lkml.org 
[lkml]   [2019]   [Aug]   [14]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 5.2 120/144] KVM/nSVM: properly map nested VMCB
    Date
    From: Vitaly Kuznetsov <vkuznets@redhat.com>

    commit 8f38302c0be2d2daf3b40f7d2142ec77e35d209e upstream.

    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>
    Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

    ---
    arch/x86/kvm/svm.c | 4 ++--
    1 file changed, 2 insertions(+), 2 deletions(-)

    --- a/arch/x86/kvm/svm.c
    +++ b/arch/x86/kvm/svm.c
    @@ -3290,7 +3290,7 @@ static int nested_svm_vmexit(struct vcpu
    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);
    @@ -3580,7 +3580,7 @@ static bool nested_svm_vmrun(struct vcpu

    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);

    \
     
     \ /
      Last update: 2019-08-14 19:27    [W:4.039 / U:0.408 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site