Changeset 30613 in vbox

Timestamp:

Jul 5, 2010 12:56:59 PM (15 years ago)

Author:

vboxsync

Message:

Free zero page when loading a saved state with prealloc enabled.

Location:

trunk/src/VBox/VMM

Files:

• PGMInternal.h (modified) (1 diff)
• PGMPhys.cpp (modified) (2 diffs)
• PGMSavedState.cpp (modified) (3 diffs)

trunk/src/VBox/VMM/PGMInternal.h

@@ -3371 +3371 @@
 VMMDECL(int)    pgmPhysHandlerRedirectToHC(PVM pVM, RTGCUINT uErrorCode, PCPUMCTXCORE pRegFrame, RTGCPTR pvFault, RTGCPHYS GCPhysFault, void *pvUser);
 VMMDECL(int)    pgmPhysRomWriteHandler(PVM pVM, RTGCUINT uErrorCode, PCPUMCTXCORE pRegFrame, RTGCPTR pvFault, RTGCPHYS GCPhysFault, void *pvUser);
+int             pgmPhysFreePage(PVM pVM, PGMMFREEPAGESREQ pReq, uint32_t *pcPendingPages, PPGMPAGE pPage, RTGCPHYS GCPhys);
+
 #ifdef IN_RING3
 void            pgmR3PhysRelinkRamRanges(PVM pVM);

trunk/src/VBox/VMM/PGMPhys.cpp

@@ -52 +52 @@
 *******************************************************************************/
 static DECLCALLBACK(int) pgmR3PhysRomWriteHandler(PVM pVM, RTGCPHYS GCPhys, void *pvPhys, void *pvBuf, size_t cbBuf, PGMACCESSTYPE enmAccessType, void *pvUser);
-static int pgmPhysFreePage(PVM pVM, PGMMFREEPAGESREQ pReq, uint32_t *pcPendingPages, PPGMPAGE pPage, RTGCPHYS GCPhys);
 
 
@@ -3710 +3709 @@
  * @remarks The caller must own the PGM lock.
  */
-static int pgmPhysFreePage(PVM pVM, PGMMFREEPAGESREQ pReq, uint32_t *pcPendingPages, PPGMPAGE pPage, RTGCPHYS GCPhys)
+int pgmPhysFreePage(PVM pVM, PGMMFREEPAGESREQ pReq, uint32_t *pcPendingPages, PPGMPAGE pPage, RTGCPHYS GCPhys)
 {
     /*

trunk/src/VBox/VMM/PGMSavedState.cpp

@@ -2524 +2524 @@
     PPGMROMRANGE    pRom     = NULL;
     PPGMMMIO2RANGE  pMmio2   = NULL;
+
+    /*
+     * We batch up pages that should be freed instead of calling GMM for
+     * each and every one of them.
+     */
+    uint32_t            cPendingPages = 0;
+    PGMMFREEPAGESREQ    pReq;
+    int rc = GMMR3FreePagesPrepare(pVM, &pReq, 128 /* batch size */, GMMACCOUNT_BASE);
+    AssertLogRelRCReturn(rc, rc);
+
     for (;;)
     {
@@ -2530 +2540 @@
          */
         uint8_t u8;
-        int rc = SSMR3GetU8(pSSM, &u8);
+        rc = SSMR3GetU8(pSSM, &u8);
         if (RT_FAILURE(rc))
             return rc;
         if (u8 == PGM_STATE_REC_END)
+        {
+            /*
+             * Finish off any pages pending freeing.
+             */
+            if (cPendingPages)
+            {
+                rc = GMMR3FreePagesPerform(pVM, pReq, cPendingPages);
+                AssertLogRelRCReturn(rc, rc);
+            }
+            GMMR3FreePagesCleanup(pReq);
             return VINF_SUCCESS;
+        }
         AssertLogRelMsgReturn((u8 & ~PGM_STATE_REC_FLAG_ADDR) <= PGM_STATE_REC_LAST, ("%#x\n", u8), VERR_SSM_DATA_UNIT_FORMAT_CHANGED);
         switch (u8 & ~PGM_STATE_REC_FLAG_ADDR)
@@ -2571 +2592 @@
                             ||  PGM_PAGE_IS_BALLOONED(pPage))
                             break;
-                        /** @todo implement zero page replacing. */
-                        AssertLogRelMsgReturn(PGM_PAGE_GET_STATE(pPage) == PGM_PAGE_STATE_ALLOCATED, ("GCPhys=%RGp %R[pgmpage]\n", GCPhys, pPage), VERR_INTERNAL_ERROR_5);
-                        void *pvDstPage;
-                        rc = pgmPhysGCPhys2CCPtrInternal(pVM, pPage, GCPhys, &pvDstPage);
-                        AssertLogRelMsgRCReturn(rc, ("GCPhys=%RGp %R[pgmpage] rc=%Rrc\n", GCPhys, pPage, rc), rc);
-                        ASMMemZeroPage(pvDstPage);
+                        /* Allocated before (prealloc), so free it now. */
+                        rc = pgmPhysFreePage(pVM, pReq, &cPendingPages, pPage, GCPhys);
+                        AssertRC(rc);
                         break;
                     }