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

Commit 0e5cbe36 authored by Joerg Roedel's avatar Joerg Roedel Committed by Avi Kivity
Browse files

KVM: SVM: Reset MMU on nested_svm_vmrun for NPT too 



Without resetting the MMU the gva_to_pga function will not
work reliably when the vcpu is running in nested context.

Signed-off-by: default avatarJoerg Roedel <joerg.roedel@amd.com>
Signed-off-by: default avatarAvi Kivity <avi@redhat.com>
parent e0231715

arch/x86/kvm/svm.c

+5 −3
Original line number Diff line number Diff line
@@ -1877,10 +1877,12 @@ static bool nested_svm_vmrun(struct vcpu_svm *svm) 
	if (npt_enabled) {

		svm->vmcb->save.cr3 = nested_vmcb->save.cr3;

		svm->vcpu.arch.cr3 = nested_vmcb->save.cr3;

	} else {

	} else

		kvm_set_cr3(&svm->vcpu, nested_vmcb->save.cr3);



	/* Guest paging mode is active - reset mmu */

	kvm_mmu_reset_context(&svm->vcpu);

	}



	svm->vmcb->save.cr2 = svm->vcpu.arch.cr2 = nested_vmcb->save.cr2;

	kvm_register_write(&svm->vcpu, VCPU_REGS_RAX, nested_vmcb->save.rax);

	kvm_register_write(&svm->vcpu, VCPU_REGS_RSP, nested_vmcb->save.rsp);