Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 39d3d6b1 authored by Will Deacon's avatar Will Deacon Committed by Channagoud Kadabi
Browse files

UPSTREAM: arm64: entry: Add exception trampoline page for exceptions from EL0 



To allow unmapping of the kernel whilst running at EL0, we need to
point the exception vectors at an entry trampoline that can map/unmap
the kernel on entry/exit respectively.

This patch adds the trampoline page, although it is not yet plugged
into the vector table and is therefore unused.

Reviewed-by: default avatarMark Rutland <mark.rutland@arm.com>
Tested-by: default avatarLaura Abbott <labbott@redhat.com>
Tested-by: default avatarShanker Donthineni <shankerd@codeaurora.org>
Signed-off-by: default avatarWill Deacon <will.deacon@arm.com>
(cherry picked from commit c7b9adaf85f818d747eeff5145eb4095ccd587fb)

[toddpoynor@google.com: fixup context]
Change-Id: I6c6b5eb93a69f26b97628726eccf91df739d03af
Signed-off-by: default avatarTodd Poynor <toddpoynor@google.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@google.com>
Git-commit: a329b068
Git-repo: https://android.googlesource.com/kernel/common/


Signed-off-by: default avatarChannagoud Kadabi <ckadabi@codeaurora.org>
parent 3c986ee7

arch/arm64/kernel/entry.S

+85 −0
Original line number Diff line number Diff line
@@ -29,6 +29,7 @@ 
#include <asm/esr.h>

#include <asm/irq.h>

#include <asm/memory.h>

#include <asm/mmu.h>

#include <asm/ptrace.h>

#include <asm/thread_info.h>

#include <asm/uaccess.h>
@@ -864,6 +865,90 @@ __ni_sys_trace: 


	.popsection				// .entry.text



#ifdef CONFIG_UNMAP_KERNEL_AT_EL0

/*

 * Exception vectors trampoline.

 */

	.pushsection ".entry.tramp.text", "ax"



	.macro tramp_map_kernel, tmp

	mrs	\tmp, ttbr1_el1

	sub	\tmp, \tmp, #(SWAPPER_DIR_SIZE + RESERVED_TTBR0_SIZE)

	bic	\tmp, \tmp, #USER_ASID_FLAG

	msr	ttbr1_el1, \tmp

	.endm



	.macro tramp_unmap_kernel, tmp

	mrs	\tmp, ttbr1_el1

	add	\tmp, \tmp, #(SWAPPER_DIR_SIZE + RESERVED_TTBR0_SIZE)

	orr	\tmp, \tmp, #USER_ASID_FLAG

	msr	ttbr1_el1, \tmp

	/*

	 * We avoid running the post_ttbr_update_workaround here because the

	 * user and kernel ASIDs don't have conflicting mappings, so any

	 * "blessing" as described in:

	 *

	 *   http://lkml.kernel.org/r/56BB848A.6060603@caviumnetworks.com

	 *

	 * will not hurt correctness. Whilst this may partially defeat the

	 * point of using split ASIDs in the first place, it avoids

	 * the hit of invalidating the entire I-cache on every return to

	 * userspace.

	 */

	.endm



	.macro tramp_ventry, regsize = 64

	.align	7

1:

	.if	\regsize == 64

	msr	tpidrro_el0, x30	// Restored in kernel_ventry

	.endif

	tramp_map_kernel	x30

	ldr	x30, =vectors

	prfm	plil1strm, [x30, #(1b - tramp_vectors)]

	msr	vbar_el1, x30

	add	x30, x30, #(1b - tramp_vectors)

	isb

	br	x30

	.endm



	.macro tramp_exit, regsize = 64

	adr	x30, tramp_vectors

	msr	vbar_el1, x30

	tramp_unmap_kernel	x30

	.if	\regsize == 64

	mrs	x30, far_el1

	.endif

	eret

	.endm



	.align	11

ENTRY(tramp_vectors)

	.space	0x400



	tramp_ventry

	tramp_ventry

	tramp_ventry

	tramp_ventry



	tramp_ventry	32

	tramp_ventry	32

	tramp_ventry	32

	tramp_ventry	32

END(tramp_vectors)



ENTRY(tramp_exit_native)

	tramp_exit

END(tramp_exit_native)



ENTRY(tramp_exit_compat)

	tramp_exit	32

END(tramp_exit_compat)



	.ltorg

	.popsection				// .entry.tramp.text

#endif /* CONFIG_UNMAP_KERNEL_AT_EL0 */



/*

 * Special system call wrappers.

 */

arch/arm64/kernel/vmlinux.lds.S

+17 −0
Original line number Diff line number Diff line
@@ -56,6 +56,17 @@ jiffies = jiffies_64; 
#define HIBERNATE_TEXT

#endif



#ifdef CONFIG_UNMAP_KERNEL_AT_EL0

#define TRAMP_TEXT					\

	. = ALIGN(PAGE_SIZE);				\

	VMLINUX_SYMBOL(__entry_tramp_text_start) = .;	\

	*(.entry.tramp.text)				\

	. = ALIGN(PAGE_SIZE);				\

	VMLINUX_SYMBOL(__entry_tramp_text_end) = .;

#else

#define TRAMP_TEXT

#endif



/*

 * The size of the PE/COFF section that covers the kernel image, which

 * runs from stext to _edata, must be a round multiple of the PE/COFF
@@ -128,6 +139,7 @@ SECTIONS 
			HYPERVISOR_TEXT

			IDMAP_TEXT

			HIBERNATE_TEXT

			TRAMP_TEXT

			*(.fixup)

			*(.gnu.warning)

		. = ALIGN(16);
@@ -221,6 +233,11 @@ SECTIONS 
	. += RESERVED_TTBR0_SIZE;

#endif



#ifdef CONFIG_UNMAP_KERNEL_AT_EL0

	tramp_pg_dir = .;

	. += PAGE_SIZE;

#endif



	_end = .;



	STABS_DEBUG