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

Timestamp:

May 13, 2009 3:06:00 PM (16 years ago)

Author:

vboxsync

Message:

Protect the MM hypervisor heap with a critical section.

File:

• trunk/src/VBox/VMM/VMMAll/MMAllHyper.cpp (modified) (6 diffs)

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

@@ -152 +152 @@
 #endif
 
+/**
+ * Locks the hypervisor heap.
+ * This might call back to Ring-3 in order to deal with lock contention in GC and R3.
+ *
+ * @param   pVM     The VM handle.
+ */
+VMMDECL(int) MMHyperLock(PVM pVM)
+{
+    PMMHYPERHEAP pHeap = pVM->mm.s.CTX_SUFF(pHyperHeap);
+
+#ifdef IN_RING3
+    if (!PDMCritSectIsInitialized(&pHeap->Lock))
+        return VINF_SUCCESS;     /* early init */
+
+    int rc = PDMCritSectEnter(&pHeap->Lock, VERR_INTERNAL_ERROR);
+#else
+    Assert(PDMCritSectIsInitialized(&pHeap->Lock));
+    int rc = PDMCritSectEnter(&pHeap->Lock, VERR_GENERAL_FAILURE);
+    if (rc == VERR_GENERAL_FAILURE)
+    {
+# ifdef IN_RC
+        rc = VMMGCCallHost(pVM, VMMCALLHOST_MMHYPER_LOCK, 0);
+# else
+        rc = VMMR0CallHost(pVM, VMMCALLHOST_MMHYPER_LOCK, 0);
+# endif
+    }
+#endif
+    AssertRC(rc);
+    return rc;
+}
+
+
+/**
+ * Unlocks the hypervisor heap.
+ *
+ * @param   pVM     The VM handle.
+ */
+VMMDECL(void) MMHyperUnlock(PVM pVM)
+{
+    PMMHYPERHEAP pHeap = pVM->mm.s.CTX_SUFF(pHyperHeap);
+
+#ifdef IN_RING3
+    if (!PDMCritSectIsInitialized(&pHeap->Lock))
+        return;     /* early init */
+#endif
+    Assert(PDMCritSectIsInitialized(&pHeap->Lock));
+    PDMCritSectLeave(&pHeap->Lock);
+}
 
 /**
@@ -166 +214 @@
  * @param   ppv         Where to store the address to the allocated
  *                      memory.
- * @remark  This is assumed not to be used at times when serialization is required.
- */
-VMMDECL(int) MMHyperAlloc(PVM pVM, size_t cb, unsigned uAlignment, MMTAG enmTag, void **ppv)
+ */
+static int mmHyperAllocInternal(PVM pVM, size_t cb, unsigned uAlignment, MMTAG enmTag, void **ppv)
 {
     AssertMsg(cb >= 8, ("Hey! Do you really mean to allocate less than 8 bytes?! cb=%d\n", cb));
@@ -282 +329 @@
 }
 
-
+/**
+ * Wrapper for mmHyperAllocInternal
+ */
+VMMDECL(int) MMHyperAlloc(PVM pVM, size_t cb, unsigned uAlignment, MMTAG enmTag, void **ppv)
+{
+    int rc;
+
+    rc = MMHyperLock(pVM);
+    AssertRCReturn(rc, rc);
+
+    rc = mmHyperAllocInternal(pVM, cb, uAlignment, enmTag, ppv);
+
+    MMHyperUnlock(pVM);
+    return rc;
+}
 
 /**
@@ -705 +766 @@
  * @remark  Try avoid free hyper memory.
  */
-VMMDECL(int) MMHyperFree(PVM pVM, void *pv)
+static int mmHyperFreeInternal(PVM pVM, void *pv)
 {
     Log2(("MMHyperFree: pv=%p\n", pv));
@@ -758 +819 @@
                     ("%p: u32Magic=%#x\n", pv, pHeap->u32Magic),
                     VERR_INVALID_POINTER);
-Assert(pHeap == pVM->mm.s.CTX_SUFF(pHyperHeap));
+    Assert(pHeap == pVM->mm.s.CTX_SUFF(pHyperHeap));
 
     /* Some more verifications using additional info from pHeap. */
@@ -844 +905 @@
 #endif
 
+    return rc;
+}
+
+
+/**
+ * Wrapper for mmHyperFreeInternal
+ */
+VMMDECL(int) MMHyperFree(PVM pVM, void *pv)
+{
+    int rc;
+
+    rc = MMHyperLock(pVM);
+    AssertRCReturn(rc, rc);
+
+    rc = mmHyperFreeInternal(pVM, pv);
+
+    MMHyperUnlock(pVM);
     return rc;
 }