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

Timestamp:

Feb 25, 2009 4:18:51 PM (16 years ago)

Author:

vboxsync

Message:

VBOX_WITH_PGMPOOL_PAGING_ONLY: explicit locking of root CR3 pages

Location:

trunk/src/VBox/VMM/VMMAll

Files:

• PGMAllBth.h (modified) (3 diffs)
• PGMAllPool.cpp (modified) (7 diffs)

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

@@ -4659 +4659 @@
     /** NOTE: We can't deal with jumps to ring 3 here as we're now in an inconsistent state! */
 #  endif
+    /* Mark the page as locked; disallow flushing. */
+    pgmPoolLockPage(pPool, pNewShwPageCR3);
+
     pVM->pgm.s.iShwUser      = SHW_POOL_ROOT_IDX;
     pVM->pgm.s.iShwUserTable = GCPhysCR3 >> PAGE_SHIFT;
@@ -4701 +4704 @@
     if (pOldShwPageCR3)
     {
+        Assert(pOldShwPageCR3->enmKind != PGMPOOLKIND_FREE);
 #  ifndef PGM_WITHOUT_MAPPINGS
         /* Remove the hypervisor mappings from the shadow page table. */
         pgmMapDeactivateCR3(pVM, pOldShwPageCR3);
 #  endif
-        /* It might have been freed already by a pool flush (see e.g. PGMR3MappingsUnfix). */
-        /** @todo Coordinate this better with the pool. */
-        if (pOldShwPageCR3->enmKind != PGMPOOLKIND_FREE)
-            pgmPoolFreeByPage(pPool, pOldShwPageCR3, iOldShwUser, iOldShwUserTable);
+        /* Mark the page as unlocked; allow flushing again. */
+        pgmPoolUnlockPage(pPool, pOldShwPageCR3);
+
+        pgmPoolFreeByPage(pPool, pOldShwPageCR3, iOldShwUser, iOldShwUserTable);
     }
 
@@ -4803 +4807 @@
     {
         PPGMPOOL pPool = pVM->pgm.s.CTX_SUFF(pPool);
+
+        /* Mark the page as unlocked; allow flushing again. */
+        pgmPoolUnlockPage(pPool, pVM->pgm.s.CTX_SUFF(pShwPageCR3));
+
         pgmPoolFreeByPage(pPool, pVM->pgm.s.CTX_SUFF(pShwPageCR3), pVM->pgm.s.iShwUser, pVM->pgm.s.iShwUserTable);
         pVM->pgm.s.pShwPageCR3R3 = 0;

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

@@ -910 +910 @@
 #ifdef VBOX_WITH_PGMPOOL_PAGING_ONLY
 /**
- * Checks if the page is the active CR3 or is one of the four PDs of a PAE PDPT
- *
- * @returns VBox status code (appropriate for GC return).
+ * Checks if the page is locked (e.g. the active CR3 or one of the four PDs of a PAE PDPT)
+ *
+ * @returns VBox status code.
  * @param   pVM         VM Handle.
  * @param   pPage       PGM pool page
  */
-bool pgmPoolIsActiveRootPage(PVM pVM, PPGMPOOLPAGE pPage)
-{
-    /* First check the simple case. */
-    if (pPage == pVM->pgm.s.CTX_SUFF(pShwPageCR3))
-    {
-        LogFlow(("pgmPoolIsActiveRootPage found CR3 root\n"));
+bool pgmPoolIsPageLocked(PVM pVM, PPGMPOOLPAGE pPage)
+{
+    if (pPage->fLocked)
+    {
+        LogFlow(("pgmPoolIsPageLocked found root page %s\n", pgmPoolPoolKindToStr(pPage->enmKind)));
         if (pPage->cModifications)
             pPage->cModifications = 1; /* reset counter (can't use 0, or else it will be reinserted in the modified list) */
         return true;
     }
+
+#ifdef VBOX_STRICT
+    Assert(pPage != pVM->pgm.s.CTX_SUFF(pShwPageCR3));
 
 # ifndef IN_RING0
@@ -946 +948 @@
                     for (unsigned i=0;i<X86_PG_PAE_PDPE_ENTRIES;i++)
                     {
-                        if (   (pPdpt->a[i].u & PGM_PLXFLAGS_MAPPING)
-                            &&  pPage->Core.Key == (pPdpt->a[i].u & X86_PDPE_PG_MASK))
-                        {
-                            Assert(pPdpt->a[i].n.u1Present);
-                            LogFlow(("pgmPoolIsActiveRootPage found PAE PDPE root\n"));
-                            if (pPage->cModifications)
-                                pPage->cModifications = 1; /* reset counter (can't use 0, or else it will be reinserted in the modified list) */
-                            return true;
-                        }
+                        Assert(   !(pPdpt->a[i].u & PGM_PLXFLAGS_MAPPING) 
+                               || (pPage->Core.Key != (pPdpt->a[i].u & X86_PDPE_PG_MASK)));
                     }
                     break;
@@ -964 +959 @@
     }
 # endif
+#endif /* VBOX_STRICT */
     return false;
 }
@@ -1315 +1311 @@
     if (    (   pPage->cModifications < 48   /** @todo #define */ /** @todo need to check that it's not mapping EIP. */ /** @todo adjust this! */
 #ifdef VBOX_WITH_PGMPOOL_PAGING_ONLY
-             || pgmPoolIsActiveRootPage(pVM, pPage)
+             || pgmPoolIsPageLocked(pVM, pPage)
 #else
              || pPage->fCR3Mix
@@ -1478 +1474 @@
      */
 #ifdef VBOX_WITH_PGMPOOL_PAGING_ONLY
-    if (pgmPoolIsActiveRootPage(pPool->CTX_SUFF(pVM), pPage))
+    if (pgmPoolIsPageLocked(pPool->CTX_SUFF(pVM), pPage))
 #else
     if (PGMGetHyperCR3(pPool->CTX_SUFF(pVM)) == pPage->Core.Key)
@@ -3157 +3153 @@
     /* Safety precaution in case we change the paging for other modes too in the future. */
 #ifdef VBOX_WITH_PGMPOOL_PAGING_ONLY
-    Assert(!pgmPoolIsActiveRootPage(pPool->CTX_SUFF(pVM), pPage));
+    Assert(!pgmPoolIsPageLocked(pPool->CTX_SUFF(pVM), pPage));
 #else
     Assert(PGMGetHyperCR3(pPool->CTX_SUFF(pVM)) != pPage->Core.Key);
@@ -4360 +4356 @@
      */
 #ifdef VBOX_WITH_PGMPOOL_PAGING_ONLY
-    if (pgmPoolIsActiveRootPage(pPool->CTX_SUFF(pVM), pPage))
+    if (pgmPoolIsPageLocked(pPool->CTX_SUFF(pVM), pPage))
     {
         AssertMsg(   pPage->enmKind == PGMPOOLKIND_64BIT_PML4