Changeset 72221 in vbox

Timestamp:

May 15, 2018 4:06:19 PM (7 years ago)

Author:

vboxsync

Message:

NEM/win: Some more interrupt fixes. bugref:9044

Location:

trunk/src/VBox/VMM

Files:

• VMMAll/NEMAllNativeTemplate-win.cpp.h (modified) (6 diffs)
• VMMR0/NEMR0Native-win.cpp (modified) (1 diff)
• include/NEMInternal.h (modified) (1 diff)

trunk/src/VBox/VMM/VMMAll/NEMAllNativeTemplate-win.cpp.h

@@ -1553 +1553 @@
      */
     nemHCWinCopyStateFromX64Header(pVCpu, pCtx, &pMsg->Header);
-    Log4(("IOIntW/%u: %04x:%08RX64: %u\n", pVCpu->idCpu, pMsg->Header.CsSegment.Selector, pMsg->Header.Rip, pMsg->Type));
+    Log4(("IntWinExit/%u: %04x:%08RX64: %u IF=%d InterruptShadow=%d\n", pVCpu->idCpu, pMsg->Header.CsSegment.Selector,
+          pMsg->Header.Rip, pMsg->Type, RT_BOOL(pMsg->Header.Rflags & X86_EFL_IF), pMsg->Header.ExecutionState.InterruptShadow));
 
     /** @todo call nemHCWinHandleInterruptFF   */
@@ -1848 +1849 @@
         }
         *pfInterruptWindows |= NEM_WIN_INTW_F_NMI;
+        Log8(("NMI window pending on %u\n", pVCpu->idCpu));
     }
 
@@ -1879 +1881 @@
         }
         *pfInterruptWindows |= NEM_WIN_INTW_F_REGULAR;
+        Log8(("Interrupt window pending on %u\n", pVCpu->idCpu));
     }
 
@@ -1922 +1925 @@
     {
         /*
-         * Pending interrupts or such?  Need to check and deal with this prior to the state syncing.
-         * Note! This may stop execution.
+         * Pending interrupts or such?  Need to check and deal with this prior
+         * to the state syncing.
          */
         pVCpu->nem.s.fDesiredInterruptWindows = 0;
@@ -1929 +1932 @@
                                      | VMCPU_FF_INTERRUPT_NMI  | VMCPU_FF_INTERRUPT_SMI))
         {
+            /* Make sure the CPU isn't executing. */
             if (pVCpu->nem.s.fHandleAndGetFlags == VID_MSHAGN_F_GET_NEXT_MESSAGE)
             {
                 pVCpu->nem.s.fHandleAndGetFlags = 0;
                 rcStrict = nemHCWinStopCpu(pVM, pVCpu, rcStrict, pMappingHeader, pGVM, pGVCpu);
-                if (rcStrict != VINF_SUCCESS)
+                if (rcStrict == VINF_SUCCESS)
+                { /* likely */ }
+                else
+                {
+                    LogFlow(("NEM/%u: breaking: nemHCWinStopCpu -> %Rrc\n", pVCpu->idCpu, VBOXSTRICTRC_VAL(rcStrict) ));
+                    STAM_REL_COUNTER_INC(&pVCpu->nem.s.StatBreakOnStatus);
                     break;
+                }
             }
+
+            /* Try inject interrupt. */
             rcStrict = nemHCWinHandleInterruptFF(pVM, pVCpu, pGVCpu, pCtx, &pVCpu->nem.s.fDesiredInterruptWindows);
-            if (rcStrict != VINF_SUCCESS)
+            if (rcStrict == VINF_SUCCESS)
+            { /* likely */ }
+            else
+            {
+                LogFlow(("NEM/%u: breaking: nemHCWinHandleInterruptFF -> %Rrc\n", pVCpu->idCpu, VBOXSTRICTRC_VAL(rcStrict) ));
+                STAM_REL_COUNTER_INC(&pVCpu->nem.s.StatBreakOnStatus);
                 break;
+            }
         }
 
@@ -1948 +1966 @@
             || pVCpu->nem.s.fCurrentInterruptWindows != pVCpu->nem.s.fDesiredInterruptWindows)
         {
+            Assert(pVCpu->nem.s.fHandleAndGetFlags != VID_MSHAGN_F_GET_NEXT_MESSAGE /* not running */);
 # ifdef IN_RING0
             int rc2 = nemR0WinExportState(pGVM, pGVCpu, pCtx);

trunk/src/VBox/VMM/VMMR0/NEMR0Native-win.cpp

@@ -519 +519 @@
 
     uint64_t const fWhat = ~pCtx->fExtrn & (CPUMCTX_EXTRN_ALL | CPUMCTX_EXTRN_NEM_WIN_MASK);
-    if (!fWhat)
+    if (   !fWhat
+        && pVCpu->nem.s.fCurrentInterruptWindows == pVCpu->nem.s.fDesiredInterruptWindows)
         return VINF_SUCCESS;
     uintptr_t iReg = 0;

trunk/src/VBox/VMM/include/NEMInternal.h

@@ -244 +244 @@
     STAMCOUNTER                 StatBreakOnStatus;
     /** @} */
-#endif
+#endif /* RT_OS_WINDOWS */
 } NEMCPU;
 /** Pointer to NEM VMCPU instance data. */