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

Commit 00885bc2 authored by James Morse's avatar James Morse Committed by Gerrit - the friendly Code Review server
Browse files

arm64: entry: Make the kpti trampoline's kpti sequence optional 



commit c47e4d04ba0f1ea17353d85d45f611277507e07a upstream.

Spectre-BHB needs to add sequences to the vectors. Having one global
set of vectors is a problem for big/little systems where the sequence
is costly on cpus that are not vulnerable.

Making the vectors per-cpu in the style of KVM's bh_harden_hyp_vecs
requires the vectors to be generated by macros.

Make the kpti remapping of the kernel optional so the macros can be
used without kpti.

Change-Id: I4dc98f5af303700bd3ae02eb80e17772f52fde36
Reviewed-by: default avatarRussell King (Oracle) <rmk+kernel@armlinux.org.uk>
Reviewed-by: default avatarCatalin Marinas <catalin.marinas@arm.com>
Signed-off-by: default avatarJames Morse <james.morse@arm.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Git-commit: 9e056623
Git-repo: https://android.googlesource.com/kernel/common/


Signed-off-by: default avatarKishor Krishna Bhat <quic_kishkris@quicinc.com>
parent 20f15f07

arch/arm64/kernel/entry.S

+11 −6
Original line number Diff line number Diff line
@@ -1003,9 +1003,10 @@ alternative_else_nop_endif 
	sub	\dst, \dst, PAGE_SIZE

	.endm



	.macro tramp_ventry, vector_start, regsize

	.macro tramp_ventry, vector_start, regsize, kpti

	.align	7

1:

	.if	\kpti == 1

	.if	\regsize == 64

	msr	tpidrro_el0, x30	// Restored in kernel_ventry

	.endif
@@ -1027,8 +1028,12 @@ alternative_insn isb, nop, ARM64_WORKAROUND_QCOM_FALKOR_E1003 
#endif

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

	msr	vbar_el1, x30

	add	x30, x30, #(1b - \vector_start + 4)

	isb

	.else

	ldr	x30, =vectors

	.endif // \kpti == 1



	add	x30, x30, #(1b - \vector_start + 4)

	ret

.org 1b + 128	// Did we overflow the ventry slot?

	.endm
@@ -1045,15 +1050,15 @@ alternative_insn isb, nop, ARM64_WORKAROUND_QCOM_FALKOR_E1003 
	eret

	.endm



	.macro	generate_tramp_vector

	.macro	generate_tramp_vector, kpti

.Lvector_start\@:

	.space	0x400



	.rept	4

	tramp_ventry	.Lvector_start\@, 64

	tramp_ventry	.Lvector_start\@, 64, \kpti

	.endr

	.rept	4

	tramp_ventry	.Lvector_start\@, 32

	tramp_ventry	.Lvector_start\@, 32, \kpti

	.endr

	.endm
@@ -1064,7 +1069,7 @@ alternative_insn isb, nop, ARM64_WORKAROUND_QCOM_FALKOR_E1003 
	.pushsection ".entry.tramp.text", "ax"

	.align	11

ENTRY(tramp_vectors)

	generate_tramp_vector

	generate_tramp_vector kpti=1

END(tramp_vectors)



ENTRY(tramp_exit_native)