Changeset 17559 in vbox

Timestamp:

Mar 9, 2009 9:55:07 AM (16 years ago)

Author:

vboxsync

Message:

Update

Location:

trunk/src/VBox/VMM

Files:

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

trunk/src/VBox/VMM/PGMShw.h

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

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

@@ -4259 +4259 @@
     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