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

Timestamp:

Mar 4, 2009 2:24:56 PM (16 years ago)

Author:

vboxsync

Message:

Fixed out of sync GC cache due to locked entries.

File:

• trunk/src/VBox/VMM/VMMAll/PGMAll.cpp (modified) (1 diff)

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

@@ -2249 +2249 @@
         {
             int iPage = au8Trans[pVM->pgm.s.iDynPageMapLast][iCache];
-            void *pv = pVM->pgm.s.pbDynPageMapBaseGC + (iPage << PAGE_SHIFT);
-            *ppv = pv;
-            STAM_COUNTER_INC(&pVM->pgm.s.StatRCDynMapCacheHits);
-            Log4(("PGMGCDynMapHCPage: HCPhys=%RHp pv=%p iPage=%d iCache=%d\n", HCPhys, pv, iPage, iCache));
-            return VINF_SUCCESS;
+
+            /* The cache can get out of sync with locked entries. (10 locked, 2 overwrites its cache position, last = 11, lookup 2 -> page 10 instead of 2) */
+            if ((pVM->pgm.s.paDynPageMap32BitPTEsGC[iPage].u & X86_PTE_PG_MASK) == HCPhys)
+            {
+                void *pv = pVM->pgm.s.pbDynPageMapBaseGC + (iPage << PAGE_SHIFT);
+                *ppv = pv;
+                STAM_COUNTER_INC(&pVM->pgm.s.StatRCDynMapCacheHits);
+                Log4(("PGMGCDynMapHCPage: HCPhys=%RHp pv=%p iPage=%d iCache=%d\n", HCPhys, pv, iPage, iCache));
+                return VINF_SUCCESS;
+            }
         }
     }