diff options
author | Ard Biesheuvel <ardb@kernel.org> | 2023-11-27 15:00:52 +0300 |
---|---|---|
committer | Will Deacon <will@kernel.org> | 2023-12-11 14:40:38 +0300 |
commit | 8885c7398fe56c49f14be6ce0ac202385f3cd818 (patch) | |
tree | 20cd2e9f4cf48acca8c0c6c40c69377e31275d98 /arch/arm64/mm | |
parent | 103423ad7e56d6c756738823c332c414b07899e6 (diff) | |
download | linux-8885c7398fe56c49f14be6ce0ac202385f3cd818.tar.xz |
arm64: mm: Only map KPTI trampoline if it is going to be used
Avoid creating the fixmap entries for the KPTI trampoline if KPTI is not
in use.
Signed-off-by: Ard Biesheuvel <ardb@kernel.org>
Acked-by: Mark Rutland <mark.rutland@arm.com>
Link: https://lore.kernel.org/r/20231127120049.2258650-7-ardb@google.com
Signed-off-by: Will Deacon <will@kernel.org>
Diffstat (limited to 'arch/arm64/mm')
-rw-r--r-- | arch/arm64/mm/mmu.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/arch/arm64/mm/mmu.c b/arch/arm64/mm/mmu.c index 15f6347d23b6..6c8078916f5e 100644 --- a/arch/arm64/mm/mmu.c +++ b/arch/arm64/mm/mmu.c @@ -674,6 +674,9 @@ static int __init map_entry_trampoline(void) { int i; + if (!arm64_kernel_unmapped_at_el0()) + return 0; + pgprot_t prot = kernel_exec_prot(); phys_addr_t pa_start = __pa_symbol(__entry_tramp_text_start); |