mips: reloc: Change R_MIPS_NONE to catch pre-reloc BSS usage
PATCH 1/1 mips: reloc: Change R_MIPS_NONE to catch pre-reloc BSS usage
This patch changes the R_MIPS_NONE define from 0 to a magic value. This makes it possible to better detect any forbidden pre-relocation usage of BSS variables, as they are often zero'ed and then relocation is stopped too early.
Additionally the error message is improved to also print the faulting address. This helps finding the root-cause for this breakage by comparing this address with the values in System.map.
This patch helps a lot when working on pre-relocation code, like the Octeon DDR init code, where such variables have hit me multiple times now.
--- arch/mips/include/asm/relocs.h | 2 +- arch/mips/lib/reloc.c | 7 ++++--- 2 files changed, 5 insertions(+), 4 deletions(-)
arch/mips/include/asm/relocs.h +1 -1
@@ -8,7 +8,7 @@#ifndef __ASM_MIPS_RELOCS_H__#define __ASM_MIPS_RELOCS_H__ -#define R_MIPS_NONE 0 +#define R_MIPS_NONE 0xbeef7531#define R_MIPS_32 2#define R_MIPS_26 4#define R_MIPS_HI16 5
arch/mips/lib/reloc.c +4 -3
@@ -67,7 +67,7 @@ static unsigned long read_uint(uint8_t **buf)* intentionally simple, and does the bare minimum needed to fixup the * relocated U-Boot - in particular, it does not check for overflows. */ -static void apply_reloc (unsigned int type,void *addr,long off) +static void apply_reloc (unsigned int type,void *addr,long off,uint8_t *buf) {uint32_t u32;
@@ -92,7 +92,8 @@ static void apply_reloc(unsigned int type, void *addr, long off)break ;default : -panic ("Unhandled reloc type %u\n" , type); +panic ("Unhandled reloc type %u (@ %p), bss used before relocation?\n" , + type, buf); } }
@@ -137,7 +138,7 @@ void relocate_code(ulong start_addr_sp, gd_t *new_gd, ulong relocaddr)break ; addr +=read_uint (&buf) <<2 ; -apply_reloc (type, (void *)addr, off); +apply_reloc (type, (void *)addr, off, buf); }/* Ensure the icache is coherent */
Signature · 1 line
2.27.0
PATCH 1/1 mips: reloc: Change R_MIPS_NONE to catch pre-reloc BSS usage
Am 05.06.20 um 10:29 schrieb Stefan Roese:
Quoted 13 lines
This patch changes the
R_MIPS_NONEdefine from 0 to a magic value. This makes it possible to better detect any forbidden pre-relocation usage of BSS variables, as they are often zero'ed and then relocation is stopped too early.Additionally the error message is improved to also print the faulting address. This helps finding the root-cause for this breakage by comparing this address with the values in System.map.
This patch helps a lot when working on pre-relocation code, like the Octeon DDR init code, where such variables have hit me multiple times now.
Quoted 9 lines
Signed-off-by Stefan Roese <[email protected]>Cc Daniel Schwierzeck <[email protected]>Cc Aaron Williams <[email protected]>Cc Chandrakala Chavva <[email protected]>--- arch/mips/include/asm/relocs.h | 2 +- arch/mips/lib/reloc.c | 7 ++++--- 2 files changed, 5 insertions(+), 4 deletions(-)
applied to u-boot-mips/next, thanks.
BTW: in case the relocation table is cutted off, you can increase the size with CONFIG_MIPS_RELOCATION_TABLE_SIZE.
Signature · 1 line
- Daniel
PATCH 1/1 mips: reloc: Change R_MIPS_NONE to catch pre-reloc BSS usage
Quoted 26 lines · Daniel Schwierzeck
Am 05.06.20 um 10:29 schrieb Stefan Roese:
Quoted 13 lines
This patch changes the
R_MIPS_NONEdefine from 0 to a magic value. This makes it possible to better detect any forbidden pre-relocation usage of BSS variables, as they are often zero'ed and then relocation is stopped too early.Additionally the error message is improved to also print the faulting address. This helps finding the root-cause for this breakage by comparing this address with the values in System.map.
This patch helps a lot when working on pre-relocation code, like the Octeon DDR init code, where such variables have hit me multiple times now.
Quoted 9 lines
Signed-off-by Stefan Roese <[email protected]>Cc Daniel Schwierzeck <[email protected]>Cc Aaron Williams <[email protected]>Cc Chandrakala Chavva <[email protected]>--- arch/mips/include/asm/relocs.h | 2 +- arch/mips/lib/reloc.c | 7 ++++--- 2 files changed, 5 insertions(+), 4 deletions(-)
Quoted 4 lines
applied to u-boot-mips/next, thanks.
BTW: in case the relocation table is cutted off, you can increase the size with
CONFIG_MIPS_RELOCATION_TABLE_SIZE.
Yes, I know. But this is not the case here. Its the runtime overwrite that I'm addressing.
Thanks,
Stefan