Changeset 34318 in vbox for trunk

Timestamp:

Nov 24, 2010 12:57:17 PM (14 years ago)

Author:

vboxsync

Message:

PGM: Fixed assertion trying to free a PXE ROM page when restoring an (older) saved state.

Location:

trunk/src/VBox/VMM

Files:

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

trunk/src/VBox/VMM/PGMPhys.cpp

@@ -4116 +4116 @@
  * Frees the specified RAM page and replaces it with the ZERO page.
  *
- * This is used by ballooning, remapping MMIO2 and RAM reset.
- *
- * @param   pVM         Pointer to the shared VM structure.
- * @param   pReq        Pointer to the request.
- * @param   pPage       Pointer to the page structure.
- * @param   GCPhys      The guest physical address of the page, if applicable.
+ * This is used by ballooning, remapping MMIO2, RAM reset and state loading.
+ *
+ * @param   pVM             Pointer to the shared VM structure.
+ * @param   pReq            Pointer to the request.
+ * @param   pcPendingPages  Where the number of pages waiting to be freed are
+ *                          kept.  This will normally be incremented.
+ * @param   pPage           Pointer to the page structure.
+ * @param   GCPhys          The guest physical address of the page, if applicable.
  *
  * @remarks The caller must own the PGM lock.

trunk/src/VBox/VMM/PGMSavedState.cpp

@@ -2578 +2578 @@
     /*
      * We batch up pages that should be freed instead of calling GMM for
-     * each and every one of them.
+     * each and every one of them.  Note that we'll lose the pages in most
+     * failure paths - this should probably be addressed one day.
      */
     uint32_t            cPendingPages = 0;
@@ -2645 +2646 @@
                         AssertLogRelMsgReturn(PGM_PAGE_GET_STATE(pPage) == PGM_PAGE_STATE_ALLOCATED, ("GCPhys=%RGp %R[pgmpage]\n", GCPhys, pPage), VERR_INTERNAL_ERROR_5);
 
-                        /* Free it only if it's not part of a previously allocated large page. */
-                        if (PGM_PAGE_GET_PDE_TYPE(pPage) != PGM_PAGE_PDE_TYPE_PDE)
+                        /* If this is a ROM page, we must clear it and not try
+                           free it... */
+                        if (   PGM_PAGE_GET_TYPE(pPage) == PGMPAGETYPE_ROM
+                            || PGM_PAGE_GET_TYPE(pPage) == PGMPAGETYPE_ROM_SHADOW)
                         {
-                            /* Allocated before (prealloc), so free it now. */
+                            void *pvDstPage;
+                            rc = pgmPhysGCPhys2CCPtrInternal(pVM, pPage, GCPhys, &pvDstPage);
+                            AssertLogRelMsgRCReturn(rc, ("GCPhys=%RGp %R[pgmpage] rc=%Rrc\n", GCPhys, pPage, rc), rc);
+                            ASMMemZeroPage(pvDstPage);
+                        }
+                        /* Free it only if it's not part of a previously
+                           allocated large page (no need to clear the page). */
+                        else if (PGM_PAGE_GET_PDE_TYPE(pPage) != PGM_PAGE_PDE_TYPE_PDE)
+                        {
                             rc = pgmPhysFreePage(pVM, pReq, &cPendingPages, pPage, GCPhys);
-                            AssertRC(rc);
+                            AssertRCReturn(rc, rc);
                         }
                         break;
@@ -2993 +3004 @@
     {
         rc = GMMR3BalloonedPages(pVM, GMMBALLOONACTION_INFLATE, pVM->pgm.s.cBalloonedPages);
-        AssertRC(rc);
+        AssertRCReturn(rc, rc);
     }
     return rc;