Changeset 10321 in vbox

Timestamp:

Jul 7, 2008 1:38:02 PM (16 years ago)

Author:

vboxsync

Message:

Deal with pool flushes directly when possible.

Location:

trunk/src/VBox/VMM/VMMAll

Files:

• PGMAll.cpp (modified) (3 diffs)
• PGMAllBth.h (modified) (6 diffs)
• PGMAllPool.cpp (modified) (1 diff)

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

@@ -754 +754 @@
         rc = pgmPoolAlloc(pVM, pPdptGst->u & X86_PDPE_PG_MASK, PGMPOOLKIND_PAE_PD_FOR_PAE_PD, PGMPOOL_IDX_PDPT, iPdPt, &pShwPage);
         if (rc == VERR_PGM_POOL_FLUSHED)
-            return VINF_PGM_SYNC_CR3;
+        {
+            Assert(pVM->pgm.s.fSyncFlags & PGM_SYNC_CLEAR_PGM_POOL);
+            pgmPoolSyncCR3(pVM);
+        }
 
         AssertRCReturn(rc, rc);
@@ -847 +850 @@
 
         if (rc == VERR_PGM_POOL_FLUSHED)
-            return VINF_PGM_SYNC_CR3;
-
+        {
+            Assert(pVM->pgm.s.fSyncFlags & PGM_SYNC_CLEAR_PGM_POOL);
+            pgmPoolSyncCR3(pVM);
+        }
         AssertRCReturn(rc, rc);
     }
@@ -885 +890 @@
 
         if (rc == VERR_PGM_POOL_FLUSHED)
-            return VINF_PGM_SYNC_CR3;
-
+        {
+            Assert(pVM->pgm.s.fSyncFlags & PGM_SYNC_CLEAR_PGM_POOL);
+            pgmPoolSyncCR3(pVM);
+        }
         AssertRCReturn(rc, rc);
     }

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

@@ -163 +163 @@
     if (rc != VINF_SUCCESS)
     {
-        AssertMsg(rc == VINF_PGM_SYNC_CR3, ("Unexpected rc=%Vrc\n", rc));
+        AssertRC(rc);
         return rc;
     }
@@ -2233 +2233 @@
     if (rc != VINF_SUCCESS)
     {
-        AssertMsg(rc == VINF_PGM_SYNC_CR3, ("Unexpected rc=%Vrc\n", rc));
+        AssertRC(rc);
         return rc;
     }
@@ -2353 +2353 @@
         }
         else if (rc == VERR_PGM_POOL_FLUSHED)
+        {
+            VM_FF_SET(pVM, VM_FF_PGM_SYNC_CR3); /** @todo no need to do global sync, right? */
             return VINF_PGM_SYNC_CR3;
+        }
         else
             AssertMsgFailedReturn(("rc=%Vrc\n", rc), VERR_INTERNAL_ERROR);
@@ -2620 +2623 @@
     if (rc != VINF_SUCCESS)
     {
-        AssertMsg(rc == VINF_PGM_SYNC_CR3, ("Unexpected rc=%Vrc\n", rc));
+        AssertRC(rc);
         return rc;
     }
@@ -2758 +2761 @@
         if (rc != VINF_SUCCESS)
         {
-            AssertMsg(rc == VINF_PGM_SYNC_CR3, ("Unexpected rc=%Vrc\n", rc));
+            AssertRC(rc);
             return rc;
         }
@@ -2877 +2880 @@
     if (rc != VINF_SUCCESS)
     {
-        AssertMsg(rc == VINF_PGM_SYNC_CR3, ("Unexpected rc=%Vrc\n", rc));
+        AssertRC(rc);
         return rc;
     }

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

@@ -1890 +1890 @@
 # else
         LogFlow(("SyncCR3: PGM_SYNC_CLEAR_PGM_POOL is set -> VINF_PGM_SYNC_CR3\n"));
+        VM_FF_SET(pVM, VM_FF_PGM_SYNC_CR3); /** @todo no need to do global sync, right? */
         return VINF_PGM_SYNC_CR3;
 # endif