Changeset 10320 in vbox for trunk/src/VBox

Timestamp:

Jul 7, 2008 1:27:57 PM (17 years ago)

Author:

vboxsync

Message:

Rearranged code to deal with pgm pool tasks during SyncCR3.

Location:

trunk/src/VBox/VMM

Files:

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

trunk/src/VBox/VMM/PGMInternal.h

@@ -2651 +2651 @@
 void            pgmPoolFlushAll(PVM pVM);
 void            pgmPoolClearAll(PVM pVM);
+int             pgmPoolSyncCR3(PVM pVM);
 void            pgmPoolTrackFlushGCPhysPT(PVM pVM, PPGMPAGE pPhysPage, uint16_t iShw, uint16_t cRefs);
 void            pgmPoolTrackFlushGCPhysPTs(PVM pVM, PPGMPAGE pPhysPage, uint16_t iPhysExt);

trunk/src/VBox/VMM/VMMAll/PGMAllBth.h

@@ -3016 +3016 @@
 
 #ifdef PGMPOOL_WITH_MONITORING
-    /*
-     * When monitoring shadowed pages, we reset the modification counters on CR3 sync.
-     * Occationally we will have to clear all the shadow page tables because we wanted
-     * to monitor a page which was mapped by too many shadowed page tables. This operation
-     * sometimes refered to as a 'lightweight flush'.
-     */
-    if (!(pVM->pgm.s.fSyncFlags & PGM_SYNC_CLEAR_PGM_POOL))
-        pgmPoolMonitorModifiedClearAll(pVM);
-    else
-    {
-# ifndef IN_GC
-        pVM->pgm.s.fSyncFlags &= ~PGM_SYNC_CLEAR_PGM_POOL;
-        pgmPoolClearAll(pVM);
-# else
-        LogFlow(("SyncCR3: PGM_SYNC_CLEAR_PGM_POOL is set -> VINF_PGM_SYNC_CR3\n"));
-        return VINF_PGM_SYNC_CR3;
-# endif
-    }
+    int rc = pgmPoolSyncCR3(pVM);
+    if (rc != VINF_SUCCESS)
+        return rc;
 #endif
 

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

@@ -1862 +1862 @@
     STAM_PROFILE_STOP(&pPool->StatClearAll, c);
 }
+
+/**
+ * Handle SyncCR3 pool tasks
+ *
+ * @returns VBox status code.
+ * @retval  VINF_SUCCESS if successfully added.
+ * @retval  VINF_PGM_SYNC_CR3 is it needs to be deferred to ring 3 (GC only)
+ * @param   pVM     The VM handle.
+ * @remark  Should only be used when monitoring is available, thus placed in
+ *          the PGMPOOL_WITH_MONITORING #ifdef.
+ */
+int pgmPoolSyncCR3(PVM pVM)
+{
+    /*
+     * When monitoring shadowed pages, we reset the modification counters on CR3 sync.
+     * Occasionally we will have to clear all the shadow page tables because we wanted
+     * to monitor a page which was mapped by too many shadowed page tables. This operation
+     * sometimes refered to as a 'lightweight flush'.
+     */
+    if (!(pVM->pgm.s.fSyncFlags & PGM_SYNC_CLEAR_PGM_POOL))
+        pgmPoolMonitorModifiedClearAll(pVM);
+    else
+    {
+# ifndef IN_GC
+        pVM->pgm.s.fSyncFlags &= ~PGM_SYNC_CLEAR_PGM_POOL;
+        pgmPoolClearAll(pVM);
+# else
+        LogFlow(("SyncCR3: PGM_SYNC_CLEAR_PGM_POOL is set -> VINF_PGM_SYNC_CR3\n"));
+        return VINF_PGM_SYNC_CR3;
+# endif
+    }
+    return VINF_SUCCESS;
+}
 #endif /* PGMPOOL_WITH_MONITORING */
-
 
 #ifdef PGMPOOL_WITH_USER_TRACKING