Changeset 107123 in vbox

Timestamp:

Nov 22, 2024 3:46:26 PM (8 weeks ago)

Author:

vboxsync

Message:

Main: Fix running VMs with less than 2GiB of RAM (r165896 regression)

Having too little RAM caused the pci-mmio region to be created below 4GiB,
which made queryMmioRegion return 0 and the page table setup code in the UEFI
fail because it would get confused by the entry having a 0 address and size and
leaving the page tables in a broken state.
Fixing that however doesn't work as the PCI MMIO space needs to be above 4GiB, so
ensure that the region will always be above 4GiB.

Location:

trunk/src/VBox/Main

Files:

• include/ResourceAssignmentManager.h (modified) (1 diff)
• src-client/ConsoleImplConfigArmV8.cpp (modified) (1 diff)
• src-client/ResourceAssignmentManager.cpp (modified) (6 diffs)

trunk/src/VBox/Main/include/ResourceAssignmentManager.h

@@ -64 +64 @@
     HRESULT assignMmioRegion(const char *pszName, RTGCPHYS cbRegion, PRTGCPHYS pGCPhysStart, PRTGCPHYS pcbRegion);
     HRESULT assignMmio32Region(const char *pszName, RTGCPHYS cbRegion, PRTGCPHYS pGCPhysStart, PRTGCPHYS pcbRegion);
+    HRESULT assignMmio64Region(const char *pszName, RTGCPHYS cbRegion, PRTGCPHYS pGCPhysStart, PRTGCPHYS pcbRegion);
 
     HRESULT assignInterrupts(const char *pszName, uint32_t cInterrupts, uint32_t *piInterruptFirst);

trunk/src/VBox/Main/src-client/ConsoleImplConfigArmV8.cpp

@@ -785 +785 @@
         hrc = pResMgr->assignMmioRegionAligned("pci-pio",    _64K, _64K, &GCPhysMmioStart,   &cbMmio, false /*fOnly32Bit*/); H();
         hrc = pResMgr->assignMmioRegion(       "pci-ecam",   16 * _1M,   &GCPhysPciMmioEcam, &cbPciMmioEcam);              H();
-        hrc = pResMgr->assignMmioRegion(       "pci-mmio",   _2G,        &GCPhysPciMmio,     &cbPciMmio);                  H();
+        hrc = pResMgr->assignMmio64Region(     "pci-mmio",   _2G,        &GCPhysPciMmio,     &cbPciMmio);                  H();
         hrc = pResMgr->assignMmio32Region(     "pci-mmio32", _256M,      &GCPhysPciMmio32,   &cbPciMmio32);                H();
 

trunk/src/VBox/Main/src-client/ResourceAssignmentManager.cpp

@@ -128 +128 @@
                    RTGCPHYS GCPhysStart, RTGCPHYS GCPhysEnd);
     HRESULT addAddrRange(const char *pszName, RESOURCEREGIONTYPE enmType, RTGCPHYS GCPhysStart, RTGCPHYS GCPhysEnd);
-    HRESULT findNextFreeAddrRange(RTGCPHYS cbRegion, RTGCPHYS cbAlignment, RTGCPHYS GCPhysMax, RTGCPHYS GCPhysHint,
+    HRESULT findNextFreeAddrRange(RTGCPHYS cbRegion, RTGCPHYS cbAlignment, RTGCPHYS GCPhysMin, RTGCPHYS GCPhysMax, RTGCPHYS GCPhysHint,
                                   PRTGCPHYS pGCPhysStart, PRTGCPHYS pcbRegion);
 
@@ -256 +256 @@
 
 
-HRESULT ResourceAssignmentManager::State::findNextFreeAddrRange(RTGCPHYS cbRegion, RTGCPHYS cbAlignment, RTGCPHYS GCPhysMax,
+HRESULT ResourceAssignmentManager::State::findNextFreeAddrRange(RTGCPHYS cbRegion, RTGCPHYS cbAlignment, RTGCPHYS GCPhysMin, RTGCPHYS GCPhysMax,
                                                                 RTGCPHYS GCPhysHint, PRTGCPHYS pGCPhysStart, PRTGCPHYS pcbRegion)
 {
@@ -275 +275 @@
             if (   pRegion->enmType == kResourceRegionType_Free
                 && GCPhysHint >= pRegion->GCPhysEnd
+                && GCPhysMin <= pRegion->GCPhysStart
                 && GCPhysMax >= pRegion->GCPhysEnd
                 && GCPhysStartAligned >= pRegion->GCPhysStart
@@ -287 +288 @@
         }
     }
+
+    while (   iRegion < m_cRegions
+           && GCPhysMin > m_paRegions[iRegion].GCPhysStart)
+        iRegion++;
 
     /* Find a free region which satisfies or requirements. */
@@ -395 +400 @@
     RTGCPHYS GCPhysRegionStart;
     RTGCPHYS cbRegionFinal;
-    HRESULT hrc = m_pState->findNextFreeAddrRange(cbRegion, cbAlignment, fOnly32Bit ? _4G : RTGCPHYS_MAX,
+    HRESULT hrc = m_pState->findNextFreeAddrRange(cbRegion, cbAlignment, 0 /*GCPhysMin*/, fOnly32Bit ? _4G : RTGCPHYS_MAX,
                                                   m_GCPhysMmioHint, &GCPhysRegionStart, &cbRegionFinal);
     if (SUCCEEDED(hrc))
@@ -417 +422 @@
 {
     return assignMmioRegionAligned(pszName, cbRegion, _4K, pGCPhysStart, pcbRegion, true /*fOnly32Bit*/);
+}
+
+
+HRESULT ResourceAssignmentManager::assignMmio64Region(const char *pszName, RTGCPHYS cbRegion, PRTGCPHYS pGCPhysStart, PRTGCPHYS pcbRegion)
+{
+    RTGCPHYS GCPhysRegionStart;
+    RTGCPHYS cbRegionFinal;
+    HRESULT hrc = m_pState->findNextFreeAddrRange(cbRegion, _4K, _4G /*GCPhysMin*/, RTGCPHYS_MAX,
+                                                  m_GCPhysMmioHint, &GCPhysRegionStart, &cbRegionFinal);
+    if (SUCCEEDED(hrc))
+    {
+        *pGCPhysStart = GCPhysRegionStart;
+        *pcbRegion    = cbRegionFinal;
+        return assignFixedMmioRegion(pszName, GCPhysRegionStart, cbRegion);
+    }
+
+    return hrc;
 }