Changeset 18354 in vbox

Timestamp:

Mar 26, 2009 10:17:20 PM (16 years ago)

Author:

vboxsync

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

45140

Message:

MMHyper: With lots of memory, we have to scale up the hyper heap size according to the memory size. We have extra expenses tracking memory we've mapped, this has to be accessible from R0. However, we don't really need this in RC, so it's one of the allocations we could put in a R3/R0 only heap later.

File:

• trunk/src/VBox/VMM/MMHyper.cpp (modified) (1 diff)

trunk/src/VBox/VMM/MMHyper.cpp

@@ -78 +78 @@
     int rc = CFGMR3QueryU32(CFGMR3GetChild(CFGMR3GetRoot(pVM), "MM"), "cbHyperHeap", &cbHyperHeap);
     if (rc == VERR_CFGM_NO_PARENT || rc == VERR_CFGM_VALUE_NOT_FOUND)
+    {
         cbHyperHeap = VMMIsHwVirtExtForced(pVM)
                     ? 640*_1K
                     : 1280*_1K;
-    else if (RT_FAILURE(rc))
-    {
-        LogRel(("MM/cbHyperHeap query -> %Rrc\n", rc));
-        AssertRCReturn(rc, rc);
-    }
+
+        /* Adjust for dynamic stuff like RAM mapping chunks. Try playing kind
+           of safe with existing configs here (HMA size must not change)... */
+        uint64_t cbRam;
+        CFGMR3QueryU64Def(CFGMR3GetRoot(pVM), "RamSize", &cbRam, 0);
+        if (cbRam > _2G)
+        {
+            cbRam = RT_MIN(cbRam, _1T);
+            cbHyperHeap += (cbRam - _1G) / _1M * 128; /* 128 is a quick guess */
+            cbHyperHeap = RT_ALIGN_32(cbHyperHeap, _64K);
+        }
+    }
+    else
+        AssertLogRelRCReturn(rc, rc);
     cbHyperHeap = RT_ALIGN_32(cbHyperHeap, PAGE_SIZE);
+    LogRel(("MM: cbHyperHeap=%#x (%u)\n", cbHyperHeap, cbHyperHeap));
 
     /*