儲存庫 vbox 的更動 17139

時間撮記:

2009-2-25 下午04:39:54 (16 年 以前)

作者:

vboxsync

訊息:

VBOX_WITH_PGMPOOL_PAGING_ONLY: more locking changes

位置:

trunk/src/VBox/VMM

檔案:

• PGMInternal.h (修改) (1 筆差異)
• VMMAll/PGMAllMap.cpp (修改) (5 筆差異)
• VMMAll/PGMAllPool.cpp (修改) (1 筆差異)

trunk/src/VBox/VMM/PGMInternal.h

@@ -4759 +4759 @@
     return VINF_SUCCESS;
 }
+
+/**
+ * Checks if the page is locked (e.g. the active CR3 or one of the four PDs of a PAE PDPT)
+ *
+ * @returns VBox status code.
+ * @param   pVM         VM Handle.
+ * @param   pPage       PGM pool page
+ */
+DECLINLINE(bool) pgmPoolIsPageLocked(PVM pVM, PPGMPOOLPAGE pPage)
+{
+    if (pPage->fLocked)
+    {
+        LogFlow(("pgmPoolIsPageLocked found root page %s\n", pgmPoolPoolKindToStr(pPage->enmKind)));
+        if (pPage->cModifications)
+            pPage->cModifications = 1; /* reset counter (can't use 0, or else it will be reinserted in the modified list) */
+        return true;
+    }
+    Assert(pPage != pVM->pgm.s.CTX_SUFF(pShwPageCR3));
+    return false;
+}
 #endif
 

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

@@ -302 +302 @@
                 AssertFatal(pShwPaePd);
 
-                PPGMPOOLPAGE pPoolPagePde = pgmPoolGetPageByHCPhys(pVM, pShwPdpt->a[iPdPt].u & X86_PDPE_PG_MASK);
-                AssertFatal(pPoolPagePde);
-
+                PPGMPOOLPAGE pPoolPagePd = pgmPoolGetPageByHCPhys(pVM, pShwPdpt->a[iPdPt].u & X86_PDPE_PG_MASK);
+                AssertFatal(pPoolPagePd);
+
+#ifdef VBOX_WITH_PGMPOOL_PAGING_ONLY
+                if (!pgmPoolIsPageLocked(pVM, pPoolPagePd))
+                {
+                    /* Mark the page as locked; disallow flushing. */
+                    pgmPoolLockPage(pVM->pgm.s.CTX_SUFF(pPool), pPoolPagePd);
+                }
+#endif
                 if (pShwPaePd->a[iPDE].n.u1Present)
                 {
                     Assert(!(pShwPaePd->a[iPDE].u & PGM_PDFLAGS_MAPPING));
-                    pgmPoolFree(pVM, pShwPaePd->a[iPDE].u & X86_PDE_PG_MASK, pPoolPagePde->idx, iNewPDE);
+                    pgmPoolFree(pVM, pShwPaePd->a[iPDE].u & X86_PDE_PG_MASK, pPoolPagePd->idx, iNewPDE);
                 }
 
@@ -322 +329 @@
                 {
                     Assert(!(pShwPaePd->a[iPDE].u & PGM_PDFLAGS_MAPPING));
-                    pgmPoolFree(pVM, pShwPaePd->a[iPDE].u & X86_PDE_PG_MASK, pPoolPagePde->idx, iNewPDE);
+                    pgmPoolFree(pVM, pShwPaePd->a[iPDE].u & X86_PDE_PG_MASK, pPoolPagePd->idx, iNewPDE);
                 }
 
