Commit d2f4c017 authored by James Morse's avatar James Morse Committed by Zheng Zengkai
Browse files

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

stable inclusion
from stable-v5.10.105
commit 73ee716a1f6356ca86d16d4ffc97fcfc7961d3ef
category: bugfix
bugzilla: 186460 https://gitee.com/src-openeuler/kernel/issues/I53MHA
CVE: CVE-2022-23960

Reference: https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?id=73ee716a1f63



--------------------------------

commit c47e4d04 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 re-mapping of the kernel optional, so the macros can be
used without kpti.

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>
Signed-off-by: default avatarChen Jiahao <chenjiahao16@huawei.com>
Reviewed-by: default avatarLiao Chang <liaochang1@huawei.com>
Signed-off-by: default avatarZheng Zengkai <zhengzengkai@huawei.com>
parent bac79a98

arch/arm64/kernel/entry.S

+12 −6
Original line number Diff line number Diff line
@@ -804,9 +804,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
@@ -829,9 +830,14 @@ alternative_insn isb, nop, ARM64_WORKAROUND_QCOM_FALKOR_E1003 
alternative_if_not ARM64_WORKAROUND_CAVIUM_TX2_219_PRFM

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

alternative_else_nop_endif



	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
@@ -849,15 +855,15 @@ alternative_else_nop_endif 
	sb

	.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
@@ -868,7 +874,7 @@ alternative_else_nop_endif 
	.pushsection ".entry.tramp.text", "ax"

	.align	11

SYM_CODE_START_NOALIGN(tramp_vectors)

	generate_tramp_vector

	generate_tramp_vector	kpti=1

SYM_CODE_END(tramp_vectors)



SYM_CODE_START(tramp_exit_native)