objtool and cross compilation
v3 cover objtool and cross compilation
rfc v1 - rfc v2:
- rebased onto tip/objtool/core
- reformatted couple of lines
rfc v2 - rfc v3:
- reused __*_ENDIAN_BITFIELD and dropped unneeded byteswap if __KERNEL__ is defined following David's suggestions,
- re-splitted changes and made x86 instruction decoder a separate patch,
- extra patch to add -Wno-nested-externs build flag to enable BUILD_BUG() usage,
- added a safer and more readable leXX_to_cpu macro in x86 instruction decoder,
- simplified includes. Switched to using leXX_to_cpu/cpu_to_leXX in the objtool and x86 instruction decoder since <linux/kernel.h> is included in the objtool already.
Currently objtool seems to be the only tool from all the build tools needed for x86 build which breaks x86 cross compilation on big endian systems.
But besides x86 cross compilation, endianness awareness is also needed for big endian architectures objtool support in general.
We have working prototype of objtool support and orc unwinder for s390 made originally by Martin Schwidefsky. I'm trying to bring it in shape again and refactor to share more code with "generic" part.
But first things first. This patch series points to endianness problems which should be addressed. Recent "other architectures support" patches currently moved only some problematic parts into x86 arch specific folder. Besides that even though big endian stuff is only needed for the objtool arch/x86/lib/insn.c and arch/x86/include/asm/insn.h are shared across the kernel source and the tools, so changes are applied to both.
Any suggestions how to make patches more acceptable are welcome.
Martin Schwidefsky (2):
objtool: x86 instruction decoder and big endian cross compiles
objtool: correct rebuilding of reloc sections
Vasily Gorbik (2):
objtool: allow nested externs to enable BUILD_BUG()
objtool: fix x86 orc generation on big endian cross compiles
arch/x86/include/asm/insn.h | 35 ++++++++ arch/x86/include/asm/orc_types.h | 10 +++ arch/x86/lib/insn.c | 108 ++++++++++++------------- tools/arch/x86/include/asm/insn.h | 35 ++++++++ tools/arch/x86/include/asm/orc_types.h | 10 +++ tools/arch/x86/lib/insn.c | 108 ++++++++++++------------- tools/objtool/Makefile | 2 +- tools/objtool/arch/x86/special.c | 2 +- tools/objtool/check.c | 4 +- tools/objtool/elf.c | 34 ++++---- tools/objtool/orc_dump.c | 4 +- tools/objtool/orc_gen.c | 2 + 12 files changed, 225 insertions(+), 129 deletions(-)
Signature · 6 lines
⣿⣿⣿⣿⢋⡀⣀⠹⣿⣿⣿⣿ ⣿⣿⣿⣿⠠⣶⡦⠀⣿⣿⣿⣿ ⣿⣿⣿⠏⣴⣮⣴⣧⠈⢿⣿⣿ ⣿⣿⡏⢰⣿⠖⣠⣿⡆⠈⣿⣿ ⣿⢛⣵⣄⠙⣶⣶⡟⣅⣠⠹⣿ ⣿⣜⣛⠻⢎⣉⣉⣀⠿⣫⣵⣿
RFC PATCH v3 1/4 objtool: allow nested externs to enable BUILD_BUG()
Currently BUILD_BUG() macro is expanded to smth like the following:
do {
extern void __compiletime_assert_0(void)
__attribute__((error("BUILD_BUG failed")));
if (!(!(1)))
__compiletime_assert_0();} while (0);
If used in a function body this obviously would produce build errors with -Wnested-externs and -Werror.
Build objtool with -Wno-nested-externs to enable BUILD_BUG() usage.
--- tools/objtool/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
tools/objtool/Makefile +1 -1
@@ -37,7 +37,7 @@ INCLUDES := -I$(srctree)/tools/include \ -I$(srctree)/tools/arch/$(HOSTARCH)/include/uapi \ -I$(srctree)/tools/arch/$(SRCARCH)/include \ -I$(srctree)/tools/objtool/arch/$(SRCARCH)/include -WARNINGS := $(EXTRA_WARNINGS) -Wno-switch-default -Wno-switch-enum -Wno-packed +WARNINGS := $(EXTRA_WARNINGS) -Wno-switch-default -Wno-switch-enum -Wno-packed -Wno-nested-externs CFLAGS := -Werror $(WARNINGS) $(KBUILD_HOSTCFLAGS) -g $(INCLUDES) $(LIBELF_FLAGS) LDFLAGS += $(LIBELF_LIBS) $(LIBSUBCMD) $(KBUILD_HOSTLDFLAGS)
Signature · 6 lines
⣿⣿⣿⣿⢋⡀⣀⠹⣿⣿⣿⣿ ⣿⣿⣿⣿⠠⣶⡦⠀⣿⣿⣿⣿ ⣿⣿⣿⠏⣴⣮⣴⣧⠈⢿⣿⣿ ⣿⣿⡏⢰⣿⠖⣠⣿⡆⠈⣿⣿ ⣿⢛⣵⣄⠙⣶⣶⡟⣅⣠⠹⣿ ⣿⣜⣛⠻⢎⣉⣉⣀⠿⣫⣵⣿
RFC PATCH v3 2/4 objtool: x86 instruction decoder and big endian cross compiles
In reply to Vasily GorbikFrom: Martin Schwidefsky <[email protected]>
Currently objtool seems to be the only tool from build tools needed which breaks x86 cross compilation on big endian systems. Make the x86 instruction decoder of the objtool usable on big endian machines.
--- arch/x86/include/asm/insn.h | 35 ++++++++++ arch/x86/lib/insn.c | 108 +++++++++++++++--------------- tools/arch/x86/include/asm/insn.h | 35 ++++++++++ tools/arch/x86/lib/insn.c | 108 +++++++++++++++--------------- 4 files changed, 178 insertions(+), 108 deletions(-)
arch/x86/include/asm/insn.h +35 -0
@@ -7,9 +7,12 @@* Copyright (C) IBM Corporation, 2009 */ +#include <asm/byteorder.h> /* insn_attr_t is defined in inat.h */ #include <asm/inat.h> +#if defined(__BYTE_ORDER) ? __BYTE_ORDER == __LITTLE_ENDIAN : defined(__LITTLE_ENDIAN) + struct insn_field { union { insn_value_t value;
@@ -20,6 +23,38 @@ struct insn_field {unsigned char nbytes; }; +static inline void insn_field_set (struct insn_field *p,insn_value_t v, +unsigned char n) +{ + p->value = v; + p->nbytes = n; +} + +#else + +struct insn_field { +insn_value_t value; +union { +insn_value_t little; +insn_byte_t bytes[4 ]; + }; +/* !0 if we've run insn_get_xxx() for this field */ +unsigned char got; +unsigned char nbytes; +}; + +static inline void insn_field_set (struct insn_field *p,insn_value_t v, +unsigned char n) +{ + p->value = v; +#ifndef __KERNEL__ + p->little =__bswap_32 (v); +#endif + p->nbytes = n; +} + +#endif +struct insn {struct insn_field prefixes;/* * Prefixes
arch/x86/lib/insn.c +54 -54
227 lines not on this page · raw message
tools/arch/x86/include/asm/insn.h +35 -0
@@ -7,9 +7,12 @@* Copyright (C) IBM Corporation, 2009 */ +#include <asm/byteorder.h> /* insn_attr_t is defined in inat.h */ #include "inat.h" +#if defined(__BYTE_ORDER) ? __BYTE_ORDER == __LITTLE_ENDIAN : defined(__LITTLE_ENDIAN) + struct insn_field { union { insn_value_t value;
@@ -20,6 +23,38 @@ struct insn_field {unsigned char nbytes; }; +static inline void insn_field_set (struct insn_field *p,insn_value_t v, +unsigned char n) +{ + p->value = v; + p->nbytes = n; +} + +#else + +struct insn_field { +insn_value_t value; +union { +insn_value_t little; +insn_byte_t bytes[4 ]; + }; +/* !0 if we've run insn_get_xxx() for this field */ +unsigned char got; +unsigned char nbytes; +}; + +static inline void insn_field_set (struct insn_field *p,insn_value_t v, +unsigned char n) +{ + p->value = v; +#ifndef __KERNEL__ + p->little =__bswap_32 (v); +#endif + p->nbytes = n; +} + +#endif +struct insn {struct insn_field prefixes;/* * Prefixes
tools/arch/x86/lib/insn.c +54 -54
227 lines not on this page · raw message
Signature · 6 lines
⣿⣿⣿⣿⢋⡀⣀⠹⣿⣿⣿⣿ ⣿⣿⣿⣿⠠⣶⡦⠀⣿⣿⣿⣿ ⣿⣿⣿⠏⣴⣮⣴⣧⠈⢿⣿⣿ ⣿⣿⡏⢰⣿⠖⣠⣿⡆⠈⣿⣿ ⣿⢛⣵⣄⠙⣶⣶⡟⣅⣠⠹⣿ ⣿⣜⣛⠻⢎⣉⣉⣀⠿⣫⣵⣿
Re: [RFC PATCH v3 2/4] objtool: x86 instruction decoder and big endian cross compiles
Quoted 9 lines · Vasily Gorbik
From: Martin Schwidefsky <[email protected]>
Currently objtool seems to be the only tool from build tools needed which breaks x86 cross compilation on big endian systems. Make the x86 instruction decoder of the objtool usable on big endian machines.
Signed-off-by Martin Schwidefsky <[email protected]>Co-developed-by Vasily Gorbik <[email protected]>Signed-off-by Vasily Gorbik <[email protected]>
Since this changes the decoder (which is shared with the kernel), please prefix the subject with "x86/insn:" instead of "objtool".
This patch is a bit ugly, but I don't necessarily have a better idea.
Masami?
Signature · 1 line
Josh
Masami Hiramatsu
Acked-byRe: [RFC PATCH v3 2/4] objtool: x86 instruction decoder and big endian cross compiles
Quoted 7 lines · On Fri, 2 Oct 2020 10:18:41 -0500 Josh Poimboeuf <[email protected]> wrote:
Quoted 6 lines · Vasily Gorbik
From: Martin Schwidefsky <[email protected]>
Currently objtool seems to be the only tool from build tools needed which breaks x86 cross compilation on big endian systems. Make the x86 instruction decoder of the objtool usable on big endian machines.
Quoted 6 lines
Quoted 3 lines
Signed-off-by Martin Schwidefsky <[email protected]>Co-developed-by Vasily Gorbik <[email protected]>Signed-off-by Vasily Gorbik <[email protected]>Since this changes the decoder (which is shared with the kernel), please prefix the subject with "x86/insn:" instead of "objtool".
Thanks for pointing it.
Quoted 4 lines
This patch is a bit ugly, but I don't necessarily have a better idea.
Masami?
Yeah, agreed. Maybe we can split that part in different header, but that makes it more ugly. And code itself looks good to me. (I like insn_field_set() idea :) )
Thank you!
Quoted 3 lines
Signature · 1 line
Josh
Signature · 1 line
Masami Hiramatsu <[email protected]>
RFC PATCH v3 3/4 objtool: correct rebuilding of reloc sections
In reply to Vasily GorbikFrom: Martin Schwidefsky <[email protected]>
Currently relocations generated in elf_rebuild_rel_reloc_section/ elf_rebuild_rela_reloc_section functions are broken if the objtool is built and run on big endian system. E.g. the following errors pop up during x86 cross compilation:
x86_64-9.1.0-ld: fs/efivarfs/inode.o: bad reloc symbol index (0x2000000 >=
0x22) for offset 0 in section `.orc_unwind_ip'
x86_64-9.1.0-ld: final link failed: bad value
To address that convert those functions to do things similar to elf_write_reloc(), reuse gelf_update_rel/gelf_update_rela libelf library functions.
--- tools/objtool/elf.c | 34 +++++++++++++++++++--------------- 1 file changed, 19 insertions(+), 15 deletions(-)
tools/objtool/elf.c +19 -15
@@ -829,25 +829,27 @@ static int elf_rebuild_rel_reloc_section(struct section *sec, int nr) {struct reloc *reloc;int idx =0 , size; -GElf_Rel *relocs; +void *buf;/* Allocate a buffer for relocations */ - size = nr *sizeof (*relocs); - relocs =malloc (size); -if (!relocs) { + size = nr *sizeof (GElf_Rel); + buf =malloc (size); +if (!buf) {perror ("malloc" );return -1 ; } - sec->data->d_buf = relocs; + sec->data->d_buf = buf; sec->data->d_size = size; + sec->data->d_type =ELF_T_REL ; sec->sh.sh_size = size; idx =0 ;list_for_each_entry (reloc, &sec->reloc_list, list) { - relocs[idx].r_offset = reloc->offset; - relocs[idx].r_info =GELF_R_INFO (reloc->sym->idx, reloc->type); + reloc->rel.r_offset = reloc->offset; + reloc->rel.r_info =GELF_R_INFO (reloc->sym->idx, reloc->type); +gelf_update_rel (sec->data, idx, &reloc->rel); idx++; }
@@ -858,26 +860,28 @@ static int elf_rebuild_rela_reloc_section(struct section *sec, int nr) {struct reloc *reloc;int idx =0 , size; -GElf_Rela *relocs; +void *buf;/* Allocate a buffer for relocations with addends */ - size = nr *sizeof (*relocs); - relocs =malloc (size); -if (!relocs) { + size = nr *sizeof (GElf_Rela); + buf =malloc (size); +if (!buf) {perror ("malloc" );return -1 ; } - sec->data->d_buf = relocs; + sec->data->d_buf = buf; sec->data->d_size = size; + sec->data->d_type =ELF_T_RELA ; sec->sh.sh_size = size; idx =0 ;list_for_each_entry (reloc, &sec->reloc_list, list) { - relocs[idx].r_offset = reloc->offset; - relocs[idx].r_addend = reloc->addend; - relocs[idx].r_info =GELF_R_INFO (reloc->sym->idx, reloc->type); + reloc->rela.r_offset = reloc->offset; + reloc->rela.r_addend = reloc->addend; + reloc->rela.r_info =GELF_R_INFO (reloc->sym->idx, reloc->type); +gelf_update_rela (sec->data, idx, &reloc->rela); idx++; }
Signature · 6 lines
⣿⣿⣿⣿⢋⡀⣀⠹⣿⣿⣿⣿ ⣿⣿⣿⣿⠠⣶⡦⠀⣿⣿⣿⣿ ⣿⣿⣿⠏⣴⣮⣴⣧⠈⢿⣿⣿ ⣿⣿⡏⢰⣿⠖⣠⣿⡆⠈⣿⣿ ⣿⢛⣵⣄⠙⣶⣶⡟⣅⣠⠹⣿ ⣿⣜⣛⠻⢎⣉⣉⣀⠿⣫⣵⣿
RFC PATCH v3 4/4 objtool: fix x86 orc generation on big endian cross compiles
In reply to Vasily GorbikCorrect objtool orc generation endianness problems to enable fully functional x86 cross compiles on big endian hardware.
--- arch/x86/include/asm/orc_types.h | 10 ++++++++++ tools/arch/x86/include/asm/orc_types.h | 10 ++++++++++ tools/objtool/arch/x86/special.c | 2 +- tools/objtool/check.c | 4 ++-- tools/objtool/orc_dump.c | 4 ++-- tools/objtool/orc_gen.c | 2 ++ 6 files changed, 27 insertions(+), 5 deletions(-)
arch/x86/include/asm/orc_types.h +10 -0
@@ -40,6 +40,8 @@#define ORC_REG_MAX 15#ifndef __ASSEMBLY__ +#include <asm/byteorder.h> +/* * This struct is more or less a vastly simplified version of the DWARF Call * Frame Information standard. It contains only the necessary parts of DWARF
@@ -51,10 +53,18 @@struct orc_entry {s16 sp_offset;s16 bp_offset; +#if defined(__LITTLE_ENDIAN_BITFIELD)unsigned sp_reg:4 ;unsigned bp_reg:4 ;unsigned type:2 ;unsigned end:1 ; +#elif defined(__BIG_ENDIAN_BITFIELD) +unsigned bp_reg:4 ; +unsigned sp_reg:4 ; +unsigned unused:5 ; +unsigned end:1 ; +unsigned type:2 ; +#endif } __packed;#endif /* __ASSEMBLY__ */
tools/arch/x86/include/asm/orc_types.h +10 -0
@@ -40,6 +40,8 @@#define ORC_REG_MAX 15#ifndef __ASSEMBLY__ +#include <asm/byteorder.h> +/* * This struct is more or less a vastly simplified version of the DWARF Call * Frame Information standard. It contains only the necessary parts of DWARF
@@ -51,10 +53,18 @@struct orc_entry {s16 sp_offset;s16 bp_offset; +#if defined(__LITTLE_ENDIAN_BITFIELD)unsigned sp_reg:4 ;unsigned bp_reg:4 ;unsigned type:2 ;unsigned end:1 ; +#elif defined(__BIG_ENDIAN_BITFIELD) +unsigned bp_reg:4 ; +unsigned sp_reg:4 ; +unsigned unused:5 ; +unsigned end:1 ; +unsigned type:2 ; +#endif } __packed;#endif /* __ASSEMBLY__ */
tools/objtool/arch/x86/special.c +1 -1
@@ -9,7 +9,7 @@void arch_handle_alternative (unsigned short feature,struct special_alt *alt) { -switch (feature) { +switch (le16_to_cpu (feature)) {case X86_FEATURE_SMAP :/* * If UACCESS validation is enabled; force that alternative;
tools/objtool/check.c +2 -2
@@ -1370,7 +1370,7 @@ static int read_unwind_hints(struct objtool_file *file) cfa = &insn->cfi.cfa;if (hint->type ==UNWIND_HINT_TYPE_RET_OFFSET ) { - insn->ret_offset = hint->sp_offset; + insn->ret_offset =le16_to_cpu (hint->sp_offset);continue ; }
@@ -1382,7 +1382,7 @@ static int read_unwind_hints(struct objtool_file *file)return -1 ; } - cfa->offset = hint->sp_offset; + cfa->offset =le16_to_cpu (hint->sp_offset); insn->cfi.type = hint->type; insn->cfi.end = hint->end; }
tools/objtool/orc_dump.c +2 -2
@@ -197,11 +197,11 @@ int orc_dump(const char *_objname)printf (" sp:" ); -print_reg (orc[i].sp_reg, orc[i].sp_offset); +print_reg (orc[i].sp_reg, (s16 )le16_to_cpu (orc[i].sp_offset));printf (" bp:" ); -print_reg (orc[i].bp_reg, orc[i].bp_offset); +print_reg (orc[i].bp_reg, (s16 )le16_to_cpu (orc[i].bp_offset));printf (" type:%s end:%d\n" ,orc_type_name (orc[i].type), orc[i].end);
tools/objtool/orc_gen.c +2 -0
@@ -96,6 +96,8 @@ static int create_orc_entry(struct elf *elf, struct section *u_sec, struct secti/* populate ORC data */ orc = (struct orc_entry *)u_sec->data->d_buf + idx;memcpy (orc, o,sizeof (*orc)); + orc->sp_offset =cpu_to_le16 (orc->sp_offset); + orc->bp_offset =cpu_to_le16 (orc->bp_offset);/* populate reloc for ip */ reloc =malloc (sizeof (*reloc));
Signature · 6 lines
⣿⣿⣿⣿⢋⡀⣀⠹⣿⣿⣿⣿ ⣿⣿⣿⣿⠠⣶⡦⠀⣿⣿⣿⣿ ⣿⣿⣿⠏⣴⣮⣴⣧⠈⢿⣿⣿ ⣿⣿⡏⢰⣿⠖⣠⣿⡆⠈⣿⣿ ⣿⢛⣵⣄⠙⣶⣶⡟⣅⣠⠹⣿ ⣿⣜⣛⠻⢎⣉⣉⣀⠿⣫⣵⣿
Re: [RFC PATCH v3 4/4] objtool: fix x86 orc generation on big endian cross compiles
tools/objtool/arch/x86/special.c line 12
Quoted 7 lines · Vasily Gorbik
+++
b/tools/objtool/arch/x86/special.ctools/objtool/arch/x86/special.c +1
-1@@ -9,7 +9,7 @@void arch_handle_alternative (unsigned short feature,struct special_alt *alt) { -switch (feature) { +switch (le16_to_cpu (feature)) {
It might be cleaner for the endian conversion to be done when the 'feature' value is first read.
feature = *(unsigned short *)(sec->data->d_buf + offset + entry->feature);
tools/objtool/check.c static int read_unwind_hints(struct objtool_file *file) · line 1373
Quoted 13 lines
tools/objtool/arch/x86/special.c +0
-0case X86_FEATURE_SMAP :/* * If UACCESS validation is enabled; force that alternative; tools/objtool/check.c +1
-1@@ -1370,7 +1370,7 @@ static int read_unwind_hints(struct objtool_file *file) cfa = &insn->cfi.cfa;if (hint->type ==UNWIND_HINT_TYPE_RET_OFFSET ) { - insn->ret_offset = hint->sp_offset; + insn->ret_offset =le16_to_cpu (hint->sp_offset);
Since this is common code, we might not always be able to assume the value is little endian. Could you make a more generic conversion macro which -- when the target ELF file's endianness doesn't match the host CPU's -- does a byte swap? For example:
insn->ret_offset = bswap_if_needed(hint->sp_offset);
The macro could detect the type size, and would also know the host/target endianness, and could swap accordingly. It could then be called for all such multi-byte reads.
Signature · 1 line
Josh
v4 cover objtool and cross compilation
rfc v1 - rfc v2:
- rebased onto tip/objtool/core
- reformatted couple of lines
rfc v2 - rfc v3:
- reused __*_ENDIAN_BITFIELD and dropped unneeded byteswap if __KERNEL__ is defined following David's suggestions,
- re-splitted changes and made x86 instruction decoder a separate patch,
- extra patch to add -Wno-nested-externs build flag to enable BUILD_BUG() usage,
- added a safer and more readable leXX_to_cpu macro in x86 instruction decoder,
- simplified includes. Switched to using leXX_to_cpu/cpu_to_leXX in the objtool and x86 instruction decoder since <linux/kernel.h> is included in the objtool already.
rfc v3 - rfc v4:
- patch 4: objtool: fix x86 orc generation on big endian cross compiles
- introduced "bswap_if_needed()" macro for multi-byte values conversion, which are read from / about to be written to a target native endianness ELF file.
- patch 2: x86/insn: instruction decoder and big endian cross compiles
- changed subject prefix from objtool to x86/insn
- reformated leXX_to_cpu macro make it easier to read
Currently objtool seems to be the only tool from all the build tools needed for x86 build which breaks x86 cross compilation on big endian systems.
But besides x86 cross compilation, endianness awareness is also needed for big endian architectures objtool support in general.
We have working prototype of objtool support and orc unwinder for s390 made originally by Martin Schwidefsky. I'm trying to bring it in shape again and refactor to share more code with "generic" part.
But first things first. This patch series points to endianness problems which should be addressed. Recent "other architectures support" patches currently moved only some problematic parts into x86 arch specific folder. Besides that even though big endian stuff is only needed for the objtool arch/x86/lib/insn.c and arch/x86/include/asm/insn.h are shared across the kernel source and the tools, so changes are applied to both.
Any suggestions how to make patches more acceptable are welcome.
Martin Schwidefsky (2):
x86/insn: instruction decoder and big endian cross compiles
objtool: correct rebuilding of reloc sections
Vasily Gorbik (2):
objtool: allow nested externs to enable BUILD_BUG()
objtool: fix x86 orc generation on big endian cross compiles
arch/x86/include/asm/insn.h | 33 ++++++ arch/x86/include/asm/orc_types.h | 10 ++ arch/x86/lib/insn.c | 101 ++++++++---------- tools/arch/x86/include/asm/insn.h | 33 ++++++ tools/arch/x86/include/asm/orc_types.h | 10 ++ tools/arch/x86/lib/insn.c | 101 ++++++++---------- tools/objtool/Makefile | 2 +- .../arch/x86/include/arch_endianness.h | 9 ++ tools/objtool/check.c | 5 +- tools/objtool/elf.c | 34 +++--- tools/objtool/endianness.h | 38 +++++++ tools/objtool/orc_dump.c | 5 +- tools/objtool/orc_gen.c | 3 + tools/objtool/special.c | 6 +- 14 files changed, 260 insertions(+), 130 deletions(-) create mode 100644 tools/objtool/arch/x86/include/arch_endianness.h create mode 100644 tools/objtool/endianness.h
Signature · 6 lines
⣿⣿⣿⣿⢋⡀⣀⠹⣿⣿⣿⣿ ⣿⣿⣿⣿⠠⣶⡦⠀⣿⣿⣿⣿ ⣿⣿⣿⠏⣴⣮⣴⣧⠈⢿⣿⣿ ⣿⣿⡏⢰⣿⠖⣠⣿⡆⠈⣿⣿ ⣿⢛⣵⣄⠙⣶⣶⡟⣅⣠⠹⣿ ⣿⣜⣛⠻⢎⣉⣉⣀⠿⣫⣵⣿
RFC PATCH v4 1/4 objtool: allow nested externs to enable BUILD_BUG()
Currently BUILD_BUG() macro is expanded to smth like the following:
do {
extern void __compiletime_assert_0(void)
__attribute__((error("BUILD_BUG failed")));
if (!(!(1)))
__compiletime_assert_0();} while (0);
If used in a function body this obviously would produce build errors with -Wnested-externs and -Werror.
Build objtool with -Wno-nested-externs to enable BUILD_BUG() usage.
--- tools/objtool/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
tools/objtool/Makefile +1 -1
@@ -37,7 +37,7 @@ INCLUDES := -I$(srctree)/tools/include \ -I$(srctree)/tools/arch/$(HOSTARCH)/include/uapi \ -I$(srctree)/tools/arch/$(SRCARCH)/include \ -I$(srctree)/tools/objtool/arch/$(SRCARCH)/include -WARNINGS := $(EXTRA_WARNINGS) -Wno-switch-default -Wno-switch-enum -Wno-packed +WARNINGS := $(EXTRA_WARNINGS) -Wno-switch-default -Wno-switch-enum -Wno-packed -Wno-nested-externs CFLAGS := -Werror $(WARNINGS) $(KBUILD_HOSTCFLAGS) -g $(INCLUDES) $(LIBELF_FLAGS) LDFLAGS += $(LIBELF_LIBS) $(LIBSUBCMD) $(KBUILD_HOSTLDFLAGS)
Signature · 6 lines
⣿⣿⣿⣿⢋⡀⣀⠹⣿⣿⣿⣿ ⣿⣿⣿⣿⠠⣶⡦⠀⣿⣿⣿⣿ ⣿⣿⣿⠏⣴⣮⣴⣧⠈⢿⣿⣿ ⣿⣿⡏⢰⣿⠖⣠⣿⡆⠈⣿⣿ ⣿⢛⣵⣄⠙⣶⣶⡟⣅⣠⠹⣿ ⣿⣜⣛⠻⢎⣉⣉⣀⠿⣫⣵⣿
RFC PATCH v4 2/4 x86/insn: instruction decoder and big endian cross compiles
In reply to Vasily GorbikFrom: Martin Schwidefsky <[email protected]>
x86 instruction decoder code is shared across the kernel source and the tools. Currently objtool seems to be the only tool from build tools needed which breaks x86 cross compilation on big endian systems. Make the x86 instruction decoder build host endianness agnostic to support x86 cross compilation and enable objtool to implement endianness awareness for big endian architectures support.
--- arch/x86/include/asm/insn.h | 33 ++++++++++ arch/x86/lib/insn.c | 101 ++++++++++++++---------------- tools/arch/x86/include/asm/insn.h | 33 ++++++++++ tools/arch/x86/lib/insn.c | 101 ++++++++++++++---------------- 4 files changed, 160 insertions(+), 108 deletions(-)
arch/x86/include/asm/insn.h +33 -0
@@ -7,9 +7,12 @@* Copyright (C) IBM Corporation, 2009 */ +#include <asm/byteorder.h> /* insn_attr_t is defined in inat.h */ #include <asm/inat.h> +#if defined(__BYTE_ORDER) ? __BYTE_ORDER == __LITTLE_ENDIAN : defined(__LITTLE_ENDIAN) + struct insn_field { union { insn_value_t value;
@@ -20,6 +23,36 @@ struct insn_field {unsigned char nbytes; }; +static inline void insn_field_set (struct insn_field *p,insn_value_t v, +unsigned char n) +{ + p->value = v; + p->nbytes = n; +} + +#else + +struct insn_field { +insn_value_t value; +union { +insn_value_t little; +insn_byte_t bytes[4 ]; + }; +/* !0 if we've run insn_get_xxx() for this field */ +unsigned char got; +unsigned char nbytes; +}; + +static inline void insn_field_set (struct insn_field *p,insn_value_t v, +unsigned char n) +{ + p->value = v; + p->little =__cpu_to_le32 (v); + p->nbytes = n; +} + +#endif +struct insn {struct insn_field prefixes;/* * Prefixes
arch/x86/lib/insn.c +47 -54
220 lines not on this page · raw message
tools/arch/x86/include/asm/insn.h +33 -0
@@ -7,9 +7,12 @@* Copyright (C) IBM Corporation, 2009 */ +#include <asm/byteorder.h> /* insn_attr_t is defined in inat.h */ #include "inat.h" +#if defined(__BYTE_ORDER) ? __BYTE_ORDER == __LITTLE_ENDIAN : defined(__LITTLE_ENDIAN) + struct insn_field { union { insn_value_t value;
@@ -20,6 +23,36 @@ struct insn_field {unsigned char nbytes; }; +static inline void insn_field_set (struct insn_field *p,insn_value_t v, +unsigned char n) +{ + p->value = v; + p->nbytes = n; +} + +#else + +struct insn_field { +insn_value_t value; +union { +insn_value_t little; +insn_byte_t bytes[4 ]; + }; +/* !0 if we've run insn_get_xxx() for this field */ +unsigned char got; +unsigned char nbytes; +}; + +static inline void insn_field_set (struct insn_field *p,insn_value_t v, +unsigned char n) +{ + p->value = v; + p->little =__cpu_to_le32 (v); + p->nbytes = n; +} + +#endif +struct insn {struct insn_field prefixes;/* * Prefixes
tools/arch/x86/lib/insn.c +47 -54
220 lines not on this page · raw message
Signature · 6 lines
⣿⣿⣿⣿⢋⡀⣀⠹⣿⣿⣿⣿ ⣿⣿⣿⣿⠠⣶⡦⠀⣿⣿⣿⣿ ⣿⣿⣿⠏⣴⣮⣴⣧⠈⢿⣿⣿ ⣿⣿⡏⢰⣿⠖⣠⣿⡆⠈⣿⣿ ⣿⢛⣵⣄⠙⣶⣶⡟⣅⣠⠹⣿ ⣿⣜⣛⠻⢎⣉⣉⣀⠿⣫⣵⣿
RFC PATCH v4 3/4 objtool: correct rebuilding of reloc sections
In reply to Vasily GorbikFrom: Martin Schwidefsky <[email protected]>
Currently relocations generated in elf_rebuild_rel_reloc_section/ elf_rebuild_rela_reloc_section functions are broken if the objtool is built and run on big endian system. E.g. the following errors pop up during x86 cross compilation:
x86_64-9.1.0-ld: fs/efivarfs/inode.o: bad reloc symbol index (0x2000000 >=
0x22) for offset 0 in section `.orc_unwind_ip'
x86_64-9.1.0-ld: final link failed: bad value
To address that convert those functions to do things similar to elf_write_reloc(), reuse gelf_update_rel/gelf_update_rela libelf library functions.
--- tools/objtool/elf.c | 34 +++++++++++++++++++--------------- 1 file changed, 19 insertions(+), 15 deletions(-)
tools/objtool/elf.c +19 -15
@@ -829,25 +829,27 @@ static int elf_rebuild_rel_reloc_section(struct section *sec, int nr) {struct reloc *reloc;int idx =0 , size; -GElf_Rel *relocs; +void *buf;/* Allocate a buffer for relocations */ - size = nr *sizeof (*relocs); - relocs =malloc (size); -if (!relocs) { + size = nr *sizeof (GElf_Rel); + buf =malloc (size); +if (!buf) {perror ("malloc" );return -1 ; } - sec->data->d_buf = relocs; + sec->data->d_buf = buf; sec->data->d_size = size; + sec->data->d_type =ELF_T_REL ; sec->sh.sh_size = size; idx =0 ;list_for_each_entry (reloc, &sec->reloc_list, list) { - relocs[idx].r_offset = reloc->offset; - relocs[idx].r_info =GELF_R_INFO (reloc->sym->idx, reloc->type); + reloc->rel.r_offset = reloc->offset; + reloc->rel.r_info =GELF_R_INFO (reloc->sym->idx, reloc->type); +gelf_update_rel (sec->data, idx, &reloc->rel); idx++; }
@@ -858,26 +860,28 @@ static int elf_rebuild_rela_reloc_section(struct section *sec, int nr) {struct reloc *reloc;int idx =0 , size; -GElf_Rela *relocs; +void *buf;/* Allocate a buffer for relocations with addends */ - size = nr *sizeof (*relocs); - relocs =malloc (size); -if (!relocs) { + size = nr *sizeof (GElf_Rela); + buf =malloc (size); +if (!buf) {perror ("malloc" );return -1 ; } - sec->data->d_buf = relocs; + sec->data->d_buf = buf; sec->data->d_size = size; + sec->data->d_type =ELF_T_RELA ; sec->sh.sh_size = size; idx =0 ;list_for_each_entry (reloc, &sec->reloc_list, list) { - relocs[idx].r_offset = reloc->offset; - relocs[idx].r_addend = reloc->addend; - relocs[idx].r_info =GELF_R_INFO (reloc->sym->idx, reloc->type); + reloc->rela.r_offset = reloc->offset; + reloc->rela.r_addend = reloc->addend; + reloc->rela.r_info =GELF_R_INFO (reloc->sym->idx, reloc->type); +gelf_update_rela (sec->data, idx, &reloc->rela); idx++; }
Signature · 6 lines
⣿⣿⣿⣿⢋⡀⣀⠹⣿⣿⣿⣿ ⣿⣿⣿⣿⠠⣶⡦⠀⣿⣿⣿⣿ ⣿⣿⣿⠏⣴⣮⣴⣧⠈⢿⣿⣿ ⣿⣿⡏⢰⣿⠖⣠⣿⡆⠈⣿⣿ ⣿⢛⣵⣄⠙⣶⣶⡟⣅⣠⠹⣿ ⣿⣜⣛⠻⢎⣉⣉⣀⠿⣫⣵⣿
RFC PATCH v4 4/4 objtool: fix x86 orc generation on big endian cross compiles
In reply to Vasily GorbikCorrect objtool orc generation endianness problems to enable fully functional x86 cross compiles on big endian hardware.
Introduces bswap_if_needed macro which does a byte swap if target endianness doesn't match the host, i.e. cross compilation for little endian on big endian and vice versa. To be used for multi-byte values conversion, which are read from / about to be written to a target native endianness ELF file.
arch/x86/include/asm/orc_types.h +10 -0
@@ -40,6 +40,8 @@#define ORC_REG_MAX 15#ifndef __ASSEMBLY__ +#include <asm/byteorder.h> +/* * This struct is more or less a vastly simplified version of the DWARF Call * Frame Information standard. It contains only the necessary parts of DWARF
@@ -51,10 +53,18 @@struct orc_entry {s16 sp_offset;s16 bp_offset; +#if defined(__LITTLE_ENDIAN_BITFIELD)unsigned sp_reg:4 ;unsigned bp_reg:4 ;unsigned type:2 ;unsigned end:1 ; +#elif defined(__BIG_ENDIAN_BITFIELD) +unsigned bp_reg:4 ; +unsigned sp_reg:4 ; +unsigned unused:5 ; +unsigned end:1 ; +unsigned type:2 ; +#endif } __packed;#endif /* __ASSEMBLY__ */
tools/arch/x86/include/asm/orc_types.h +10 -0
@@ -40,6 +40,8 @@#define ORC_REG_MAX 15#ifndef __ASSEMBLY__ +#include <asm/byteorder.h> +/* * This struct is more or less a vastly simplified version of the DWARF Call * Frame Information standard. It contains only the necessary parts of DWARF
@@ -51,10 +53,18 @@struct orc_entry {s16 sp_offset;s16 bp_offset; +#if defined(__LITTLE_ENDIAN_BITFIELD)unsigned sp_reg:4 ;unsigned bp_reg:4 ;unsigned type:2 ;unsigned end:1 ; +#elif defined(__BIG_ENDIAN_BITFIELD) +unsigned bp_reg:4 ; +unsigned sp_reg:4 ; +unsigned unused:5 ; +unsigned end:1 ; +unsigned type:2 ; +#endif } __packed;#endif /* __ASSEMBLY__ */
tools/objtool/arch/x86/include/arch_endianness.h new file +9 -0
@@ -0,0 +1,9 @@ +/* SPDX-License-Identifier: GPL-2.0-or-later */ +#ifndef _ARCH_ENDIANNESS_H +#define _ARCH_ENDIANNESS_H + +#include <endian.h> + +#define __TARGET_BYTE_ORDER __LITTLE_ENDIAN + +#endif /* _ARCH_ENDIANNESS_H */
tools/objtool/check.c +3 -2
@@ -13,6 +13,7 @@#include "special.h" #include "warn.h" #include "arch_elf.h" +#include "endianness.h" #include <linux/objtool.h> #include <linux/hashtable.h>
@@ -1370,7 +1371,7 @@ static int read_unwind_hints(struct objtool_file *file) cfa = &insn->cfi.cfa;if (hint->type ==UNWIND_HINT_TYPE_RET_OFFSET ) { - insn->ret_offset = hint->sp_offset; + insn->ret_offset =bswap_if_needed (hint->sp_offset);continue ; }
@@ -1382,7 +1383,7 @@ static int read_unwind_hints(struct objtool_file *file)return -1 ; } - cfa->offset = hint->sp_offset; + cfa->offset =bswap_if_needed (hint->sp_offset); insn->cfi.type = hint->type; insn->cfi.end = hint->end; }
tools/objtool/endianness.h new file +38 -0
@@ -0,0 +1,38 @@ +/* SPDX-License-Identifier: GPL-2.0-or-later */ +#ifndef _OBJTOOL_ENDIANNESS_H +#define _OBJTOOL_ENDIANNESS_H + +#include <linux/kernel.h> +#include <endian.h> +#include "arch_endianness.h" + +#ifndef __TARGET_BYTE_ORDER +#error undefined arch __TARGET_BYTE_ORDER +#endif + +#if __BYTE_ORDER != __TARGET_BYTE_ORDER +#define __NEED_BSWAP 1 +#else +#define __NEED_BSWAP 0 +#endif + +/* +* Does a byte swap if target endianness doesn't match the host, i.e. cross +* compilation for little endian on big endian and vice versa. +* To be used for multi-byte values conversion, which are read from / about +* to be written to a target native endianness ELF file. +*/ +#define bswap_if_needed (val) \ +({ \ + __typeof__(val) __ret; \ + switch (sizeof(val)) { \ + case 8: __ret = __NEED_BSWAP ? bswap_64(val) : (val); break; \ + case 4: __ret = __NEED_BSWAP ? bswap_32(val) : (val); break; \ + case 2: __ret = __NEED_BSWAP ? bswap_16(val) : (val); break; \ + default: \ + BUILD_BUG(); break; \ + } \ + __ret; \ +}) + +#endif /* _OBJTOOL_ENDIANNESS_H */
tools/objtool/orc_dump.c +3 -2
@@ -8,6 +8,7 @@#include <asm/orc_types.h> #include "objtool.h" #include "warn.h" +#include "endianness.h" static const char *reg_name (unsigned int reg) {
@@ -197,11 +198,11 @@ int orc_dump(const char *_objname)printf (" sp:" ); -print_reg (orc[i].sp_reg, orc[i].sp_offset); +print_reg (orc[i].sp_reg,bswap_if_needed (orc[i].sp_offset));printf (" bp:" ); -print_reg (orc[i].bp_reg, orc[i].bp_offset); +print_reg (orc[i].bp_reg,bswap_if_needed (orc[i].bp_offset));printf (" type:%s end:%d\n" ,orc_type_name (orc[i].type), orc[i].end);
tools/objtool/orc_gen.c +3 -0
@@ -11,6 +11,7 @@#include "check.h" #include "warn.h" +#include "endianness.h" int create_orc (struct objtool_file *file) {
@@ -96,6 +97,8 @@ static int create_orc_entry(struct elf *elf, struct section *u_sec, struct secti/* populate ORC data */ orc = (struct orc_entry *)u_sec->data->d_buf + idx;memcpy (orc, o,sizeof (*orc)); + orc->sp_offset =bswap_if_needed (orc->sp_offset); + orc->bp_offset =bswap_if_needed (orc->bp_offset);/* populate reloc for ip */ reloc =malloc (sizeof (*reloc));
tools/objtool/special.c +4 -3
@@ -15,6 +15,7 @@#include "special.h" #include "warn.h" #include "arch_special.h" +#include "endianness.h" struct special_entry {const char *sec;
@@ -77,8 +78,9 @@ static int get_alt_entry(struct elf *elf, struct special_entry *entry,if (entry->feature) {unsigned short feature; - feature = *(unsigned short *)(sec->data->d_buf + offset + - entry->feature); + feature =bswap_if_needed (*(unsigned short *)(sec->data->d_buf + + offset + + entry->feature));arch_handle_alternative (feature, alt); } ---
arch/x86/include/asm/orc_types.h | 10 +++++ tools/arch/x86/include/asm/orc_types.h | 10 +++++ .../arch/x86/include/arch_endianness.h | 9 +++++ tools/objtool/check.c | 5 ++- tools/objtool/endianness.h | 38 +++++++++++++++++++ tools/objtool/orc_dump.c | 5 ++- tools/objtool/orc_gen.c | 3 ++ tools/objtool/special.c | 6 ++- 8 files changed, 80 insertions(+), 6 deletions(-) create mode 100644 tools/objtool/arch/x86/include/arch_endianness.h create mode 100644 tools/objtool/endianness.h
arch/x86/include/asm/orc_types.h +10 -0
@@ -40,6 +40,8 @@#define ORC_REG_MAX 15#ifndef __ASSEMBLY__ +#include <asm/byteorder.h> +/* * This struct is more or less a vastly simplified version of the DWARF Call * Frame Information standard. It contains only the necessary parts of DWARF
@@ -51,10 +53,18 @@struct orc_entry {s16 sp_offset;s16 bp_offset; +#if defined(__LITTLE_ENDIAN_BITFIELD)unsigned sp_reg:4 ;unsigned bp_reg:4 ;unsigned type:2 ;unsigned end:1 ; +#elif defined(__BIG_ENDIAN_BITFIELD) +unsigned bp_reg:4 ; +unsigned sp_reg:4 ; +unsigned unused:5 ; +unsigned end:1 ; +unsigned type:2 ; +#endif } __packed;#endif /* __ASSEMBLY__ */
tools/arch/x86/include/asm/orc_types.h +10 -0
@@ -40,6 +40,8 @@#define ORC_REG_MAX 15#ifndef __ASSEMBLY__ +#include <asm/byteorder.h> +/* * This struct is more or less a vastly simplified version of the DWARF Call * Frame Information standard. It contains only the necessary parts of DWARF
@@ -51,10 +53,18 @@struct orc_entry {s16 sp_offset;s16 bp_offset; +#if defined(__LITTLE_ENDIAN_BITFIELD)unsigned sp_reg:4 ;unsigned bp_reg:4 ;unsigned type:2 ;unsigned end:1 ; +#elif defined(__BIG_ENDIAN_BITFIELD) +unsigned bp_reg:4 ; +unsigned sp_reg:4 ; +unsigned unused:5 ; +unsigned end:1 ; +unsigned type:2 ; +#endif } __packed;#endif /* __ASSEMBLY__ */
tools/objtool/arch/x86/include/arch_endianness.h new file +9 -0
@@ -0,0 +1,9 @@ +/* SPDX-License-Identifier: GPL-2.0-or-later */ +#ifndef _ARCH_ENDIANNESS_H +#define _ARCH_ENDIANNESS_H + +#include <endian.h> + +#define __TARGET_BYTE_ORDER __LITTLE_ENDIAN + +#endif /* _ARCH_ENDIANNESS_H */
tools/objtool/check.c +3 -2
@@ -13,6 +13,7 @@#include "special.h" #include "warn.h" #include "arch_elf.h" +#include "endianness.h" #include <linux/objtool.h> #include <linux/hashtable.h>
@@ -1370,7 +1371,7 @@ static int read_unwind_hints(struct objtool_file *file) cfa = &insn->cfi.cfa;if (hint->type ==UNWIND_HINT_TYPE_RET_OFFSET ) { - insn->ret_offset = hint->sp_offset; + insn->ret_offset =bswap_if_needed (hint->sp_offset);continue ; }
@@ -1382,7 +1383,7 @@ static int read_unwind_hints(struct objtool_file *file)return -1 ; } - cfa->offset = hint->sp_offset; + cfa->offset =bswap_if_needed (hint->sp_offset); insn->cfi.type = hint->type; insn->cfi.end = hint->end; }
tools/objtool/endianness.h new file +38 -0
@@ -0,0 +1,38 @@ +/* SPDX-License-Identifier: GPL-2.0-or-later */ +#ifndef _OBJTOOL_ENDIANNESS_H +#define _OBJTOOL_ENDIANNESS_H + +#include <linux/kernel.h> +#include <endian.h> +#include "arch_endianness.h" + +#ifndef __TARGET_BYTE_ORDER +#error undefined arch __TARGET_BYTE_ORDER +#endif + +#if __BYTE_ORDER != __TARGET_BYTE_ORDER +#define __NEED_BSWAP 1 +#else +#define __NEED_BSWAP 0 +#endif + +/* +* Does a byte swap if target endianness doesn't match the host, i.e. cross +* compilation for little endian on big endian and vice versa. +* To be used for multi-byte values conversion, which are read from / about +* to be written to a target native endianness ELF file. +*/ +#define bswap_if_needed (val) \ +({ \ + __typeof__(val) __ret; \ + switch (sizeof(val)) { \ + case 8: __ret = __NEED_BSWAP ? bswap_64(val) : (val); break; \ + case 4: __ret = __NEED_BSWAP ? bswap_32(val) : (val); break; \ + case 2: __ret = __NEED_BSWAP ? bswap_16(val) : (val); break; \ + default: \ + BUILD_BUG(); break; \ + } \ + __ret; \ +}) + +#endif /* _OBJTOOL_ENDIANNESS_H */
tools/objtool/orc_dump.c +3 -2
@@ -8,6 +8,7 @@#include <asm/orc_types.h> #include "objtool.h" #include "warn.h" +#include "endianness.h" static const char *reg_name (unsigned int reg) {
@@ -197,11 +198,11 @@ int orc_dump(const char *_objname)printf (" sp:" ); -print_reg (orc[i].sp_reg, orc[i].sp_offset); +print_reg (orc[i].sp_reg,bswap_if_needed (orc[i].sp_offset));printf (" bp:" ); -print_reg (orc[i].bp_reg, orc[i].bp_offset); +print_reg (orc[i].bp_reg,bswap_if_needed (orc[i].bp_offset));printf (" type:%s end:%d\n" ,orc_type_name (orc[i].type), orc[i].end);
tools/objtool/orc_gen.c +3 -0
@@ -11,6 +11,7 @@#include "check.h" #include "warn.h" +#include "endianness.h" int create_orc (struct objtool_file *file) {
@@ -96,6 +97,8 @@ static int create_orc_entry(struct elf *elf, struct section *u_sec, struct secti/* populate ORC data */ orc = (struct orc_entry *)u_sec->data->d_buf + idx;memcpy (orc, o,sizeof (*orc)); + orc->sp_offset =bswap_if_needed (orc->sp_offset); + orc->bp_offset =bswap_if_needed (orc->bp_offset);/* populate reloc for ip */ reloc =malloc (sizeof (*reloc));
tools/objtool/special.c +4 -2
@@ -15,6 +15,7 @@#include "special.h" #include "warn.h" #include "arch_special.h" +#include "endianness.h" struct special_entry {const char *sec;
@@ -77,8 +78,9 @@ static int get_alt_entry(struct elf *elf, struct special_entry *entry,if (entry->feature) {unsigned short feature; - feature = *(unsigned short *)(sec->data->d_buf + offset + - entry->feature); + feature =bswap_if_needed (*(unsigned short *)(sec->data->d_buf + + offset + + entry->feature));arch_handle_alternative (feature, alt); }
Signature · 6 lines
⣿⣿⣿⣿⢋⡀⣀⠹⣿⣿⣿⣿ ⣿⣿⣿⣿⠠⣶⡦⠀⣿⣿⣿⣿ ⣿⣿⣿⠏⣴⣮⣴⣧⠈⢿⣿⣿ ⣿⣿⡏⢰⣿⠖⣠⣿⡆⠈⣿⣿ ⣿⢛⣵⣄⠙⣶⣶⡟⣅⣠⠹⣿ ⣿⣜⣛⠻⢎⣉⣉⣀⠿⣫⣵⣿
Re: [RFC PATCH v4 4/4] objtool: fix x86 orc generation on big endian cross compiles
arch/x86/include/asm/orc_types.h
Quoted 26 lines · Vasily Gorbik
tools/objtool/special.c +3
-3@@ -77,8 +78,9 @@ static int get_alt_entry(struct elf *elf, struct special_entry *entry,if (entry->feature) {unsigned short feature; - feature = *(unsigned short *)(sec->data->d_buf + offset + - entry->feature); + feature =bswap_if_needed (*(unsigned short *)(sec->data->d_buf + + offset + + entry->feature));arch_handle_alternative (feature, alt); } --- arch/x86/include/asm/orc_types.h | 10 +++++ tools/arch/x86/include/asm/orc_types.h | 10 +++++ .../arch/x86/include/arch_endianness.h | 9 +++++ tools/objtool/check.c |5 ++- tools/objtool/endianness.h |38 +++++++++++++++++++ tools/objtool/orc_dump.c |5 ++- tools/objtool/orc_gen.c | 3 ++ tools/objtool/special.c |6 ++- 8 files changed, 80 insertions(+), 6 deletions(-) create mode 100644 tools/objtool/arch/x86/include/arch_endianness.h create mode 100644 tools/objtool/endianness.harch/x86/include/asm/orc_types.h +0
-0
This patch is misformatted. Almost like it was concatenated with itself?
Signature · 1 line
Josh
v4 cover objtool and cross compilation
Sorry for the extra noise. Patches has been resent because one of them has been corrupted. That's what you get for post-editing mailbox in vim, few wrong extra strokes and your wife wants to divorce you because you just copied and pretty-formatted her threatening message to your internet service provider from another buffer.
rfc v1 - rfc v2:
- rebased onto tip/objtool/core
- reformatted couple of lines
rfc v2 - rfc v3:
- reused __*_ENDIAN_BITFIELD and dropped unneeded byteswap if __KERNEL__ is defined following David's suggestions,
- re-splitted changes and made x86 instruction decoder a separate patch,
- extra patch to add -Wno-nested-externs build flag to enable BUILD_BUG() usage,
- added a safer and more readable leXX_to_cpu macro in x86 instruction decoder,
- simplified includes. Switched to using leXX_to_cpu/cpu_to_leXX in the objtool and x86 instruction decoder since <linux/kernel.h> is included in the objtool already.
rfc v3 - rfc v4:
- patch 4: objtool: fix x86 orc generation on big endian cross compiles
- introduced "bswap_if_needed()" macro for multi-byte values conversion, which are read from / about to be written to a target native endianness ELF file.
- patch 2: x86/insn: instruction decoder and big endian cross compiles
- changed subject prefix from objtool to x86/insn
- reformated leXX_to_cpu macro make it easier to read
Currently objtool seems to be the only tool from all the build tools needed for x86 build which breaks x86 cross compilation on big endian systems.
But besides x86 cross compilation, endianness awareness is also needed for big endian architectures objtool support in general.
We have working prototype of objtool support and orc unwinder for s390 made originally by Martin Schwidefsky. I'm trying to bring it in shape again and refactor to share more code with "generic" part.
But first things first. This patch series points to endianness problems which should be addressed. Recent "other architectures support" patches currently moved only some problematic parts into x86 arch specific folder. Besides that even though big endian stuff is only needed for the objtool arch/x86/lib/insn.c and arch/x86/include/asm/insn.h are shared across the kernel source and the tools, so changes are applied to both.
Any suggestions how to make patches more acceptable are welcome.
Martin Schwidefsky (2):
x86/insn: instruction decoder and big endian cross compiles
objtool: correct rebuilding of reloc sections
Vasily Gorbik (2):
objtool: allow nested externs to enable BUILD_BUG()
objtool: fix x86 orc generation on big endian cross compiles
arch/x86/include/asm/insn.h | 33 ++++++ arch/x86/include/asm/orc_types.h | 10 ++ arch/x86/lib/insn.c | 101 ++++++++---------- tools/arch/x86/include/asm/insn.h | 33 ++++++ tools/arch/x86/include/asm/orc_types.h | 10 ++ tools/arch/x86/lib/insn.c | 101 ++++++++---------- tools/objtool/Makefile | 2 +- .../arch/x86/include/arch_endianness.h | 9 ++ tools/objtool/check.c | 5 +- tools/objtool/elf.c | 34 +++--- tools/objtool/endianness.h | 38 +++++++ tools/objtool/orc_dump.c | 5 +- tools/objtool/orc_gen.c | 3 + tools/objtool/special.c | 6 +- 14 files changed, 260 insertions(+), 130 deletions(-) create mode 100644 tools/objtool/arch/x86/include/arch_endianness.h create mode 100644 tools/objtool/endianness.h
Signature · 6 lines
⣿⣿⣿⣿⢋⡀⣀⠹⣿⣿⣿⣿ ⣿⣿⣿⣿⠠⣶⡦⠀⣿⣿⣿⣿ ⣿⣿⣿⠏⣴⣮⣴⣧⠈⢿⣿⣿ ⣿⣿⡏⢰⣿⠖⣠⣿⡆⠈⣿⣿ ⣿⢛⣵⣄⠙⣶⣶⡟⣅⣠⠹⣿ ⣿⣜⣛⠻⢎⣉⣉⣀⠿⣫⣵⣿
PATCH v2 1/1 objtool: avoid ../ headers includes and name clashes
Currently objtool headers are being included either by their base name or included via ../ from a parent directory. In case of a base name usage:
#include "warn.h"
#include "arch_elf.h"
it does not make it apparent from which directory the file comes from. To make it slightly better, and actually to avoid name clashes some arch specific files have "arch_" suffix. And files from an arch folder have to revert to including via ../ e.g:
#include "../../elf.h"
With additional architectures support and the code base growth there is a need for clearer headers naming scheme for multiple reasons:
1. to make it instantly obvious where these files come from (objtool itself / objtool arch|generic folders / some other external files),
2. to avoid name clashes of objtool arch specific headers, potential obtool arch generic headers and the system header files (there is /usr/include/elf.h already),
3. to avoid ../ includes and improve code readability.
4. to give a warm fuzzy feeling to developers who are mostly kernel developers and are accustomed to linux kernel headers arranging scheme.
Doesn't this make it instantly obvious where are these files come from?
#include <objtool/warn.h>
#include <arch/elf.h>
And doesn't it look nicer to avoid ugly ../ includes? Which also guarantees this is elf.h from the objtool and not /usr/include/elf.h.
#include <objtool/elf.h>
This patch defines and implements new objtool headers arranging scheme. Which is:
- all generic headers go to include/objtool (similar to include/linux)
- all arch headers go to arch/$(SRCARCH)/include/arch (to get arch prefix). This is similar to linux arch specific "asm/*" headers but we are not abusing "asm" name and calling it what it is. This also helps to prevent name clashes (arch is not used in system headers or kernel exports).
To bring objtool to this state the following things are done:
1. current top level tools/objtool/ headers are moved into include/objtool/ subdirectory,
2. arch specific headers, currently only arch/x86/include/ are moved into arch/x86/include/arch/ and were stripped of "arch_" suffix,
3. new -I$(srctree)/tools/objtool/include include path to make includes like <objtool/warn.h> possible,
4. rewriting file includes,
5. make git not to ignore include/objtool/ subdirectory.
---
v1 - v2: patch is rebased on top of
[RFC PATCH RESEND v4] objtool and cross compilation patch series.
tools/objtool/.gitignore | 2 +-
tools/objtool/Makefile | 1 +
tools/objtool/arch/x86/decode.c | 8 ++++----
.../arch/x86/include/{ => arch}/cfi_regs.h | 0
.../arch/x86/include/{arch_elf.h => arch/elf.h} | 0
.../{arch_endianness.h => arch/endianness.h} | 0
.../include/{arch_special.h => arch/special.h} | 0
tools/objtool/arch/x86/special.c | 4 ++--
tools/objtool/builtin-check.c | 4 ++--
tools/objtool/builtin-orc.c | 4 ++--
tools/objtool/check.c | 16 ++++++++--------
tools/objtool/elf.c | 6 +++---
tools/objtool/{ => include/objtool}/arch.h | 4 ++--
tools/objtool/{ => include/objtool}/builtin.h | 0
tools/objtool/{ => include/objtool}/cfi.h | 2 +-
tools/objtool/{ => include/objtool}/check.h | 4 ++--
tools/objtool/{ => include/objtool}/elf.h | 0
tools/objtool/{ => include/objtool}/endianness.h | 2 +-
tools/objtool/{ => include/objtool}/objtool.h | 2 +-
tools/objtool/{ => include/objtool}/special.h | 4 ++--
tools/objtool/{ => include/objtool}/warn.h | 2 +-
tools/objtool/objtool.c | 6 +++---
tools/objtool/orc_dump.c | 6 +++---
tools/objtool/orc_gen.c | 6 +++---
tools/objtool/special.c | 10 +++++-----
tools/objtool/weak.c | 2 +-
26 files changed, 48 insertions(+), 47 deletions(-)
rename tools/objtool/arch/x86/include/{ => arch}/cfi_regs.h (100%)
rename tools/objtool/arch/x86/include/{arch_elf.h => arch/elf.h} (100%)
rename tools/objtool/arch/x86/include/{arch_endianness.h => arch/endianness.h} (100%)
rename tools/objtool/arch/x86/include/{arch_special.h => arch/special.h} (100%)
rename tools/objtool/{ => include/objtool}/arch.h (96%)
rename tools/objtool/{ => include/objtool}/builtin.h (100%)
rename tools/objtool/{ => include/objtool}/cfi.h (96%)
rename tools/objtool/{ => include/objtool}/check.h (96%)
rename tools/objtool/{ => include/objtool}/elf.h (100%)
rename tools/objtool/{ => include/objtool}/endianness.h (97%)
rename tools/objtool/{ => include/objtool}/objtool.h (96%)
rename tools/objtool/{ => include/objtool}/special.h (94%)
rename tools/objtool/{ => include/objtool}/warn.h (98%)tools/objtool/.gitignore +1 -1
@@ -1,4 +1,4 @@ # SPDX-License-Identifier: GPL-2.0-only arch/x86/lib/inat-tables.c -objtool +/objtool fixdep
tools/objtool/Makefile +1 -0
@@ -36,6 +36,7 @@ all: $(OBJTOOL) INCLUDES := -I$(srctree)/tools/include \ -I$(srctree)/tools/arch/$(HOSTARCH)/include/uapi \ -I$(srctree)/tools/arch/$(SRCARCH)/include \ + -I$(srctree)/tools/objtool/include \ -I$(srctree)/tools/objtool/arch/$(SRCARCH)/include WARNINGS := $(EXTRA_WARNINGS) -Wno-switch-default -Wno-switch-enum -Wno-packed -Wno-nested-externs CFLAGS := -Werror $(WARNINGS) $(KBUILD_HOSTCFLAGS) -g $(INCLUDES) $(LIBELF_FLAGS)
tools/objtool/arch/x86/decode.c +4 -4
@@ -11,11 +11,11 @@#include "../../../arch/x86/lib/inat.c" #include "../../../arch/x86/lib/insn.c" -#include "../../check.h" -#include "../../elf.h" -#include "../../arch.h" -#include "../../warn.h" #include <asm/orc_types.h> +#include <objtool/check.h> +#include <objtool/elf.h> +#include <objtool/arch.h> +#include <objtool/warn.h> static unsigned char op_to_cfi_reg[][2 ] = { {CFI_AX ,CFI_R8 },
tools/objtool/arch/x86/include/arch/cfi_regs.h renamed from tools/objtool/arch/x86/include/cfi_regs.h +0 -0
tools/objtool/arch/x86/include/arch/elf.h renamed from tools/objtool/arch/x86/include/arch_elf.h +0 -0
tools/objtool/arch/x86/include/arch/endianness.h renamed from tools/objtool/arch/x86/include/arch_endianness.h +0 -0
tools/objtool/arch/x86/include/arch/special.h renamed from tools/objtool/arch/x86/include/arch_special.h +0 -0
tools/objtool/arch/x86/special.c +2 -2
@@ -1,8 +1,8 @@// SPDX-License-Identifier: GPL-2.0-or-later #include <string.h> -#include "../../special.h" -#include "../../builtin.h" +#include <objtool/special.h> +#include <objtool/builtin.h> #define X86_FEATURE_POPCNT (4 * 32 + 23)#define X86_FEATURE_SMAP (9 * 32 + 20)
tools/objtool/builtin-check.c +2 -2
@@ -15,8 +15,8 @@#include <subcmd/parse-options.h> #include <string.h> -#include "builtin.h" -#include "objtool.h" +#include <objtool/builtin.h> +#include <objtool/objtool.h> bool no_fp, no_unreachable, retpoline, module, backtrace, uaccess, stats, validate_dup, vmlinux;
tools/objtool/builtin-orc.c +2 -2
@@ -13,8 +13,8 @@*/ #include <string.h> -#include "builtin.h" -#include "objtool.h" +#include <objtool/builtin.h> +#include <objtool/objtool.h> static const char *orc_usage[] = {"objtool orc generate [<options>] file.o" ,
tools/objtool/check.c +8 -8
@@ -6,14 +6,14 @@#include <string.h> #include <stdlib.h> -#include "builtin.h" -#include "cfi.h" -#include "arch.h" -#include "check.h" -#include "special.h" -#include "warn.h" -#include "arch_elf.h" -#include "endianness.h" +#include <arch/elf.h> +#include <objtool/builtin.h> +#include <objtool/cfi.h> +#include <objtool/arch.h> +#include <objtool/check.h> +#include <objtool/special.h> +#include <objtool/warn.h> +#include <objtool/endianness.h> #include <linux/objtool.h> #include <linux/hashtable.h>
tools/objtool/elf.c +3 -3
@@ -15,10 +15,10 @@#include <string.h> #include <unistd.h> #include <errno.h> -#include "builtin.h" +#include <objtool/builtin.h> -#include "elf.h" -#include "warn.h" +#include <objtool/elf.h> +#include <objtool/warn.h> #define MAX_NAME_LEN 128
tools/objtool/include/objtool/arch.h renamed from tools/objtool/arch.h +2 -2
@@ -8,8 +8,8 @@#include <stdbool.h> #include <linux/list.h> -#include "objtool.h" -#include "cfi.h" +#include <objtool/objtool.h> +#include <objtool/cfi.h> #ifdef INSN_USE_ORC #include <asm/orc_types.h>
tools/objtool/include/objtool/builtin.h renamed from tools/objtool/builtin.h +0 -0
tools/objtool/include/objtool/cfi.h renamed from tools/objtool/cfi.h +1 -1
@@ -6,7 +6,7 @@#ifndef _OBJTOOL_CFI_H#define _OBJTOOL_CFI_H -#include "cfi_regs.h" +#include <arch/cfi_regs.h> #define CFI_UNDEFINED -1#define CFI_CFA -2
tools/objtool/include/objtool/check.h renamed from tools/objtool/check.h +2 -2
@@ -7,8 +7,8 @@#define _CHECK_H#include <stdbool.h> -#include "cfi.h" -#include "arch.h" +#include <objtool/cfi.h> +#include <objtool/arch.h> struct insn_state {struct cfi_state cfi;
tools/objtool/include/objtool/elf.h renamed from tools/objtool/elf.h +0 -0
tools/objtool/include/objtool/endianness.h renamed from tools/objtool/endianness.h +1 -1
@@ -2,9 +2,9 @@#ifndef _OBJTOOL_ENDIANNESS_H#define _OBJTOOL_ENDIANNESS_H +#include <arch/endianness.h> #include <linux/kernel.h> #include <endian.h> -#include "arch_endianness.h" #ifndef __TARGET_BYTE_ORDER#error undefined arch __TARGET_BYTE_ORDER
tools/objtool/include/objtool/objtool.h renamed from tools/objtool/objtool.h +1 -1
@@ -10,7 +10,7 @@#include <linux/list.h> #include <linux/hashtable.h> -#include "elf.h" +#include <objtool/elf.h> #define __weak __attribute__((weak))
tools/objtool/include/objtool/special.h renamed from tools/objtool/special.h +2 -2
@@ -7,8 +7,8 @@#define _SPECIAL_H#include <stdbool.h> -#include "check.h" -#include "elf.h" +#include <objtool/check.h> +#include <objtool/elf.h> #define C_JUMP_TABLE_SECTION ".rodata..c_jump_table"
tools/objtool/include/objtool/warn.h renamed from tools/objtool/warn.h +1 -1
@@ -11,7 +11,7 @@#include <sys/types.h> #include <sys/stat.h> #include <fcntl.h> -#include "elf.h" +#include <objtool/elf.h> extern const char *objname;
tools/objtool/objtool.c +3 -3
@@ -21,9 +21,9 @@#include <subcmd/pager.h> #include <linux/kernel.h> -#include "builtin.h" -#include "objtool.h" -#include "warn.h" +#include <objtool/builtin.h> +#include <objtool/objtool.h> +#include <objtool/warn.h> struct cmd_struct {const char *name;
tools/objtool/orc_dump.c +3 -3
@@ -6,9 +6,9 @@#include <unistd.h> #include <linux/objtool.h> #include <asm/orc_types.h> -#include "objtool.h" -#include "warn.h" -#include "endianness.h" +#include <objtool/objtool.h> +#include <objtool/warn.h> +#include <objtool/endianness.h> static const char *reg_name (unsigned int reg) {
tools/objtool/orc_gen.c +3 -3
@@ -9,9 +9,9 @@#include <linux/objtool.h> #include <asm/orc_types.h> -#include "check.h" -#include "warn.h" -#include "endianness.h" +#include <objtool/check.h> +#include <objtool/warn.h> +#include <objtool/endianness.h> int create_orc (struct objtool_file *file) {
tools/objtool/special.c +5 -5
@@ -11,11 +11,11 @@#include <stdlib.h> #include <string.h> -#include "builtin.h" -#include "special.h" -#include "warn.h" -#include "arch_special.h" -#include "endianness.h" +#include <arch/special.h> +#include <objtool/builtin.h> +#include <objtool/special.h> +#include <objtool/warn.h> +#include <objtool/endianness.h> struct special_entry {const char *sec;
tools/objtool/weak.c +1 -1
@@ -7,7 +7,7 @@#include <stdbool.h> #include <errno.h> -#include "objtool.h" +#include <objtool/objtool.h> #define UNSUPPORTED (name) \ ({ \
Signature · 6 lines
⣿⣿⣿⣿⢋⡀⣀⠹⣿⣿⣿⣿ ⣿⣿⣿⣿⠠⣶⡦⠀⣿⣿⣿⣿ ⣿⣿⣿⠏⣴⣮⣴⣧⠈⢿⣿⣿ ⣿⣿⡏⢰⣿⠖⣠⣿⡆⠈⣿⣿ ⣿⢛⣵⣄⠙⣶⣶⡟⣅⣠⠹⣿ ⣿⣜⣛⠻⢎⣉⣉⣀⠿⣫⣵⣿
RFC PATCH v4 1/4 objtool: allow nested externs to enable BUILD_BUG()
In reply to Vasily GorbikCurrently BUILD_BUG() macro is expanded to smth like the following:
do {
extern void __compiletime_assert_0(void)
__attribute__((error("BUILD_BUG failed")));
if (!(!(1)))
__compiletime_assert_0();} while (0);
If used in a function body this obviously would produce build errors with -Wnested-externs and -Werror.
Build objtool with -Wno-nested-externs to enable BUILD_BUG() usage.
--- tools/objtool/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
tools/objtool/Makefile +1 -1
@@ -37,7 +37,7 @@ INCLUDES := -I$(srctree)/tools/include \ -I$(srctree)/tools/arch/$(HOSTARCH)/include/uapi \ -I$(srctree)/tools/arch/$(SRCARCH)/include \ -I$(srctree)/tools/objtool/arch/$(SRCARCH)/include -WARNINGS := $(EXTRA_WARNINGS) -Wno-switch-default -Wno-switch-enum -Wno-packed +WARNINGS := $(EXTRA_WARNINGS) -Wno-switch-default -Wno-switch-enum -Wno-packed -Wno-nested-externs CFLAGS := -Werror $(WARNINGS) $(KBUILD_HOSTCFLAGS) -g $(INCLUDES) $(LIBELF_FLAGS) LDFLAGS += $(LIBELF_LIBS) $(LIBSUBCMD) $(KBUILD_HOSTLDFLAGS)
Signature · 6 lines
⣿⣿⣿⣿⢋⡀⣀⠹⣿⣿⣿⣿ ⣿⣿⣿⣿⠠⣶⡦⠀⣿⣿⣿⣿ ⣿⣿⣿⠏⣴⣮⣴⣧⠈⢿⣿⣿ ⣿⣿⡏⢰⣿⠖⣠⣿⡆⠈⣿⣿ ⣿⢛⣵⣄⠙⣶⣶⡟⣅⣠⠹⣿ ⣿⣜⣛⠻⢎⣉⣉⣀⠿⣫⣵⣿
RFC PATCH v4 2/4 x86/insn: instruction decoder and big endian cross compiles
In reply to Vasily GorbikFrom: Martin Schwidefsky <[email protected]>
x86 instruction decoder code is shared across the kernel source and the tools. Currently objtool seems to be the only tool from build tools needed which breaks x86 cross compilation on big endian systems. Make the x86 instruction decoder build host endianness agnostic to support x86 cross compilation and enable objtool to implement endianness awareness for big endian architectures support.
--- arch/x86/include/asm/insn.h | 33 ++++++++++ arch/x86/lib/insn.c | 101 ++++++++++++++---------------- tools/arch/x86/include/asm/insn.h | 33 ++++++++++ tools/arch/x86/lib/insn.c | 101 ++++++++++++++---------------- 4 files changed, 160 insertions(+), 108 deletions(-)
arch/x86/include/asm/insn.h +33 -0
@@ -7,9 +7,12 @@* Copyright (C) IBM Corporation, 2009 */ +#include <asm/byteorder.h> /* insn_attr_t is defined in inat.h */ #include <asm/inat.h> +#if defined(__BYTE_ORDER) ? __BYTE_ORDER == __LITTLE_ENDIAN : defined(__LITTLE_ENDIAN) + struct insn_field { union { insn_value_t value;
@@ -20,6 +23,36 @@ struct insn_field {unsigned char nbytes; }; +static inline void insn_field_set (struct insn_field *p,insn_value_t v, +unsigned char n) +{ + p->value = v; + p->nbytes = n; +} + +#else + +struct insn_field { +insn_value_t value; +union { +insn_value_t little; +insn_byte_t bytes[4 ]; + }; +/* !0 if we've run insn_get_xxx() for this field */ +unsigned char got; +unsigned char nbytes; +}; + +static inline void insn_field_set (struct insn_field *p,insn_value_t v, +unsigned char n) +{ + p->value = v; + p->little =__cpu_to_le32 (v); + p->nbytes = n; +} + +#endif +struct insn {struct insn_field prefixes;/* * Prefixes
arch/x86/lib/insn.c +47 -54
220 lines not on this page · raw message
tools/arch/x86/include/asm/insn.h +33 -0
@@ -7,9 +7,12 @@* Copyright (C) IBM Corporation, 2009 */ +#include <asm/byteorder.h> /* insn_attr_t is defined in inat.h */ #include "inat.h" +#if defined(__BYTE_ORDER) ? __BYTE_ORDER == __LITTLE_ENDIAN : defined(__LITTLE_ENDIAN) + struct insn_field { union { insn_value_t value;
@@ -20,6 +23,36 @@ struct insn_field {unsigned char nbytes; }; +static inline void insn_field_set (struct insn_field *p,insn_value_t v, +unsigned char n) +{ + p->value = v; + p->nbytes = n; +} + +#else + +struct insn_field { +insn_value_t value; +union { +insn_value_t little; +insn_byte_t bytes[4 ]; + }; +/* !0 if we've run insn_get_xxx() for this field */ +unsigned char got; +unsigned char nbytes; +}; + +static inline void insn_field_set (struct insn_field *p,insn_value_t v, +unsigned char n) +{ + p->value = v; + p->little =__cpu_to_le32 (v); + p->nbytes = n; +} + +#endif +struct insn {struct insn_field prefixes;/* * Prefixes
tools/arch/x86/lib/insn.c +47 -54
220 lines not on this page · raw message
Signature · 6 lines
⣿⣿⣿⣿⢋⡀⣀⠹⣿⣿⣿⣿ ⣿⣿⣿⣿⠠⣶⡦⠀⣿⣿⣿⣿ ⣿⣿⣿⠏⣴⣮⣴⣧⠈⢿⣿⣿ ⣿⣿⡏⢰⣿⠖⣠⣿⡆⠈⣿⣿ ⣿⢛⣵⣄⠙⣶⣶⡟⣅⣠⠹⣿ ⣿⣜⣛⠻⢎⣉⣉⣀⠿⣫⣵⣿
RFC PATCH v4 3/4 objtool: correct rebuilding of reloc sections
In reply to Vasily GorbikFrom: Martin Schwidefsky <[email protected]>
Currently relocations generated in elf_rebuild_rel_reloc_section/ elf_rebuild_rela_reloc_section functions are broken if the objtool is built and run on big endian system. E.g. the following errors pop up during x86 cross compilation:
x86_64-9.1.0-ld: fs/efivarfs/inode.o: bad reloc symbol index (0x2000000 >=
0x22) for offset 0 in section `.orc_unwind_ip'
x86_64-9.1.0-ld: final link failed: bad value
To address that convert those functions to do things similar to elf_write_reloc(), reuse gelf_update_rel/gelf_update_rela libelf library functions.
--- tools/objtool/elf.c | 34 +++++++++++++++++++--------------- 1 file changed, 19 insertions(+), 15 deletions(-)
tools/objtool/elf.c +19 -15
@@ -829,25 +829,27 @@ static int elf_rebuild_rel_reloc_section(struct section *sec, int nr) {struct reloc *reloc;int idx =0 , size; -GElf_Rel *relocs; +void *buf;/* Allocate a buffer for relocations */ - size = nr *sizeof (*relocs); - relocs =malloc (size); -if (!relocs) { + size = nr *sizeof (GElf_Rel); + buf =malloc (size); +if (!buf) {perror ("malloc" );return -1 ; } - sec->data->d_buf = relocs; + sec->data->d_buf = buf; sec->data->d_size = size; + sec->data->d_type =ELF_T_REL ; sec->sh.sh_size = size; idx =0 ;list_for_each_entry (reloc, &sec->reloc_list, list) { - relocs[idx].r_offset = reloc->offset; - relocs[idx].r_info =GELF_R_INFO (reloc->sym->idx, reloc->type); + reloc->rel.r_offset = reloc->offset; + reloc->rel.r_info =GELF_R_INFO (reloc->sym->idx, reloc->type); +gelf_update_rel (sec->data, idx, &reloc->rel); idx++; }
@@ -858,26 +860,28 @@ static int elf_rebuild_rela_reloc_section(struct section *sec, int nr) {struct reloc *reloc;int idx =0 , size; -GElf_Rela *relocs; +void *buf;/* Allocate a buffer for relocations with addends */ - size = nr *sizeof (*relocs); - relocs =malloc (size); -if (!relocs) { + size = nr *sizeof (GElf_Rela); + buf =malloc (size); +if (!buf) {perror ("malloc" );return -1 ; } - sec->data->d_buf = relocs; + sec->data->d_buf = buf; sec->data->d_size = size; + sec->data->d_type =ELF_T_RELA ; sec->sh.sh_size = size; idx =0 ;list_for_each_entry (reloc, &sec->reloc_list, list) { - relocs[idx].r_offset = reloc->offset; - relocs[idx].r_addend = reloc->addend; - relocs[idx].r_info =GELF_R_INFO (reloc->sym->idx, reloc->type); + reloc->rela.r_offset = reloc->offset; + reloc->rela.r_addend = reloc->addend; + reloc->rela.r_info =GELF_R_INFO (reloc->sym->idx, reloc->type); +gelf_update_rela (sec->data, idx, &reloc->rela); idx++; }
Signature · 6 lines
⣿⣿⣿⣿⢋⡀⣀⠹⣿⣿⣿⣿ ⣿⣿⣿⣿⠠⣶⡦⠀⣿⣿⣿⣿ ⣿⣿⣿⠏⣴⣮⣴⣧⠈⢿⣿⣿ ⣿⣿⡏⢰⣿⠖⣠⣿⡆⠈⣿⣿ ⣿⢛⣵⣄⠙⣶⣶⡟⣅⣠⠹⣿ ⣿⣜⣛⠻⢎⣉⣉⣀⠿⣫⣵⣿
RFC PATCH v4 4/4 objtool: fix x86 orc generation on big endian cross compiles
In reply to Vasily GorbikCorrect objtool orc generation endianness problems to enable fully functional x86 cross compiles on big endian hardware.
Introduces bswap_if_needed macro which does a byte swap if target endianness doesn't match the host, i.e. cross compilation for little endian on big endian and vice versa. To be used for multi-byte values conversion, which are read from / about to be written to a target native endianness ELF file.
--- arch/x86/include/asm/orc_types.h | 10 +++++ tools/arch/x86/include/asm/orc_types.h | 10 +++++ .../arch/x86/include/arch_endianness.h | 9 +++++ tools/objtool/check.c | 5 ++- tools/objtool/endianness.h | 38 +++++++++++++++++++ tools/objtool/orc_dump.c | 5 ++- tools/objtool/orc_gen.c | 3 ++ tools/objtool/special.c | 6 ++- 8 files changed, 80 insertions(+), 6 deletions(-) create mode 100644 tools/objtool/arch/x86/include/arch_endianness.h create mode 100644 tools/objtool/endianness.h
arch/x86/include/asm/orc_types.h +10 -0
@@ -40,6 +40,8 @@#define ORC_REG_MAX 15#ifndef __ASSEMBLY__ +#include <asm/byteorder.h> +/* * This struct is more or less a vastly simplified version of the DWARF Call * Frame Information standard. It contains only the necessary parts of DWARF
@@ -51,10 +53,18 @@struct orc_entry {s16 sp_offset;s16 bp_offset; +#if defined(__LITTLE_ENDIAN_BITFIELD)unsigned sp_reg:4 ;unsigned bp_reg:4 ;unsigned type:2 ;unsigned end:1 ; +#elif defined(__BIG_ENDIAN_BITFIELD) +unsigned bp_reg:4 ; +unsigned sp_reg:4 ; +unsigned unused:5 ; +unsigned end:1 ; +unsigned type:2 ; +#endif } __packed;#endif /* __ASSEMBLY__ */
tools/arch/x86/include/asm/orc_types.h +10 -0
@@ -40,6 +40,8 @@#define ORC_REG_MAX 15#ifndef __ASSEMBLY__ +#include <asm/byteorder.h> +/* * This struct is more or less a vastly simplified version of the DWARF Call * Frame Information standard. It contains only the necessary parts of DWARF
@@ -51,10 +53,18 @@struct orc_entry {s16 sp_offset;s16 bp_offset; +#if defined(__LITTLE_ENDIAN_BITFIELD)unsigned sp_reg:4 ;unsigned bp_reg:4 ;unsigned type:2 ;unsigned end:1 ; +#elif defined(__BIG_ENDIAN_BITFIELD) +unsigned bp_reg:4 ; +unsigned sp_reg:4 ; +unsigned unused:5 ; +unsigned end:1 ; +unsigned type:2 ; +#endif } __packed;#endif /* __ASSEMBLY__ */
tools/objtool/arch/x86/include/arch_endianness.h new file +9 -0
@@ -0,0 +1,9 @@ +/* SPDX-License-Identifier: GPL-2.0-or-later */ +#ifndef _ARCH_ENDIANNESS_H +#define _ARCH_ENDIANNESS_H + +#include <endian.h> + +#define __TARGET_BYTE_ORDER __LITTLE_ENDIAN + +#endif /* _ARCH_ENDIANNESS_H */
tools/objtool/check.c +3 -2
@@ -13,6 +13,7 @@#include "special.h" #include "warn.h" #include "arch_elf.h" +#include "endianness.h" #include <linux/objtool.h> #include <linux/hashtable.h>
@@ -1370,7 +1371,7 @@ static int read_unwind_hints(struct objtool_file *file) cfa = &insn->cfi.cfa;if (hint->type ==UNWIND_HINT_TYPE_RET_OFFSET ) { - insn->ret_offset = hint->sp_offset; + insn->ret_offset =bswap_if_needed (hint->sp_offset);continue ; }
@@ -1382,7 +1383,7 @@ static int read_unwind_hints(struct objtool_file *file)return -1 ; } - cfa->offset = hint->sp_offset; + cfa->offset =bswap_if_needed (hint->sp_offset); insn->cfi.type = hint->type; insn->cfi.end = hint->end; }
tools/objtool/endianness.h new file +38 -0
@@ -0,0 +1,38 @@ +/* SPDX-License-Identifier: GPL-2.0-or-later */ +#ifndef _OBJTOOL_ENDIANNESS_H +#define _OBJTOOL_ENDIANNESS_H + +#include <linux/kernel.h> +#include <endian.h> +#include "arch_endianness.h" + +#ifndef __TARGET_BYTE_ORDER +#error undefined arch __TARGET_BYTE_ORDER +#endif + +#if __BYTE_ORDER != __TARGET_BYTE_ORDER +#define __NEED_BSWAP 1 +#else +#define __NEED_BSWAP 0 +#endif + +/* +* Does a byte swap if target endianness doesn't match the host, i.e. cross +* compilation for little endian on big endian and vice versa. +* To be used for multi-byte values conversion, which are read from / about +* to be written to a target native endianness ELF file. +*/ +#define bswap_if_needed (val) \ +({ \ + __typeof__(val) __ret; \ + switch (sizeof(val)) { \ + case 8: __ret = __NEED_BSWAP ? bswap_64(val) : (val); break; \ + case 4: __ret = __NEED_BSWAP ? bswap_32(val) : (val); break; \ + case 2: __ret = __NEED_BSWAP ? bswap_16(val) : (val); break; \ + default: \ + BUILD_BUG(); break; \ + } \ + __ret; \ +}) + +#endif /* _OBJTOOL_ENDIANNESS_H */
tools/objtool/orc_dump.c +3 -2
@@ -8,6 +8,7 @@#include <asm/orc_types.h> #include "objtool.h" #include "warn.h" +#include "endianness.h" static const char *reg_name (unsigned int reg) {
@@ -197,11 +198,11 @@ int orc_dump(const char *_objname)printf (" sp:" ); -print_reg (orc[i].sp_reg, orc[i].sp_offset); +print_reg (orc[i].sp_reg,bswap_if_needed (orc[i].sp_offset));printf (" bp:" ); -print_reg (orc[i].bp_reg, orc[i].bp_offset); +print_reg (orc[i].bp_reg,bswap_if_needed (orc[i].bp_offset));printf (" type:%s end:%d\n" ,orc_type_name (orc[i].type), orc[i].end);
tools/objtool/orc_gen.c +3 -0
@@ -11,6 +11,7 @@#include "check.h" #include "warn.h" +#include "endianness.h" int create_orc (struct objtool_file *file) {
@@ -96,6 +97,8 @@ static int create_orc_entry(struct elf *elf, struct section *u_sec, struct secti/* populate ORC data */ orc = (struct orc_entry *)u_sec->data->d_buf + idx;memcpy (orc, o,sizeof (*orc)); + orc->sp_offset =bswap_if_needed (orc->sp_offset); + orc->bp_offset =bswap_if_needed (orc->bp_offset);/* populate reloc for ip */ reloc =malloc (sizeof (*reloc));
tools/objtool/special.c +4 -2
@@ -15,6 +15,7 @@#include "special.h" #include "warn.h" #include "arch_special.h" +#include "endianness.h" struct special_entry {const char *sec;
@@ -77,8 +78,9 @@ static int get_alt_entry(struct elf *elf, struct special_entry *entry,if (entry->feature) {unsigned short feature; - feature = *(unsigned short *)(sec->data->d_buf + offset + - entry->feature); + feature =bswap_if_needed (*(unsigned short *)(sec->data->d_buf + + offset + + entry->feature));arch_handle_alternative (feature, alt); }
Signature · 6 lines
⣿⣿⣿⣿⢋⡀⣀⠹⣿⣿⣿⣿ ⣿⣿⣿⣿⠠⣶⡦⠀⣿⣿⣿⣿ ⣿⣿⣿⠏⣴⣮⣴⣧⠈⢿⣿⣿ ⣿⣿⡏⢰⣿⠖⣠⣿⡆⠈⣿⣿ ⣿⢛⣵⣄⠙⣶⣶⡟⣅⣠⠹⣿ ⣿⣜⣛⠻⢎⣉⣉⣀⠿⣫⣵⣿
Re: [RFC PATCH v4 4/4] objtool: fix x86 orc generation on big endian cross compiles
In reply to Josh PoimboeufQuoted 5 lines · Josh Poimboeuf
Quoted 4 lines · Vasily Gorbik
tools/objtool/special.c +0
-0@@ -77,8 +78,9 @@ static int get_alt_entry(struct elf *elf, struct special_entry *entry,if (entry->feature) {unsigned short feature;
Quoted 14 lines
tools/objtool/special.c static int get_alt_entry(struct elf *elf, struct special_entry *entry,
Quoted 11 lines
tools/objtool/special.c +3
-3- feature = *(unsigned short *)(sec->data->d_buf + offset + - entry->feature); + feature =bswap_if_needed (*(unsigned short *)(sec->data->d_buf + + offset + + entry->feature));arch_handle_alternative (feature, alt); } --- arch/x86/include/asm/orc_types.h | 10 +++++ tools/arch/x86/include/asm/orc_types.h | 10 +++++ .../arch/x86/include/arch_endianness.h | 9 +++++This patch is misformatted. Almost like it was concatenated with itself?
Indeed. I wonder how that could have happened. Sorry for that. I've resent patches with rebased patch
"objtool: avoid ../ headers includes and name clashes"
on top. This time I checked patches could be applied from outgoing mailbox before sending it.