Changeset 102799 in vbox for trunk

Timestamp:

Jan 9, 2024 4:04:32 PM (13 months ago)

Author:

vboxsync

Message:

VMM/CPUM: bugref:10498 Check if the physical address fits before creating an MTRR mask (and region).

File:

• trunk/src/VBox/VMM/VMMR3/CPUM.cpp (modified) (2 diffs)

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

@@ -3369 +3369 @@
     if (pMtrrMap->idxMtrr < pMtrrMap->cMtrrs)
     {
-        pMtrrMap->aMtrrs[pMtrrMap->idxMtrr].MtrrPhysBase = GCPhysFirst | fType;
-        pMtrrMap->aMtrrs[pMtrrMap->idxMtrr].MtrrPhysMask = cpumR3GetVarMtrrMask(pVM, GCPhysFirst, GCPhysLast)
-                                                         | MSR_IA32_MTRR_PHYSMASK_VALID;
-        ++pMtrrMap->idxMtrr;
-
-        uint64_t const cbRange = GCPhysLast - GCPhysFirst + 1;
-        if (fType != X86_MTRR_MT_UC)
-            pMtrrMap->cbMapped += cbRange;
-        else
+        RTGCPHYS const GCPhysLastMax = RT_BIT_64(pVM->cpum.s.GuestFeatures.cMaxPhysAddrWidth) - 1U;
+        if (GCPhysLast <= GCPhysLastMax)
         {
-            Assert(pMtrrMap->cbMapped >= cbRange);
-            pMtrrMap->cbMapped -= cbRange;
+            pMtrrMap->aMtrrs[pMtrrMap->idxMtrr].MtrrPhysBase = GCPhysFirst | fType;
+            pMtrrMap->aMtrrs[pMtrrMap->idxMtrr].MtrrPhysMask = cpumR3GetVarMtrrMask(pVM, GCPhysFirst, GCPhysLast)
+                                                             | MSR_IA32_MTRR_PHYSMASK_VALID;
+            ++pMtrrMap->idxMtrr;
+
+            uint64_t const cbRange = GCPhysLast - GCPhysFirst + 1;
+            if (fType != X86_MTRR_MT_UC)
+                pMtrrMap->cbMapped += cbRange;
+            else
+            {
+                Assert(pMtrrMap->cbMapped >= cbRange);
+                pMtrrMap->cbMapped -= cbRange;
+            }
+            return VINF_SUCCESS;
         }
-        return VINF_SUCCESS;
     }
     return VERR_OUT_OF_RESOURCES;
@@ -3787 +3791 @@
      */
     uint32_t const cbRamHole = MMR3PhysGet4GBRamHoleSize(pVM);
-    AssertMsg(cbRamHole <= 4032U * _1M, ("RAM hole size (%u bytes) is too large\n", cbRamHole));
-    AssertMsg(cbRamHole > 16 * _1M,     ("RAM hole size (%u byets) is too small\n", cbRamHole));
-    AssertMsg(!(cbRamHole & (_4M - 1)), ("RAM hole size (%u bytes) must be 4MB aligned\n", cbRamHole));
+    AssertMsg(cbRamHole <= 4032U * _1M, ("RAM hole size (%RU32 bytes) is too large\n", cbRamHole));
+    AssertMsg(cbRamHole > 16 * _1M,     ("RAM hole size (%RU32 byets) is too small\n", cbRamHole));
+    AssertMsg(!(cbRamHole & (_4M - 1)), ("RAM hole size (%RU32 bytes) must be 4MB aligned\n", cbRamHole));
+
+    /*
+     * Paranoia.
+     * Ensure the maximum physical-address width can accomodate the specified RAM size.
+     */
+    RTGCPHYS const GCPhysEndMax = RT_BIT_64(pVM->cpum.s.GuestFeatures.cMaxPhysAddrWidth);
+    RTGCPHYS const GCPhysEnd    = cbRam + cbRamHole;
+    if (GCPhysEnd <= GCPhysEndMax)
+    { /* likely */ }
+    else
+    {
+        LogRel(("CPUM: WARNING! Cannot fully map RAM of %' Rhcb (%RU64 bytes) as it exceeds maximum physical-address (%#RX64)\n",
+                cbRam, cbRam, cbRamHole, cbRamHole, GCPhysEndMax - 1));
+    }
 
     /*