Changeset 19488 in vbox for trunk

Timestamp:

May 7, 2009 1:54:51 PM (16 years ago)

Author:

vboxsync

Message:

Made pgmPoolSyncCR3 a bit more SMP safe (pgmPoolClearAll still to be done).

Location:

trunk/src/VBox/VMM

Files:

• PGMInternal.h (modified) (1 diff)
• VMMAll/PGMAllPool.cpp (modified) (4 diffs)

trunk/src/VBox/VMM/PGMInternal.h

@@ -2939 +2939 @@
 int             pgmPoolMonitorChainFlush(PPGMPOOL pPool, PPGMPOOLPAGE pPage);
 void            pgmPoolMonitorModifiedInsert(PPGMPOOL pPool, PPGMPOOLPAGE pPage);
-void            pgmPoolMonitorModifiedClearAll(PVM pVM);
 #endif
 

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

@@ -1914 +1914 @@
 void pgmPoolMonitorModifiedClearAll(PVM pVM)
 {
+    pgmLock(pVM);
     PPGMPOOL pPool = pVM->pgm.s.CTX_SUFF(pPool);
     LogFlow(("pgmPoolMonitorModifiedClearAll: cModifiedPages=%d\n", pPool->cModifiedPages));
@@ -1931 +1932 @@
     AssertMsg(cPages == pPool->cModifiedPages, ("%d != %d\n", cPages, pPool->cModifiedPages));
     pPool->cModifiedPages = 0;
+    pgmUnlock(pVM);
 }
 
@@ -2078 +2080 @@
      * sometimes refered to as a 'lightweight flush'.
      */
-    if (!(pVM->pgm.s.fGlobalSyncFlags & PGM_GLOBAL_SYNC_CLEAR_PGM_POOL))
-        pgmPoolMonitorModifiedClearAll(pVM);
-    else
-    {
 # ifdef IN_RING3 /* Don't flush in ring-0 or raw mode, it's taking too long. */
+    if (ASMBitTestAndClear(&pVM->pgm.s.fGlobalSyncFlags, PGM_GLOBAL_SYNC_CLEAR_PGM_POOL))
+    {
         /** @todo SMP support! */
         Assert(pVM->cCPUs == 1);
-        pVM->pgm.s.fGlobalSyncFlags &= ~PGM_GLOBAL_SYNC_CLEAR_PGM_POOL;
         pgmPoolClearAll(pVM);
 # else  /* !IN_RING3 */
+    if (pVM->pgm.s.fGlobalSyncFlags & PGM_GLOBAL_SYNC_CLEAR_PGM_POOL)
+    {
         LogFlow(("SyncCR3: PGM_GLOBAL_SYNC_CLEAR_PGM_POOL is set -> VINF_PGM_SYNC_CR3\n"));
         VMCPU_FF_SET(VMMGetCpu(pVM), VMCPU_FF_PGM_SYNC_CR3); /** @todo no need to do global sync, right? */
@@ -2093 +2094 @@
 # endif /* !IN_RING3 */
     }
+    else
+        pgmPoolMonitorModifiedClearAll(pVM);
+
     return VINF_SUCCESS;
 }