Changeset 90992 in vbox

Timestamp:

Aug 30, 2021 9:52:14 AM (3 years ago)

Author:

vboxsync

Message:

VMM: Eliminated VMMCALLRING3_PGM_LOCK. bugref:6695

Location:

trunk

Files:

• include/VBox/vmm/pgm.h (modified) (1 diff)
• src/VBox/VMM/VMMAll/PGMAll.cpp (modified) (1 diff)
• src/VBox/VMM/VMMR3/PGM.cpp (modified) (1 diff)
• src/VBox/VMM/VMMR3/VMM.cpp (modified) (1 diff)

trunk/include/VBox/vmm/pgm.h

@@ -722 +722 @@
 VMMR3_INT_DECL(void)    PGMR3MemSetup(PVM pVM, bool fReset);
 VMMR3DECL(int)      PGMR3Term(PVM pVM);
-VMMR3DECL(int)      PGMR3LockCall(PVM pVM);
 
 VMMR3DECL(int)      PGMR3PhysRegisterRam(PVM pVM, RTGCPHYS GCPhys, RTGCPHYS cb, const char *pszDesc);

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

@@ -3527 +3527 @@
 {
 #if defined(VBOX_STRICT)
-    int rc = PDMCritSectEnterDebug(pVM, &pVM->pgm.s.CritSectX, VERR_SEM_BUSY, (uintptr_t)ASMReturnAddress(), RT_SRC_POS_ARGS);
+    int rc = PDMCritSectEnterDebug(pVM, &pVM->pgm.s.CritSectX, VINF_SUCCESS, (uintptr_t)ASMReturnAddress(), RT_SRC_POS_ARGS);
 #else
-    int rc = PDMCritSectEnter(pVM, &pVM->pgm.s.CritSectX, VERR_SEM_BUSY);
+    int rc = PDMCritSectEnter(pVM, &pVM->pgm.s.CritSectX, VINF_SUCCESS);
 #endif
     if (RT_SUCCESS(rc))
         return rc;
-
-#ifdef IN_RING0
-    if (rc == VERR_SEM_BUSY)
-    {
-        rc = VMMRZCallRing3NoCpu(pVM, VMMCALLRING3_PGM_LOCK, 0);
-        if (RT_SUCCESS(rc))
-            return rc;
-    }
-#endif
     if (fVoid)
         PDM_CRITSECT_RELEASE_ASSERT_RC(pVM, &pVM->pgm.s.CritSectX, rc);

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

@@ -2366 +2366 @@
 
 /**
- * Service a VMMCALLRING3_PGM_LOCK call.
- *
- * @returns VBox status code.
- * @param   pVM     The cross context VM structure.
- */
-VMMR3DECL(int) PGMR3LockCall(PVM pVM)
-{
-    int rc = PDMR3CritSectEnterEx(pVM, &pVM->pgm.s.CritSectX, true /* fHostCall */);
-    AssertRC(rc);
-    return rc;
-}
-
-
-/**
  * Called by pgmPoolFlushAllInt prior to flushing the pool.
  *

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

@@ -2541 +2541 @@
 
         /*
-         * Acquire the PGM lock.
-         */
-        case VMMCALLRING3_PGM_LOCK:
-        {
-            pVCpu->vmm.s.rcCallRing3 = PGMR3LockCall(pVM);
-            break;
-        }
-
-        /*
          * Set the VM error message.
          */