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

Timestamp:

Mar 20, 2013 11:13:27 AM (12 years ago)

Author:

vboxsync

Message:

PGMPool: Eliminated fictive page (except NIL). #6367

Location:

trunk/src/VBox/VMM/VMMAll

Files:

• PGMAll.cpp (modified) (1 diff)
• PGMAllBth.h (modified) (6 diffs)
• PGMAllPool.cpp (modified) (14 diffs)
• PGMAllShw.h (modified) (5 diffs)

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

@@ -1230 +1230 @@
 
         rc = pgmPoolAlloc(pVM, GCPml4, PGMPOOLKIND_EPT_PDPT_FOR_PHYS, PGMPOOLACCESS_DONTCARE, PGM_A20_IS_ENABLED(pVCpu),
-                          PGMPOOL_IDX_NESTED_ROOT, iPml4, false /*fLockPage*/,
+                          pVCpu->pgm.s.CTX_SUFF(pShwPageCR3)->idx, iPml4, false /*fLockPage*/,
                           &pShwPage);
         AssertRCReturn(rc, rc);

trunk/src/VBox/VMM/VMMAll/PGMAllBth.h

@@ -4582 +4582 @@
     PPGMPOOL     pPool             = pVM->pgm.s.CTX_SUFF(pPool);
     PPGMPOOLPAGE pOldShwPageCR3    = pVCpu->pgm.s.CTX_SUFF(pShwPageCR3);
-    uint32_t     iOldShwUserTable  = pVCpu->pgm.s.iShwUserTable;
-    uint32_t     iOldShwUser       = pVCpu->pgm.s.iShwUser;
     PPGMPOOLPAGE pNewShwPageCR3;
 
@@ -4595 +4593 @@
     Assert(!(GCPhysCR3 >> (PAGE_SHIFT + 32)));
     rc = pgmPoolAlloc(pVM, GCPhysCR3 & GST_CR3_PAGE_MASK, BTH_PGMPOOLKIND_ROOT, PGMPOOLACCESS_DONTCARE, PGM_A20_IS_ENABLED(pVCpu),
-                      SHW_POOL_ROOT_IDX, GCPhysCR3 >> PAGE_SHIFT, true /*fLockPage*/,
+                      NIL_PGMPOOL_IDX, UINT32_MAX, true /*fLockPage*/,
                       &pNewShwPageCR3);
     AssertFatalRC(rc);
@@ -4612 +4610 @@
 #  endif
 
-    pVCpu->pgm.s.iShwUser      = SHW_POOL_ROOT_IDX;
-    pVCpu->pgm.s.iShwUserTable = GCPhysCR3 >> PAGE_SHIFT;
     pVCpu->pgm.s.CTX_SUFF(pShwPageCR3) = pNewShwPageCR3;
 #  ifdef IN_RING0
@@ -4660 +4656 @@
         pgmPoolUnlockPage(pPool, pOldShwPageCR3);
 
-        pgmPoolFreeByPage(pPool, pOldShwPageCR3, iOldShwUser, iOldShwUserTable);
+        pgmPoolFreeByPage(pPool, pOldShwPageCR3, NIL_PGMPOOL_IDX, UINT32_MAX);
     }
     pgmUnlock(pVM);
@@ -4743 +4739 @@
         PPGMPOOL pPool = pVM->pgm.s.CTX_SUFF(pPool);
 
-        Assert(pVCpu->pgm.s.iShwUser != PGMPOOL_IDX_NESTED_ROOT);
-
 # ifdef PGMPOOL_WITH_OPTIMIZED_DIRTY_PT
         if (pPool->cDirtyPages)
@@ -4753 +4747 @@
         pgmPoolUnlockPage(pPool, pVCpu->pgm.s.CTX_SUFF(pShwPageCR3));
 
