Changeset 11711 in vbox

Timestamp:

Aug 27, 2008 4:08:15 PM (16 years ago)

Author:

vboxsync

Message:

Deal with PGMR3MappingsUnfix flushing the entire page pool. In long mode the cached CR3 page will be flushed as well.

Location:

trunk/src/VBox/VMM

Files:

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

trunk/src/VBox/VMM/PGMMap.cpp

@@ -450 +450 @@
     pgmPoolFlushAll(pVM);
 #endif
-    int rc = PGM_GST_PFN(MonitorCR3, pVM)(pVM, pVM->pgm.s.GCPhysCR3);
+    /* Remap CR3 as we have just flushed the CR3 shadow PML4 in case we're in long mode. */
+    int rc = PGM_GST_PFN(MapCR3, pVM)(pVM, pVM->pgm.s.GCPhysCR3);
+    AssertRC(rc);
+
+    rc = PGM_GST_PFN(MonitorCR3, pVM)(pVM, pVM->pgm.s.GCPhysCR3);
     AssertRC(rc);
 

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

@@ -494 +494 @@
                 if (pVM->pgm.s.pHCShwAmd64CR3)
                 {
-                    pgmPoolFreeByPage(pPool, pVM->pgm.s.pHCShwAmd64CR3, PGMPOOL_IDX_AMD64_CR3, pVM->pgm.s.pHCShwAmd64CR3->GCPhys >> PAGE_SHIFT);
+                    /* It might have been freed already by a pool flush (see e.g. PGMR3MappingsUnfix). */
+                    if (pgmPoolGetPage(pPool, pVM->pgm.s.pHCShwAmd64CR3->GCPhys))
+                        pgmPoolFreeByPage(pPool, pVM->pgm.s.pHCShwAmd64CR3, PGMPOOL_IDX_AMD64_CR3, pVM->pgm.s.pHCShwAmd64CR3->GCPhys >> PAGE_SHIFT);
                     pVM->pgm.s.pHCShwAmd64CR3 = 0;
                     pVM->pgm.s.pHCPaePML4     = 0;

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

@@ -2024 +2024 @@
      * Lazy approach.
      */
+    /* @todo incompatible with long mode paging (cr3 root will be flushed) */
+    Assert(!CPUMIsGuestInLongMode(pVM));
     pgmPoolFlushAllInt(pPool);
     return VERR_PGM_POOL_FLUSHED;
@@ -3731 +3733 @@
      * a cheap replacement strategy...
      */
+    /* @todo incompatible with long mode paging (cr3 root will be flushed) */
+    Assert(!CPUMIsGuestInLongMode(pVM));
     pgmPoolFlushAllInt(pPool);
     return VERR_PGM_POOL_FLUSHED;