Changeset 36009 in vbox for trunk/src/VBox/VMM/include

Timestamp:

Feb 17, 2011 10:15:02 AM (14 years ago)

Author:

vboxsync

Message:

PGM: Fixed large pages and write monitoring (live snapshot). Added checks for PGM_PAGE_PDE_TYPE_PDE_DISABLED in a few places where only PGM_PAGE_PDE_TYPE_PDE was checked for (might have missed some).

Location:

trunk/src/VBox/VMM/include

Files:

• PGMInline.h (modified) (1 diff)
• PGMInternal.h (modified) (3 diffs)

trunk/src/VBox/VMM/include/PGMInline.h

@@ -563 +563 @@
 
 #endif /* !IN_RC */
+
+
+/**
+ * Enables write monitoring for an allocated page.
+ *  
+ * The caller is responsible for updating the shadow page tables. 
+ *  
+ * @param   pVM         The VM handle.
+ * @param   pPage       The page to write monitor. 
+ * @param   GCPhysPage  The address of the page.
+ */
+DECLINLINE(void) pgmPhysPageWriteMonitor(PVM pVM, PPGMPAGE pPage, RTGCPHYS GCPhysPage)
+{
+    Assert(PGM_PAGE_GET_STATE(pPage) == PGM_PAGE_STATE_ALLOCATED);
+    Assert(PGMIsLockOwner(pVM));
+
+    PGM_PAGE_SET_STATE(pPage, PGM_PAGE_STATE_WRITE_MONITORED);
+    pVM->pgm.s.cMonitoredPages++;
+
+    /* Large pages must disabled. */
+    if (PGM_PAGE_GET_PDE_TYPE(pPage) == PGM_PAGE_PDE_TYPE_PDE)
+    {
+        PPGMPAGE pFirstPage = pgmPhysGetPage(&pVM->pgm.s, GCPhysPage & X86_PDE2M_PAE_PG_MASK);
+        AssertFatal(pFirstPage);
+        if (PGM_PAGE_GET_PDE_TYPE(pFirstPage) == PGM_PAGE_PDE_TYPE_PDE)
+        {
+            PGM_PAGE_SET_PDE_TYPE(pFirstPage, PGM_PAGE_PDE_TYPE_PDE_DISABLED);
+            pVM->pgm.s.cLargePagesDisabled++;
+        }
+        else
+            Assert(PGM_PAGE_GET_PDE_TYPE(pFirstPage) == PGM_PAGE_PDE_TYPE_PDE_DISABLED);
+    }
+}
 
 

trunk/src/VBox/VMM/include/PGMInternal.h

@@ -3213 +3213 @@
     uint32_t                        cMappedChunks;      /**< Number of times we mapped a chunk. */
     uint32_t                        cUnmappedChunks;    /**< Number of times we unmapped a chunk. */
+    uint32_t                        cLargePages;        /**< The number of large pages. */
+    uint32_t                        cLargePagesDisabled;/**< The number of disabled large pages. */
 /*    uint32_t                        aAlignment4[1]; */
 
@@ -3218 +3220 @@
     STAMCOUNTER                     cRelocations;
 
-    STAMCOUNTER                     StatLargePageAlloc;                 /**< The number of large pages we've allocated.*/
     STAMCOUNTER                     StatLargePageReused;                /**< The number of large pages we've reused.*/
     STAMCOUNTER                     StatLargePageRefused;               /**< The number of times we couldn't use a large page.*/
@@ -3766 +3767 @@
 int             pgmPhysAllocPage(PVM pVM, PPGMPAGE pPage, RTGCPHYS GCPhys);
 int             pgmPhysAllocLargePage(PVM pVM, RTGCPHYS GCPhys);
-int             pgmPhysIsValidLargePage(PVM pVM, RTGCPHYS GCPhys, PPGMPAGE pLargePage);
+int             pgmPhysRecheckLargePage(PVM pVM, RTGCPHYS GCPhys, PPGMPAGE pLargePage);
 int             pgmPhysPageLoadIntoTlb(PPGM pPGM, RTGCPHYS GCPhys);
 int             pgmPhysPageLoadIntoTlbWithPage(PPGM pPGM, PPGMPAGE pPage, RTGCPHYS GCPhys);