Changeset 43163 in vbox for trunk/src/VBox/VMM/VMMAll

Timestamp:

Sep 4, 2012 2:12:53 PM (13 years ago)

Author:

vboxsync

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

80548

Message:

VMM: A wee bit page pool paranoia related to #6349.

File:

• trunk/src/VBox/VMM/VMMAll/PGMAllPool.cpp (modified) (3 diffs)

trunk/src/VBox/VMM/VMMAll/PGMAllPool.cpp

@@ -2037 +2037 @@
          * Call pgmPoolCacheUsed to move the page to the head of the age list.
          */
-        if (!pgmPoolIsPageLocked(pPage))
+        if (   !pgmPoolIsPageLocked(pPage)
+            && pPage->idx >= PGMPOOL_IDX_FIRST /* paranoia (#6349) */)
             break;
         LogFlow(("pgmPoolCacheFreeOne: refuse CR3 mapping\n"));
@@ -4783 +4784 @@
 
     /*
-     * Quietly reject any attempts at flushing any of the special root pages.
-     */
-    if (pPage->idx < PGMPOOL_IDX_FIRST)
-    {
-        AssertFailed(); /* can no longer happen */
-        Log(("pgmPoolFlushPage: special root page, rejected. enmKind=%s idx=%d\n", pgmPoolPoolKindToStr(pPage->enmKind), pPage->idx));
-        return VINF_SUCCESS;
-    }
+     * Reject any attempts at flushing any of the special root pages (shall
+     * not happen).
+     */
+    AssertMsgReturn(pPage->idx >= PGMPOOL_IDX_FIRST,
+                    ("pgmPoolFlushPage: special root page, rejected. enmKind=%s idx=%d\n",
+                     pgmPoolPoolKindToStr(pPage->enmKind), pPage->idx),
+                    VINF_SUCCESS);
 
     pgmLock(pVM);
@@ -4903 +4903 @@
     LogFlow(("pgmPoolFreeByPage: pPage=%p:{.Key=%RHp, .idx=%d, enmKind=%s} iUser=%d iUserTable=%#x\n",
              pPage, pPage->Core.Key, pPage->idx, pgmPoolPoolKindToStr(pPage->enmKind), iUser, iUserTable));
-    Assert(pPage->idx >= PGMPOOL_IDX_FIRST);
+    AssertReturnVoid(pPage->idx >= PGMPOOL_IDX_FIRST); /* paranoia (#6349) */
+
     pgmLock(pVM);
     pgmPoolTrackFreeUser(pPool, pPage, iUser, iUserTable);