Changeset 14757 in vbox

Timestamp:

Nov 28, 2008 3:24:01 AM (16 years ago)

Author:

vboxsync

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

40072

Message:

#3202: do PGMDynMapReleaseAutoSet/PGMDynMapStartAutoSet in the VMXR0RunGuestCode loop or we'll run out of entries very quickly (xp/pgmpool).

Location:

trunk/src/VBox/VMM/VMMR0

Files:

• HWVMXR0.cpp (modified) (2 diffs)
• PGMR0DynMap.cpp (modified) (2 diffs)

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

@@ -1894 +1894 @@
     }
 #endif
+#ifdef VBOX_WITH_2X_4GB_ADDR_SPACE_IN_R0
+    PGMDynMapReleaseAutoSet(pVCpu);
+#endif
 
     /*
@@ -2048 +2051 @@
         AssertRC(rc);
     }
+#ifdef VBOX_WITH_2X_4GB_ADDR_SPACE_IN_R0
+    PGMDynMapStartAutoSet(pVCpu);
+#endif
 
     /* Some cases don't need a complete resync of the guest CPU state; handle them here. */

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

@@ -1468 +1468 @@
  * since the PGMDynMapStartAutoSet call.
  *
+ * If the set is already closed, nothing will be done.
+ *
  * @param   pVCpu       The shared data for the current virtual CPU.
  */
@@ -1474 +1476 @@
     PPGMMAPSET  pSet = &pVCpu->pgm.s.AutoSet;
 
-    /* close the set */
+    /*
+     * Is the set open?
+     *
+     * We might be closed before VM execution and not reopened again before
+     * we leave for ring-3 or something.
+     */
     uint32_t    i = pSet->cEntries;
-    AssertMsg(i <= RT_ELEMENTS(pSet->aEntries), ("%#x (%u)\n", i, i));
-    pSet->cEntries = PGMMAPSET_CLOSED;
-
-    /* release any pages we're referencing. */
-    if (i != 0 && RT_LIKELY(i <= RT_ELEMENTS(pSet->aEntries)))
-    {
-        PPGMR0DYNMAP    pThis = g_pPGMR0DynMap;
-        RTSPINLOCKTMP   Tmp = RTSPINLOCKTMP_INITIALIZER;
-        RTSpinlockAcquire(pThis->hSpinlock, &Tmp);
-
-        while (i-- > 0)
-        {
-            uint32_t iPage = pSet->aEntries[i].iPage;
-            Assert(iPage < pThis->cPages);
-            int32_t  cRefs = pSet->aEntries[i].cRefs;
-            Assert(cRefs > 0);
-            pgmR0DynMapReleasePageLocked(pThis, iPage, cRefs);
-
-            pSet->aEntries[i].iPage = UINT16_MAX;
-            pSet->aEntries[i].cRefs = 0;
-        }
-
-        Assert(pThis->cLoad <= pThis->cPages - pThis->cGuardPages);
-        RTSpinlockRelease(pThis->hSpinlock, &Tmp);
+    if (i != PGMMAPSET_CLOSED)
+    {
+        /*
+         * Close the set
+         */
+        AssertMsg(i <= RT_ELEMENTS(pSet->aEntries), ("%#x (%u)\n", i, i));
+        pSet->cEntries = PGMMAPSET_CLOSED;
+
+        /*
+         * Release any pages it's referencing.
+         */
+        if (i != 0 && RT_LIKELY(i <= RT_ELEMENTS(pSet->aEntries)))
+        {
+            PPGMR0DYNMAP    pThis = g_pPGMR0DynMap;
+            RTSPINLOCKTMP   Tmp = RTSPINLOCKTMP_INITIALIZER;
+            RTSpinlockAcquire(pThis->hSpinlock, &Tmp);
+
+            while (i-- > 0)
+            {
+                uint32_t iPage = pSet->aEntries[i].iPage;
+                Assert(iPage < pThis->cPages);
+                int32_t  cRefs = pSet->aEntries[i].cRefs;
+                Assert(cRefs > 0);
+                pgmR0DynMapReleasePageLocked(pThis, iPage, cRefs);
+
+                pSet->aEntries[i].iPage = UINT16_MAX;
+                pSet->aEntries[i].cRefs = 0;
+            }
+
+            Assert(pThis->cLoad <= pThis->cPages - pThis->cGuardPages);
+            RTSpinlockRelease(pThis->hSpinlock, &Tmp);
+        }
     }
 }