Changeset 92192 in vbox

Timestamp:

Nov 3, 2021 2:44:45 PM (3 years ago)

Author:

vboxsync

Message:

VMM/MM,DevPcArch: Split the base RAM allocation into conventional (< 640KB) and extended (>= 1MB) ranges, leaving the UMA w/o RAM range backing. This will fit better with NEM, esp. on linux. bugref:10122

Location:

trunk/src/VBox

Files:

• Devices/PC/DevPcArch.cpp (modified) (2 diffs)
• VMM/VMMR3/MM.cpp (modified) (3 diffs)

trunk/src/VBox/Devices/PC/DevPcArch.cpp

@@ -215 +215 @@
     RT_NOREF(pDevIns, pvUser, off);
     memset(pv, 0xff, cb);
-    return VINF_SUCCESS;
-}
-
-
-/**
- * @interface_method_impl{PDMDEVREG,pfnInitComplete,
- *      Turn RAM pages between 0xa0000 and 0xfffff into reserved memory.}
- */
-static DECLCALLBACK(int) pcarchInitComplete(PPDMDEVINS pDevIns)
-{
-    int             iRegion   = 0;
-    RTGCPHYS const  GCPhysEnd = 0x100000;
-    RTGCPHYS        GCPhysCur = 0x0a0000;
-    do
-    {
-        if (!PDMDevHlpPhysIsGCPhysNormal(pDevIns, GCPhysCur))
-            GCPhysCur += X86_PAGE_SIZE;
-        else
-        {
-            RTGCPHYS const GCPhysStart = GCPhysCur;
-            do
-                GCPhysCur += X86_PAGE_SIZE;
-            while (GCPhysCur < GCPhysEnd && PDMDevHlpPhysIsGCPhysNormal(pDevIns, GCPhysCur));
-
-            IOMMMIOHANDLE hMmioRegion;
-            int rc = PDMDevHlpMmioCreateAndMap(pDevIns, GCPhysStart, GCPhysCur - GCPhysStart,
-                                               pcarchReservedMemoryWrite, pcarchReservedMemoryRead,
-                                               IOMMMIO_FLAGS_READ_PASSTHRU | IOMMMIO_FLAGS_WRITE_PASSTHRU | IOMMMIO_FLAGS_ABS,
-                                               PDMDevHlpMMHeapAPrintf(pDevIns, MM_TAG_PGM_PHYS /* bad bird*/, "PC Arch Reserved #%u", iRegion),
-                                               &hMmioRegion);
-            AssertLogRelRCReturn(rc, rc);
-            iRegion++;
-        }
-    } while (GCPhysCur < GCPhysEnd);
-
     return VINF_SUCCESS;
 }
@@ -324 +289 @@
     /* .pfnDetach = */              NULL,
     /* .pfnQueryInterface = */      NULL,
-    /* .pfnInitComplete = */        pcarchInitComplete,
+    /* .pfnInitComplete = */        NULL,
     /* .pfnPowerOff = */            NULL,
     /* .pfnSoftReset = */           NULL,

trunk/src/VBox/VMM/VMMR3/MM.cpp

@@ -377 +377 @@
      * Make the initial memory reservation with GMM.
      */
-    uint64_t cBasePages = (cbRam >> PAGE_SHIFT) + pVM->mm.s.cBasePages;
+    uint32_t const cbUma      = _1M - 640*_1K;
+    uint64_t       cBasePages = ((cbRam - cbUma) >> PAGE_SHIFT) + pVM->mm.s.cBasePages;
     rc = GMMR3InitialReservation(pVM,
                                  RT_MAX(cBasePages + pVM->mm.s.cHandyPages, 1),
@@ -407 +408 @@
      */
     pVM->mm.s.cbRamHole = cbRamHole;
-    if (cbRam > offRamHole)
-    {
-        pVM->mm.s.cbRamBelow4GB = offRamHole;
-        rc = PGMR3PhysRegisterRam(pVM, 0, offRamHole, "Base RAM");
-        if (RT_SUCCESS(rc))
+
+    /* First the conventional memory: */
+    rc = PGMR3PhysRegisterRam(pVM, 0, RT_MIN(cbRam, 640*_1K), "Conventional RAM");
+    if (RT_SUCCESS(rc))
+    {
+        /* The extended memory from 1MiB up to 4GiB: */
+        if (cbRam > offRamHole)
         {
-            pVM->mm.s.cbRamAbove4GB = cbRam - offRamHole;
-            rc = PGMR3PhysRegisterRam(pVM, _4G, cbRam - offRamHole, "Above 4GB Base RAM");
+            pVM->mm.s.cbRamBelow4GB = offRamHole;
+            rc = PGMR3PhysRegisterRam(pVM, _1M, offRamHole - _1M, "Extended RAM");
+            if (RT_SUCCESS(rc))
+            {
+                /* Then all the memory above 4GiB: */
+                pVM->mm.s.cbRamAbove4GB = cbRam - offRamHole;
+                rc = PGMR3PhysRegisterRam(pVM, _4G, cbRam - offRamHole, "Above 4GB Base RAM");
+            }
         }
-    }
-    else
-    {
-        pVM->mm.s.cbRamBelow4GB = cbRam;
-        pVM->mm.s.cbRamAbove4GB = 0;
-        rc = PGMR3PhysRegisterRam(pVM, 0, cbRam, "Base RAM");
+        else
+        {
+            pVM->mm.s.cbRamBelow4GB = cbRam;
+            pVM->mm.s.cbRamAbove4GB = 0;
+            if (cbRam > _1M)
+                rc = PGMR3PhysRegisterRam(pVM, _1M, cbRam - _1M, "Extended RAM");
+        }
     }
 
@@ -608 +618 @@
     uint64_t cOld = pVM->mm.s.cBasePages;
     pVM->mm.s.cBasePages += cAddBasePages;
-    LogFlow(("MMR3IncreaseBaseReservation: +%RU64 (%RU64 -> %RU64\n", cAddBasePages, cOld, pVM->mm.s.cBasePages));
+    LogFlow(("MMR3IncreaseBaseReservation: +%RU64 (%RU64 -> %RU64)\n", cAddBasePages, cOld, pVM->mm.s.cBasePages));
     int rc = mmR3UpdateReservation(pVM);
     if (RT_FAILURE(rc))