diff options
| author |   James Morse <james.morse@arm.com> | 2021-11-18 15:04:32 +0000 |
|---|---|---|
| committer | James Morse <james.morse@arm.com> | 2022-02-15 17:40:28 +0000 |
| commit | a9c406e6462ff14956d690de7bbe5131a5677dc9 (patch) | |
| tree | 90b8435c09994d03fff2d8d26d131c503efdd700 /arch/arm64/kernel/vmlinux.lds.S | |
| parent | arm64: entry: Make the kpti trampoline's kpti sequence optional (diff) | |
| download | linux-dev-a9c406e6462ff14956d690de7bbe5131a5677dc9.tar.xz linux-dev-a9c406e6462ff14956d690de7bbe5131a5677dc9.zip | |
arm64: entry: Allow the trampoline text to occupy multiple pages
Adding a second set of vectors to .entry.tramp.text will make it
larger than a single 4K page.
Allow the trampoline text to occupy up to three pages by adding two
more fixmap slots. Previous changes to tramp_valias allowed it to reach
beyond a single page.
Reviewed-by: Catalin Marinas <catalin.marinas@arm.com>
Signed-off-by: James Morse <james.morse@arm.com>
Diffstat (limited to 'arch/arm64/kernel/vmlinux.lds.S')
| -rw-r--r-- | arch/arm64/kernel/vmlinux.lds.S | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm64/kernel/vmlinux.lds.S b/arch/arm64/kernel/vmlinux.lds.S index 50bab186c49b..edaf0faf766f 100644 --- a/arch/arm64/kernel/vmlinux.lds.S +++ b/arch/arm64/kernel/vmlinux.lds.S @@ -341,7 +341,7 @@ ASSERT(__hibernate_exit_text_end - (__hibernate_exit_text_start & ~(SZ_4K - 1)) <= SZ_4K, "Hibernate exit text too big or misaligned") #endif #ifdef CONFIG_UNMAP_KERNEL_AT_EL0 -ASSERT((__entry_tramp_text_end - __entry_tramp_text_start) == PAGE_SIZE, +ASSERT((__entry_tramp_text_end - __entry_tramp_text_start) <= 3*PAGE_SIZE, "Entry trampoline text too big") #endif #ifdef CONFIG_KVM |