arm64: entry: simplify trampoline data page
PATCH v2 1/1 arm64: entry: simplify trampoline data page
Get rid of some clunky open coded arithmetic on section addresses, by emitting the trampoline data variables into a separate, dedicated r/o data section, and putting it at the next page boundary. This way, we can access the literals via single LDR instruction.
While at it, get rid of other, implicit literals, and use ADRP/ADD or MOVZ/MOVK sequences, as appropriate. Note that the latter are only supported for CONFIG_RELOCATABLE=n (which is usually the case if CONFIG_RANDOMIZE_BASE=n), so update the CPP conditionals to reflect this.
---
v2: incorporate suggested comment by Mark and add his ack
arch/arm64/include/asm/fixmap.h | 4 +- arch/arm64/kernel/entry.S | 53 ++++++++------------ arch/arm64/kernel/vmlinux.lds.S | 3 +- arch/arm64/mm/mmu.c | 10 ++-- 4 files changed, 30 insertions(+), 40 deletions(-)
arch/arm64/include/asm/fixmap.h +3 -1
@@ -62,10 +62,12 @@ enum fixed_addresses {#endif /* CONFIG_ACPI_APEI_GHES */ #ifdef CONFIG_UNMAP_KERNEL_AT_EL0 +#ifdef CONFIG_RELOCATABLE +FIX_ENTRY_TRAMP_TEXT4 ,/* one extra slot for the data page */ +#endifFIX_ENTRY_TRAMP_TEXT3 ,FIX_ENTRY_TRAMP_TEXT2 ,FIX_ENTRY_TRAMP_TEXT1 , -FIX_ENTRY_TRAMP_DATA , #define TRAMP_VALIAS (__fix_to_virt(FIX_ENTRY_TRAMP_TEXT1))#endif /* CONFIG_UNMAP_KERNEL_AT_EL0 */ __end_of_permanent_fixed_addresses,
arch/arm64/kernel/entry.S +22 -31
85 lines not on this page · raw message
arch/arm64/kernel/vmlinux.lds.S +2 -1
@@ -115,7 +115,8 @@ jiffies = jiffies_64; __entry_tramp_text_start = .; \ *(.entry.tramp.text) \ . = ALIGN(PAGE_SIZE); \ - __entry_tramp_text_end = .; + __entry_tramp_text_end = .; \ + *(.entry.tramp.rodata) #else #define TRAMP_TEXT #endif
arch/arm64/mm/mmu.c +3 -7
@@ -665,13 +665,9 @@ static int __init map_entry_trampoline(void)__set_fixmap (FIX_ENTRY_TRAMP_TEXT1 - i, pa_start + i *PAGE_SIZE , prot); -if (IS_ENABLED (CONFIG_RANDOMIZE_BASE )) { -extern char __entry_tramp_data_start[]; - -__set_fixmap (FIX_ENTRY_TRAMP_DATA , -__pa_symbol (__entry_tramp_data_start), -PAGE_KERNEL_RO ); - } +if (IS_ENABLED (CONFIG_RELOCATABLE )) +__set_fixmap (FIX_ENTRY_TRAMP_TEXT1 - i, + pa_start + i *PAGE_SIZE ,PAGE_KERNEL_RO );return 0 ; }
Signature · 7 lines
2.35.1 _______________________________________________ linux-arm-kernel mailing list [email protected] http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
Quoted 5 lines · Ard Biesheuvel
Get rid of some clunky open coded arithmetic on section addresses, by emitting the trampoline data variables into a separate, dedicated r/o data section, and putting it at the next page boundary. This way, we can access the literals via single LDR instruction.
Quoted 7 lines
While at it, get rid of other, implicit literals, and use ADRP/ADD or MOVZ/MOVK sequences, as appropriate. Note that the latter are only supported for
CONFIG_RELOCATABLE=n(which is usually the case ifCONFIG_RANDOMIZE_BASE=n), so update the CPP conditionals to reflect this.[...]
Applied to arm64 (for-next/kpti), thanks!
[1/1] arm64: entry: simplify trampoline data page
https://git.kernel.org/arm64/c/1c9a8e876808
Cheers,
Signature · 10 lines
Will https://fixes.arm64.dev https://next.arm64.dev https://will.arm64.dev _______________________________________________ linux-arm-kernel mailing list [email protected] http://lists.infradead.org/mailman/listinfo/linux-arm-kernel