Changeset 19675 in vbox for trunk

Timestamp:

May 14, 2009 8:08:42 AM (16 years ago)

Author:

vboxsync

Message:

Must acquire the pgm lock in pgm pool access handlers too.

Location:

trunk/src/VBox/VMM

Files:

• PGMPool.cpp (modified) (3 diffs)
• VMMAll/PGMAllPool.cpp (modified) (4 diffs)

trunk/src/VBox/VMM/PGMPool.cpp

@@ -528 +528 @@
      * We cannot flush a page if we're in an async thread because of REM notifications.
      */
+    pgmLock(pVM);
     if (!pVCpu)
     {
@@ -535 +536 @@
         if (!pPage->fReusedFlushPending)
         {
+            pgmUnlock(pVM);
             int rc = VMR3ReqCallEx(pPool->pVMR3, VMCPUID_ANY, NULL, 0, VMREQFLAGS_NO_WAIT | VMREQFLAGS_VOID, (PFNRT)pgmR3PoolFlushReusedPage, 2, pPool, pPage);
             AssertRCReturn(rc, rc);
+            pgmLock(pVM);
             pPage->fReusedFlushPending = true;
             pPage->cModifications += 0x1000;
         }
+
         pgmPoolMonitorChainChanging(pVCpu, pPool, pPage, GCPhys, pvPhys, NULL);
         /** @todo r=bird: making unsafe assumption about not crossing entries here! */
@@ -568 +572 @@
         STAM_PROFILE_STOP_EX(&pPool->StatMonitorR3, &pPool->StatMonitorR3FlushPage, a);
     }
-
+    pgmUnlock(pVM);
     return VINF_PGM_HANDLER_DO_DEFAULT;
 }

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

@@ -1118 +1118 @@
     AssertRCReturn(rc, rc);
 
+    pgmLock(pVM);
+
     /*
      * Check if it's worth dealing with.
@@ -1135 +1137 @@
              rc = pgmPoolAccessHandlerSimple(pVM, pVCpu, pPool, pPage, &Cpu, pRegFrame, GCPhysFault, pvFault);
              STAM_PROFILE_STOP_EX(&pVM->pgm.s.CTX_SUFF(pPool)->CTX_SUFF_Z(StatMonitor), &pPool->CTX_MID_Z(StatMonitor,Handled), a);
+             pgmUnlock(pVM);
              return rc;
         }
@@ -1157 +1160 @@
              rc = pgmPoolAccessHandlerSTOSD(pVM, pPool, pPage, &Cpu, pRegFrame, GCPhysFault, pvFault);
              STAM_PROFILE_STOP_EX(&pVM->pgm.s.CTX_SUFF(pPool)->CTX_SUFF_Z(StatMonitor), &pPool->CTX_MID_Z(StatMonitor,RepStosd), a);
+             pgmUnlock(pVM);
              return rc;
         }
@@ -1178 +1182 @@
         rc = VINF_SUCCESS;
     STAM_PROFILE_STOP_EX(&pVM->pgm.s.CTX_SUFF(pPool)->CTX_SUFF_Z(StatMonitor), &pPool->CTX_MID_Z(StatMonitor,FlushPage), a);
+    pgmUnlock(pVM);
     return rc;
 }