Changeset 20762 in vbox

Timestamp:

Jun 22, 2009 11:06:56 AM (16 years ago)

Author:

vboxsync

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

48882

Message:

More PGM locking

Location:

trunk/src/VBox/VMM/VMMAll

Files:

• PGMAll.cpp (modified) (5 diffs)
• PGMAllBth.h (modified) (5 diffs)
• PGMAllPool.cpp (modified) (3 diffs)

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

@@ -873 +873 @@
     int            rc;
 
+    Assert(PGMIsLockOwner(pVM));
+
     /* Allocate page directory if not present. */
     if (    !pPdpe->n.u1Present
@@ -964 +966 @@
     const unsigned  iPdPt = (GCPtr >> X86_PDPT_SHIFT) & X86_PDPT_MASK_PAE;
     PX86PDPT        pPdpt = pgmShwGetPaePDPTPtr(pPGM);
+
+    Assert(PGMIsLockOwner(PGMCPU2VM(pPGM)));
+
     AssertReturn(pPdpt, VERR_PAGE_DIRECTORY_PTR_NOT_PRESENT);    /* can't happen */
     if (!pPdpt->a[iPdPt].n.u1Present)
@@ -1009 +1014 @@
     int            rc;
 
+    Assert(PGMIsLockOwner(pVM));
+
     /* Allocate page directory pointer table if not present. */
     if (    !pPml4e->n.u1Present
@@ -1106 +1113 @@
     const unsigned  iPml4 = (GCPtr >> X86_PML4_SHIFT) & X86_PML4_MASK;
     PCX86PML4E      pPml4e = pgmShwGetLongModePML4EPtr(pPGM, iPml4);
+
+    Assert(PGMIsLockOwner(PGMCPU2VM(pPGM)));
+
     AssertReturn(pPml4e, VERR_INTERNAL_ERROR);
     if (ppPml4e)
@@ -1155 +1165 @@
 
     Assert(HWACCMIsNestedPagingActive(pVM));
+    Assert(PGMIsLockOwner(pVM));
 
     pPml4 = (PEPTPML4)PGMPOOL_PAGE_2_PTR_BY_PGMCPU(pPGM, pPGM->CTX_SUFF(pShwPageCR3));

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

@@ -4343 +4343 @@
     PPGMPOOLPAGE pNewShwPageCR3;
 
+    pgmLock(pVM);
+
     Assert(!(GCPhysCR3 >> (PAGE_SHIFT + 32)));
-    rc = pgmPoolAlloc(pVM, GCPhysCR3 & GST_CR3_PAGE_MASK, BTH_PGMPOOLKIND_ROOT, SHW_POOL_ROOT_IDX, GCPhysCR3 >> PAGE_SHIFT, &pNewShwPageCR3);
+    rc = pgmPoolAlloc(pVM, GCPhysCR3 & GST_CR3_PAGE_MASK, BTH_PGMPOOLKIND_ROOT, SHW_POOL_ROOT_IDX, GCPhysCR3 >> PAGE_SHIFT, &pNewShwPageCR3, true /* lock page */);
     AssertFatalRC(rc);
     rc = VINF_SUCCESS;
-
-    /* Mark the page as locked; disallow flushing. */
-    pgmPoolLockPage(pPool, pNewShwPageCR3);
 
 #  ifdef IN_RC
     /* NOTE: We can't deal with jumps to ring 3 here as we're now in an inconsistent state! */
     bool fLog = VMMGCLogDisable(pVM);
-    pgmLock(pVM);
 #  endif
 
@@ -4389 +4387 @@
 
 #  ifdef IN_RC
-    pgmUnlock(pVM);
     VMMGCLogRestore(pVM, fLog);
 #  endif
@@ -4406 +4403 @@
         pgmPoolFreeByPage(pPool, pOldShwPageCR3, iOldShwUser, iOldShwUserTable);
     }
-
+    pgmUnlock(pVM);
 # endif
 
@@ -4473 +4470 @@
 #  endif
 
+    pgmLock(pVM);
+
 # ifndef PGM_WITHOUT_MAPPINGS
     if (pVCpu->pgm.s.CTX_SUFF(pShwPageCR3))
@@ -4495 +4494 @@
         pVCpu->pgm.s.iShwUserTable = 0;
     }
+    pgmUnlock(pVM);
 # endif
 #endif /* !IN_RC*/

trunk/src/VBox/VMM/VMMAll/PGMAllPool.cpp ¶

@@ -4055 +4055 @@
  * @param   iUserTable  The index into the user table (shadowed).
  * @param   ppPage      Where to store the pointer to the page. NULL is stored here on failure.
- */
-int pgmPoolAllocEx(PVM pVM, RTGCPHYS GCPhys, PGMPOOLKIND enmKind, PGMPOOLACCESS enmAccess, uint16_t iUser, uint32_t iUserTable, PPPGMPOOLPAGE ppPage)
+ * @param   fLockPage   Lock the page
+ */
+int pgmPoolAllocEx(PVM pVM, RTGCPHYS GCPhys, PGMPOOLKIND enmKind, PGMPOOLACCESS enmAccess, uint16_t iUser, uint32_t iUserTable, PPPGMPOOLPAGE ppPage, bool fLockPage)
 {
     PPGMPOOL pPool = pVM->pgm.s.CTX_SUFF(pPool);
@@ -4074 +4075 @@
         if (RT_SUCCESS(rc2))
         {
+            if (fLockPage)
+                pgmPoolLockPage(pPool, *ppPage);
             pgmUnlock(pVM);
             STAM_PROFILE_ADV_STOP(&pPool->StatAlloc, a);
@@ -4164 +4167 @@
 
     *ppPage = pPage;
+    if (fLockPage)
+        pgmPoolLockPage(pPool, pPage);
     pgmUnlock(pVM);
     LogFlow(("pgmPoolAlloc: returns %Rrc *ppPage=%p:{.Key=%RHp, .idx=%d, .fCached=%RTbool, .fMonitored=%RTbool}\n",