Changeset 23372 in vbox for trunk/src/VBox

Timestamp:

Sep 28, 2009 12:46:22 PM (15 years ago)

Author:

vboxsync

Message:

pgmR3PoolClearAll.

Location:

trunk/src/VBox/VMM

Files:

• EMRaw.cpp (modified) (1 diff)
• PGMInternal.h (modified) (3 diffs)
• PGMPool.cpp (modified) (1 diff)
• VMMAll/PGMAllPool.cpp (modified) (9 diffs)

trunk/src/VBox/VMM/EMRaw.cpp

@@ -1332 +1332 @@
      * The CSAMR3CheckGates call in TRPMR3SyncIDT may call PGMPrefetchPage
      * and PGMShwModifyPage, so we're in for trouble if for instance a
-     * PGMSyncCR3+pgmPoolClearAll is pending.
+     * PGMSyncCR3+pgmR3PoolClearAll is pending.
      */
     if (VMCPU_FF_ISPENDING(pVCpu, VMCPU_FF_TRPM_SYNC_IDT))

trunk/src/VBox/VMM/PGMInternal.h

@@ -1835 +1835 @@
     /** Profiling pgmPoolAlloc(). */
     STAMPROFILEADV              StatAlloc;
-    /** Profiling pgmPoolClearAll(). */
+    /** Profiling pgmR3PoolClearDoIt(). */
     STAMPROFILE                 StatClearAll;
-    /** Profiling pgmPoolFlushAllInt(). */
-    STAMPROFILE                 StatFlushAllInt;
+    /** Profiling pgmR3PoolReset(). */
+    STAMPROFILE                 StatR3Reset;
     /** Profiling pgmPoolFlushPage(). */
     STAMPROFILE                 StatFlushPage;
@@ -3166 +3166 @@
 void            pgmR3PoolRelocate(PVM pVM);
 void            pgmR3PoolReset(PVM pVM);
+void            pgmR3PoolClearAll(PVM pVM);
 
 #endif /* IN_RING3 */
@@ -3182 +3183 @@
 int             pgmPoolFlushPage(PPGMPOOL pPool, PPGMPOOLPAGE pPage);
 void            pgmPoolFlushPageByGCPhys(PVM pVM, RTGCPHYS GCPhys);
-void            pgmPoolClearAll(PVM pVM);
 PPGMPOOLPAGE    pgmPoolGetPage(PPGMPOOL pPool, RTHCPHYS HCPhys);
 int             pgmPoolSyncCR3(PVMCPU pVCpu);

trunk/src/VBox/VMM/PGMPool.cpp

@@ -333 +333 @@
     STAM_REG(pVM, &pPool->cUsedPagesHigh,               STAMTYPE_U16_RESET, "/PGM/Pool/cUsedPagesHigh", STAMUNIT_PAGES,             "The high watermark for cUsedPages.");
     STAM_REG(pVM, &pPool->StatAlloc,                  STAMTYPE_PROFILE_ADV, "/PGM/Pool/Alloc",          STAMUNIT_TICKS_PER_CALL,    "Profiling of pgmPoolAlloc.");
-    STAM_REG(pVM, &pPool->StatClearAll,                 STAMTYPE_PROFILE,   "/PGM/Pool/ClearAll",       STAMUNIT_TICKS_PER_CALL,    "Profiling of pgmPoolClearAll.");
-    STAM_REG(pVM, &pPool->StatFlushAllInt,              STAMTYPE_PROFILE,   "/PGM/Pool/FlushAllInt",    STAMUNIT_TICKS_PER_CALL,    "Profiling of pgmPoolFlushAllInt.");
+    STAM_REG(pVM, &pPool->StatClearAll,                 STAMTYPE_PROFILE,   "/PGM/Pool/ClearAll",       STAMUNIT_TICKS_PER_CALL,    "Profiling of pgmR3PoolClearAll.");
+    STAM_REG(pVM, &pPool->StatR3Reset,                  STAMTYPE_PROFILE,   "/PGM/Pool/R3Reset",        STAMUNIT_TICKS_PER_CALL,    "Profiling of pgmR3PoolReset.");
     STAM_REG(pVM, &pPool->StatFlushPage,                STAMTYPE_PROFILE,   "/PGM/Pool/FlushPage",      STAMUNIT_TICKS_PER_CALL,    "Profiling of pgmPoolFlushPage.");
     STAM_REG(pVM, &pPool->StatFree,                     STAMTYPE_PROFILE,   "/PGM/Pool/Free",           STAMUNIT_TICKS_PER_CALL,    "Profiling of pgmPoolFree.");

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

@@ -2549 +2549 @@
 }
 
