Changeset 17556 in vbox for trunk

Timestamp:

Mar 9, 2009 9:46:40 AM (16 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

43995

Message:

Allow pgm pool flushing only in ring 3. Deal with shadow mode reinit there as well.

Location:

trunk/src/VBox/VMM

Files:

• PGM.cpp (modified) (1 diff)
• PGMShw.h (modified) (2 diffs)
• VMMAll/PGMAllPool.cpp (modified) (6 diffs)

trunk/src/VBox/VMM/PGM.cpp

@@ -2241 +2241 @@
         if (RT_SUCCESS(rc))
         {
-#ifdef VBOX_WITH_PGMPOOL_PAGING_ONLY
-            /* Force a shadow mode reinit (necessary for nested paging and ept). */
-            pVM->pgm.s.enmShadowMode = PGMMODE_INVALID;
-#endif
             /*
              * Switch mode back to real mode.

trunk/src/VBox/VMM/PGMShw.h

@@ -191 +191 @@
 
     Assert(HWACCMIsNestedPagingActive(pVM));
+    Assert(!pVM->pgm.s.pShwPageCR3R3);
 
     int rc = pgmPoolAlloc(pVM, GCPhysCR3, PGMPOOLKIND_ROOT_NESTED, PGMPOOL_IDX_NESTED_ROOT, GCPhysCR3 >> PAGE_SHIFT, &pNewShwPageCR3);
@@ -246 +247 @@
 PGM_SHW_DECL(int, Exit)(PVM pVM)
 {
-#ifndef VBOX_WITH_PGMPOOL_PAGING_ONLY
+#ifdef VBOX_WITH_PGMPOOL_PAGING_ONLY
+    if (pVM->pgm.s.CTX_SUFF(pShwPageCR3))
+    {
+        PPGMPOOL pPool = pVM->pgm.s.CTX_SUFF(pPool);
+
+        Assert(pVM->pgm.s.iShwUser == PGMPOOL_IDX_NESTED_ROOT);
+
+        /* 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;
+        pVM->pgm.s.pShwPageCR3R0 = 0;
+        pVM->pgm.s.pShwPageCR3RC = 0;
+        pVM->pgm.s.iShwUser      = 0;
+        pVM->pgm.s.iShwUserTable = 0;
+    }
+#else
 # if PGM_SHW_TYPE == PGM_TYPE_NESTED
     Assert(HWACCMIsNestedPagingActive(pVM));

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

@@ -4156 +4156 @@
 #endif /* PGMPOOL_WITH_USER_TRACKING */
 
+
+#ifdef IN_RING3
 /**
  * Flushes all the special root pages as part of a pgmPoolFlushAllInt operation.
@@ -4256 +4258 @@
     /* Unmap the old CR3 value before flushing everything. */
     int rc = PGM_BTH_PFN(UnmapCR3, pVM)(pVM);
+    AssertRC(rc);
+
+    /* Exit the current shadow paging mode as well; nested paging and EPT use a root CR3 which will get flushed here. */
+    rc = PGM_SHW_PFN(Exit, pVM)(pVM);
     AssertRC(rc);
 #endif
@@ -4403 +4409 @@
     }
 
+#ifdef VBOX_WITH_PGMPOOL_PAGING_ONLY
+    /* Force a shadow mode reinit (necessary for nested paging and ept). */
+    pVM->pgm.s.enmShadowMode = PGMMODE_INVALID;
+
+    /* Reinit the current shadow paging mode as well; nested paging and EPT use a root CR3 which will get flushed here. */
+    rc = PGMR3ChangeMode(pVM, PGMGetGuestMode(pVM));
+    AssertRC(rc);
+#endif
+
     /*
      * Finally, assert the FF.
@@ -4410 +4425 @@
     STAM_PROFILE_STOP(&pPool->StatFlushAllInt, a);
 }
-
+#endif /* IN_RING3 */
 
 /**
@@ -4781 +4796 @@
 }
 
-
+#ifdef IN_RING3
 /**
  * Flushes the entire cache.
@@ -4795 +4810 @@
     pgmPoolFlushAllInt(pVM->pgm.s.CTX_SUFF(pPool));
 }
+#endif
 
 #ifdef LOG_ENABLED