@@ -386 +393 @@
             case PGMMODE_PAE_NX:
             {
-                PX86PDPT  pPdpt = NULL;
+                PX86PDPT  pShwPdpt = NULL;
                 PX86PDPAE pShwPaePd = NULL;
 
@@ -392 +399 @@
                 unsigned iPDE = iOldPDE * 2 % 512;
 #ifdef VBOX_WITH_PGMPOOL_PAGING_ONLY
-                pPdpt     = (PX86PDPT)PGMPOOL_PAGE_2_PTR_BY_PGM(&pVM->pgm.s, pShwPageCR3);
-                pShwPaePd = pgmShwGetPaePDPtr(&pVM->pgm.s, pPdpt, (iPD << X86_PDPT_SHIFT));
-#else
-                pPdpt     = pgmShwGetPaePDPTPtr(&pVM->pgm.s); 
+                pShwPdpt  = (PX86PDPT)PGMPOOL_PAGE_2_PTR_BY_PGM(&pVM->pgm.s, pShwPageCR3);
+                pShwPaePd = pgmShwGetPaePDPtr(&pVM->pgm.s, pShwPdpt, (iPD << X86_PDPT_SHIFT));
+#else
+                pShwPdpt  = pgmShwGetPaePDPTPtr(&pVM->pgm.s); 
                 pShwPaePd = pgmShwGetPaePDPtr(&pVM->pgm.s, (iPD << X86_PDPT_SHIFT)); 
 #endif
@@ -407 +414 @@
                 pShwPaePd->a[iPDE].u = 0;
                 /* Clear the PGM_PDFLAGS_MAPPING flag for the page directory pointer entry. (legacy PAE guest mode) */
-                pPdpt->a[iPD].u &= ~PGM_PLXFLAGS_MAPPING;
+                pShwPdpt->a[iPD].u &= ~PGM_PLXFLAGS_MAPPING;
+
+#ifdef VBOX_WITH_PGMPOOL_PAGING_ONLY
+                PPGMPOOLPAGE pPoolPagePd = pgmPoolGetPageByHCPhys(pVM, pShwPdpt->a[iPD].u & X86_PDPE_PG_MASK);
+                AssertFatal(pPoolPagePd);
+
+                if (pgmPoolIsPageLocked(pVM, pPoolPagePd))
+                {
+                    /* Mark the page as unlocked; allow flushing again. */
+                    pgmPoolUnlockPage(pVM->pgm.s.CTX_SUFF(pPool), pPoolPagePd);
+                }
+#endif
+
                 break;
             }

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

@@ -908 +908 @@
 }
 
-#ifdef VBOX_WITH_PGMPOOL_PAGING_ONLY
-/**
- * Checks if the page is locked (e.g. the active CR3 or one of the four PDs of a PAE PDPT)
- *
- * @returns VBox status code.
- * @param   pVM         VM Handle.
- * @param   pPage       PGM pool page
- */
-bool pgmPoolIsPageLocked(PVM pVM, PPGMPOOLPAGE pPage)
-{
-    if (pPage->fLocked)
-    {
-        LogFlow(("pgmPoolIsPageLocked found root page %s\n", pgmPoolPoolKindToStr(pPage->enmKind)));
-        if (pPage->cModifications)
-            pPage->cModifications = 1; /* reset counter (can't use 0, or else it will be reinserted in the modified list) */
-        return true;
-    }
-
-#ifdef VBOX_STRICT
-    Assert(pPage != pVM->pgm.s.CTX_SUFF(pShwPageCR3));
-
-# ifndef IN_RING0
-    switch (PGMGetShadowMode(pVM))
-    {
-        case PGMMODE_PAE:
-        case PGMMODE_PAE_NX:
-        {
-            switch (pPage->enmKind)
-            {
-                case PGMPOOLKIND_PAE_PD_FOR_PAE_PD:
-                case PGMPOOLKIND_PAE_PD0_FOR_32BIT_PD:
-                case PGMPOOLKIND_PAE_PD1_FOR_32BIT_PD:
-                case PGMPOOLKIND_PAE_PD2_FOR_32BIT_PD:
-                case PGMPOOLKIND_PAE_PD3_FOR_32BIT_PD:
-                {
-                    PX86PDPT pPdpt = pgmShwGetPaePDPTPtr(&pVM->pgm.s);
-                    Assert(pPdpt);
-
-                    for (unsigned i=0;i<X86_PG_PAE_PDPE_ENTRIES;i++)
-                    {
-                        Assert(   !(pPdpt->a[i].u & PGM_PLXFLAGS_MAPPING) 
-                               || (pPage->Core.Key != (pPdpt->a[i].u & X86_PDPE_PG_MASK)));
-                    }
-                    break;
-                }
-            }
-
-            break;
-        }
-    }
-# endif
-#endif /* VBOX_STRICT */
-    return false;
-}
-#endif /* VBOX_WITH_PGMPOOL_PAGING_ONLY */
-
-
 # ifndef IN_RING3
 /**