-
 #ifdef IN_RING3
-/**
- * Callback to clear all shadow pages and clear all modification counters.
- *
- * @returns VBox strict status code.
+
+/**
+ * Rendezvous callback used by pgmR3PoolClearAll that clears all shadow pages
+ * and all modification counters.
+ *
+ * This is only called on one of the EMTs while the other ones are waiting for
+ * it to complete this function.
+ *
+ * @returns VINF_SUCCESS (VBox strict status code).
  * @param   pVM     The VM handle.
  * @param   pVCpu   The VMCPU for the EMT we're being called on. Unused.
@@ -2561 +2565 @@
  * @remark  Should only be used when monitoring is available, thus placed in
  *          the PGMPOOL_WITH_MONITORING \#ifdef.
- */
-DECLCALLBACK(VBOXSTRICTRC) pgmPoolClearAll(PVM pVM, PVMCPU pVCpu, void *pvUser)
+ * @remark  Too expensive for use in R0/RC, but it remains here because of
+ *          dependencies?
+ */
+static DECLCALLBACK(VBOXSTRICTRC) pgmR3PoolClearAllRendezvous(PVM pVM, PVMCPU pVCpu, void *pvUser)
 {
     PPGMPOOL pPool = pVM->pgm.s.CTX_SUFF(pPool);
     STAM_PROFILE_START(&pPool->StatClearAll, c);
-    LogFlow(("pgmPoolClearAll: cUsedPages=%d\n", pPool->cUsedPages));
-    NOREF(pvUser); NOREF(pVCpu);
+    LogFlow(("pgmPoolClearAllDoIt: cUsedPages=%d\n", pPool->cUsedPages));
 
     pgmLock(pVM);
@@ -2576 +2581 @@
 
     /*
-     * Iterate all the pages until we've encountered all that in use.
+     * Iterate all the pages until we've encountered all that are in use.
      * This is simple but not quite optimal solution.
      */
@@ -2707 +2712 @@
     return VINF_SUCCESS;
 }
+
+
+/**
+ * Clears the shadow page pool.
+ *
+ * @param   pVM         The VM handle.
+ */
+void pgmR3PoolClearAll(PVM pVM)
+{
+    int rc = VMMR3EmtRendezvous(pVM, VMMEMTRENDEZVOUS_FLAGS_TYPE_ONCE, pgmR3PoolClearAllRendezvous, NULL);
+    AssertRC(rc);
+}
+
 #endif /* IN_RING3 */
-
 
 /**
@@ -2732 +2749 @@
      */
 # ifdef IN_RING3 /* Don't flush in ring-0 or raw mode, it's taking too long. */
-    if (ASMBitTestAndClear(&pVCpu->pgm.s.fSyncFlags, PGM_SYNC_CLEAR_PGM_POOL_BIT))
-    {
-        int rc = VMMR3EmtRendezvous(pVM, VMMEMTRENDEZVOUS_FLAGS_TYPE_ONCE, pgmPoolClearAll, NULL);
-        AssertRC(rc);
-    }
+    if (pVCpu->pgm.s.fSyncFlags & PGM_SYNC_CLEAR_PGM_POOL)
+        pgmR3PoolClearAll(pVM);
 # else  /* !IN_RING3 */
     if (pVCpu->pgm.s.fSyncFlags & PGM_SYNC_CLEAR_PGM_POOL)
@@ -5039 +5053 @@
  * Flushes the entire cache.
  *
- * It will assert a global CR3 flush (FF) and assumes the caller is aware of this
- * and execute this CR3 flush.
+ * It will assert a global CR3 flush (FF) and assumes the caller is aware of
+ * this and execute this CR3 flush.
  *
  * @param   pPool       The pool.
@@ -5049 +5063 @@
 
     Assert(PGMIsLockOwner(pVM));
-    STAM_PROFILE_START(&pPool->StatFlushAllInt, a);
-    LogFlow(("pgmPoolFlushAllInt:\n"));
+    STAM_PROFILE_START(&pPool->StatR3Reset, a);
+    LogFlow(("pgmR3PoolReset:\n"));
 
     /*
@@ -5057 +5071 @@
     if (pPool->cCurPages <= PGMPOOL_IDX_FIRST)
     {
-        STAM_PROFILE_STOP(&pPool->StatFlushAllInt, a);
+        STAM_PROFILE_STOP(&pPool->StatR3Reset, a);
         return;
     }
@@ -5231 +5245 @@
     }
 
-    STAM_PROFILE_STOP(&pPool->StatFlushAllInt, a);
+    STAM_PROFILE_STOP(&pPool->StatR3Reset, a);
 }
 #endif /* IN_RING3 */