diff options
| author | Marc Zyngier <maz@kernel.org> | 2020-06-11 11:26:09 +0100 |
|---|---|---|
| committer | Marc Zyngier <maz@kernel.org> | 2020-06-22 11:42:50 +0100 |
| commit | 655169cec7bbf84f59faa9f824edb581eaecf78d (patch) | |
| tree | 72b27ddd35ec6af993fd0b57069238720e3320be /arch/arm64/include/asm/kvm_ptrauth.h | |
| parent | aff7cce0d337f5468470d614ef83a507dcf4c93f (diff) | |
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: Mark Rutland <mark.rutland@arm.com>
Signed-off-by: Marc Zyngier <maz@kernel.org>
Diffstat (limited to 'arch/arm64/include/asm/kvm_ptrauth.h')
| -rw-r--r-- | arch/arm64/include/asm/kvm_ptrauth.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/arm64/include/asm/kvm_ptrauth.h b/arch/arm64/include/asm/kvm_ptrauth.h index 6301813dcace..f1830173fa9e 100644 --- a/arch/arm64/include/asm/kvm_ptrauth.h +++ b/arch/arm64/include/asm/kvm_ptrauth.h @@ -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 |