Commit 25ba64d5 authored Mar 31, 2022 by James Morse Committed by Srinivasarao Pathipati Sep 05, 2022

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



commit 13d7a08352a83ef2252aeb464a5e08dfc06b5dfd upstream.

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.

Change-Id: I4aed238febd06b5aa464132c4467b62924389f20
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>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Git-commit: 10fbae21
Git-repo: https://android.googlesource.com/kernel/common/


Signed-off-by: Srinivasarao Pathipati <quic_c_spathi@quicinc.com>

parent 5c720407

arch/arm64/kernel/entry.S

+6 −6

Original line number	Diff line number	Diff line
		@@ -1029,12 +1029,7 @@ __ni_sys_trace:

		.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
		sub \tmp, \tmp, #(SWAPPER_DIR_SIZE + RESERVED_TTBR0_SIZE)
		@@ -1125,6 +1120,11 @@ alternative_insn isb, nop, ARM64_WORKAROUND_QCOM_FALKOR_E1003
		.endr
		.endm

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