diff options
| author | Vitaly Kuznetsov | 2019-06-04 18:09:39 +0200 |
|---|---|---|
| committer | Paolo Bonzini | 2019-06-04 19:27:27 +0200 |
| commit | 8f38302c0be2d2daf3b40f7d2142ec77e35d209e (patch) | |
| tree | c6b4164bdf4b949489b517ed5e97b069bdb1f6e4 /arch/x86/kvm/svm.c | |
| parent | kvm: x86: Fix reserved bits related calculation errors caused by MKTME (diff) | |
| download | kernel-qcow2-linux-8f38302c0be2d2daf3b40f7d2142ec77e35d209e.tar.gz kernel-qcow2-linux-8f38302c0be2d2daf3b40f7d2142ec77e35d209e.tar.xz kernel-qcow2-linux-8f38302c0be2d2daf3b40f7d2142ec77e35d209e.zip | |
KVM/nSVM: properly map nested VMCB
Commit 8c5fbf1a7231 ("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: 8c5fbf1a7231 ("KVM/nSVM: Use the new mapping API for mapping guest memory")
Signed-off-by: Vitaly Kuznetsov <vkuznets@redhat.com>
Reviewed-by: Sean Christopherson <sean.j.christopherson@intel.com>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
Diffstat (limited to 'arch/x86/kvm/svm.c')
| -rw-r--r-- | arch/x86/kvm/svm.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/x86/kvm/svm.c b/arch/x86/kvm/svm.c index 735b8c01895e..5beca1030c9a 100644 --- a/arch/x86/kvm/svm.c +++ b/arch/x86/kvm/svm.c @@ -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); |