Changeset 27778 in vbox

Timestamp:

Mar 29, 2010 11:24:13 AM (15 years ago)

Author:

vboxsync

Message:

Must take the pgm lock during PGMSyncCR3; guest SMP can cause an inconsistent state due to pending flushes.

File:

• trunk/src/VBox/VMM/VMMAll/PGMAll.cpp (modified) (5 diffs)

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

@@ -1815 +1815 @@
     int rc;
 
+    pgmLock(pVM);
+
     /*
      * The pool may have pending stuff and even require a return to ring-3 to
@@ -1821 +1823 @@
     rc = pgmPoolSyncCR3(pVCpu);
     if (rc != VINF_SUCCESS)
+    {
+        pgmUnlock(pVM);
         return rc;
+    }
 
     /*
@@ -1836 +1841 @@
         VMCPU_FF_CLEAR(pVCpu, VMCPU_FF_PGM_SYNC_CR3);
         VMCPU_FF_CLEAR(pVCpu, VMCPU_FF_PGM_SYNC_CR3_NON_GLOBAL);
+        pgmUnlock(pVM);
         return VINF_SUCCESS;
     }
@@ -1885 +1891 @@
             if (rc == VINF_PGM_SYNC_CR3)
                 pVCpu->pgm.s.GCPhysCR3 = GCPhysCR3Old;
+            pgmUnlock(pVM);
             return VINF_PGM_SYNC_CR3;
 #endif
         }
-        AssertRCReturn(rc, rc);
-        AssertRCSuccessReturn(rc, VERR_INTERNAL_ERROR);
+        if (rc != VINF_SUCCESS)
+        {
+            pgmUnlock(pVM);
+            AssertFailed();
+            return RT_FAILURE(rc) ? rc : VERR_INTERNAL_ERROR;
+        }
     }
 
@@ -1922 +1933 @@
     if (rc == VINF_SUCCESS)
         PGM_INVL_VCPU_TLBS(pVCpu);
+
+    pgmUnlock(pVM);
     return rc;
 }