-        pgmPoolFreeByPage(pPool, pVCpu->pgm.s.CTX_SUFF(pShwPageCR3), pVCpu->pgm.s.iShwUser, pVCpu->pgm.s.iShwUserTable);
+        pgmPoolFreeByPage(pPool, pVCpu->pgm.s.CTX_SUFF(pShwPageCR3), NIL_PGMPOOL_IDX, UINT32_MAX);
         pVCpu->pgm.s.pShwPageCR3R3 = 0;
         pVCpu->pgm.s.pShwPageCR3R0 = 0;
         pVCpu->pgm.s.pShwPageCR3RC = 0;
-        pVCpu->pgm.s.iShwUser      = 0;
-        pVCpu->pgm.s.iShwUserTable = 0;
     }
     pgmUnlock(pVM);

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

@@ -5 +5 @@
 
 /*
- * Copyright (C) 2006-2012 Oracle Corporation
+ * Copyright (C) 2006-2013 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
@@ -2014 +2014 @@
     {
         uint16_t iToFree = pPool->iAgeTail;
-        if (iToFree == iUser)
+        if (iToFree == iUser && iUser != NIL_PGMPOOL_IDX)
             iToFree = pPool->aPages[iToFree].iAgePrev;
 /* This is the alternative to the SyncCR3 pgmPoolCacheUsed calls.
@@ -2173 +2173 @@
  * @param   enmAccess   Access type for the mapping (only relevant for big pages)
  * @param   fA20Enabled Whether the CPU has the A20 gate enabled.
- * @param   iUser       The shadow page pool index of the user table.
- * @param   iUserTable  The index into the user table (shadowed).
+ * @param   iUser       The shadow page pool index of the user table.  This is
+ *                      NIL_PGMPOOL_IDX for root pages.
+ * @param   iUserTable  The index into the user table (shadowed).  Ignored if
+ *                      root page
  * @param   ppPage      Where to store the pointer to the page.
  */
@@ -2202 +2204 @@
                     pgmPoolCacheUsed(pPool, pPage);
 
