Changeset 23488 in vbox for trunk/src/VBox/VMM

Timestamp:

Oct 1, 2009 3:38:06 PM (15 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

53113

Message:

PGM: Lock stats and check for write locks on monitored pages during live save.

Location:

trunk/src/VBox/VMM

Files:

• PGM.cpp (modified) (1 diff)
• PGMInternal.h (modified) (1 diff)
• PGMPhys.cpp (modified) (2 diffs)
• PGMSavedState.cpp (modified) (2 diffs)
• VMMAll/PGMAllPhys.cpp (modified) (4 diffs)

trunk/src/VBox/VMM/PGM.cpp

@@ -1570 +1570 @@
     STAM_REL_REG(pVM, &pPGM->cMonitoredPages,               STAMTYPE_U32,     "/PGM/Page/cMonitoredPages",          STAMUNIT_OCCURENCES,     "The number of write monitored pages.");
     STAM_REL_REG(pVM, &pPGM->cWrittenToPages,               STAMTYPE_U32,     "/PGM/Page/cWrittenToPages",          STAMUNIT_OCCURENCES,     "The number of previously write monitored pages that have been written to.");
+    STAM_REL_REG(pVM, &pPGM->cWriteLockedPages,             STAMTYPE_U32,     "/PGM/Page/cWriteLockedPages",        STAMUNIT_OCCURENCES,     "The number of write(/read) locked pages.");
+    STAM_REL_REG(pVM, &pPGM->cReadLockedPages,              STAMTYPE_U32,     "/PGM/Page/cReadLockedPages",         STAMUNIT_OCCURENCES,     "The number of read (only) locked pages.");
     STAM_REL_REG(pVM, &pPGM->cHandyPages,                   STAMTYPE_U32,     "/PGM/Page/cHandyPages",              STAMUNIT_OCCURENCES,     "The number of handy pages (not included in cAllPages).");
     STAM_REL_REG(pVM, &pPGM->cRelocations,                  STAMTYPE_COUNTER, "/PGM/cRelocations",                  STAMUNIT_OCCURENCES,     "Number of hypervisor relocations.");

trunk/src/VBox/VMM/PGMInternal.h

@@ -2704 +2704 @@
     uint32_t                        cMonitoredPages;    /**< The number of write monitored pages. */
     uint32_t                        cWrittenToPages;    /**< The number of previously write monitored pages. */
+    uint32_t                        cWriteLockedPages;  /**< The number of write locked pages. */
+    uint32_t                        cReadLockedPages;   /**< The number of read locked pages. */
 
     /** The number of times we were forced to change the hypervisor region location. */

trunk/src/VBox/VMM/PGMPhys.cpp

@@ -456 +456 @@
             unsigned cLocks = PGM_PAGE_GET_WRITE_LOCKS(pPage);
             if (RT_LIKELY(cLocks < PGM_PAGE_MAX_LOCKS - 1))
+            {
+                if (cLocks == 0)
+                    pVM->pgm.s.cWriteLockedPages++;
                 PGM_PAGE_INC_WRITE_LOCKS(pPage);
+            }
             else if (cLocks != PGM_PAGE_GET_WRITE_LOCKS(pPage))
             {
@@ -530 +534 @@
             unsigned cLocks = PGM_PAGE_GET_READ_LOCKS(pPage);
             if (RT_LIKELY(cLocks < PGM_PAGE_MAX_LOCKS - 1))
+            {
+                if (cLocks == 0)
+                    pVM->pgm.s.cReadLockedPages++;
                 PGM_PAGE_INC_READ_LOCKS(pPage);
+            }
             else if (cLocks != PGM_PAGE_GET_READ_LOCKS(pPage))
             {

trunk/src/VBox/VMM/PGMSavedState.cpp

@@ -1047 +1047 @@
                          * A RAM page.
                          */
-/** @todo Check for page locks (write) since these indicates that someone might
- * be changing the page without owning the PGM lock.  This breaks assumptions
- * elsewhere.
- * (A quick fix is to mark the page written-to when releasing a write lock.) */
                         switch (PGM_PAGE_GET_STATE(&pCur->aPages[iPage]))
                         {
@@ -1088 +1084 @@
                             case PGM_PAGE_STATE_WRITE_MONITORED:
                                 Assert(paLSPages[iPage].fWriteMonitored);
-                                paLSPages[iPage].fWriteMonitoredJustNow = 0;
+                                paLSPages[iPage].fWriteMonitoredJustNow = PGM_PAGE_GET_WRITE_LOCKS(&pCur->aPages[iPage]) > 0;
                                 break;
 

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

@@ -1072 +1072 @@
             unsigned cLocks = PGM_PAGE_GET_WRITE_LOCKS(pPage);
             if (RT_LIKELY(cLocks < PGM_PAGE_MAX_LOCKS - 1))
+            {
+                if (cLocks == 0)
+                    pVM->pgm.s.cWriteLockedPages++;
                 PGM_PAGE_INC_WRITE_LOCKS(pPage);
+            }
             else if (cLocks != PGM_PAGE_GET_WRITE_LOCKS(pPage))
             {
@@ -1170 +1174 @@
             unsigned cLocks = PGM_PAGE_GET_READ_LOCKS(pPage);
             if (RT_LIKELY(cLocks < PGM_PAGE_MAX_LOCKS - 1))
+            {
+                if (cLocks == 0)
+                    pVM->pgm.s.cReadLockedPages++;
                 PGM_PAGE_INC_READ_LOCKS(pPage);
+            }
             else if (cLocks != PGM_PAGE_GET_READ_LOCKS(pPage))
             {
@@ -1293 +1301 @@
         Assert(cLocks > 0);
         if (RT_LIKELY(cLocks > 0 && cLocks < PGM_PAGE_MAX_LOCKS))
+        {
+            if (cLocks == 1)
+            {
+                Assert(pVM->pgm.s.cWriteLockedPages > 0);
+                pVM->pgm.s.cWriteLockedPages--;
+            }
             PGM_PAGE_DEC_WRITE_LOCKS(pPage);
+        }
 
         if (PGM_PAGE_GET_STATE(pPage) == PGM_PAGE_STATE_WRITE_MONITORED)
@@ -1309 +1324 @@
         Assert(cLocks > 0);
         if (RT_LIKELY(cLocks > 0 && cLocks < PGM_PAGE_MAX_LOCKS))
+        {
+            if (cLocks == 1)
+            {
+                Assert(pVM->pgm.s.cReadLockedPages > 0);
+                pVM->pgm.s.cReadLockedPages--;
+            }
             PGM_PAGE_DEC_READ_LOCKS(pPage);
+        }
     }