1. Patchew
  2. linux
  3. View series

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

Sven Schnelle posted 1 patch 7 months ago 
tools/objtool/check.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
[PATCH] objtool: Add missing endianess conversion when checking annations
Posted by Sven Schnelle 7 months ago 
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@linux.ibm.com>
Signed-off-by: Sven Schnelle <svens@linux.ibm.com>
---
 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);
-- 
2.45.2
Re: [PATCH] objtool: Add missing endianess conversion when checking annations
Posted by Sven Schnelle 5 months, 2 weeks ago 
Sven Schnelle <svens@linux.ibm.com> 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@linux.ibm.com>
> Signed-off-by: Sven Schnelle <svens@linux.ibm.com>
> ---
>  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?
Re: [PATCH] objtool: Add missing endianess conversion when checking annations
Posted by Peter Zijlstra 5 months, 2 weeks ago 
On Wed, Jul 02, 2025 at 10:30:51AM +0200, Sven Schnelle wrote:
> Sven Schnelle <svens@linux.ibm.com> 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@linux.ibm.com>
> > Signed-off-by: Sven Schnelle <svens@linux.ibm.com>
> > ---
> >  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
Re: [PATCH] objtool: Add missing endianess conversion when checking annations
Posted by Sven Schnelle 5 months, 2 weeks ago 
Peter Zijlstra <peterz@infradead.org> writes:

> On Wed, Jul 02, 2025 at 10:30:51AM +0200, Sven Schnelle wrote:
>> Sven Schnelle <svens@linux.ibm.com> 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@linux.ibm.com>
>> > Signed-off-by: Sven Schnelle <svens@linux.ibm.com>
>> > ---
>> >  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

Ok, thanks!
Re: [PATCH] objtool: Add missing endianess conversion when checking annations
Posted by Alexander Gordeev 7 months ago 
On Wed, May 14, 2025 at 03:35:15PM +0200, Sven Schnelle wrote:
> 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@linux.ibm.com>
> Signed-off-by: Sven Schnelle <svens@linux.ibm.com>
> ---
>  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);

Tested-by: Alexander Gordeev <agordeev@linux.ibm.com>

Patchew 2.1-devel-b67e4c2

© 2016 - 2025 Red Hat, Inc.