Changeset 90991 in vbox for trunk/src

Timestamp:

Aug 30, 2021 9:49:20 AM (3 years ago)

Author:

vboxsync

Message:

VMM: Eliminated VMMCALLRING3_MMHYPER_LOCK. bugref:6695

Location:

trunk/src/VBox/VMM

Files:

• VMMAll/MMAllHyper.cpp (modified) (3 diffs)
• VMMR3/MMHyper.cpp (modified) (1 diff)
• VMMR3/VMM.cpp (modified) (1 diff)

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

@@ -166 +166 @@
     Assert(PDMCritSectIsInitialized(&pHeap->Lock));
 #endif
-    int rc = PDMCritSectEnter(pVM, &pHeap->Lock, VERR_SEM_BUSY);
-#ifdef IN_RING0
-    if (rc == VERR_SEM_BUSY)
-        rc = VMMRZCallRing3NoCpu(pVM, VMMCALLRING3_MMHYPER_LOCK, 0);
-#endif
-    AssertRC(rc);
+    int rc = PDMCritSectEnter(pVM, &pHeap->Lock, VINF_SUCCESS);
+    PDM_CRITSECT_RELEASE_ASSERT_RC(pVM, &pHeap->Lock, rc);
     return rc;
 }
@@ -934 +930 @@
 VMMDECL(int) MMHyperFree(PVMCC pVM, void *pv)
 {
-    int rc;
-
-    rc = mmHyperLock(pVM);
+    int rc = mmHyperLock(pVM);
     AssertRCReturn(rc, rc);
 
@@ -1218 +1212 @@
 {
 #ifdef MMHYPER_HEAP_STRICT
-    int rc;
-
-    rc = mmHyperLock(pVM);
+    int rc = mmHyperLock(pVM);
     AssertRC(rc);
     mmHyperHeapCheck(pVM->mm.s.CTX_SUFF(pHyperHeap));

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

@@ -411 +411 @@
     return false;
 }
-#endif /* !PGM_WITHOUT_MAPPINGS */
-
-
-/**
- * Service a VMMCALLRING3_MMHYPER_LOCK call.
- *
- * @returns VBox status code.
- * @param   pVM     The cross context VM structure.
- */
-VMMR3DECL(int) MMR3LockCall(PVM pVM)
-{
-    PMMHYPERHEAP pHeap = pVM->mm.s.CTX_SUFF(pHyperHeap);
-
-    int rc = PDMR3CritSectEnterEx(pVM, &pHeap->Lock, true /* fHostCall */);
-    AssertRC(rc);
-    return rc;
-}
-
-
-#ifndef PGM_WITHOUT_MAPPINGS
+
 
 /**

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

@@ -2550 +2550 @@
 
         /*
-         * Acquire the MM hypervisor heap lock.
-         */
-        case VMMCALLRING3_MMHYPER_LOCK:
-        {
-            pVCpu->vmm.s.rcCallRing3 = MMR3LockCall(pVM);
-            break;
-        }
-
-        /*
          * Set the VM error message.
          */