儲存庫 vbox 的更動 16419

時間撮記:

2009-1-30 下午03:00:20 (16 年 以前)

作者:

vboxsync

訊息:

Store the iUser & iUserTable of the root shadow page table in PGM.

位置:

trunk/src/VBox/VMM

檔案:

• PGMBth.h (修改) (2 筆差異)
• PGMInternal.h (修改) (2 筆差異)
• VMMAll/PGMAllBth.h (修改) (3 筆差異)
• VMMAll/PGMAllPool.cpp (修改) (1 筆差異)

trunk/src/VBox/VMM/PGMBth.h

@@ -159 +159 @@
 #  endif
             pVM->pgm.s.HCPhysShwCR3  = 0;
+            pVM->pgm.s.iShwUser      = 0;
+            pVM->pgm.s.iShwUserTable = 0;
         }
 
@@ -167 +169 @@
         RTGCPHYS GCPhysCR3 = RT_BIT_64(63) | RT_BIT_64(62);
 #  endif
-        int rc = pgmPoolAlloc(pVM, GCPhysCR3, BTH_PGMPOOLKIND_ROOT, SHW_POOL_ROOT_IDX, GCPhysCR3 >> PAGE_SHIFT, &pVM->pgm.s.CTX_SUFF(pShwPageCR3));
+        pVM->pgm.s.iShwUser      = SHW_POOL_ROOT_IDX;
+        pVM->pgm.s.iShwUserTable = GCPhysCR3 >> PAGE_SHIFT;
+        int rc = pgmPoolAlloc(pVM, GCPhysCR3, BTH_PGMPOOLKIND_ROOT, pVM->pgm.s.iShwUser, pVM->pgm.s.iShwUserTable, &pVM->pgm.s.CTX_SUFF(pShwPageCR3));
         if (rc == VERR_PGM_POOL_FLUSHED)
         {

trunk/src/VBox/VMM/PGMInternal.h

@@ -1623 +1623 @@
     uint16_t            iAgePrev;
 #endif /* PGMPOOL_WITH_CACHE */
-    /* The shadow page pool index of the user table as specified during allocation; useful for freeing root pages */
-    uint16_t            iUser;
-    /* The index into the user table (shadowed) as specified during allocation; useful for freeing root pages. */
-    uint32_t            iUserTable;
     /** Used to indicate that the page is zeroed. */
     bool                fZeroed;
@@ -2256 +2252 @@
     /** 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 */
+    uint32_t                        iShwUser;
+    /* The index into the user table (shadowed) as specified during allocation; useful for freeing root pages. */
+    uint32_t                        iShwUserTable;
 # if HC_ARCH_BITS == 64
     RTRCPTR                         alignment6; /**< structure size alignment. */

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

@@ -4579 +4579 @@
         /** @todo Coordinate this better with the pool. */
         if (pVM->pgm.s.CTX_SUFF(pShwPageCR3)->enmKind != PGMPOOLKIND_FREE)
-            pgmPoolFreeByPage(pPool, pVM->pgm.s.CTX_SUFF(pShwPageCR3), pVM->pgm.s.CTX_SUFF(pShwPageCR3)->iUser, pVM->pgm.s.CTX_SUFF(pShwPageCR3)->iUserTable);
+            pgmPoolFreeByPage(pPool, pVM->pgm.s.CTX_SUFF(pShwPageCR3), pVM->pgm.s.iShwUser, pVM->pgm.s.iShwUserTable);
         pVM->pgm.s.pShwPageCR3R3 = 0;
         pVM->pgm.s.pShwPageCR3R0 = 0;
@@ -4587 +4587 @@
 #  endif
         pVM->pgm.s.HCPhysShwCR3  = 0;
+        pVM->pgm.s.iShwUser      = 0;
+        pVM->pgm.s.iShwUserTable = 0;
     }
 
     Assert(!(GCPhysCR3 >> (PAGE_SHIFT + 32)));
-    rc = pgmPoolAlloc(pVM, GCPhysCR3, BTH_PGMPOOLKIND_ROOT, SHW_POOL_ROOT_IDX, GCPhysCR3 >> PAGE_SHIFT, &pVM->pgm.s.CTX_SUFF(pShwPageCR3));
+    pVM->pgm.s.iShwUser      = SHW_POOL_ROOT_IDX;
+    pVM->pgm.s.iShwUserTable = GCPhysCR3 >> PAGE_SHIFT;
+    rc = pgmPoolAlloc(pVM, GCPhysCR3, BTH_PGMPOOLKIND_ROOT, pVM->pgm.s.iShwUser, pVM->pgm.s.iShwUserTable, &pVM->pgm.s.CTX_SUFF(pShwPageCR3));
     if (rc == VERR_PGM_POOL_FLUSHED)
     {
@@ -4701 +4705 @@
     {
         PPGMPOOL pPool = pVM->pgm.s.CTX_SUFF(pPool);
-        pgmPoolFreeByPage(pPool, pVM->pgm.s.CTX_SUFF(pShwPageCR3), pVM->pgm.s.CTX_SUFF(pShwPageCR3)->iUser, pVM->pgm.s.CTX_SUFF(pShwPageCR3)->iUserTable);
+        pgmPoolFreeByPage(pPool, pVM->pgm.s.CTX_SUFF(pShwPageCR3), pVM->pgm.s.iShwUser, pVM->pgm.s.iShwUserTable);
         pVM->pgm.s.pShwPageCR3R3 = 0;
         pVM->pgm.s.pShwPageCR3R0 = 0;
+        pVM->pgm.s.iShwUser      = 0;
+        pVM->pgm.s.iShwUserTable = 0;
     }
 # endif

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

@@ -4244 +4244 @@
     pPage->fReusedFlushPending = false;
     pPage->fCR3Mix = false;
-    pPage->iUser = iUser;
-    pPage->iUserTable = iUserTable;
 #ifdef PGMPOOL_WITH_MONITORING
     pPage->cModifications = 0;