lkml.org 
[lkml]   [2009]   [Aug]   [7]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 16/21] kvm/svm: handle errors in vmrun emulation path appropriatly
    Date
    If nested svm fails to load the msrpm the vmrun succeeds with the old
    msrpm which is not correct. This patch changes the logic to roll back
    to host mode in case the msrpm cannot be loaded.

    Signed-off-by: Joerg Roedel <joerg.roedel@amd.com>
    ---
    arch/x86/kvm/svm.c | 14 +++++++++++++-
    1 files changed, 13 insertions(+), 1 deletions(-)

    diff --git a/arch/x86/kvm/svm.c b/arch/x86/kvm/svm.c
    index 63d2f63..cad7582 100644
    --- a/arch/x86/kvm/svm.c
    +++ b/arch/x86/kvm/svm.c
    @@ -1880,6 +1880,7 @@ static int vmsave_interception(struct vcpu_svm *svm, struct kvm_run *kvm_run)
    static int vmrun_interception(struct vcpu_svm *svm, struct kvm_run *kvm_run)
    {
    nsvm_printk("VMrun\n");
    +
    if (nested_svm_check_permissions(svm))
    return 1;

    @@ -1890,7 +1891,18 @@ static int vmrun_interception(struct vcpu_svm *svm, struct kvm_run *kvm_run)
    return 1;

    if (!nested_svm_vmrun_msrpm(svm))
    - return 1;
    + goto failed;
    +
    + return 1;
    +
    +failed:
    +
    + svm->vmcb->control.exit_code = SVM_EXIT_ERR;
    + svm->vmcb->control.exit_code_hi = 0;
    + svm->vmcb->control.exit_info_1 = 0;
    + svm->vmcb->control.exit_info_2 = 0;
    +
    + nested_svm_vmexit(svm);

    return 1;
    }
    --
    1.6.3.3



    \
     
     \ /
      Last update: 2009-08-07 11:57    [W:4.086 / U:0.156 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site