Changeset 18266 in vbox

Timestamp:

Mar 25, 2009 5:25:53 PM (16 years ago)

Author:

vboxsync

Message:

PGM: Made PGMR3PhysRomProtect use instead of doing a full pool flush for each call (expensive using reset), this fixes a reset assertion in pgmPoolMonitorFlush. Changed pgmPoolTrackFlushGCPhys to return VINF_PGM_SYNC_CR3 and set VM_FF_PGM_SYNCR3 and PGM_SYNC_CLEAR_PGM_POOL instead of leave this to the caller.

Location:

trunk/src/VBox/VMM

Files:

• PGMPhys.cpp (modified) (5 diffs)
• VMMAll/PGMAllHandler.cpp (modified) (5 diffs)
• VMMAll/PGMAllPhys.cpp (modified) (1 diff)
• VMMAll/PGMAllPool.cpp (modified) (3 diffs)

trunk/src/VBox/VMM/PGMPhys.cpp

@@ -2335 +2335 @@
  *
  * @returns VBox status code.
+ * @retval  VINF_PGM_SYNC_CR3
+ *
  * @param   pVM         Pointer to the shared VM structure.
  * @param   GCPhys      Where to start. Page aligned.
@@ -2356 +2358 @@
      * Process the request.
      */
-    bool fFlushedPool = false;
+    int  rc = VINF_SUCCESS;
+    bool fFlushTLB = false;
     for (PPGMROMRANGE pRom = pVM->pgm.s.pRomRangesR3; pRom; pRom = pRom->pNextR3)
         if (    GCPhys     <= pRom->GCPhysLast
@@ -2363 +2366 @@
         {
             /*
-             * Iterate the relevant pages and the ncessary make changes.
+             * Iterate the relevant pages and make necessary the changes.
              */
             bool fChanges = false;
@@ -2378 +2381 @@
                     fChanges = true;
 
-                    /* flush the page pool first so we don't leave any usage references dangling. */
-                    if (!fFlushedPool)
-                    {
-                        pgmPoolFlushAll(pVM);
-                        fFlushedPool = true;
-                    }
+                    /* flush references to the page. */
+                    PPGMPAGE pRamPage = pgmPhysGetPage(&pVM->pgm.s, pRom->GCPhys + (iPage << PAGE_SHIFT));
+                    int rc2 = pgmPoolTrackFlushGCPhys(pVM, pRamPage, &fFlushTLB);
+                    if (rc2 != VINF_SUCCESS && (rc == VINF_SUCCESS || RT_FAILURE(rc2)))
+                        rc = rc2;
 
                     PPGMPAGE pOld = PGMROMPROT_IS_ROM(pRomPage->enmProt) ? &pRomPage->Virgin : &pRomPage->Shadow;
                     PPGMPAGE pNew = PGMROMPROT_IS_ROM(pRomPage->enmProt) ? &pRomPage->Shadow : &pRomPage->Virgin;
-                    PPGMPAGE pRamPage = pgmPhysGetPage(&pVM->pgm.s, pRom->GCPhys + (iPage << PAGE_SHIFT));
 
                     *pOld = *pRamPage;
@@ -2410 +2411 @@
         }
 
-    return VINF_SUCCESS;
+    if (fFlushTLB)
+        PGM_INVL_GUEST_TLBS();
+    return rc;
 }
 

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

