KVM: VMX: When emulating on invalid vmx state, don't return to userspace unnecessarily

If we aren't doing mmio there's no need to exit to userspace (which will
just be confused).

Signed-off-by: Avi Kivity <avi@redhat.com>

diff --git a/arch/x86/kvm/vmx.c b/arch/x86/kvm/vmx.c
index a309be6788e74ce62f74f49ed7134f1ed84812ca..df454de8acfa2af8bf35fa96446ed300331cf6ba 100644 (file)
--- a/arch/x86/kvm/vmx.c
+++ b/arch/x86/kvm/vmx.c
@@ -91,6 +91,7 @@ struct vcpu_vmx {
        } rmode;
        int vpid;
        bool emulation_required;
+       enum emulation_result invalid_state_emulation_result;
 
        /* Support for vnmi-less CPUs */
        int soft_vnmi_blocked;
@@ -3130,7 +3131,8 @@ static int handle_nmi_window(struct kvm_vcpu *vcpu, struct kvm_run *kvm_run)
 static void handle_invalid_guest_state(struct kvm_vcpu *vcpu,
                                struct kvm_run *kvm_run)
 {
-       int err;
+       struct vcpu_vmx *vmx = to_vmx(vcpu);
+       enum emulation_result err = EMULATE_DONE;
 
        preempt_enable();
        local_irq_enable();
@@ -3154,6 +3156,8 @@ static void handle_invalid_guest_state(struct kvm_vcpu *vcpu,
 
        local_irq_disable();
        preempt_disable();
+
+       vmx->invalid_state_emulation_result = err;
 }
 
 /*
@@ -3205,7 +3209,7 @@ static int kvm_handle_exit(struct kvm_run *kvm_run, struct kvm_vcpu *vcpu)
        if (vmx->emulation_required && emulate_invalid_guest_state) {
                if (guest_state_valid(vcpu))
                        vmx->emulation_required = 0;
-               return 0;
+               return vmx->invalid_state_emulation_result != EMULATE_DO_MMIO;
        }
 
        /* Access CR3 don't cause VMExit in paging mode, so we need