lkml.org 
[lkml]   [2007]   [Sep]   [17]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 019/104] KVM: Hoist kvm_mmu_reload() out of the critical section
    Date
    From: Shaohua Li <shaohua.li@intel.com>

    vmx_cpu_run doesn't handle error correctly and kvm_mmu_reload might
    sleep with mutex changes, so I move it above.

    Signed-off-by: Shaohua Li <shaohua.li@intel.com>
    Signed-off-by: Avi Kivity <avi@qumranet.com>
    ---
    drivers/kvm/vmx.c | 8 ++++----
    1 files changed, 4 insertions(+), 4 deletions(-)

    diff --git a/drivers/kvm/vmx.c b/drivers/kvm/vmx.c
    index 2c4f01b..79674a7 100644
    --- a/drivers/kvm/vmx.c
    +++ b/drivers/kvm/vmx.c
    @@ -1999,16 +1999,16 @@ preempted:
    kvm_guest_debug_pre(vcpu);

    again:
    + r = kvm_mmu_reload(vcpu);
    + if (unlikely(r))
    + goto out;
    +
    if (!vcpu->mmio_read_completed)
    do_interrupt_requests(vcpu, kvm_run);

    vmx_save_host_state(vcpu);
    kvm_load_guest_fpu(vcpu);

    - r = kvm_mmu_reload(vcpu);
    - if (unlikely(r))
    - goto out;
    -
    /*
    * Loading guest fpu may have cleared host cr0.ts
    */
    --
    1.5.3
    -
    To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
    the body of a message to majordomo@vger.kernel.org
    More majordomo info at http://vger.kernel.org/majordomo-info.html
    Please read the FAQ at http://www.tux.org/lkml/

    \
     
     \ /
      Last update: 2007-09-17 10:39    [W:0.024 / U:148.528 seconds]
    ©2003-2016 Jasper Spaans. hosted at Digital OceanAdvertise on this site