Changeset 19627 in vbox for trunk/src/VBox/VMM

Timestamp:

May 12, 2009 2:11:47 PM (16 years ago)

Author:

vboxsync

Message:

PGM pool: allow multiple users of top-level paging structures (SHW_POOL_ROOT_IDX).

Location:

trunk/src/VBox/VMM

Files:

• PGMBth.h (modified) (1 diff)
• VMMAll/PGMAllPool.cpp (modified) (2 diffs)

trunk/src/VBox/VMM/PGMBth.h

@@ -166 +166 @@
     }
 
-    /* contruct a fake address which is unique across VCPUs. */
-    GCPhysCR3 = RT_BIT_64(63) | ((uint64_t)pVCpu->idCpu << 32);
+    /* contruct a fake address. */
+    GCPhysCR3 = RT_BIT_64(63);
     pVCpu->pgm.s.iShwUser      = SHW_POOL_ROOT_IDX;
     pVCpu->pgm.s.iShwUserTable = GCPhysCR3 >> PAGE_SHIFT;

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

@@ -2257 +2257 @@
 
     Log3(("pgmPoolTrackAddUser GCPhys = %RGp iUser %x iUserTable %x\n", pPage->GCPhys, iUser, iUserTable));
+
 #  ifdef VBOX_STRICT
     /*
-     * Check that the entry doesn't already exists.
+     * Check that the entry doesn't already exists. We only allow multiple users of top-level paging structures (SHW_POOL_ROOT_IDX).
      */
     if (pPage->iUserHead != NIL_PGMPOOL_USER_INDEX)
@@ -2267 +2268 @@
         {
             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));
+            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));
             i = paUsers[i].iNext;
         } while (i != NIL_PGMPOOL_USER_INDEX);