diff options
| author |   Marc Zyngier <maz@kernel.org> | 2020-06-10 19:09:26 +0100 |
|---|---|---|
| committer | Marc Zyngier <maz@kernel.org> | 2020-06-10 19:10:40 +0100 |
| commit | 15c99816ed9396c548eed2e84f30c14caccad1f4 (patch) | |
| tree | 236060e2c844264f5f5e5621681817a09db3a2c4 /arch/arm64/kvm/hyp/sysreg-sr.c | |
| parent | KVM: arm64: Synchronize sysreg state on injecting an AArch32 exception (diff) | |
| parent | KVM: arm64: Move hyp_symbol_addr() to kvm_asm.h (diff) | |
| download | linux-dev-15c99816ed9396c548eed2e84f30c14caccad1f4.tar.xz linux-dev-15c99816ed9396c548eed2e84f30c14caccad1f4.zip | |
Merge branch 'kvm-arm64/ptrauth-fixes' into kvmarm-master/next
Signed-off-by: Marc Zyngier <maz@kernel.org>
Diffstat (limited to 'arch/arm64/kvm/hyp/sysreg-sr.c')
| -rw-r--r-- | arch/arm64/kvm/hyp/sysreg-sr.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/arch/arm64/kvm/hyp/sysreg-sr.c b/arch/arm64/kvm/hyp/sysreg-sr.c index 0d60e6ee96b2..4fe528c570cf 100644 --- a/arch/arm64/kvm/hyp/sysreg-sr.c +++ b/arch/arm64/kvm/hyp/sysreg-sr.c @@ -263,12 +263,13 @@ void __hyp_text __sysreg32_restore_state(struct kvm_vcpu *vcpu) */ void kvm_vcpu_load_sysregs(struct kvm_vcpu *vcpu) { - struct kvm_cpu_context *host_ctxt = vcpu->arch.host_cpu_context; struct kvm_cpu_context *guest_ctxt = &vcpu->arch.ctxt; + struct kvm_cpu_context *host_ctxt; if (!has_vhe()) return; + host_ctxt = &__hyp_this_cpu_ptr(kvm_host_data)->host_ctxt; __sysreg_save_user_state(host_ctxt); /* @@ -299,12 +300,13 @@ void kvm_vcpu_load_sysregs(struct kvm_vcpu *vcpu) */ void kvm_vcpu_put_sysregs(struct kvm_vcpu *vcpu) { - struct kvm_cpu_context *host_ctxt = vcpu->arch.host_cpu_context; struct kvm_cpu_context *guest_ctxt = &vcpu->arch.ctxt; + struct kvm_cpu_context *host_ctxt; if (!has_vhe()) return; + host_ctxt = &__hyp_this_cpu_ptr(kvm_host_data)->host_ctxt; deactivate_traps_vhe_put(); __sysreg_save_el1_state(guest_ctxt); |