Changeset 43163 in vbox

Timestamp:

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

Author:

vboxsync

Message:

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

Location:

trunk/src/VBox/VMM

Files:

• VMMAll/PGMAllPool.cpp (modified) (3 diffs)
• VMMR3/PGMPool.cpp (modified) (2 diffs)
• include/PGMInternal.h (modified) (2 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);

trunk/src/VBox/VMM/VMMR3/PGMPool.cpp

@@ -285 +285 @@
     /* The NIL entry. */
     Assert(NIL_PGMPOOL_IDX == 0);
-    pPool->aPages[NIL_PGMPOOL_IDX].enmKind = PGMPOOLKIND_INVALID;
+    pPool->aPages[NIL_PGMPOOL_IDX].enmKind          = PGMPOOLKIND_INVALID;
+    pPool->aPages[NIL_PGMPOOL_IDX].idx              = NIL_PGMPOOL_IDX;
 
     /* The Shadow 32-bit PD. (32 bits guest paging) */
-    pPool->aPages[PGMPOOL_IDX_PD].Core.Key  = NIL_RTHCPHYS;
-    pPool->aPages[PGMPOOL_IDX_PD].GCPhys    = NIL_RTGCPHYS;
-    pPool->aPages[PGMPOOL_IDX_PD].pvPageR3  = 0;
-    pPool->aPages[PGMPOOL_IDX_PD].enmKind   = PGMPOOLKIND_32BIT_PD;
-    pPool->aPages[PGMPOOL_IDX_PD].idx       = PGMPOOL_IDX_PD;
+    pPool->aPages[PGMPOOL_IDX_PD].enmKind           = PGMPOOLKIND_32BIT_PD;
+    pPool->aPages[PGMPOOL_IDX_PD].idx               = PGMPOOL_IDX_PD;
 
     /* The Shadow PDPT. */
-    pPool->aPages[PGMPOOL_IDX_PDPT].Core.Key  = NIL_RTHCPHYS;
-    pPool->aPages[PGMPOOL_IDX_PDPT].GCPhys    = NIL_RTGCPHYS;
-    pPool->aPages[PGMPOOL_IDX_PDPT].pvPageR3  = 0;
-    pPool->aPages[PGMPOOL_IDX_PDPT].enmKind   = PGMPOOLKIND_PAE_PDPT;
-    pPool->aPages[PGMPOOL_IDX_PDPT].idx       = PGMPOOL_IDX_PDPT;
+    pPool->aPages[PGMPOOL_IDX_PDPT].enmKind         = PGMPOOLKIND_PAE_PDPT;
+    pPool->aPages[PGMPOOL_IDX_PDPT].idx             = PGMPOOL_IDX_PDPT;
 
     /* The Shadow AMD64 CR3. */
-    pPool->aPages[PGMPOOL_IDX_AMD64_CR3].Core.Key  = NIL_RTHCPHYS;
-    pPool->aPages[PGMPOOL_IDX_AMD64_CR3].GCPhys    = NIL_RTGCPHYS;
-    pPool->aPages[PGMPOOL_IDX_AMD64_CR3].pvPageR3  = 0;
-    pPool->aPages[PGMPOOL_IDX_AMD64_CR3].enmKind   = PGMPOOLKIND_64BIT_PML4;
-    pPool->aPages[PGMPOOL_IDX_AMD64_CR3].idx       = PGMPOOL_IDX_AMD64_CR3;
+    pPool->aPages[PGMPOOL_IDX_AMD64_CR3].enmKind    = PGMPOOLKIND_64BIT_PML4;
+    pPool->aPages[PGMPOOL_IDX_AMD64_CR3].idx        = PGMPOOL_IDX_AMD64_CR3;
 
     /* The Nested Paging CR3. */
