Changeset 17462 in vbox

Timestamp:

Mar 6, 2009 1:00:54 PM (16 years ago)

Author:

vboxsync

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

43886

Message:

Refined locking.

Location:

trunk/src/VBox/VMM

Files:

• PGMInternal.h (modified) (2 diffs)
• VMMAll/PGMAll.cpp (modified) (5 diffs)

trunk/src/VBox/VMM/PGMInternal.h

@@ -184 +184 @@
 #define PGM_PTFLAGS_CSAM_VALIDATED      RT_BIT_64(11)
 #endif
-
-/** Mark a dynamic map entry (PGMDynMapHCPage) as locked. */
-#define PGM_PTFLAGS_DYN_LOCKED          RT_BIT(9)
 
 /** @} */
@@ -2633 +2630 @@
      * The cache size is covering half of the mapping area. */
     RTHCPHYS                        aHCPhysDynPageMapCache[MM_HYPER_DYNAMIC_SIZE >> (PAGE_SHIFT + 1)];
+    uint32_t                        aLockedDynPageMapCache[MM_HYPER_DYNAMIC_SIZE >> (PAGE_SHIFT + 1)];
 
     /** The address of the ring-0 mapping cache if we're making use of it.  */

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

@@ -2274 +2274 @@
     {
         pVM->pgm.s.iDynPageMapLast = iPage = (iPage + 1) & ((MM_HYPER_DYNAMIC_SIZE >> PAGE_SHIFT) - 1);
-        if (!(pVM->pgm.s.paDynPageMap32BitPTEsGC[iPage].u & PGM_PTFLAGS_DYN_LOCKED))
+        if (!pVM->pgm.s.aLockedDynPageMapCache[iPage])
             break;
         iPage++;
@@ -2286 +2286 @@
     pVM->pgm.s.paDynPageMap32BitPTEsGC[iPage].u = (uint32_t)HCPhys | X86_PTE_P | X86_PTE_A | X86_PTE_D;
     pVM->pgm.s.paDynPageMapPaePTEsGC[iPage].u   =           HCPhys | X86_PTE_P | X86_PTE_A | X86_PTE_D;
+    pVM->pgm.s.aLockedDynPageMapCache[iPage]    = 0;
 
     void *pv = pVM->pgm.s.pbDynPageMapBaseGC + (iPage << PAGE_SHIFT);
@@ -2308 +2309 @@
     Assert(GCPage >= pVM->pgm.s.pbDynPageMapBaseGC && GCPage < (pVM->pgm.s.pbDynPageMapBaseGC + MM_HYPER_DYNAMIC_SIZE));
     iPage = ((uintptr_t)(GCPage - pVM->pgm.s.pbDynPageMapBaseGC)) >> PAGE_SHIFT;
-    Assert(!(pVM->pgm.s.paDynPageMap32BitPTEsGC[iPage].u & PGM_PTFLAGS_DYN_LOCKED));
-    pVM->pgm.s.paDynPageMap32BitPTEsGC[iPage].u |= PGM_PTFLAGS_DYN_LOCKED;
+    Assert(!pVM->pgm.s.aLockedDynPageMapCache[iPage]);
+    ASMAtomicIncU32(&pVM->pgm.s.aLockedDynPageMapCache[iPage]);
     return VINF_SUCCESS;
 }
@@ -2325 +2326 @@
     unsigned iPage;
 
+    AssertCompile(RT_ELEMENTS(pVM->pgm.s.aHCPhysDynPageMapCache) == RT_ELEMENTS(pVM->pgm.s.aLockedDynPageMapCache));
+
     Assert(GCPage >= pVM->pgm.s.pbDynPageMapBaseGC && GCPage < (pVM->pgm.s.pbDynPageMapBaseGC + MM_HYPER_DYNAMIC_SIZE));
     iPage = ((uintptr_t)(GCPage - pVM->pgm.s.pbDynPageMapBaseGC)) >> PAGE_SHIFT;
-    Assert(pVM->pgm.s.paDynPageMap32BitPTEsGC[iPage].u & PGM_PTFLAGS_DYN_LOCKED);
-    pVM->pgm.s.paDynPageMap32BitPTEsGC[iPage].u &= ~PGM_PTFLAGS_DYN_LOCKED;
+    Assert(pVM->pgm.s.aLockedDynPageMapCache[iPage]);
+    ASMAtomicDecU32(&pVM->pgm.s.aLockedDynPageMapCache[iPage]);
     return VINF_SUCCESS;
 }
@@ -2341 +2344 @@
 VMMDECL(void) PGMDynCheckLocks(PVM pVM)
 {
-    for (unsigned i=0;i<(MM_HYPER_DYNAMIC_SIZE >> PAGE_SHIFT);i++)
-        Assert(!(pVM->pgm.s.paDynPageMap32BitPTEsGC[i].u & PGM_PTFLAGS_DYN_LOCKED));
+    for (unsigned i=0;i<RT_ELEMENTS(pVM->pgm.s.aLockedDynPageMapCache);i++)
+        Assert(!pVM->pgm.s.aLockedDynPageMapCache[i]);
 }
 #  endif /* VBOX_STRICT */