Re: [PATCH][PING] linux-user/elfload: Fix /proc/cpuinfo features: on s390x

[Thomas Huth]

On 17/07/2023 09.44, Richard Henderson wrote:
> On 7/14/23 13:16, Ilya Leoshkevich wrote:
> > On Wed, 2023-06-28 at 09:49 +0200, Richard Henderson wrote:
> > > On 6/27/23 17:13, Ilya Leoshkevich wrote:
> > > > elf_hwcap_str() takes a bit number, but compares it for equality
> > > > with
> > > > the HWCAP_S390_* masks. This causes /proc/cpuinfo to display
> > > > incorrect
> > > > hwcaps.
> > > >
> > > > Fix by introducing the HWCAP_S390_NR_* constants and using them in
> > > > elf_hwcap_str() instead of the HWCAP_S390_*. While at it, add the
> > > > missing nnpa, pcimio and sie hwcaps from the latest kernel.
> > > >
> > > > Output before:
> > > >
> > > >          features        : esan3 zarch stfle msa
> > > >
> > > > Output after:
> > > >
> > > >          features        : esan3 zarch stfle msa ldisp eimm etf3eh
> > > > highgprs vx vxe
> > > >
> > > > Fixes: e19807bee357 ("linux-user/elfload: Introduce elf_hwcap_str()
> > > > on s390x")
> > > > Signed-off-by: Ilya Leoshkevich<iii@linux.ibm.com>
> > > > ---
> > > >    include/elf.h        | 66 +++++++++++++++++++++++++++++++--------
> > > > -----
> > > >    linux-user/elfload.c | 41 ++++++++++++++-------------
> > > >    2 files changed, 69 insertions(+), 38 deletions(-)
> > >
> > > Reviewed-by: Richard Henderson <richard.henderson@linaro.org>
> > >
> > > r~
> >
> > Hi,
> >
> > I noticed that while the other s390x fixes were picked up and are in
> > master, this one wasn't. Is there anything I need to improve here?
>
> I just missed it while collecting patches.  Sorry about that.
> Queued to tcg-next.

If you like, I can also take this through my s390x branch ... I'm currently 
in progress of assembling a pull request, so if you've got nothing else 
pending right now, I can put it there.

 Thomas