Re: [PATCH] objtool: Add missing endianess conversion when checking annations

From: Peter Zijlstra
Date: Wed Jul 02 2025 - 04:38:55 EST


On Wed, Jul 02, 2025 at 10:30:51AM +0200, Sven Schnelle wrote:
> Sven Schnelle <svens@xxxxxxxxxxxxx> writes:
>
> > cross-compiling a kernel for x86 on s390 produces the following warning:
> >
> > drivers/mfd/mc13xxx-core.o: warning: objtool: mc13xxx_reg_rmw+0xc: Unknown annotation type: 50331648
> >
> > Fix this by adding the required endianess conversion.
> >
> > Fixes: 2116b349e29a ("objtool: Generic annotation infrastructure")
> > Reported-by: Alexander Gordeev <agordeev@xxxxxxxxxxxxx>
> > Signed-off-by: Sven Schnelle <svens@xxxxxxxxxxxxx>
> > ---
> > tools/objtool/check.c | 2 +-
> > 1 file changed, 1 insertion(+), 1 deletion(-)
> >
> > diff --git a/tools/objtool/check.c b/tools/objtool/check.c
> > index b21b12ec88d9..35fb871b2c62 100644
> > --- a/tools/objtool/check.c
> > +++ b/tools/objtool/check.c
> > @@ -2316,7 +2316,7 @@ static int read_annotate(struct objtool_file *file,
> > }
> >
> > for_each_reloc(sec->rsec, reloc) {
> > - type = *(u32 *)(sec->data->d_buf + (reloc_idx(reloc) * sec->sh.sh_entsize) + 4);
> > + type = bswap_if_needed(file->elf, *(u32 *)(sec->data->d_buf + (reloc_idx(reloc) * sec->sh.sh_entsize) + 4));
> >
> > offset = reloc->sym->offset + reloc_addend(reloc);
> > insn = find_insn(file, reloc->sym->sec, offset);
>
> Gentle ping?

Oh, I missed there were two of these. I merged this:

https://lkml.kernel.org/r/175137563313.406.6298042704364318030.tip-bot2@tip-bot2