Changeset 48410 in vbox for trunk/src/VBox/VMM/VMMAll

Timestamp:

Sep 10, 2013 2:22:51 PM (11 years ago)

Author:

vboxsync

Message:

IOMMMIOPhysHandler: Don't sit on the IOM lock.

File:

• trunk/src/VBox/VMM/VMMAll/IOMAllMMIO.cpp (modified) (2 diffs)

trunk/src/VBox/VMM/VMMAll/IOMAllMMIO.cpp

@@ -1759 +1759 @@
 VMMDECL(VBOXSTRICTRC) IOMMMIOPhysHandler(PVM pVM, PVMCPU pVCpu, RTGCUINT uErrorCode, PCPUMCTXCORE pCtxCore, RTGCPHYS GCPhysFault)
 {
+    /*
+     * We don't have a range here, so look it up before calling the common function.
+     */
     int rc2 = IOM_LOCK_SHARED(pVM); NOREF(rc2);
 #ifndef IN_RING3
@@ -1764 +1767 @@
         return VINF_IOM_R3_MMIO_READ_WRITE;
 #endif
-    VBOXSTRICTRC rcStrict = iomMMIOHandler(pVM, pVCpu, (uint32_t)uErrorCode, pCtxCore, GCPhysFault,
-                                           iomMmioGetRange(pVM, pVCpu, GCPhysFault));
+    PIOMMMIORANGE pRange = iomMmioGetRange(pVM, pVCpu, GCPhysFault);
+    if (RT_UNLIKELY(!pRange))
+    {
+        IOM_UNLOCK_SHARED(pVM);
+        return VERR_IOM_MMIO_RANGE_NOT_FOUND;
+    }
+    iomMmioRetainRange(pRange);
     IOM_UNLOCK_SHARED(pVM);
+
+    VBOXSTRICTRC rcStrict = iomMMIOHandler(pVM, pVCpu, (uint32_t)uErrorCode, pCtxCore, GCPhysFault, pRange);
+
+    iomMmioReleaseRange(pVM, pRange);
     return VBOXSTRICTRC_VAL(rcStrict);
 }