Changeset 92719 in vbox

Timestamp:

Dec 2, 2021 10:40:31 PM (3 years ago)

Author:

vboxsync

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

148620

Message:

VMM/IOM: Driverless adjustments to IOM init code running after ring-0 init. bugref:10138

Location:

trunk/src/VBox/VMM

Files:

• VMMR3/IOM.cpp (modified) (2 diffs)
• VMMR3/IOMR3IoPort.cpp (modified) (1 diff)
• VMMR3/IOMR3Mmio.cpp (modified) (1 diff)
• include/IOMInternal.h (modified) (2 diffs)

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

@@ -216 +216 @@
          * later calls to grow the statistics tables will fail.
          */
-        int rc = VMMR3CallR0Emt(pVM, pVM->apCpusR3[0], VMMR0_DO_IOM_SYNC_STATS_INDICES, 0, NULL);
-        AssertLogRelRCReturn(rc, rc);
+        if (!SUPR3IsDriverless())
+        {
+            int rc = VMMR3CallR0Emt(pVM, pVM->apCpusR3[0], VMMR0_DO_IOM_SYNC_STATS_INDICES, 0, NULL);
+            AssertLogRelRCReturn(rc, rc);
+        }
 
         /*
@@ -242 +245 @@
     RT_NOREF(pVM, enmWhat);
 #endif
+
+    /*
+     * Freeze I/O port and MMIO registrations.
+     */
+    pVM->iom.s.fIoPortsFrozen = true;
+    pVM->iom.s.fMmioFrozen    = true;
     return VINF_SUCCESS;
 }

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

@@ -356 +356 @@
     VM_ASSERT_EMT0_RETURN(pVM, VERR_VM_THREAD_NOT_EMT);
     VM_ASSERT_STATE_RETURN(pVM, VMSTATE_CREATING, VERR_VM_INVALID_VM_STATE);
+    AssertReturn(!pVM->iom.s.fIoPortsFrozen, VERR_WRONG_ORDER);
 
     AssertPtrReturn(pDevIns, VERR_INVALID_POINTER);

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

@@ -267 +267 @@
     VM_ASSERT_EMT0_RETURN(pVM, 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);
 
     AssertPtrReturn(pDevIns, VERR_INVALID_POINTER);

trunk/src/VBox/VMM/include/IOMInternal.h

@@ -401 +401 @@
      * There is a parallel table in ring-0, IOMR0PERVM::paIoPortRegs. */
     R3PTRTYPE(PIOMIOPORTENTRYR3)    paIoPortRegs;
+    /** I/O port lookup table. */
+    R3PTRTYPE(PIOMIOPORTLOOKUPENTRY) paIoPortLookup;
     /** Number of entries in the lookup table. */
     uint32_t                        cIoPortLookupEntries;
-    uint32_t                        u32Padding1;
-    /** I/O port lookup table. */
-    R3PTRTYPE(PIOMIOPORTLOOKUPENTRY) paIoPortLookup;
+    /** Set if I/O port registrations are frozen. */
+    bool                            fIoPortsFrozen;
+    bool                            afPadding1[3];
 
     /** The number of valid entries in paioPortStats. */
@@ -429 +431 @@
      * There is a parallel table in ring-0, IOMR0PERVM::paMmioRegs. */
     R3PTRTYPE(PIOMMMIOENTRYR3)      paMmioRegs;
+    /** MMIO lookup table. */
+    R3PTRTYPE(PIOMMMIOLOOKUPENTRY)  paMmioLookup;
     /** Number of entries in the lookup table. */
     uint32_t                        cMmioLookupEntries;
-    uint32_t                        u32Padding2;
-    /** MMIO lookup table. */
-    R3PTRTYPE(PIOMMMIOLOOKUPENTRY)  paMmioLookup;
+    /** Set if MMIO registrations are frozen. */
+    bool                            fMmioFrozen;
+    bool                            afPadding2[3];
 
     /** The number of valid entries in paioPortStats. */