Changeset 20068 in vbox

Timestamp:

May 27, 2009 11:32:49 AM (16 years ago)

Author:

vboxsync

Message:

Trying to get rid of annoying assertions

Location:

trunk/src/VBox/VMM/VMMAll

Files:

• PGMAll.cpp (modified) (1 diff)
• PGMAllBth.h (modified) (3 diffs)
• PGMAllShw.h (modified) (1 diff)

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

@@ -790 +790 @@
 VMMDECL(int) PGMShwGetPage(PVMCPU pVCpu, RTGCPTR GCPtr, uint64_t *pfFlags, PRTHCPHYS pHCPhys)
 {
-    return PGM_SHW_PFN(GetPage, pVCpu)(pVCpu, GCPtr, pfFlags, pHCPhys);
+    pgmLock(pVCpu->CTX_SUFF(pVM));
+    int rc = PGM_SHW_PFN(GetPage, pVCpu)(pVCpu, GCPtr, pfFlags, pHCPhys);
+    pgmUnlock(pVCpu->CTX_SUFF(pVM));
+    return rc;
 }
 

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

@@ -800 +800 @@
                     pgmLock(pVM);
                     rc = PGM_BTH_NAME(SyncPage)(pVCpu, PdeSrc, pvFault, 1, uErr);
+#   ifndef VBOX_STRICT
+                    /* Keep it locked in VBOX_STRICT mode so the next checks won't trigger without reason with guest SMP. */
                     pgmUnlock(pVM);
+#   endif
                     if (RT_SUCCESS(rc))
                     {
@@ -815 +818 @@
                         uint64_t fPageShw;
                         rc = PGMShwGetPage(pVCpu, pvFault, &fPageShw, NULL);
-                        AssertMsg((pVM->cCPUs > 1 && rc == VERR_PAGE_NOT_PRESENT) || (RT_SUCCESS(rc) && (fPageShw & X86_PTE_RW)), ("rc=%Rrc fPageShw=%RX64\n", rc, fPageShw));
+                        AssertMsg((RT_SUCCESS(rc) && (fPageShw & X86_PTE_RW)), ("rc=%Rrc fPageShw=%RX64\n", rc, fPageShw));
+                        pgmUnlock(pVM);
 #   endif /* VBOX_STRICT */
                         STAM_PROFILE_STOP(&pVCpu->pgm.s.StatRZTrap0eTimeOutOfSync, c);
@@ -821 +825 @@
                         return VINF_SUCCESS;
                     }
+#   ifdef VBOX_STRICT
+                    pgmUnlock(pVM);
+#   endif
 
                     /* Check to see if we need to emulate the instruction as X86_CR0_WP has been cleared. */

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

@@ -146 +146 @@
     PVM pVM = pVCpu->CTX_SUFF(pVM);
 
+    Assert(PGMIsLockOwner(pVM));
+
     /*
      * Get the PDE.