Changeset 37452 in vbox for trunk/src/VBox/VMM/include/IOMInline.h

Timestamp:

Jun 14, 2011 6:13:48 PM (13 years ago)

Author:

vboxsync

Message:

IOM,PDMCritSect: Extended PDMCritSectEnter to handle rcBusy=VINF_SUCCESS as a request to call ring-3 to acquire a busy lock. Implemented device level locking in the MMIO code.

File:

• trunk/src/VBox/VMM/include/IOMInline.h (modified) (5 diffs)

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

@@ -65 +65 @@
  * @param   GCPhys  Physical address to lookup.
  */
-DECLINLINE(PIOMMMIORANGE) iomMMIOGetRange(PVM pVM, RTGCPHYS GCPhys)
+DECLINLINE(PIOMMMIORANGE) iomMmioGetRange(PVM pVM, RTGCPHYS GCPhys)
 {
-    Assert(PDMCritSectIsOwner(&pVM->iom.s.EmtLock) || !PDMCritSectIsInitialized(&pVM->iom.s.EmtLock));
+    Assert(PDMCritSectIsOwner(&pVM->iom.s.EmtLock));
     PIOMMMIORANGE pRange = pVM->iom.s.CTX_SUFF(pMMIORangeLast);
     if (    !pRange
         ||  GCPhys - pRange->GCPhys >= pRange->cb)
-        pVM->iom.s.CTX_SUFF(pMMIORangeLast) = pRange 
+        pVM->iom.s.CTX_SUFF(pMMIORangeLast) = pRange
             = (PIOMMMIORANGE)RTAvlroGCPhysRangeGet(&pVM->iom.s.CTX_SUFF(pTrees)->MMIOTree, GCPhys);
     return pRange;
+}
+
+/**
+ * Retain a MMIO range.
+ *
+ * @param   pRange  The range to release.
+ */
+DECLINLINE(void) iomMmioRetainRange(PIOMMMIORANGE pRange)
+{
+    uint32_t cRefs = ASMAtomicIncU32(&pRange->cRefs);
+    Assert(cRefs > 1);
+    Assert(cRefs < _1M);
+}
+
+
+/**
+ * Gets the referenced MMIO range for the specified physical address in the
+ * current context.
+ *
+ * @returns Pointer to MMIO range.
+ * @returns NULL if address not in a MMIO range.
+ *
+ * @param   pVM     The VM handle.
+ * @param   GCPhys  Physical address to lookup.
+ */
+DECLINLINE(PIOMMMIORANGE) iomMmioGetRangeWithRef(PVM pVM, RTGCPHYS GCPhys)
+{
+    int rc = PDMCritSectEnter(&pVM->iom.s.EmtLock, VINF_SUCCESS);
+    AssertRCReturn(rc, NULL);
+
+    PIOMMMIORANGE pRange = pVM->iom.s.CTX_SUFF(pMMIORangeLast);
+    if (   !pRange
+        || GCPhys - pRange->GCPhys >= pRange->cb)
+        pVM->iom.s.CTX_SUFF(pMMIORangeLast) = pRange
+            = (PIOMMMIORANGE)RTAvlroGCPhysRangeGet(&pVM->iom.s.CTX_SUFF(pTrees)->MMIOTree, GCPhys);
+    if (pRange)
+        iomMmioRetainRange(pRange);
+
+    PDMCritSectLeave(&pVM->iom.s.EmtLock);
+    return pRange;
+}
+
+
+/**
+ * Releases a MMIO range.
+ *
+ * @param   pVM     The VM handle.
+ * @param   pRange  The range to release.
+ */
+DECLINLINE(void) iomMmioReleaseRange(PVM pVM, PIOMMMIORANGE pRange)
+{
+    uint32_t cRefs = ASMAtomicDecU32(&pRange->cRefs);
+    if (!cRefs)
+        iomMmioFreeRange(pVM, pRange);
 }
 
@@ -92 +146 @@
     if (    !pRange
         ||  GCPhys - pRange->GCPhys >= pRange->cb)
-        pVM->iom.s.CTX_SUFF(pMMIORangeLast) = pRange 
+        pVM->iom.s.CTX_SUFF(pMMIORangeLast) = pRange
             = (PIOMMMIORANGE)RTAvlroGCPhysRangeGet(&pVM->iom.s.CTX_SUFF(pTrees)->MMIOTree, GCPhys);
     return pRange;
@@ -113 +167 @@
  * @param   pRange      The MMIO range.
  */
-DECLINLINE(PIOMMMIOSTATS) iomMMIOGetStats(PVM pVM, RTGCPHYS GCPhys, PIOMMMIORANGE pRange)
+DECLINLINE(PIOMMMIOSTATS) iomMmioGetStats(PVM pVM, RTGCPHYS GCPhys, PIOMMMIORANGE pRange)
 {
-    Assert(PDMCritSectIsOwner(&pVM->iom.s.EmtLock));
+    PDMCritSectEnter(&pVM->iom.s.EmtLock, VINF_SUCCESS);
 
     /* For large ranges, we'll put everything on the first byte. */
@@ -125 +179 @@
         ||  pStats->Core.Key != GCPhys)
     {
-        pStats = (PIOMMMIOSTATS)RTAvloGCPhysGet(&pVM->iom.s.CTX_SUFF(pTrees)->MMIOStatTree, GCPhys);
+        pStats = (PIOMMMIOSTATS)RTAvloGCPhysGet(&pVM->iom.s.CTX_SUFF(pTrees)->MmioStatTree, GCPhys);
 # ifdef IN_RING3
         if (!pStats)
@@ -131 +185 @@
 # endif
     }
+
+    PDMCritSectLeave(&pVM->iom.s.EmtLock);
     return pStats;
 }