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

Timestamp:

May 7, 2009 12:05:40 PM (16 years ago)

Author:

vboxsync

Message:

Release the PGM lock when calling physical handlers (PGMPhysRead/Write). Deadlock prevent with IOM lock.

File:

• trunk/src/VBox/VMM/VMMAll/PGMAllPhys.cpp (modified) (4 diffs)

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

@@ -1420 +1420 @@
         Log5(("pgmPhysReadHandler: GCPhys=%RGp cb=%#x pPage=%R[pgmpage] phys %s\n", GCPhys, cb, pPage, R3STRING(pPhys->pszDesc) ));
         STAM_PROFILE_START(&pPhys->Stat, h);
+        Assert(PGMIsLockOwner(pVM));
+        /* Release the PGM lock as MMIO handlers take the IOM lock. (deadlock prevention) */
+        pgmUnlock(pVM);
         rc = pPhys->CTX_SUFF(pfnHandler)(pVM, GCPhys, (void *)pvSrc, pvBuf, cb, PGMACCESSTYPE_READ, pPhys->CTX_SUFF(pvUser));
+        pgmLock(pVM);
         STAM_PROFILE_STOP(&pPhys->Stat, h);
         AssertLogRelMsg(rc == VINF_SUCCESS || rc == VINF_PGM_HANDLER_DO_DEFAULT, ("rc=%Rrc GCPhys=%RGp\n", rc, GCPhys));
@@ -1646 +1650 @@
             {
                 STAM_PROFILE_START(&pCur->Stat, h);
+                Assert(PGMIsLockOwner(pVM));
+                /* Release the PGM lock as MMIO handlers take the IOM lock. (deadlock prevention) */
+                pgmUnlock(pVM);
                 rc = pCur->CTX_SUFF(pfnHandler)(pVM, GCPhys, pvDst, (void *)pvBuf, cbRange, PGMACCESSTYPE_WRITE, pCur->CTX_SUFF(pvUser));
+                pgmLock(pVM);
                 STAM_PROFILE_STOP(&pCur->Stat, h);
                 if (rc == VINF_PGM_HANDLER_DO_DEFAULT)
@@ -1845 +1853 @@
             Log5(("pgmPhysWriteHandler: GCPhys=%RGp cbRange=%#x pPage=%R[pgmpage] phys %s\n", GCPhys, cbRange, pPage, R3STRING(pPhys->pszDesc) ));
             STAM_PROFILE_START(&pPhys->Stat, h);
+            Assert(PGMIsLockOwner(pVM));
+            /* Release the PGM lock as MMIO handlers take the IOM lock. (deadlock prevention) */
+            pgmUnlock(pVM);
             rc = pPhys->CTX_SUFF(pfnHandler)(pVM, GCPhys, pvDst, (void *)pvBuf, cbRange, PGMACCESSTYPE_WRITE, pPhys->CTX_SUFF(pvUser));
+            pgmLock(pVM);
             STAM_PROFILE_STOP(&pPhys->Stat, h);
             AssertLogRelMsg(rc == VINF_SUCCESS || rc == VINF_PGM_HANDLER_DO_DEFAULT, ("rc=%Rrc GCPhys=%RGp pPage=%R[pgmpage] %s\n", rc, GCPhys, pPage, pPhys->pszDesc));
@@ -1902 +1914 @@
 
             STAM_PROFILE_START(&pPhys->Stat, h);
+            Assert(PGMIsLockOwner(pVM));
+            /* Release the PGM lock as MMIO handlers take the IOM lock. (deadlock prevention) */
+            pgmUnlock(pVM);
             rc = pPhys->CTX_SUFF(pfnHandler)(pVM, GCPhys, pvDst, (void *)pvBuf, cbRange, PGMACCESSTYPE_WRITE, pPhys->CTX_SUFF(pvUser));
+            pgmLock(pVM);
             STAM_PROFILE_STOP(&pPhys->Stat, h);
             AssertLogRelMsg(rc == VINF_SUCCESS || rc == VINF_PGM_HANDLER_DO_DEFAULT, ("rc=%Rrc GCPhys=%RGp pPage=%R[pgmpage] %s\n", rc, GCPhys, pPage, pPhys->pszDesc));