Commit 13d7a083 authored Nov 18, 2021 by James Morse

arm64: entry: Move trampoline macros out of ifdef'd section



The macros for building the kpti trampoline are all behind
CONFIG_UNMAP_KERNEL_AT_EL0, and in a region that outputs to the
.entry.tramp.text section.

Move the macros out so they can be used to generate other kinds of
trampoline. Only the symbols need to be guarded by
CONFIG_UNMAP_KERNEL_AT_EL0 and appear in the .entry.tramp.text section.

Reviewed-by: Russell King (Oracle) <rmk+kernel@armlinux.org.uk>
Reviewed-by: Catalin Marinas <catalin.marinas@arm.com>
Signed-off-by: James Morse <james.morse@arm.com>

parent ed50da77

arch/arm64/kernel/entry.S

+5 −6

Original line number	Diff line number	Diff line
		@@ -608,12 +608,6 @@ SYM_CODE_END(ret_to_user)

		.popsection // .entry.text

		#ifdef CONFIG_UNMAP_KERNEL_AT_EL0
		/*
		* Exception vectors trampoline.
		*/
		.pushsection ".entry.tramp.text", "ax"

		// Move from tramp_pg_dir to swapper_pg_dir
		.macro tramp_map_kernel, tmp
		mrs \tmp, ttbr1_el1
		@@ -709,6 +703,11 @@ alternative_else_nop_endif
		.endr
		.endm

		#ifdef CONFIG_UNMAP_KERNEL_AT_EL0
		/*
		* Exception vectors trampoline.
		*/
		.pushsection ".entry.tramp.text", "ax"
		.align 11
		SYM_CODE_START_NOALIGN(tramp_vectors)
		generate_tramp_vector