Changeset 18880 in vbox

Timestamp:

Apr 14, 2009 9:42:01 AM (16 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

45904

Message:

PGM/MM: Implemented the /RamPreAlloc CFGM option.

Location:

trunk/src/VBox/VMM

Files:

• MM.cpp (modified) (1 diff)
• PGM.cpp (modified) (2 diffs)
• PGMInternal.h (modified) (3 diffs)
• PGMPhys.cpp (modified) (6 diffs)
• VMMAll/PGMAllPhys.cpp (modified) (1 diff)

trunk/src/VBox/VMM/MM.cpp

@@ -429 +429 @@
     else
         rc = PGMR3PhysRegisterRam(pVM, 0, RT_MIN(cbRam, offRamHole), "Base RAM");
-    if (    RT_SUCCESS(rc)
-        &&  fPreAlloc)
-    {
-        /** @todo RamPreAlloc should be handled at the very end of the VM creation. (lazy bird) */
-        return VM_SET_ERROR(pVM, VERR_NOT_IMPLEMENTED, "TODO: RamPreAlloc");
-    }
 
     /*

trunk/src/VBox/VMM/PGM.cpp

@@ -1209 +1209 @@
     }
 
-    rc = CFGMR3QueryBoolDef(pCfgPGM, "RamPreAlloc", &pVM->pgm.s.fRamPreAlloc, false);
+    rc = CFGMR3QueryBoolDef(CFGMR3GetRoot(pVM), "RamPreAlloc", &pVM->pgm.s.fRamPreAlloc, false);
     AssertLogRelRCReturn(rc, rc);
 
@@ -1873 +1873 @@
     else
         pVM->pgm.s.GCPhys4MBPSEMask = RT_BIT_64(32) - 1;
+
+    /*
+     * Allocate memory if we're supposed to do that.
+     */
+    if (pVM->pgm.s.fRamPreAlloc)
+        rc = pgmR3PhysRamPreAllocate(pVM);
 
     LogRel(("PGMR3InitFinalize: 4 MB PSE mask %RGp\n", pVM->pgm.s.GCPhys4MBPSEMask));

trunk/src/VBox/VMM/PGMInternal.h

@@ -2833 +2833 @@
 
 
+int             pgmPhysAllocPage(PVM pVM, PPGMPAGE pPage, RTGCPHYS GCPhys);
 int             pgmPhysPageLoadIntoTlb(PPGM pPGM, RTGCPHYS GCPhys);
 int             pgmPhysPageLoadIntoTlbWithPage(PPGM pPGM, PPGMPAGE pPage, RTGCPHYS GCPhys);
@@ -2843 +2844 @@
 VMMDECL(int)    pgmPhysRomWriteHandler(PVM pVM, RTGCUINT uErrorCode, PCPUMCTXCORE pRegFrame, RTGCPTR pvFault, RTGCPHYS GCPhysFault, void *pvUser);
 #ifdef IN_RING3
-int             pgmR3PhysChunkMap(PVM pVM, uint32_t idChunk, PPPGMCHUNKR3MAP ppChunk);
 void            pgmR3PhysRelinkRamRanges(PVM pVM);
+int             pgmR3PhysRamPreAllocate(PVM pVM);
 int             pgmR3PhysRamReset(PVM pVM);
 int             pgmR3PhysRomReset(PVM pVM);
+int             pgmR3PhysChunkMap(PVM pVM, uint32_t idChunk, PPPGMCHUNKR3MAP ppChunk);
 
 int             pgmR3PoolInit(PVM pVM);
@@ -2882 +2884 @@
 #endif
 
+int             pgmR3ExitShadowModeBeforePoolFlush(PVM pVM);
+int             pgmR3ReEnterShadowModeAfterPoolFlush(PVM pVM);
+
 void            pgmMapSetShadowPDEs(PVM pVM, PPGMMAPPING pMap, unsigned iNewPDE);
 void            pgmMapClearShadowPDEs(PVM pVM, PPGMPOOLPAGE pShwPageCR3, PPGMMAPPING pMap, unsigned iOldPDE, bool fDeactivateCR3);

trunk/src/VBox/VMM/PGMPhys.cpp

@@ -1019 +1019 @@
     REMR3NotifyPhysRamRegister(pVM, GCPhys, cb, REM_NOTIFY_PHYS_RAM_FLAGS_RAM);
 
+    return VINF_SUCCESS;
+}
+
+
+/**
+ * Worker called by PGMR3InitFinalize if we're configured to pre-allocate RAM.
+ *
+ * We do this late in the init process so that all the ROM and MMIO ranges have
+ * been registered already and we don't go wasting memory on them.
+ *
+ * @returns VBox status code.
+ *
+ * @param   pVM     Pointer to the shared VM structure.
+ */
+int pgmR3PhysRamPreAllocate(PVM pVM)
+{
+    Assert(pVM->pgm.s.fRamPreAlloc);
+    Log(("pgmR3PhysRamPreAllocate: enter\n"));
+
+    /*
+     * Walk the RAM ranges and allocate all RAM pages, halt at
+     * the first allocation error.
+     */
+    uint64_t cPages = 0;
+    uint64_t NanoTS = RTTimeNanoTS();
+    pgmLock(pVM);
+    for (PPGMRAMRANGE pRam = pVM->pgm.s.pRamRangesR3; pRam; pRam = pRam->pNextR3)
+    {
+        PPGMPAGE    pPage  = &pRam->aPages[0];
+        RTGCPHYS    GCPhys = pRam->GCPhys;
+        uint32_t    cLeft  = pRam->cb >> PAGE_SHIFT;
+        while (cLeft-- > 0)
+        {
+            if (PGM_PAGE_GET_TYPE(pPage) == PGMPAGETYPE_RAM)
+            {
+                switch (PGM_PAGE_GET_STATE(pPage))
+                {
+                    case PGM_PAGE_STATE_ZERO:
+                    {
+                        int rc = pgmPhysAllocPage(pVM, pPage, GCPhys);
+                        if (RT_FAILURE(rc))
+                        {
+                            LogRel(("PGM: RAM Pre-allocation failed at %RGp (in %s) with rc=%Rrc\n", GCPhys, pRam->pszDesc, rc));
+                            pgmUnlock(pVM);
+                            return rc;
+                        }
+                        cPages++;
+                        break;
+                    }
+
+                    case PGM_PAGE_STATE_ALLOCATED:
+                    case PGM_PAGE_STATE_WRITE_MONITORED:
+                    case PGM_PAGE_STATE_SHARED:
+                        /* nothing to do here. */
+                        break;
+                }
+            }
+
+            /* next */
+            pPage++;
+            GCPhys += PAGE_SIZE;
+        }
+    }
+    pgmUnlock(pVM);
+    NanoTS = RTTimeNanoTS() - NanoTS;
+
+    LogRel(("PGM: Pre-allocated %llu pages in %llu ms\n", cPages, NanoTS / 1000000));
+    Log(("pgmR3PhysRamPreAllocate: returns VINF_SUCCESS\n"));
     return VINF_SUCCESS;
 }
