Commit 655169ce authored by Marc Zyngier's avatar Marc Zyngier
Browse files

KVM: arm64: Check HCR_EL2 instead of shadow copy to swap PtrAuth registers 



When save/restoring PtrAuth registers between host and guest, it is
pretty useless to fetch the in-memory state, while we have the right
state in the HCR_EL2 system register. Use that instead.

Acked-by: default avatarMark Rutland <mark.rutland@arm.com>
Signed-off-by: default avatarMarc Zyngier <maz@kernel.org>
parent aff7cce0

arch/arm64/include/asm/kvm_ptrauth.h

+2 −2
Original line number Diff line number Diff line
@@ -74,7 +74,7 @@ alternative_if_not ARM64_HAS_ADDRESS_AUTH_IMP_DEF 
	b	1001f

alternative_else_nop_endif

1000:

	ldr	\reg1, [\g_ctxt, #(VCPU_HCR_EL2 - VCPU_CONTEXT)]

	mrs	\reg1, hcr_el2

	and	\reg1, \reg1, #(HCR_API | HCR_APK)

	cbz	\reg1, 1001f

	add	\reg1, \g_ctxt, #CPU_APIAKEYLO_EL1
@@ -90,7 +90,7 @@ alternative_if_not ARM64_HAS_ADDRESS_AUTH_IMP_DEF 
	b	2001f

alternative_else_nop_endif

2000:

	ldr	\reg1, [\g_ctxt, #(VCPU_HCR_EL2 - VCPU_CONTEXT)]

	mrs	\reg1, hcr_el2

	and	\reg1, \reg1, #(HCR_API | HCR_APK)

	cbz	\reg1, 2001f

	add	\reg1, \g_ctxt, #CPU_APIAKEYLO_EL1