Changeset 78982 in vbox

Timestamp:

Jun 5, 2019 8:58:53 AM (5 years ago)

Author:

vboxsync

Message:

VMM/IEM: Nested VMX: bugref:9180 Setup interrupt-window exiting similar to NMI-window exiting. Check for interrupt-window exiting before executing subsequent instructions in iemExecOneInner..

Location:

trunk/src/VBox/VMM/VMMAll

Files:

• IEMAll.cpp (modified) (1 diff)
• IEMAllCImplVmxInstr.cpp.h (modified) (2 diffs)

trunk/src/VBox/VMM/VMMAll/IEMAll.cpp

@@ -14079 +14079 @@
         }
 
-        /* NMI-window VM-exit. */
+        /*
+         * Check remaining intercepts.
+         *
+         * NMI-window and Interrupt-window VM-exits.
+         * Interrupt shadow (block-by-STI and Mov SS) inhibits interrupts and may also block NMIs.
+         * Event injection during VM-entry takes priority over NMI-window and interrupt-window VM-exits.
+         *
+         * See Intel spec. 26.7.6 "NMI-Window Exiting".
+         * See Intel spec. 26.7.5 "Interrupt-Window Exiting and Virtual-Interrupt Delivery".
+         */
         if (    fCheckRemainingIntercepts
-             && pVCpu->cpum.GstCtx.hwvirt.vmx.fInterceptEvents     /* Event injection during VM-entry takes priority. */
-             && VMCPU_FF_IS_SET(pVCpu, VMCPU_FF_VMX_NMI_WINDOW)
-             && !VMCPU_FF_IS_SET(pVCpu, VMCPU_FF_INHIBIT_INTERRUPTS)
-             && !CPUMIsGuestNmiBlocking(pVCpu))
+            &&  pVCpu->cpum.GstCtx.hwvirt.vmx.fInterceptEvents
+            && !VMCPU_FF_IS_SET(pVCpu, VMCPU_FF_INHIBIT_INTERRUPTS))
         {
-            rcStrict = iemVmxVmexit(pVCpu, VMX_EXIT_NMI_WINDOW);
-            Assert(!VMCPU_FF_IS_SET(pVCpu, VMCPU_FF_VMX_NMI_WINDOW));
+            if (   VMCPU_FF_IS_SET(pVCpu, VMCPU_FF_VMX_NMI_WINDOW)
+                && CPUMIsGuestVmxVirtNmiBlocking(pVCpu, &pVCpu->cpum.GstCtx))
+            {
+                rcStrict = iemVmxVmexit(pVCpu, VMX_EXIT_NMI_WINDOW);
+                Assert(!VMCPU_FF_IS_SET(pVCpu, VMCPU_FF_VMX_NMI_WINDOW));
+            }
+            else if (   VMCPU_FF_IS_SET(pVCpu, VMCPU_FF_VMX_INT_WINDOW)
+                     && CPUMIsGuestVmxVirtIntrEnabled(pVCpu, &pVCpu->cpum.GstCtx))
+            {
+                rcStrict = iemVmxVmexit(pVCpu, VMX_EXIT_INT_WINDOW);
+                Assert(!VMCPU_FF_IS_SET(pVCpu, VMCPU_FF_VMX_INT_WINDOW));
+            }
         }
     }

trunk/src/VBox/VMM/VMMAll/IEMAllCImplVmxInstr.cpp.h

@@ -7290 +7290 @@
 
 /**
+ * Sets up interrupt-window exiting.
+ *
+ * @param   pVCpu       The cross context virtual CPU structure.
+ * @param   pszInstr    The VMX instruction name (for logging purposes).
+ */
+IEM_STATIC void iemVmxVmentrySetupIntWindow(PVMCPU pVCpu, const char *pszInstr)
+{
+    PCVMXVVMCS pVmcs = pVCpu->cpum.GstCtx.hwvirt.vmx.CTX_SUFF(pVmcs);
+    Assert(pVmcs);
+    if (pVmcs->u32ProcCtls & VMX_PROC_CTLS_INT_WINDOW_EXIT)
+    {
+        VMCPU_FF_SET(pVCpu, VMCPU_FF_VMX_INT_WINDOW);
+        Log(("%s: Interrupt-window set on VM-entry\n", pszInstr));
+    }
+    else
+        Assert(!VMCPU_FF_IS_SET(pVCpu, VMCPU_FF_VMX_INT_WINDOW));
+    NOREF(pszInstr);
+}
+
+
+/**
  * Set up the VMX-preemption timer.
  *
@@ -7710 +7731 @@
                                 /* Setup NMI-window exiting. */
                                 iemVmxVmentrySetupNmiWindow(pVCpu, pszInstr);
+
+                                /* Setup interrupt-window exiting. */
+                                iemVmxVmentrySetupIntWindow(pVCpu, pszInstr);
 
                                 /* Now that we've switched page tables, we can go ahead and inject any event. */