-    pPool->aPages[PGMPOOL_IDX_NESTED_ROOT].Core.Key  = NIL_RTHCPHYS;
-    pPool->aPages[PGMPOOL_IDX_NESTED_ROOT].GCPhys    = NIL_RTGCPHYS;
-    pPool->aPages[PGMPOOL_IDX_NESTED_ROOT].pvPageR3  = 0;
-    pPool->aPages[PGMPOOL_IDX_NESTED_ROOT].enmKind   = PGMPOOLKIND_ROOT_NESTED;
-    pPool->aPages[PGMPOOL_IDX_NESTED_ROOT].idx       = PGMPOOL_IDX_NESTED_ROOT;
+    pPool->aPages[PGMPOOL_IDX_NESTED_ROOT].enmKind  = PGMPOOLKIND_ROOT_NESTED;
+    pPool->aPages[PGMPOOL_IDX_NESTED_ROOT].idx      = PGMPOOL_IDX_NESTED_ROOT;
 
     /*
      * Set common stuff.
      */
-    for (unsigned iPage = 1; iPage < PGMPOOL_IDX_FIRST; iPage++)
-    {
+    for (unsigned iPage = 0; iPage < PGMPOOL_IDX_FIRST; iPage++)
+    {
+        pPool->aPages[iPage].Core.Key       = NIL_RTHCPHYS;
+        pPool->aPages[iPage].GCPhys         = NIL_RTGCPHYS;
         pPool->aPages[iPage].iNext          = NIL_PGMPOOL_IDX;
+        /* pPool->aPages[iPage].cLocked        = INT32_MAX; - test this out... */
+        pPool->aPages[iPage].pvPageR3       = 0;
         pPool->aPages[iPage].iUserHead      = NIL_PGMPOOL_USER_INDEX;
         pPool->aPages[iPage].iModifiedNext  = NIL_PGMPOOL_IDX;
@@ -328 +321 @@
         pPool->aPages[iPage].iAgeNext       = NIL_PGMPOOL_IDX;
         pPool->aPages[iPage].iAgePrev       = NIL_PGMPOOL_IDX;
+
         Assert(pPool->aPages[iPage].idx == iPage);
         Assert(pPool->aPages[iPage].GCPhys == NIL_RTGCPHYS);

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

@@ -2446 +2446 @@
 # define PGMPOOL_PAGE_2_PTR(a_pVM, a_pPage)     pgmPoolMapPageInlined((a_pVM), (a_pPage) RTLOG_COMMA_SRC_POS)
 #elif defined(VBOX_STRICT) || 1 /* temporarily going strict here */
-# define PGMPOOL_PAGE_2_PTR(a_pVM, a_pPage)     pgmPoolMapPageStrict(a_pPage)
-DECLINLINE(void *) pgmPoolMapPageStrict(PPGMPOOLPAGE a_pPage)
+# define PGMPOOL_PAGE_2_PTR(a_pVM, a_pPage)     pgmPoolMapPageStrict(a_pPage, __FUNCTION__)
+DECLINLINE(void *) pgmPoolMapPageStrict(PPGMPOOLPAGE a_pPage, const char *pszCaller)
 {
     AssertPtr(a_pPage);
-    AssertReleaseMsg(RT_VALID_PTR(a_pPage->pvPageR3), ("enmKind=%d idx=%#x HCPhys=%RHp GCPhys=%RGp\n", a_pPage->enmKind, a_pPage->idx, a_pPage->Core.Key, a_pPage->GCPhys));
+    AssertReleaseMsg(RT_VALID_PTR(a_pPage->pvPageR3), ("enmKind=%d idx=%#x HCPhys=%RHp GCPhys=%RGp caller=%s\n", a_pPage->enmKind, a_pPage->idx, a_pPage->Core.Key, a_pPage->GCPhys, pszCaller));
     return a_pPage->pvPageR3;
 }
@@ -3750 +3750 @@
     /** Pointer to the page of the current active CR3 - RC Ptr. */
     RCPTRTYPE(PPGMPOOLPAGE)         pShwPageCR3RC;
-    /* The shadow page pool index of the user table as specified during allocation; useful for freeing root pages */
+    /** The shadow page pool index of the user table as specified during
+     * allocation; useful for freeing root pages. */
     uint32_t                        iShwUser;
-    /* The index into the user table (shadowed) as specified during allocation; useful for freeing root pages. */
+    /** The index into the user table (shadowed) as specified during allocation;
+     * useful for freeing root pages. */
     uint32_t                        iShwUserTable;
 # if HC_ARCH_BITS == 64