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

Commit 8f38302c authored by Vitaly Kuznetsov's avatar Vitaly Kuznetsov Committed by Paolo Bonzini
Browse files

KVM/nSVM: properly map nested VMCB 



Commit 8c5fbf1a ("KVM/nSVM: Use the new mapping API for mapping guest
memory") broke nested SVM completely: kvm_vcpu_map()'s second parameter is
GFN so vmcb_gpa needs to be converted with gpa_to_gfn(), not the other way
around.

Fixes: 8c5fbf1a ("KVM/nSVM: Use the new mapping API for mapping guest memory")
Signed-off-by: default avatarVitaly Kuznetsov <vkuznets@redhat.com>
Reviewed-by: default avatarSean Christopherson <sean.j.christopherson@intel.com>
Signed-off-by: default avatarPaolo Bonzini <pbonzini@redhat.com>
parent f3ecb59d

arch/x86/kvm/svm.c

+2 −2
Original line number Diff line number Diff line
@@ -3293,7 +3293,7 @@ static int nested_svm_vmexit(struct vcpu_svm *svm) 
				       vmcb->control.exit_int_info_err,

				       KVM_ISA_SVM);



	rc = kvm_vcpu_map(&svm->vcpu, gfn_to_gpa(svm->nested.vmcb), &map);

	rc = kvm_vcpu_map(&svm->vcpu, gpa_to_gfn(svm->nested.vmcb), &map);

	if (rc) {

		if (rc == -EINVAL)

			kvm_inject_gp(&svm->vcpu, 0);
@@ -3583,7 +3583,7 @@ static bool nested_svm_vmrun(struct vcpu_svm *svm) 


	vmcb_gpa = svm->vmcb->save.rax;



	rc = kvm_vcpu_map(&svm->vcpu, gfn_to_gpa(vmcb_gpa), &map);

	rc = kvm_vcpu_map(&svm->vcpu, gpa_to_gfn(vmcb_gpa), &map);

	if (rc) {

		if (rc == -EINVAL)

			kvm_inject_gp(&svm->vcpu, 0);