Changeset 17058 in vbox

Timestamp:

Feb 24, 2009 12:21:56 PM (16 years ago)

Author:

vboxsync

Message:

More updates for temp locks.

Location:

trunk

Files:

• include/VBox/pgm.h (modified) (1 diff)
• src/VBox/VMM/VMMAll/PGMAll.cpp (modified) (1 diff)
• src/VBox/VMM/VMMAll/PGMAllBth.h (modified) (6 diffs)

trunk/include/VBox/pgm.h

@@ -459 +459 @@
 VMMDECL(int)        PGMDynLockHCPage(PVM pVM, RCPTRTYPE(uint8_t *) GCPage);
 VMMDECL(int)        PGMDynUnlockHCPage(PVM pVM, RCPTRTYPE(uint8_t *) GCPage);
+#  ifdef VBOX_STRICT
+VMMDECL(void)       PGMDynCheckLocks(PVM pVM);
+#  endif
 # endif
 VMMDECL(void)       PGMDynMapStartAutoSet(PVMCPU pVCpu);

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

@@ -2250 +2250 @@
 }
 
+# ifdef VBOX_STRICT
+/**
+ * Check for lock leaks.
+ *
+ * @param   pVM         VM handle.
+ */
+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));
+}
+# endif
 # endif /* IN_RC */
 

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

@@ -82 +82 @@
 PGM_BTH_DECL(int, Trap0eHandler)(PVM pVM, RTGCUINT uErr, PCPUMCTXCORE pRegFrame, RTGCPTR pvFault)
 {
+# if defined(IN_RC) && defined(VBOX_WITH_PGMPOOL_PAGING_ONLY)
+    PGMDynCheckLocks(pVM);
+# endif
+
 # if  (PGM_GST_TYPE == PGM_TYPE_32BIT || PGM_GST_TYPE == PGM_TYPE_REAL || PGM_GST_TYPE == PGM_TYPE_PROT || PGM_GST_TYPE == PGM_TYPE_PAE || PGM_GST_TYPE == PGM_TYPE_AMD64) \
     && PGM_SHW_TYPE != PGM_TYPE_NESTED    \
@@ -2452 +2456 @@
     Assert(!PdeDst.n.u1Present); /* We're only supposed to call SyncPT on PDE!P and conflicts.*/
 
+# if defined(IN_RC) && defined(VBOX_WITH_PGMPOOL_PAGING_ONLY)
+    /* Make sure the dynamic pPdeDst mapping will not be reused during this function. */
+    PGMDynLockHCPage(pVM, pPdeDst);
+# endif
+
     /*
      * Sync page directory entry.
@@ -2518 +2527 @@
             }
             *pPdeDst = PdeDst;
+# if defined(IN_RC) && defined(VBOX_WITH_PGMPOOL_PAGING_ONLY)
+            PGMDynUnlockHCPage(pVM, pPdeDst);
+# endif
             return VINF_SUCCESS;
         }
@@ -2523 +2535 @@
         {
             VM_FF_SET(pVM, VM_FF_PGM_SYNC_CR3);
+# if defined(IN_RC) && defined(VBOX_WITH_PGMPOOL_PAGING_ONLY)
+            PGMDynUnlockHCPage(pVM, pPdeDst);
+# endif
             return VINF_PGM_SYNC_CR3;
         }
@@ -2553 +2568 @@
                          | (PdeSrc.u & ~(GST_PDE_PG_MASK | X86_PDE_AVL_MASK | X86_PDE_PCD | X86_PDE_PWT | X86_PDE_PS | X86_PDE4M_G | X86_PDE4M_D));
                 *pPdeDst = PdeDst;
+# if defined(IN_RC) && defined(VBOX_WITH_PGMPOOL_PAGING_ONLY)            
+                PGMDynUnlockHCPage(pVM, pPdeDst);
+# endif
 
                 /*
@@ -2656 +2674 @@
             }
             *pPdeDst = PdeDst;
+# if defined(IN_RC) && defined(VBOX_WITH_PGMPOOL_PAGING_ONLY)            
+            PGMDynUnlockHCPage(pVM, pPdeDst);
+# endif
 
             /*