armv7: Add Position Independent Execution support
PATCH 1/1 armv7: Add Position Independent Execution support
A U-Boot image could be loaded and executed at a different location than it was linked at.
For example, Aspeed takes a stable release version of U-Boot image as the golden one for recovery purposes. When the primary storage such as flash is corrupted, the golden image could be loaded to any SRAM/DRAM address on demands through ethernet/UART/etc.
To deal with this condition, the PIE is needed as there is only one signed, golden image, which could be however executed at different places.
This patch adds the PIE support for ARMv7 platform.
--- arch/arm/Kconfig | 4 +++- arch/arm/cpu/armv7/start.S | 43 ++++++++++++++++++++++++++++++++++++++ arch/arm/lib/crt0.S | 11 ++++++++++ arch/arm/lib/relocate.S | 35 ++++++++++++++++++++++--------- 4 files changed, 82 insertions(+), 11 deletions(-)
arch/arm/Kconfig +3 -1
@@ -9,7 +9,7 @@ config ARM64 select PHYS_64BIT select SYS_CACHE_SHIFT_6 -if ARM64 +if ARM64 || CPU_V7A config POSITION_INDEPENDENT bool "Generate position-independent pre-relocation code" help
@@ -19,7 +19,9 @@ config POSITION_INDEPENDENT almost any 4K aligned address. This logic relies on the relocation information that is embedded in the binary to support U-Boot relocating itself to the top-of-RAM later during execution. +endif +if ARM64 config INIT_SP_RELATIVE bool "Specify the early stack pointer relative to the .bss section" default n if ARCH_QEMU
arch/arm/cpu/armv7/start.S +43 -0
52 lines not on this page · raw message
arch/arm/lib/crt0.S +11 -0
@@ -130,6 +130,14 @@ ENTRY(_main) ldr r9, [r9, #GD_NEW_GD] /* r9 <- gd->new_gd */ adr lr, here +#if defined(CONFIG_POSITION_INDEPENDENT) + adr r0, _main + ldr r1, _start_ofs + add r0, r1 + ldr r1, =CONFIG_SYS_TEXT_BASE + sub r1, r0 + add lr, r1 +#endif ldr r0, [r9, #GD_RELOC_OFF] /* r0 = gd->reloc_off */ add lr, lr, r0 #if defined(CONFIG_CPU_V7M)
@@ -180,3 +188,6 @@ here: #endif ENDPROC(_main) + +_start_ofs: + .word _start - _main
arch/arm/lib/relocate.S +25 -10
@@ -78,22 +78,28 @@ ENDPROC(relocate_vectors) */ ENTRY(relocate_code) - ldr r1, =__image_copy_start /* r1 <- SRC &__image_copy_start */ - subs r4, r0, r1 /* r4 <- relocation offset */ - beq relocate_done /* skip relocation */ - ldr r2, =__image_copy_end /* r2 <- SRC &__image_copy_end */ - + adr r3, relocate_code + ldr r1, _image_copy_start_ofs + add r1, r3 /* r1 <- Run &__image_copy_start */ + subs r4, r0, r1 /* r4 <- Run to copy offset */ + beq relocate_done /* skip relocation */ + ldr r1, _image_copy_start_ofs + add r1, r3 /* r1 <- Run &__image_copy_start */ + ldr r2, _image_copy_end_ofs + add r2, r3 /* r2 <- Run &__image_copy_end */ copy_loop: - ldmia r1!, {r10-r11} /* copy from source address [r1] */ - stmia r0!, {r10-r11} /* copy to target address [r0] */ - cmp r1, r2 /* until source end address [r2] */ + ldmia r1!, {r10-r11} /* copy from source address [r1] */ + stmia r0!, {r10-r11} /* copy to target address [r0] */ + cmp r1, r2 /* until source end address [r2] */ blo copy_loop /* * fix .rel.dyn relocations */ - ldr r2, =__rel_dyn_start /* r2 <- SRC &__rel_dyn_start */ - ldr r3, =__rel_dyn_end /* r3 <- SRC &__rel_dyn_end */ + ldr r1, _rel_dyn_start_ofs + add r2, r1, r3 /* r2 <- Run &__rel_dyn_start */ + ldr r1, _rel_dyn_end_ofs + add r3, r1, r3 /* r3 <- Run &__rel_dyn_end */ fixloop: ldmia r2!, {r0-r1} /* (r0,r1) <- (SRC location,fixup) */ and r1, r1, #0xff
@@ -129,3 +135,12 @@ relocate_done: #endif ENDPROC(relocate_code) + +_image_copy_start_ofs: + .word __image_copy_start - relocate_code +_image_copy_end_ofs: + .word __image_copy_end - relocate_code +_rel_dyn_start_ofs: + .word __rel_dyn_start - relocate_code +_rel_dyn_end_ofs: + .word __rel_dyn_end - relocate_code
Signature · 1 line
2.17.1
Quoted 27 lines · Chia-Wei Wang
A U-Boot image could be loaded and executed at a different location than it was linked at.
For example, Aspeed takes a stable release version of U-Boot image as the golden one for recovery purposes. When the primary storage such as flash is corrupted, the golden image could be loaded to any SRAM/DRAM address on demands through ethernet/UART/etc.
To deal with this condition, the PIE is needed as there is only one signed, golden image, which could be however executed at different places.
This patch adds the PIE support for ARMv7 platform.
Signed-off-by Chia-Wei Wang <[email protected]>--- arch/arm/Kconfig | 4 +++- arch/arm/cpu/armv7/start.S | 43 ++++++++++++++++++++++++++++++++++++++ arch/arm/lib/crt0.S | 11 ++++++++++ arch/arm/lib/relocate.S | 35 ++++++++++++++++++++++--------- 4 files changed, 82 insertions(+), 11 deletions(-)arch/arm/Kconfig +0
-0
arch/arm/Kconfig config ARM64 · line 15
Quoted 8 lines
arch/arm/Kconfig +1
-1@@ -9,7 +9,7 @@ config ARM64 select PHYS_64BIT select SYS_CACHE_SHIFT_6 -if ARM64 +if ARM64 || CPU_V7A config POSITION_INDEPENDENT bool "Generate position-independent pre-relocation code" help
Thanks for doing this. I think we need to fix the depends on lines here rather than hide with if ARM64 || CPU_V7A, and then fix anything else that follows to also have the correct dependencies.
Signature · 1 line
Tom
Hi Tom,
Quoted 34 lines
From: Tom Rini <[email protected]>
Sent: Tuesday, August 3, 2021 5:31 AMQuoted 12 lines · Chia-Wei Wang
A U-Boot image could be loaded and executed at a different location than it was linked at.
For example, Aspeed takes a stable release version of U-Boot image as the golden one for recovery purposes. When the primary storage such as flash is corrupted, the golden image could be loaded to any SRAM/DRAM address on demands through ethernet/UART/etc.
To deal with this condition, the PIE is needed as there is only one signed, golden image, which could be however executed at different places.
Quoted 6 lines
This patch adds the PIE support for ARMv7 platform.
Signed-off-by Chia-Wei Wang <[email protected]>--- arch/arm/Kconfig | 4 +++- arch/arm/cpu/armv7/start.S | 43++++++++++++++++++++++++++++++++++++++
Quoted 12 lines
arch/arm/lib/crt0.S | 11 ++++++++++ arch/arm/lib/relocate.S | 35 ++++++++++++++++++++++--------- 4 files changed, 82 insertions(+), 11 deletions(-)arch/arm/Kconfig index renamed from arch/arm/Kconfig +0
-0
2b7b625705..45879c9f06100644arch/arm/Kconfig +0
-0@@ -9,7 +9,7 @@ config ARM64 select PHYS_64BIT select SYS_CACHE_SHIFT_6
Quoted 9 lines
arch/arm/Kconfig config ARM64 · line 15
Quoted 5 lines
arch/arm/Kconfig +1
-1-if ARM64 +if ARM64 || CPU_V7A config POSITION_INDEPENDENT bool "Generate position-independent pre-relocation code" helpThanks for doing this. I think we need to fix the depends on lines here rather than hide with if ARM64 ||
CPU_V7A, and then fix anything else that follows to also have the correct dependencies.
Thanks for reviewing this. I will prepare a v2 patch to include the 'depends on' fix.
Regards,
Chiawei
Quoted 8 lines · Tom Rini
Quoted 7 lines · Chia-Wei Wang
A U-Boot image could be loaded and executed at a different location than it was linked at.
For example, Aspeed takes a stable release version of U-Boot image as the golden one for recovery purposes. When the primary storage such as flash is corrupted, the golden image could be loaded to any SRAM/DRAM address on demands through ethernet/UART/etc.
How? When flash got corrupted, how do you manage to load the golden image?
Quoted 33 lines
Quoted 20 lines
To deal with this condition, the PIE is needed as there is only one signed, golden image, which could be however executed at different places.
This patch adds the PIE support for ARMv7 platform.
Signed-off-by Chia-Wei Wang <[email protected]>--- arch/arm/Kconfig | 4 +++- arch/arm/cpu/armv7/start.S | 43 ++++++++++++++++++++++++++++++++++++++ arch/arm/lib/crt0.S | 11 ++++++++++ arch/arm/lib/relocate.S | 35 ++++++++++++++++++++++--------- 4 files changed, 82 insertions(+), 11 deletions(-)arch/arm/Kconfig +0
-0arch/arm/Kconfig config ARM64 · line 15
Quoted 8 lines
arch/arm/Kconfig +1
-1@@ -9,7 +9,7 @@ config ARM64 select PHYS_64BIT select SYS_CACHE_SHIFT_6 -if ARM64 +if ARM64 || CPU_V7A config POSITION_INDEPENDENT bool "Generate position-independent pre-relocation code" helpThanks for doing this. I think we need to fix the depends on lines here rather than hide with if ARM64 ||
CPU_V7A, and then fix anything else that follows to also have the correct dependencies.
Hi Peng,
Quoted 10 lines
-----Original Message-----
From: Peng Fan (OSS) <[email protected]>
Sent: Tuesday, August 3, 2021 2:02 PMQuoted 4 lines · Tom Rini
Quoted 3 lines · Chia-Wei Wang
A U-Boot image could be loaded and executed at a different location than it was linked at.
Quoted 7 lines
Quoted 4 lines
Quoted 4 lines
For example, Aspeed takes a stable release version of U-Boot image as the golden one for recovery purposes. When the primary storage such as flash is corrupted, the golden image could be loaded to any SRAM/DRAM address on demands through ethernet/UART/etc.
How? When flash got corrupted, how do you manage to load the golden image?
AST2600 supports boot-from-UART through HW strap.
When boot-from-UART is enabled for recovery purposes, the ROM code receives image data bytes from UART and put them into SRAM for execution. In addition, if secure boot is also enabled, the image sent has to be signed and be verified by the public key programmed in OTP.
As AST2600 is based on ARMv7 architecture, this patch is implemented for.
Regards,
Chiawei
Quoted 35 lines
Quoted 6 lines
Quoted 6 lines
To deal with this condition, the PIE is needed as there is only one signed, golden image, which could be however executed at different places.
Quoted 6 lines
Quoted 6 lines
This patch adds the PIE support for ARMv7 platform.
Signed-off-by Chia-Wei Wang <[email protected]>--- arch/arm/Kconfig | 4 +++- arch/arm/cpu/armv7/start.S | 43++++++++++++++++++++++++++++++++++++++
Quoted 22 lines
Quoted 9 lines
arch/arm/lib/crt0.S | 11 ++++++++++ arch/arm/lib/relocate.S | 35 ++++++++++++++++++++++--------- 4 files changed, 82 insertions(+), 11 deletions(-)arch/arm/Kconfig index renamed from arch/arm/Kconfig +0
-0
2b7b625705..45879c9f06100644arch/arm/Kconfig config ARM64 · line 15
Quoted 8 lines
arch/arm/Kconfig +1
-1@@ -9,7 +9,7 @@ config ARM64 select PHYS_64BIT select SYS_CACHE_SHIFT_6 -if ARM64 +if ARM64 || CPU_V7A config POSITION_INDEPENDENT bool "Generate position-independent pre-relocation code" helpThanks for doing this. I think we need to fix the depends on lines here rather than hide with if ARM64 ||
CPU_V7A, and then fix anything else that follows to also have the correct dependencies.