Changeset 15423 in vbox

Timestamp:

Dec 13, 2008 8:43:02 AM (16 years ago)

Author:

vboxsync

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

40872

Message:

PGMR0DynMap: bail out on failure, don't crash the host.

File:

• trunk/src/VBox/VMM/VMMR0/PGMR0DynMap.cpp (modified) (7 diffs)

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

@@ -231 +231 @@
 /** Pointer to the ring-0 dynamic mapping cache. */
 static PPGMR0DYNMAP g_pPGMR0DynMap;
+/** For overflow testing. */
+static bool         g_fPGMR0DynMapTestRunning = false;
 
 
@@ -1322 +1324 @@
                 {
                     RTSpinlockRelease(pThis->hSpinlock, &Tmp);
+                    *ppvPage = NULL;
                     return iPage;
                 }
@@ -1343 +1346 @@
         ASMAtomicDecS32(&paPages[iPage].cRefs);
         RTSpinlockRelease(pThis->hSpinlock, &Tmp);
+        *ppvPage = NULL;
         AssertLogRelMsgFailedReturn(("cRefs=%d iPage=%p HCPhys=%RHp\n", cRefs, iPage, HCPhys), UINT32_MAX);
     }
@@ -1805 +1809 @@
     if (RT_UNLIKELY(iPage == UINT32_MAX))
     {
-        static uint32_t s_cBitched = 0;
-        if (++s_cBitched < 10)
-            LogRel(("PGMDynMapHCPage: cLoad=%u/%u cPages=%u cGuardPages=%u\n",
-                    g_pPGMR0DynMap->cLoad, g_pPGMR0DynMap->cMaxLoad, g_pPGMR0DynMap->cPages, g_pPGMR0DynMap->cGuardPages));
+        AssertMsg2("PGMDynMapHCPage: cLoad=%u/%u cPages=%u cGuardPages=%u\n",
+                   g_pPGMR0DynMap->cLoad, g_pPGMR0DynMap->cMaxLoad, g_pPGMR0DynMap->cPages, g_pPGMR0DynMap->cGuardPages);
+        if (!g_fPGMR0DynMapTestRunning)
+            VMMR0CallHost(pVM, VMMCALLHOST_VM_R0_ASSERTION, 0);
         *ppv = NULL;
         return VERR_PGM_DYNMAP_FAILED;
@@ -1900 +1904 @@
                 pgmR0DynMapReleasePage(g_pPGMR0DynMap, iPage, 1);
 
-                static uint32_t s_cBitched = 0;
-                if (++s_cBitched < 10)
-                    LogRel(("PGMDynMapHCPage: set is full!\n"));
+                AssertMsg2("PGMDynMapHCPage: set is full!\n");
+                if (!g_fPGMR0DynMapTestRunning)
+                    VMMR0CallHost(pVM, VMMCALLHOST_VM_R0_ASSERTION, 0);
                 *ppv = NULL;
                 return VERR_PGM_DYNMAP_FULL_SET;
@@ -1990 +1994 @@
     void           *pvR0DynMapUsedSaved = pVM->pgm.s.pvR0DynMapUsed;
     pVM->pgm.s.pvR0DynMapUsed = pThis;
+    g_fPGMR0DynMapTestRunning = true;
 
     /*
@@ -2176 +2181 @@
         PGMR0DynMapAssertIntegrity();
 
+    g_fPGMR0DynMapTestRunning = false;
     LogRel(("Result: rc=%Rrc Load=%u/%u/%u Set=%#x/%u\n", rc,
             pThis->cLoad, pThis->cMaxLoad, pThis->cPages - pThis->cPages, pSet->cEntries, RT_ELEMENTS(pSet->aEntries)));