@@ -1489 +1557 @@
     int rc = MMR3AdjustFixedReservation(pVM, cPages, pszDesc);
     if (RT_SUCCESS(rc))
-    {    
+    {
         void *pvPages;
         PSUPPAGE paPages = (PSUPPAGE)RTMemTmpAlloc(cPages * sizeof(SUPPAGE));
@@ -1497 +1565 @@
         {
             memset(pvPages, 0, cPages * PAGE_SIZE);
-    
+
             /*
              * Create the MMIO2 range record for it.
@@ -1520 +1588 @@
                 pNew->RamRange.cb           = cb;
                 //pNew->RamRange.fFlags     = 0; /// @todo MMIO2 flag?
-    
+
                 pNew->RamRange.pvR3         = pvPages;
-    
+
                 uint32_t iPage = cPages;
                 while (iPage-- > 0)
@@ -1530 +1598 @@
                                   PGMPAGETYPE_MMIO2, PGM_PAGE_STATE_ALLOCATED);
                 }
-    
+
                 /* update page count stats */
                 pVM->pgm.s.cAllPages     += cPages;
                 pVM->pgm.s.cPrivatePages += cPages;
-    
+
                 /*
                  * Link it into the list.
@@ -1541 +1609 @@
                 pNew->pNextR3 = pVM->pgm.s.pMmio2RangesR3;
                 pVM->pgm.s.pMmio2RangesR3 = pNew;
-    
+
                 *ppv = pvPages;
                 RTMemTmpFree(paPages);
                 return VINF_SUCCESS;
             }
-    
+
             SUPR3PageFreeEx(pvPages, cPages);
         }

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

@@ -334 +334 @@
  *
  * @remarks This function shouldn't really fail, however if it does
- *          it probably means we've screwed up the size of the amount
- *          and/or the low-water mark of handy pages. Or, that some
- *          device I/O is causing a lot of pages to be allocated while
- *          while the host is in a low-memory condition.
+ *          it probably means we've screwed up the size of handy pages and/or
+ *          the low-water mark. Or, that some device I/O is causing a lot of
+ *          pages to be allocated while while the host is in a low-memory
+ *          condition. This latter should be handled elsewhere and in a more
+ *          controlled manner, it's on the @bugref{3170} todo list...
  */
 int pgmPhysAllocPage(PVM pVM, PPGMPAGE pPage, RTGCPHYS GCPhys)