Changeset 27182 in vbox

Timestamp:

Mar 8, 2010 5:28:01 PM (15 years ago)

Author:

vboxsync

Message:

Saved the state of ballooned memory and reinflate when loading the saved state.

Location:

trunk/src/VBox/VMM

Files:

• PGM.cpp (modified) (1 diff)
• PGMInternal.h (modified) (1 diff)
• PGMPhys.cpp (modified) (1 diff)
• PGMSavedState.cpp (modified) (6 diffs)
• VMMR0/GMMR0.cpp (modified) (1 diff)

trunk/src/VBox/VMM/PGM.cpp

@@ -1574 +1574 @@
     STAM_REL_REG(pVM, &pPGM->cWriteLockedPages,                  STAMTYPE_U32,     "/PGM/Page/cWriteLockedPages",        STAMUNIT_COUNT,     "The number of write(/read) locked pages.");
     STAM_REL_REG(pVM, &pPGM->cReadLockedPages,                   STAMTYPE_U32,     "/PGM/Page/cReadLockedPages",         STAMUNIT_COUNT,     "The number of read (only) locked pages.");
+    STAM_REL_REG(pVM, &pPGM->cBalloonedPages,                    STAMTYPE_U32,     "/PGM/Page/cBalloonedPages",          STAMUNIT_COUNT,     "The number of ballooned pages.");
     STAM_REL_REG(pVM, &pPGM->cHandyPages,                        STAMTYPE_U32,     "/PGM/Page/cHandyPages",              STAMUNIT_COUNT,     "The number of handy pages (not included in cAllPages).");
     STAM_REL_REG(pVM, &pPGM->cRelocations,                       STAMTYPE_COUNTER, "/PGM/cRelocations",                  STAMUNIT_OCCURENCES,"Number of hypervisor relocations.");

trunk/src/VBox/VMM/PGMInternal.h

@@ -2782 +2782 @@
     uint32_t                        cWriteLockedPages;  /**< The number of write locked pages. */
     uint32_t                        cReadLockedPages;   /**< The number of read locked pages. */
+    uint32_t                        cBalloonedPages;    /**< The number of ballooned pages. */
 
     /** The number of times we were forced to change the hypervisor region location. */

trunk/src/VBox/VMM/PGMPhys.cpp

@@ -843 +843 @@
     /* Notify GMM about the balloon change. */
     rc = GMMR3BalloonedPages(pVM, (fInflate) ? GMMBALLOONACTION_INFLATE : GMMBALLOONACTION_DEFLATE, cPages);
+    if (RT_SUCCESS(rc))
+    {
+        if (!fInflate)
+        {
+            Assert(pVM->pgm.s.cBalloonedPages >= cPages);
+            pVM->pgm.s.cBalloonedPages -= cPages;
+        }
+        else
+            pVM->pgm.s.cBalloonedPages += cPages;
+    }
+
     pgmUnlock(pVM);
     AssertLogRelRC(rc);

trunk/src/VBox/VMM/PGMSavedState.cpp

@@ -51 +51 @@
 /** Saved state data unit version.
  * @todo remove the guest mappings from the saved state at next version change! */
-#define PGM_SAVED_STATE_VERSION                 11
+#define PGM_SAVED_STATE_VERSION                 12
+/** Saved state before the balloon change. */
+#define PGM_SAVED_STATE_VERSION_PRE_BALLOON     11
 /** Saved state data unit version used during 3.1 development, misses the RAM
  *  config. */
@@ -114 +116 @@
     /** A20 gate mask.
      * Our current approach to A20 emulation is to let REM do it and don't bother
-     * anywhere else. The interesting Guests will be operating with it enabled anyway.
-     * But whould need arrise, we'll subject physical addresses to this mask. */
+     * anywhere else. The interesting guests will be operating with it enabled anyway.
+     * But should the need arise, we'll subject physical addresses to this mask. */
     RTGCPHYS                        GCPhysA20Mask;
     /** A20 gate state - boolean! */
@@ -128 +130 @@
 *******************************************************************************/
 /** PGM fields to save/load. */
+
 static const SSMFIELD s_aPGMFields[] =
 {
@@ -133 +136 @@
     SSMFIELD_ENTRY_GCPTR(   PGM, GCPtrMappingFixed),
     SSMFIELD_ENTRY(         PGM, cbMappingFixed),
+    SSMFIELD_ENTRY(         PGM, cBalloonedPages),
+    SSMFIELD_ENTRY_TERM()
+};
+
+static const SSMFIELD s_aPGMFieldsPreBalloon[] =
+{
+    SSMFIELD_ENTRY(         PGM, fMappingsFixed),
+    SSMFIELD_ENTRY_GCPTR(   PGM, GCPtrMappingFixed),
+    SSMFIELD_ENTRY(         PGM, cbMappingFixed),
+    SSMFIELD_ENTRY(         PGM, cBalloonedPages),
     SSMFIELD_ENTRY_TERM()
 };
@@ -2755 +2768 @@
     if (uVersion >= PGM_SAVED_STATE_VERSION_3_0_0)
     {
-        rc = SSMR3GetStruct(pSSM, pPGM, &s_aPGMFields[0]);
+        if (uVersion > PGM_SAVED_STATE_VERSION_PRE_BALLOON)
+        {
+            rc = SSMR3GetStruct(pSSM, pPGM, &s_aPGMFields[0]);
+            if (    RT_SUCCESS(rc)
+                &&  pVM->pgm.s.cBalloonedPages)
+            {
+                rc = GMMR3BalloonedPages(pVM, GMMBALLOONACTION_INFLATE, pVM->pgm.s.cBalloonedPages);
+                AssertRC(rc);
+            }
+        }
+        else
+            rc = SSMR3GetStruct(pSSM, pPGM, &s_aPGMFieldsPreBalloon[0]);
+
         AssertLogRelRCReturn(rc, rc);
 
@@ -2885 +2910 @@
     if (   (   uPass != SSM_PASS_FINAL
             && uVersion != PGM_SAVED_STATE_VERSION
+            && uVersion != PGM_SAVED_STATE_VERSION_PRE_BALLOON
             && uVersion != PGM_SAVED_STATE_VERSION_NO_RAM_CFG)
         || (   uVersion != PGM_SAVED_STATE_VERSION
+            && uVersion != PGM_SAVED_STATE_VERSION_PRE_BALLOON
             && uVersion != PGM_SAVED_STATE_VERSION_NO_RAM_CFG
             && uVersion != PGM_SAVED_STATE_VERSION_3_0_0

trunk/src/VBox/VMM/VMMR0/GMMR0.cpp

@@ -2838 +2838 @@
  *
  * The request may or may not have been initiated by the GMM. If it was initiated
- * by the GMM it is important that this function is called even if no pages was
+ * by the GMM it is important that this function is called even if no pages were
  * ballooned.
  *
  * @returns VBox status code:
  * @retval  VERR_GMM_ATTEMPT_TO_FREE_TOO_MUCH
- * @retval  VERR_GMM_ATTEMPT_TO_DEFLATE_TOO_MUCH
+ * @retval  VERR_GMM_ATTEMPT_TO_DEFLATE_TOO_MUCH 
  * @retval  VERR_GMM_OVERCOMMITED_TRY_AGAIN_IN_A_BIT - reset condition
- *          indicating that we won't neceessarily have sufficient RAM to boot
+ *          indicating that we won't necessarily have sufficient RAM to boot
  *          the VM again and that it should pause until this changes (we'll try
  *          balloon some other VM).  (For standard deflate we have little choice