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

Commit 34f8cdf1 authored by Christoffer Dall's avatar Christoffer Dall Committed by Marc Zyngier
Browse files

KVM: arm64: Don't deactivate VM on VHE systems 



There is no need to reset the VTTBR to zero when exiting the guest on
VHE systems.  VHE systems don't use stage 2 translations for the EL2&0
translation regime used by the host.

Reviewed-by: default avatarAndrew Jones <drjones@redhat.com>
Acked-by: default avatarMarc Zyngier <marc.zyngier@arm.com>
Signed-off-by: default avatarChristoffer Dall <christoffer.dall@linaro.org>
Signed-off-by: default avatarMarc Zyngier <marc.zyngier@arm.com>
parent 86d05682

arch/arm64/kvm/hyp/switch.c

+3 −5
Original line number Diff line number Diff line
@@ -156,9 +156,8 @@ static void __hyp_text __deactivate_traps(struct kvm_vcpu *vcpu) 
	write_sysreg(0, pmuserenr_el0);

}



static void __hyp_text __activate_vm(struct kvm_vcpu *vcpu)

static void __hyp_text __activate_vm(struct kvm *kvm)

{

	struct kvm *kvm = kern_hyp_va(vcpu->kvm);

	write_sysreg(kvm->arch.vttbr, vttbr_el2);

}
@@ -377,7 +376,7 @@ int kvm_vcpu_run_vhe(struct kvm_vcpu *vcpu) 
	__sysreg_save_host_state(host_ctxt);



	__activate_traps(vcpu);

	__activate_vm(vcpu);

	__activate_vm(vcpu->kvm);



	__vgic_restore_state(vcpu);

	__timer_enable_traps(vcpu);
@@ -405,7 +404,6 @@ int kvm_vcpu_run_vhe(struct kvm_vcpu *vcpu) 
	__vgic_save_state(vcpu);



	__deactivate_traps(vcpu);

	__deactivate_vm(vcpu);



	__sysreg_restore_host_state(host_ctxt);
@@ -440,7 +438,7 @@ int __hyp_text __kvm_vcpu_run_nvhe(struct kvm_vcpu *vcpu) 
	__sysreg_save_host_state(host_ctxt);



	__activate_traps(vcpu);

	__activate_vm(vcpu);

	__activate_vm(kern_hyp_va(vcpu->kvm));



	__vgic_restore_state(vcpu);

	__timer_enable_traps(vcpu);