@@ -169 +169 @@
     {
         rc = pgmHandlerPhysicalSetRamFlagsAndFlushShadowPTs(pVM, pNew, pRam);
-        if (rc == VINF_PGM_GCPHYS_ALIASED)
-        {
-            pVM->pgm.s.fSyncFlags |= PGM_SYNC_CLEAR_PGM_POOL;
-            VM_FF_SET(pVM, VM_FF_PGM_SYNC_CR3);
-        }
+        if (rc == VINF_PGM_SYNC_CR3)
+            rc = VINF_PGM_GCPHYS_ALIASED;
         pVM->pgm.s.fPhysCacheFlushPending = true;
         HWACCMFlushTLB(pVM);
@@ -203 +200 @@
  * @returns VBox status code.
  * @retval  VINF_SUCCESS when shadow PTs was successfully updated.
- * @retval  VINF_PGM_GCPHYS_ALIASED when the shadow PTs could be updated because
- *          the guest page aliased or/and mapped by multiple PTs.
+ * @retval  VINF_PGM_SYNC_CR3 when the shadow PTs could be updated because
+ *          the guest page aliased or/and mapped by multiple PTs. FFs set.
  * @param   pVM     The VM handle.
  * @param   pCur    The physical handler.
@@ -441 +438 @@
     int rc = pgmPoolTrackFlushGCPhys(pVM, pPage, &fFlushTLBs);
     AssertLogRelRCReturnVoid(rc);
-    if (rc == VINF_PGM_GCPHYS_ALIASED)
-    {
-        pVM->pgm.s.fSyncFlags |= PGM_SYNC_CLEAR_PGM_POOL;
-        VM_FF_SET(pVM, VM_FF_PGM_SYNC_CR3);
-        rc = VINF_PGM_SYNC_CR3;
-    }
 # ifdef IN_RC
-    else if (fFlushTLBs)
+    if (fFlushTLBs && rc != VINF_PGM_SYNC_CR3)
         PGM_INVL_GUEST_TLBS();
 # else
@@ -580 +571 @@
                      */
                     rc = pgmHandlerPhysicalSetRamFlagsAndFlushShadowPTs(pVM, pCur, pRam);
-                    if (rc == VINF_PGM_GCPHYS_ALIASED)
-                    {
-                        pVM->pgm.s.fSyncFlags |= PGM_SYNC_CLEAR_PGM_POOL;
-                        VM_FF_SET(pVM, VM_FF_PGM_SYNC_CR3);
-                    }
                     pVM->pgm.s.fPhysCacheFlushPending = true;
 
@@ -891 +877 @@
                      */
                     rc = pgmHandlerPhysicalSetRamFlagsAndFlushShadowPTs(pVM, pCur, pRam);
-                    if (rc == VINF_PGM_GCPHYS_ALIASED)
-                    {
-                        pVM->pgm.s.fSyncFlags |= PGM_SYNC_CLEAR_PGM_POOL;
-                        VM_FF_SET(pVM, VM_FF_PGM_SYNC_CR3);
-                    }
                     pVM->pgm.s.fPhysCacheFlushPending = true;
                     HWACCMFlushTLB(pVM);

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

@@ -382 +382 @@
     bool fFlushTLBs = false;
     int rc = pgmPoolTrackFlushGCPhys(pVM, pPage, &fFlushTLBs);
-    if (rc == VINF_SUCCESS)
-        /* nothing */;
-    else if (rc == VINF_PGM_GCPHYS_ALIASED)
-    {
-        pVM->pgm.s.fSyncFlags |= PGM_SYNC_CLEAR_PGM_POOL;
-        VM_FF_SET(pVM, VM_FF_PGM_SYNC_CR3);
-        rc = VINF_PGM_SYNC_CR3;
-    }
-    else
-    {
-        AssertRCReturn(rc, rc);
-        AssertMsgFailedReturn(("%Rrc\n", rc), VERR_INTERNAL_ERROR);
-    }
+    AssertMsgReturn(rc == VINF_SUCCESS || rc == VINF_PGM_GCPHYS_ALIASED, ("%Rrc\n", rc), RT_FAILURE(rc) ? rc : VERR_INTERNAL_ERROR);
 
     /*

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

@@ -2630 +2630 @@
  * @returns VBox status code.
  * @retval  VINF_SUCCESS if all references has been successfully cleared.
- * @retval  VINF_PGM_GCPHYS_ALIASED if we're better off with a CR3 sync and
- *          a page pool cleaning.
+ * @retval  VINF_PGM_SYNC_CR3 if we're better off with a CR3 sync and a page
+ *          pool cleaning. FF and sync flags are set.
  *
  * @param   pVM         The VM handle.
@@ -2706 +2706 @@
     rc = VINF_PGM_GCPHYS_ALIASED;
 #endif
+
+    if (rc == VINF_PGM_GCPHYS_ALIASED)
+    {
+        pVM->pgm.s.fSyncFlags |= PGM_SYNC_CLEAR_PGM_POOL;
+        VM_FF_SET(pVM, VM_FF_PGM_SYNC_CR3);
+        rc = VINF_PGM_SYNC_CR3;
+    }
 
     return rc;
@@ -3954 +3961 @@
     }
 
-    /* Force a shadow mode reinit (necessary for nested paging and ept). */
+    /*
+     * Force a shadow mode reinit (necessary for nested paging and ept).
+     * Reinit the current shadow paging mode as well; nested paging and
+     * EPT use a root CR3 which will get flushed here.
+     */
     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);