Changeset 104840 in vbox for trunk/src/VBox/VMM/VMMR3/IOMR3Mmio.cpp

Timestamp:

Jun 5, 2024 12:59:51 AM (8 months ago)

Author:

vboxsync

Message:

VMM/PGM: Refactored RAM ranges, MMIO2 ranges and ROM ranges and added MMIO ranges (to PGM) so we can safely access RAM ranges at runtime w/o fear of them ever being freed up. It is now only possible to create these during VM creation and loading, and they will live till VM destruction (except for MMIO2 which could be destroyed during loading (PCNet fun)). The lookup handling is by table instead of pointer tree. No more ring-0 pointers in shared data. bugref:10687 bugref:10093

File:

• trunk/src/VBox/VMM/VMMR3/IOMR3Mmio.cpp (modified) (8 diffs)

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

@@ -275 +275 @@
     AssertPtrReturn(phRegion, VERR_INVALID_POINTER);
     *phRegion = UINT32_MAX;
-    VM_ASSERT_EMT0_RETURN(pVM, VERR_VM_THREAD_NOT_EMT);
+    PVMCPU const pVCpu = VMMGetCpu(pVM);
+    AssertReturn(pVCpu && pVCpu->idCpu == 0, VERR_VM_THREAD_NOT_EMT);
     VM_ASSERT_STATE_RETURN(pVM, VMSTATE_CREATING, VERR_VM_INVALID_VM_STATE);
     AssertReturn(!pVM->iom.s.fMmioFrozen, VERR_WRONG_ORDER);
@@ -324 +325 @@
         AssertReturn(idx == pVM->iom.s.cMmioRegs, VERR_IOM_MMIO_IPE_1);
     }
+
+    /*
+     * Create a matching ad-hoc RAM range for this MMIO region.
+     */
+    uint16_t idRamRange = 0;
+    int rc = PGMR3PhysMmioRegister(pVM, pVCpu, cbRegion, pszDesc, &idRamRange);
+    AssertRCReturn(rc,  rc);
 
     /*
@@ -341 +349 @@
     pVM->iom.s.paMmioRegs[idx].fMapped            = false;
     pVM->iom.s.paMmioRegs[idx].fFlags             = fFlags;
+    pVM->iom.s.paMmioRegs[idx].idRamRange         = idRamRange;
     pVM->iom.s.paMmioRegs[idx].idxSelf            = idx;
 
@@ -409 +418 @@
                         /* Register with PGM before we shuffle the array: */
                         ASMAtomicWriteU64(&pRegEntry->GCPhysMapping, GCPhys);
-                        rc = PGMR3PhysMmioRegister(pVM, pVCpu, GCPhys, cbRegion, pVM->iom.s.hNewMmioHandlerType,
-                                                   hRegion, pRegEntry->pszDesc);
+                        rc = PGMR3PhysMmioMap(pVM, pVCpu, GCPhys, cbRegion, pRegEntry->idRamRange,
+                                              pVM->iom.s.hNewMmioHandlerType, hRegion);
                         AssertRCReturnStmt(rc, ASMAtomicWriteU64(&pRegEntry->GCPhysMapping, NIL_RTGCPHYS); IOM_UNLOCK_EXCL(pVM), rc);
 
@@ -428 +437 @@
                         /* Register with PGM before we shuffle the array: */
                         ASMAtomicWriteU64(&pRegEntry->GCPhysMapping, GCPhys);
-                        rc = PGMR3PhysMmioRegister(pVM, pVCpu, GCPhys, cbRegion, pVM->iom.s.hNewMmioHandlerType,
-                                                   hRegion, pRegEntry->pszDesc);
+                        rc = PGMR3PhysMmioMap(pVM, pVCpu, GCPhys, cbRegion, pRegEntry->idRamRange,
+                                              pVM->iom.s.hNewMmioHandlerType, hRegion);
                         AssertRCReturnStmt(rc, ASMAtomicWriteU64(&pRegEntry->GCPhysMapping, NIL_RTGCPHYS); IOM_UNLOCK_EXCL(pVM), rc);
 
@@ -455 +464 @@
             /* First entry in the lookup table: */
             ASMAtomicWriteU64(&pRegEntry->GCPhysMapping, GCPhys);
-            rc = PGMR3PhysMmioRegister(pVM, pVCpu, GCPhys, cbRegion, pVM->iom.s.hNewMmioHandlerType, hRegion, pRegEntry->pszDesc);
+            rc = PGMR3PhysMmioMap(pVM, pVCpu, GCPhys, cbRegion, pRegEntry->idRamRange,
+                                  pVM->iom.s.hNewMmioHandlerType, hRegion);
             AssertRCReturnStmt(rc, ASMAtomicWriteU64(&pRegEntry->GCPhysMapping, NIL_RTGCPHYS); IOM_UNLOCK_EXCL(pVM), rc);
 
@@ -572 +582 @@
                 pVM->iom.s.cMmioLookupEntries = cEntries - 1;
 
-                rc = PGMR3PhysMmioDeregister(pVM, pVCpu, GCPhys, pRegEntry->cbRegion);
+                rc = PGMR3PhysMmioUnmap(pVM, pVCpu, GCPhys, pRegEntry->cbRegion, pRegEntry->idRamRange);
                 AssertRC(rc);
 
@@ -622 +632 @@
 {
     RT_NOREF(pVM, pDevIns, hRegion, cbRegion);
+    AssertFailed();
     return VERR_NOT_IMPLEMENTED;
 }