Commit e609b4f4 authored by Sami Tolvanen's avatar Sami Tolvanen Committed by Palmer Dabbelt

riscv: Move global pointer loading to a macro

In Clang 17, -fsanitize=shadow-call-stack uses the newly declared
platform register gp for storing shadow call stack pointers. As
this is obviously incompatible with gp relaxation, in preparation
for CONFIG_SHADOW_CALL_STACK support, move global pointer loading
to a single macro, which we can cleanly disable when SCS is used
instead.

Link: https://reviews.llvm.org/rGaa1d2693c256
Link: https://github.com/riscv-non-isa/riscv-elf-psabi-doc/commit/a484e843e6eeb51f0cb7b8819e50da6d2444d769Signed-off-by: default avatarSami Tolvanen <samitolvanen@google.com>
Tested-by: default avatarNathan Chancellor <nathan@kernel.org>
Link: https://lore.kernel.org/r/20230927224757.1154247-11-samitolvanen@google.comSigned-off-by: default avatarPalmer Dabbelt <palmer@rivosinc.com>
parent 82982fdd
...@@ -109,6 +109,14 @@ ...@@ -109,6 +109,14 @@
REG_L \dst, 0(\dst) REG_L \dst, 0(\dst)
.endm .endm
/* load __global_pointer to gp */
.macro load_global_pointer
.option push
.option norelax
la gp, __global_pointer$
.option pop
.endm
/* save all GPs except x1 ~ x5 */ /* save all GPs except x1 ~ x5 */
.macro save_from_x6_to_x31 .macro save_from_x6_to_x31
REG_S x6, PT_T1(sp) REG_S x6, PT_T1(sp)
......
...@@ -75,10 +75,8 @@ _save_context: ...@@ -75,10 +75,8 @@ _save_context:
csrw CSR_SCRATCH, x0 csrw CSR_SCRATCH, x0
/* Load the global pointer */ /* Load the global pointer */
.option push load_global_pointer
.option norelax
la gp, __global_pointer$
.option pop
move a0, sp /* pt_regs */ move a0, sp /* pt_regs */
la ra, ret_from_exception la ra, ret_from_exception
......
...@@ -110,10 +110,7 @@ relocate_enable_mmu: ...@@ -110,10 +110,7 @@ relocate_enable_mmu:
csrw CSR_TVEC, a0 csrw CSR_TVEC, a0
/* Reload the global pointer */ /* Reload the global pointer */
.option push load_global_pointer
.option norelax
la gp, __global_pointer$
.option pop
/* /*
* Switch to kernel page tables. A full fence is necessary in order to * Switch to kernel page tables. A full fence is necessary in order to
...@@ -134,10 +131,7 @@ secondary_start_sbi: ...@@ -134,10 +131,7 @@ secondary_start_sbi:
csrw CSR_IP, zero csrw CSR_IP, zero
/* Load the global pointer */ /* Load the global pointer */
.option push load_global_pointer
.option norelax
la gp, __global_pointer$
.option pop
/* /*
* Disable FPU & VECTOR to detect illegal usage of * Disable FPU & VECTOR to detect illegal usage of
...@@ -228,10 +222,7 @@ pmp_done: ...@@ -228,10 +222,7 @@ pmp_done:
#endif /* CONFIG_RISCV_M_MODE */ #endif /* CONFIG_RISCV_M_MODE */
/* Load the global pointer */ /* Load the global pointer */
.option push load_global_pointer
.option norelax
la gp, __global_pointer$
.option pop
/* /*
* Disable FPU & VECTOR to detect illegal usage of * Disable FPU & VECTOR to detect illegal usage of
......
...@@ -61,10 +61,7 @@ END(__cpu_suspend_enter) ...@@ -61,10 +61,7 @@ END(__cpu_suspend_enter)
SYM_TYPED_FUNC_START(__cpu_resume_enter) SYM_TYPED_FUNC_START(__cpu_resume_enter)
/* Load the global pointer */ /* Load the global pointer */
.option push load_global_pointer
.option norelax
la gp, __global_pointer$
.option pop
#ifdef CONFIG_MMU #ifdef CONFIG_MMU
/* Save A0 and A1 */ /* Save A0 and A1 */
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment