Changeset 57555 in vbox for trunk/src/VBox

Timestamp:

Aug 27, 2015 10:11:18 AM (10 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

102373

Message:

VMM/HMVMXR0: Don't lose interrupt-window exiting due to unrelated exits to ring-3.

File:

• trunk/src/VBox/VMM/VMMR0/HMVMXR0.cpp (modified) (14 diffs)

trunk/src/VBox/VMM/VMMR0/HMVMXR0.cpp

@@ -337 +337 @@
 static void               hmR0VmxFlushEpt(PVMCPU pVCpu, VMXFLUSHEPT enmFlush);
 static void               hmR0VmxFlushVpid(PVM pVM, PVMCPU pVCpu, VMXFLUSHVPID enmFlush, RTGCPTR GCPtr);
+static void               hmR0VmxClearIntNmiWindowsVmcs(PVMCPU pVCpu);
 static int                hmR0VmxInjectEventVmcs(PVMCPU pVCpu, PCPUMCTX pMixedCtx, uint64_t u64IntInfo, uint32_t cbInstr,
                                                  uint32_t u32ErrCode, RTGCUINTREG GCPtrFaultAddress,
@@ -6810 +6811 @@
 
 /**
- * Converts any pending HM event into a TRPM trap. Typically used when leaving
- * VT-x to execute any instruction.
+ * Converts the pending HM event into a TRPM trap.
  *
  * @param   pvCpu           Pointer to the VMCPU.
@@ -6873 +6873 @@
         TRPMSetInstrLength(pVCpu, pVCpu->hm.s.Event.cbInstr);
     }
+
+    /* Clear the pending event from the VMCS. */
+#ifdef VBOX_STRICT
+    uint32_t u32EntryInfo;
+    rc = VMXReadVmcs32(VMX_VMCS32_CTRL_ENTRY_INTERRUPTION_INFO, &u32EntryInfo);
+    AssertRC(rc);
+    Assert(VMX_ENTRY_INTERRUPTION_INFO_IS_VALID(u32EntryInfo));
+#endif
+    rc = VMXWriteVmcs32(VMX_VMCS32_CTRL_ENTRY_INTERRUPTION_INFO, 0);        AssertRC(rc);
+    rc = VMXWriteVmcs32(VMX_VMCS_GUEST_PENDING_DEBUG_EXCEPTIONS, 0);        AssertRC(rc);
+
+    /* We're now done converting the pending event. */
     pVCpu->hm.s.Event.fPending = false;
 }
@@ -7107 +7119 @@
         Assert(!pVCpu->hm.s.Event.fPending);
     }
+
+    /* Clear interrupt-window and NMI-window controls as we re-evaluate it when we return from ring-3. */
+    hmR0VmxClearIntNmiWindowsVmcs(pVCpu);
 
     /* If we're emulating an instruction, we shouldn't have any TRPM traps pending
@@ -7311 +7326 @@
 static void hmR0VmxEvaluatePendingEvent(PVMCPU pVCpu, PCPUMCTX pMixedCtx)
 {
-    Assert(!pVCpu->hm.s.Event.fPending);
-
     /* Get the current interruptibility-state of the guest and then figure out what can be injected. */
     uint32_t const uIntrState = hmR0VmxGetGuestIntrState(pVCpu, pMixedCtx);
@@ -7332 +7345 @@
     {
         /* On some CPUs block-by-STI also blocks NMIs. See Intel spec. 26.3.1.5 "Checks On Guest Non-Register State". */
-        if (   !fBlockNmi
+        if (   !pVCpu->hm.s.Event.fPending
+            && !fBlockNmi
             && !fBlockSti
             && !fBlockMovSS)
@@ -7356 +7370 @@
         AssertRC(rc);
         bool const fBlockInt = !(pMixedCtx->eflags.u32 & X86_EFL_IF);
-        if (   !fBlockInt
+        if (   !pVCpu->hm.s.Event.fPending
+            && !fBlockInt
             && !fBlockSti
             && !fBlockMovSS)
@@ -7435 +7450 @@
     {
         /*
-         * Clear any interrupt-window exiting control if we're going to inject an interrupt. Saves one extra
-         * VM-exit in situations where we previously setup interrupt-window exiting but got other VM-exits and
-         * ended up enabling interrupts outside VT-x.
+         * Do -not- clear any interrupt-window exiting control here. We might have an interrupt
+         * pending even while injecting an event and in this case, we want a VM-exit as soon as
+         * the guest is ready for the next interrupt, see @bugref{6208#c45}.
+         *
+         * See Intel spec. 26.6.5 "Interrupt-Window Exiting and Virtual-Interrupt Delivery".
          */
-        uint32_t uIntType = VMX_EXIT_INTERRUPTION_INFO_TYPE(pVCpu->hm.s.Event.u64IntInfo);
-        if (   (pVCpu->hm.s.vmx.u32ProcCtls & VMX_VMCS_CTRL_PROC_EXEC_INT_WINDOW_EXIT)
-            && uIntType == VMX_EXIT_INTERRUPTION_INFO_TYPE_EXT_INT)
-        {
-            Assert(pVCpu->CTX_SUFF(pVM)->hm.s.vmx.Msrs.VmxProcCtls.n.allowed1 & VMX_VMCS_CTRL_PROC_EXEC_INT_WINDOW_EXIT);
-            hmR0VmxClearIntWindowExitVmcs(pVCpu);
-        }
-
+        uint32_t const uIntType = VMX_EXIT_INTERRUPTION_INFO_TYPE(pVCpu->hm.s.Event.u64IntInfo);
 #ifdef VBOX_STRICT
         if (uIntType == VMX_EXIT_INTERRUPTION_INFO_TYPE_EXT_INT)
@@ -7474 +7484 @@
         fBlockSti   = RT_BOOL(uIntrState & VMX_VMCS_GUEST_INTERRUPTIBILITY_STATE_BLOCK_STI);
 
-#ifdef VBOX_WITH_STATISTICS
         if (uIntType == VMX_EXIT_INTERRUPTION_INFO_TYPE_EXT_INT)
             STAM_COUNTER_INC(&pVCpu->hm.s.StatInjectInterrupt);
         else
             STAM_COUNTER_INC(&pVCpu->hm.s.StatInjectXcpt);
-#endif
     }
 
@@ -7920 +7928 @@
  * @remarks No-long-jump zone!!!
  */
-static void hmR0VmxClearEventVmcs(PVMCPU pVCpu)
+static void hmR0VmxClearIntNmiWindowsVmcs(PVMCPU pVCpu)
 {
     int rc;
@@ -7930 +7938 @@
     if (pVCpu->hm.s.vmx.u32ProcCtls & VMX_VMCS_CTRL_PROC_EXEC_NMI_WINDOW_EXIT)
         hmR0VmxClearNmiWindowExitVmcs(pVCpu);
-
-    if (!pVCpu->hm.s.Event.fPending)
-        return;
-
-#ifdef VBOX_STRICT
-    uint32_t u32EntryInfo;
-    rc = VMXReadVmcs32(VMX_VMCS32_CTRL_ENTRY_INTERRUPTION_INFO, &u32EntryInfo);
-    AssertRC(rc);
-    Assert(VMX_ENTRY_INTERRUPTION_INFO_IS_VALID(u32EntryInfo));
-#endif
-
-    rc = VMXWriteVmcs32(VMX_VMCS32_CTRL_ENTRY_INTERRUPTION_INFO, 0);
-    AssertRC(rc);
-
-    rc = VMXWriteVmcs32(VMX_VMCS_GUEST_PENDING_DEBUG_EXCEPTIONS, 0);
-    AssertRC(rc);
-
-    /* We deliberately don't clear "hm.s.Event.fPending" here, it's taken
-       care of in hmR0VmxExitToRing3() converting the pending event to TRPM. */
 }
 
@@ -8400 +8389 @@
     if (TRPMHasTrap(pVCpu))
         hmR0VmxTrpmTrapToPendingEvent(pVCpu);
-    else if (!pVCpu->hm.s.Event.fPending)
-        hmR0VmxEvaluatePendingEvent(pVCpu, pMixedCtx);
+    hmR0VmxEvaluatePendingEvent(pVCpu, pMixedCtx);
 
     /*
@@ -8446 +8434 @@
             || VMCPU_FF_IS_PENDING(pVCpu, VMCPU_FF_HM_TO_R3_MASK & ~(VMCPU_FF_TIMER | VMCPU_FF_PDM_CRITSECT))) )
     {
-        hmR0VmxClearEventVmcs(pVCpu);
         ASMSetFlags(pVmxTransient->fEFlags);
         VMMRZCallRing3Enable(pVCpu);
@@ -8455 +8442 @@
     if (RTThreadPreemptIsPending(NIL_RTTHREAD))
     {
-        hmR0VmxClearEventVmcs(pVCpu);
         ASMSetFlags(pVmxTransient->fEFlags);
         VMMRZCallRing3Enable(pVCpu);