-                    int rc = pgmPoolTrackAddUser(pPool, pPage, iUser, iUserTable);
+                    int rc = VINF_SUCCESS;
+                    if (iUser != NIL_PGMPOOL_IDX)
+                        rc = pgmPoolTrackAddUser(pPool, pPage, iUser, iUserTable);
                     if (RT_SUCCESS(rc))
                     {
@@ -2805 +2809 @@
     LogFlow(("pgmPoolTrackInsert GCPhys=%RGp iUser=%d iUserTable=%x\n", GCPhys, iUser, iUserTable));
 
+    if (iUser != NIL_PGMPOOL_IDX)
+    {
 #ifdef VBOX_STRICT
-    /*
-     * Check that the entry doesn't already exists.
-     */
-    if (pPage->iUserHead != NIL_PGMPOOL_USER_INDEX)
-    {
-        uint16_t i = pPage->iUserHead;
-        do
-        {
-            Assert(i < pPool->cMaxUsers);
-            AssertMsg(paUsers[i].iUser != iUser || paUsers[i].iUserTable != iUserTable, ("%x %x vs new %x %x\n", paUsers[i].iUser, paUsers[i].iUserTable, iUser, iUserTable));
-            i = paUsers[i].iNext;
-        } while (i != NIL_PGMPOOL_USER_INDEX);
-    }
+        /*
+         * Check that the entry doesn't already exists.
+         */
+        if (pPage->iUserHead != NIL_PGMPOOL_USER_INDEX)
+        {
+            uint16_t i = pPage->iUserHead;
+            do
+            {
+                Assert(i < pPool->cMaxUsers);
+                AssertMsg(paUsers[i].iUser != iUser || paUsers[i].iUserTable != iUserTable, ("%x %x vs new %x %x\n", paUsers[i].iUser, paUsers[i].iUserTable, iUser, iUserTable));
+                i = paUsers[i].iNext;
+            } while (i != NIL_PGMPOOL_USER_INDEX);
+        }
 #endif
 
-    /*
-     * Find free a user node.
-     */
-    uint16_t i = pPool->iUserFreeHead;
-    if (i == NIL_PGMPOOL_USER_INDEX)
-    {
-        rc = pgmPoolTrackFreeOneUser(pPool, iUser);
-        if (RT_FAILURE(rc))
-            return rc;
-        i = pPool->iUserFreeHead;
-    }
-
-    /*
-     * Unlink the user node from the free list,
-     * initialize and insert it into the user list.
-     */
-    pPool->iUserFreeHead = paUsers[i].iNext;
-    paUsers[i].iNext = NIL_PGMPOOL_USER_INDEX;
-    paUsers[i].iUser = iUser;
-    paUsers[i].iUserTable = iUserTable;
-    pPage->iUserHead = i;
+        /*
+         * Find free a user node.
+         */
+        uint16_t i = pPool->iUserFreeHead;
+        if (i == NIL_PGMPOOL_USER_INDEX)
+        {
+            rc = pgmPoolTrackFreeOneUser(pPool, iUser);
+            if (RT_FAILURE(rc))
+                return rc;
+            i = pPool->iUserFreeHead;
+        }
+
+        /*
+         * Unlink the user node from the free list,
+         * initialize and insert it into the user list.
+         */
+        pPool->iUserFreeHead = paUsers[i].iNext;
+        paUsers[i].iNext = NIL_PGMPOOL_USER_INDEX;
+        paUsers[i].iUser = iUser;
+        paUsers[i].iUserTable = iUserTable;
+        pPage->iUserHead = i;
+    }
+    else
+        pPage->iUserHead = NIL_PGMPOOL_USER_INDEX;
+
 
     /*
@@ -2881 +2891 @@
 static int pgmPoolTrackAddUser(PPGMPOOL pPool, PPGMPOOLPAGE pPage, uint16_t iUser, uint32_t iUserTable)
 {
+    Log3(("pgmPoolTrackAddUser: GCPhys=%RGp iUser=%%x iUserTable=%x\n", pPage->GCPhys, iUser, iUserTable));
     PPGMPOOLUSER paUsers = pPool->CTX_SUFF(paUsers);
-
-    Log3(("pgmPoolTrackAddUser GCPhys = %RGp iUser %x iUserTable %x\n", pPage->GCPhys, iUser, iUserTable));
+    Assert(iUser != NIL_PGMPOOL_IDX);
 
 #  ifdef VBOX_STRICT
@@ -2896 +2906 @@
         {
             Assert(i < pPool->cMaxUsers);
-            AssertMsg(iUser != PGMPOOL_IDX_PD || iUser != PGMPOOL_IDX_PDPT || iUser != PGMPOOL_IDX_NESTED_ROOT || iUser != PGMPOOL_IDX_AMD64_CR3 ||
-                      paUsers[i].iUser != iUser || paUsers[i].iUserTable != iUserTable, ("%x %x vs new %x %x\n", paUsers[i].iUser, paUsers[i].iUserTable, iUser, iUserTable));
+            /** @todo this assertion looks odd... Shouldn't it be && here? */
+            AssertMsg(paUsers[i].iUser != iUser || paUsers[i].iUserTable != iUserTable, ("%x %x vs new %x %x\n", paUsers[i].iUser, paUsers[i].iUserTable, iUser, iUserTable));
             i = paUsers[i].iNext;
         } while (i != NIL_PGMPOOL_USER_INDEX);
@@ -2947 +2957 @@
  * @param   iUser       The shadow page pool index of the user table.
  * @param   iUserTable  The index into the user table (shadowed).
