Changeset 71044 in vbox for trunk/src/VBox/VMM/VMMR3

Timestamp:

Feb 16, 2018 9:15:52 PM (7 years ago)

Author:

vboxsync

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

120907

Message:

NEM: Upped the max mapped pages to 4000, which helps with performance. Problem was spurious event injections. Sketched out what the pending interrupt register might look like. bugref:9044

File:

• trunk/src/VBox/VMM/VMMR3/NEMR3Native-win.cpp (modified) (7 diffs)

trunk/src/VBox/VMM/VMMR3/NEMR3Native-win.cpp

@@ -59 +59 @@
 #endif
 
-
-/*********************************************************************************************************************************
-*   Structures and Typedefs                                                                                                      *
-*********************************************************************************************************************************/
 /** @name Our two-bit physical page state for PGMPAGE
  * @{ */
@@ -77 +73 @@
 #define NEM_WIN_IS_RELEVANT_TO_A20(a_GCPhys)    \
     ( ((RTGCPHYS)((a_GCPhys) - _1M) < (RTGCPHYS)_64K) || ((RTGCPHYS)(a_GCPhys) < (RTGCPHYS)_64K) )
+
+
+/*********************************************************************************************************************************
+*   Structures and Typedefs                                                                                                      *
+*********************************************************************************************************************************/
+/** WHvRegisterInterruptState layout, reconstructed from the v7.1 DDK. */
+typedef union MISSINGINTERUPTSTATEREG
+{
+    /** 64-bit view. */
+    uint64_t au64[2];
+    struct /* unamed */
+    {
+        uint64_t fInterruptShadow : 1;
+        uint64_t fNmiMasked : 2;
+        uint64_t uReserved0 : 61;
+        uint64_t uReserved1;
+    };
+} MISSINGINTERUPTSTATEREG;
+AssertCompileSize(MISSINGINTERUPTSTATEREG, 16);
+
+/** Used by MISSINGPENDINGINTERRUPTIONREG. */
+typedef enum MISSINGPENDINGINTERRUPTIONTYPE
+{
+    kPendingIntType_Interrupt = 0,
+    kPendingIntType_Nmi,
+    kPendingIntType_Xcpt,
+    kPendingIntType_Dunno,
+    kPendingIntType_SoftwareInterrupt
+} MISSINGPENDINGINTERRUPTIONTYPE;
+
+/** WHvRegisterPendingInterruption layout, reconstructed from the v7.1 DDK. */
+typedef union MISSINGPENDINGINTERRUPTIONREG
+{
+    /** 64-bit view. */
+    uint64_t au64[2];
+    struct /* unamed */
+    {
+        uint32_t fInterruptionPending : 1;
+        uint32_t enmInterruptionType : 3; /**< MISSINGPENDINGINTERRUPTIONTYPE */
+        uint32_t fDeliverErrCd : 1;
+        uint32_t fUnknown0 : 1;
+        uint32_t fUnknown1 : 1; /**< Observed set when software interrupt was issued. */
+        uint32_t uReserved0 : 9;
+        uint32_t InterruptionVector : 16;
+        uint32_t uErrCd;
+        uint64_t uReserved1;
+    };
+} MISSINGPENDINGINTERRUPTIONREG;
+AssertCompileSize(MISSINGPENDINGINTERRUPTIONREG, 16);
 
 
@@ -997 +1042 @@
     aValues[iReg].Reg64 = pCtx->cr2;
     iReg++;
-Log(("=> cr2=%RX64\n", pCtx->cr2));
     aenmNames[iReg]     = WHvX64RegisterCr3;
     aValues[iReg].Reg64 = pCtx->cr3;
@@ -1314 +1358 @@
     /* event injection */
     aenmNames[76] = WHvRegisterPendingInterruption;
-    aenmNames[77] = WHvRegisterPendingInterruption;
+    aenmNames[77] = WHvRegisterInterruptState;
     aenmNames[78] = WHvRegisterInterruptState;
     aenmNames[79] = WHvRegisterPendingEvent0;
@@ -1399 +1443 @@
         Assert(aenmNames[29] == WHvX64RegisterCr2);
         pCtx->cr2 = aValues[29].Reg64;
-Log(("<= cr2=%RX64\n", pCtx->cr2));
         if (pCtx->cr3 != aValues[30].Reg64)
         {
@@ -1538 +1581 @@
 
         /// @todo WHvRegisterPendingInterruption
+        Assert(aenmNames[76] == WHvRegisterPendingInterruption);
+        /** @todo Someone at microsoft please explain why HV_X64_PENDING_INTERRUPTION_REGISTER
+         * and HV_X64_INTERRUPT_STATE_REGISTER are missing from the headers.  Ditto for
+         * wathever structures WHvRegisterPendingEvent0/1 uses.   */
+        MISSINGPENDINGINTERRUPTIONREG const * pPendingInt = (MISSINGPENDINGINTERRUPTIONREG const *)&aValues[76];
+        if (pPendingInt->fInterruptionPending)
+        {
+            Log6(("PendingInterruption: type=%u vector=%#x errcd=%RTbool/%#x unk0=%u unk1=%u\n",
+                  pPendingInt->enmInterruptionType, pPendingInt->InterruptionVector, pPendingInt->fDeliverErrCd,
+                  pPendingInt->uErrCd, pPendingInt->fUnknown0, pPendingInt->fUnknown1));
+            AssertMsg(pPendingInt->uReserved0 == 0 && pPendingInt->uReserved1 == 0,
+                      ("%#RX64 %#RX64\n", pPendingInt->au64[0], pPendingInt->au64[1]));
+        }
+
         /// @todo WHvRegisterInterruptState
         /// @todo WHvRegisterPendingEvent0
@@ -2270 +2327 @@
         }
 
-        /* Major hack alert! */
+        /* Hack alert! */
         uint32_t const cMappedPages = pVM->nem.s.cMappedPages;
-        if (cMappedPages < 200)
+        if (cMappedPages < 4000)
         { /* likely */ }
         else