| From foo@baz Sat Mar 19 01:51:18 PM CET 2022 |
| From: James Morse <james.morse@arm.com> |
| Date: Fri, 18 Mar 2022 17:48:30 +0000 |
| Subject: arm64: entry: Move trampoline macros out of ifdef'd section |
| To: stable@vger.kernel.org |
| Cc: linux-kernel@vger.kernel.org, james.morse@arm.com, catalin.marinas@arm.com |
| Message-ID: <20220318174842.2321061-11-james.morse@arm.com> |
| |
| From: James Morse <james.morse@arm.com> |
| |
| 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. |
| |
| 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> |
| --- |
| arch/arm64/kernel/entry.S | 12 ++++++------ |
| 1 file changed, 6 insertions(+), 6 deletions(-) |
| |
| --- a/arch/arm64/kernel/entry.S |
| +++ b/arch/arm64/kernel/entry.S |
| @@ -933,12 +933,7 @@ ENDPROC(el0_svc) |
| |
| .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 |
| add \tmp, \tmp, #(PAGE_SIZE + RESERVED_TTBR0_SIZE) |
| @@ -1029,6 +1024,11 @@ alternative_insn isb, nop, ARM64_WORKARO |
| .endr |
| .endm |
| |
| +#ifdef CONFIG_UNMAP_KERNEL_AT_EL0 |
| +/* |
| + * Exception vectors trampoline. |
| + */ |
| + .pushsection ".entry.tramp.text", "ax" |
| .align 11 |
| ENTRY(tramp_vectors) |
| generate_tramp_vector |