+ *
+ * @remarks Don't call this for root pages.
  */
 static void pgmPoolTrackFreeUser(PPGMPOOL pPool, PPGMPOOLPAGE pPage, uint16_t iUser, uint32_t iUserTable)
 {
+    Log3(("pgmPoolTrackFreeUser %RGp %x %x\n", pPage->GCPhys, iUser, iUserTable));
+    PPGMPOOLUSER paUsers = pPool->CTX_SUFF(paUsers);
+    Assert(iUser != NIL_PGMPOOL_IDX);
+
     /*
      * Unlink and free the specified user entry.
      */
-    PPGMPOOLUSER paUsers = pPool->CTX_SUFF(paUsers);
-
-    Log3(("pgmPoolTrackFreeUser %RGp %x %x\n", pPage->GCPhys, iUser, iUserTable));
+
     /* Special: For PAE and 32-bit paging, there is usually no more than one user. */
     uint16_t i = pPage->iUserHead;
@@ -4899 +4913 @@
  * @param   HCPhys      The HC physical address of the shadow page.
  * @param   iUser       The shadow page pool index of the user table.
- * @param   iUserTable  The index into the user table (shadowed).
+ *                      NIL_PGMPOOL_IDX for root pages.
+ * @param   iUserTable  The index into the user table (shadowed). Ignored if
+ *                      root page.
  */
 void pgmPoolFreeByPage(PPGMPOOL pPool, PPGMPOOLPAGE pPage, uint16_t iUser, uint32_t iUserTable)
@@ -4911 +4927 @@
 
     pgmLock(pVM);
-    pgmPoolTrackFreeUser(pPool, pPage, iUser, iUserTable);
+    if (iUser != NIL_PGMPOOL_IDX)
+        pgmPoolTrackFreeUser(pPool, pPage, iUser, iUserTable);
     if (!pPage->fCached)
         pgmPoolFlushPage(pPool, pPage);
@@ -4933 +4950 @@
 {
     PVM pVM = pPool->CTX_SUFF(pVM);
-    LogFlow(("pgmPoolMakeMoreFreePages: iUser=%d\n", iUser));
+    LogFlow(("pgmPoolMakeMoreFreePages: enmKind=%d iUser=%d\n", enmKind, iUser));
     NOREF(enmKind);
 
@@ -4985 +5002 @@
  * @param   enmAccess   Access type for the mapping (only relevant for big pages)
  * @param   fA20Enabled Whether the A20 gate is enabled or not.
- * @param   iUser       The shadow page pool index of the user table.
- * @param   iUserTable  The index into the user table (shadowed).
+ * @param   iUser       The shadow page pool index of the user table.  Root
+ *                      pages should pass NIL_PGMPOOL_IDX.
+ * @param   iUserTable  The index into the user table (shadowed).  Ignored for
+ *                      root pages (iUser == NIL_PGMPOOL_IDX).
  * @param   fLockPage   Lock the page
  * @param   ppPage      Where to store the pointer to the page. NULL is stored here on failure.
@@ -5119 +5138 @@
  * @param   HCPhys      The HC physical address of the shadow page.
  * @param   iUser       The shadow page pool index of the user table.
- * @param   iUserTable  The index into the user table (shadowed).
+ *                      NIL_PGMPOOL_IDX if root page.
+ * @param   iUserTable  The index into the user table (shadowed).  Ignored if
+ *                      root page.
  */
 void pgmPoolFree(PVM pVM, RTHCPHYS HCPhys, uint16_t iUser, uint32_t iUserTable)
@@ -5407 +5428 @@
      * Reinsert active pages into the hash and ensure monitoring chains are correct.
      */
-    for (unsigned i = PGMPOOL_IDX_FIRST_SPECIAL; i < PGMPOOL_IDX_FIRST; i++)
-    {
-        PPGMPOOLPAGE pPage = &pPool->aPages[i];
-
-        /** @todo r=bird: Is this code still needed in any way?  The special root
-         *        pages should not be monitored or anything these days AFAIK. */
-        Assert(pPage->iNext == NIL_PGMPOOL_IDX);
-        Assert(pPage->iModifiedNext == NIL_PGMPOOL_IDX);
-        Assert(pPage->iModifiedPrev == NIL_PGMPOOL_IDX);
-        Assert(pPage->iMonitoredNext == NIL_PGMPOOL_IDX);
-        Assert(pPage->iMonitoredPrev == NIL_PGMPOOL_IDX);
-        Assert(!pPage->fMonitored);
-
-        pPage->iNext = NIL_PGMPOOL_IDX;
-        pPage->iModifiedNext = NIL_PGMPOOL_IDX;
-        pPage->iModifiedPrev = NIL_PGMPOOL_IDX;
-        pPage->cModifications = 0;
-        /* ASSUMES that we're not sharing with any of the other special pages (safe for now). */
-        pPage->iMonitoredNext = NIL_PGMPOOL_IDX;
-        pPage->iMonitoredPrev = NIL_PGMPOOL_IDX;
-        if (pPage->fMonitored)
-        {
-            int rc = PGMHandlerPhysicalChangeCallbacks(pVM, pPage->GCPhys & ~(RTGCPHYS)PAGE_OFFSET_MASK,
-                                                       pPool->pfnAccessHandlerR3, MMHyperCCToR3(pVM, pPage),
-                                                       pPool->pfnAccessHandlerR0, MMHyperCCToR0(pVM, pPage),
-                                                       pPool->pfnAccessHandlerRC, MMHyperCCToRC(pVM, pPage),
-                                                       pPool->pszAccessHandler);
-            AssertFatalRCSuccess(rc);
-            pgmPoolHashInsert(pPool, pPage);
-        }
-        Assert(pPage->iUserHead == NIL_PGMPOOL_USER_INDEX); /* for now */
-        Assert(pPage->iAgeNext == NIL_PGMPOOL_IDX);
-        Assert(pPage->iAgePrev == NIL_PGMPOOL_IDX);
-    }
-
     for (VMCPUID i = 0; i < pVM->cCpus; i++)
     {

trunk/src/VBox/VMM/VMMAll/PGMAllShw.h

@@ -52 +52 @@
 #undef SHW_PDPT_MASK
 #undef SHW_PDPE_PG_MASK
-#undef SHW_POOL_ROOT_IDX
 
 #if PGM_SHW_TYPE == PGM_TYPE_32BIT
@@ -85 +84 @@
 # define SHW_PT_SHIFT                   X86_PT_SHIFT
 # define SHW_PT_MASK                    X86_PT_MASK
-# define SHW_POOL_ROOT_IDX              PGMPOOL_IDX_PD
 
 #elif PGM_SHW_TYPE == PGM_TYPE_EPT
@@ -121 +119 @@
 # define SHW_PDPE_PG_MASK               EPT_PDPE_PG_MASK
 # define SHW_TOTAL_PD_ENTRIES           (EPT_PG_AMD64_ENTRIES*EPT_PG_AMD64_PDPE_ENTRIES)
-# define SHW_POOL_ROOT_IDX              PGMPOOL_IDX_NESTED_ROOT      /* do not use! exception is real mode & protected mode without paging. */
 
 #else
@@ -159 +156 @@
 #  define SHW_PDPE_PG_MASK              X86_PDPE_PG_MASK
 #  define SHW_TOTAL_PD_ENTRIES          (X86_PG_AMD64_ENTRIES * X86_PG_AMD64_PDPE_ENTRIES)
-#  define SHW_POOL_ROOT_IDX             PGMPOOL_IDX_AMD64_CR3
 
 # else /* 32 bits PAE mode */
@@ -166 +162 @@
 #  define SHW_PDPE_PG_MASK              X86_PDPE_PG_MASK
 #  define SHW_TOTAL_PD_ENTRIES          (X86_PG_PAE_ENTRIES * X86_PG_PAE_PDPE_ENTRIES)
-#  define SHW_POOL_ROOT_IDX             PGMPOOL_IDX_PDPT
 
 # endif