Changeset 24767 in vbox for trunk/src/VBox/VMM/VMMAll

Timestamp:

Nov 18, 2009 5:15:02 PM (15 years ago)

Author:

vboxsync

Message:

PGM: Deal with write monitored pages without involving EMT. This works around the pcnet/pgm deadlocks (#4464 an #3775).

File:

• trunk/src/VBox/VMM/VMMAll/PGMAllPhys.cpp (modified) (2 diffs)

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

@@ -438 +438 @@
 
 /**
+ * Deal with a write monitored page.
+ *
+ * @returns VBox strict status code.
+ *
+ * @param   pVM         The VM address.
+ * @param   pPage       The physical page tracking structure.
+ *
+ * @remarks Called from within the PGM critical section.
+ */
+void pgmPhysPageMakeWriteMonitoredWritable(PVM pVM, PPGMPAGE pPage)
+{
+    Assert(PGM_PAGE_GET_STATE(pPage) == PGM_PAGE_STATE_WRITE_MONITORED);
+    PGM_PAGE_SET_WRITTEN_TO(pPage);
+    PGM_PAGE_SET_STATE(pPage, PGM_PAGE_STATE_ALLOCATED);
+    Assert(pVM->pgm.s.cMonitoredPages > 0);
+    pVM->pgm.s.cMonitoredPages--;
+    pVM->pgm.s.cWrittenToPages++;
+}
+
+
+/**
  * Deal with pages that are not writable, i.e. not in the ALLOCATED state.
  *
@@ -456 +477 @@
     {
         case PGM_PAGE_STATE_WRITE_MONITORED:
-            PGM_PAGE_SET_WRITTEN_TO(pPage);
-            PGM_PAGE_SET_STATE(pPage, PGM_PAGE_STATE_ALLOCATED);
-            Assert(pVM->pgm.s.cMonitoredPages > 0);
-            pVM->pgm.s.cMonitoredPages--;
-            pVM->pgm.s.cWrittenToPages++;
+            pgmPhysPageMakeWriteMonitoredWritable(pVM, pPage);
             /* fall thru */
         default: /* to shut up GCC */