Changeset 4714 in vbox

Timestamp:

Sep 11, 2007 4:30:42 PM (17 years ago)

Author:

vboxsync

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

24386

Message:

ZeroPg

Location:

trunk/src/VBox/VMM

Files:

• PGM.cpp (modified) (4 diffs)
• PGMInternal.h (modified) (1 diff)
• VMMAll/PGMAllPhys.cpp (modified) (3 diffs)
• testcase/tstVMStructGC.cpp (modified) (1 diff)

trunk/src/VBox/VMM/PGM.cpp

@@ -925 +925 @@
         return rc;
 
-    /* Initialise PGM critical section. */
+    /* 
+     * Initialize the PGM critical section and flush the phys TLBs
+     */
     rc = PDMR3CritSectInit(pVM, &pVM->pgm.s.CritSect, "PGM");
     AssertRCReturn(rc, rc);
 
-    /* 
-     * Invalidate the TLBs.
-     */
     PGMR3PhysChunkInvalidateTLB(pVM);
     PGMPhysInvalidatePageR3MapTLB(pVM);
@@ -944 +943 @@
     {
         pVM->pgm.s.pTreesGC = MMHyperHC2GC(pVM, pVM->pgm.s.pTreesHC);
+
+        /*
+         * Alocate the zero page.
+         */
+        rc = MMHyperAlloc(pVM, PAGE_SIZE, PAGE_SIZE, MM_TAG_PGM, &pVM->pgm.s.pvZeroPgR3);
+    }
+    if (VBOX_SUCCESS(rc))
+    {
+        pVM->pgm.s.pvZeroPgGC = MMHyperR3ToGC(pVM, pVM->pgm.s.pvZeroPgR3);
+        pVM->pgm.s.pvZeroPgR0 = MMHyperR3ToR0(pVM, pVM->pgm.s.pvZeroPgR3);
+        AssertRelease(pVM->pgm.s.pvZeroPgR0 != NIL_RTHCPHYS);
+        pVM->pgm.s.HCPhysZeroPg = MMR3HyperHCVirt2HCPhys(pVM, pVM->pgm.s.pvZeroPgR3);
+        AssertRelease(pVM->pgm.s.HCPhysZeroPg != NIL_RTHCPHYS);
 
         /*
@@ -995 +1007 @@
         return VINF_SUCCESS;
     }
-    /* No cleanup necessary, MM frees all memory. */
+
+    /* Almost no cleanup necessary, MM frees all memory. */
+    PDMR3CritSectDelete(&pVM->pgm.s.CritSect);
 
     return rc;
@@ -1608 +1622 @@
     pVM->pgm.s.paDynPageMapPaePTEsGC += offDelta;
     pVM->pgm.s.pbDynPageMapBaseGC += offDelta;
+
+    /*
+     * The Zero page.
+     */
+    pVM->pgm.s.pvZeroPgR0 = MMHyperR3ToR0(pVM, pVM->pgm.s.pvZeroPgR3);
+    AssertRelease(pVM->pgm.s.pvZeroPgR0);
 
     /*

trunk/src/VBox/VMM/PGMInternal.h

@@ -1835 +1835 @@
     PGMPAGER3MAPTLB                 PhysTlbHC;
 
+    /** @name   The zero page.
+     * @{ */
+    /** The host physical address of the zero page. */
+    RTHCPHYS                        HCPhysZeroPg;
+    /** The ring-3 mapping of the zero page. */ 
+    RTR3PTR                         pvZeroPgR3;
+    /** The ring-0 mapping of the zero page. */ 
+    RTR0PTR                         pvZeroPgR0;
+    /** The GC mapping of the zero page. */ 
+    RTGCPTR                         pvZeroPgGC;
+#if GC_ARCH_BITS == 32
+    uint32_t                        u32ZeroAlignment; /**< Alignment padding. */
+#endif
+    /** @}*/
+
     /** @name Release Statistics
      * @{ */

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

@@ -250 +250 @@
     *ppMap = NULL;
     RTHCPHYS HCPhys = PGM_PAGE_GET_HCPHYS(pPage);
-    /** @todo  Assert(HCPhys != pVM->pgm.s.HCPhysZeroPg); */
+    Assert(HCPhys != pVM->pgm.s.HCPhysZeroPg);
     return PGMGCDynMapHCPage(pVM, HCPhys, ppv);
 
@@ -298 +298 @@
     {
         Assert(PGM_PAGE_IS_ZERO(pPage));
-        ///@todo *ppv = pVM->pgm.s.pvZeroPgR3;
+        *ppv = pVM->pgm.s.CTXALLSUFF(pvZeroPg);
         *ppMap = NULL;
         return VINF_SUCCESS;
@@ -359 +359 @@
     else
     {
-        /** @todo Assert(PGM_PAGE_GET_HCPHYS(pPage) == pPGM->HCPhysZeroPg); */
+        Assert(PGM_PAGE_GET_HCPHYS(pPage) == pPGM->HCPhysZeroPg);
         pTlbe->pMap = NULL;
-        /** @todo pTlbe->pv = pPGM->pvZeroPgR3; */
+        pTlbe->pv = pPGM->CTXALLSUFF(pvZeroPg);
     }
     pTlbe->pPage = pPage;

trunk/src/VBox/VMM/testcase/tstVMStructGC.cpp

@@ -407 +407 @@
     GEN_CHECK_OFF(PGM, pgmphysreadcache);
     GEN_CHECK_OFF(PGM, pgmphyswritecache);
+    GEN_CHECK_OFF(PGM, ChunkR3Map);
+    GEN_CHECK_OFF(PGM, ChunkR3Map.pTree);
+    GEN_CHECK_OFF(PGM, ChunkR3Map.Tlb);
+    GEN_CHECK_OFF(PGM, ChunkR3Map.c);
+    GEN_CHECK_OFF(PGM, ChunkR3Map.cMax);
+    GEN_CHECK_OFF(PGM, ChunkR3Map.iNow);
+    GEN_CHECK_OFF(PGM, ChunkR3Map.AgeingCountdown);
+    GEN_CHECK_OFF(PGM, PhysTlbHC);
+    GEN_CHECK_OFF(PGM, PhysTlbHC.aEntries[0]);
+    GEN_CHECK_OFF(PGM, PhysTlbHC.aEntries[1]);
+    GEN_CHECK_OFF(PGM, PhysTlbHC.aEntries[1].GCPhys);
+    GEN_CHECK_OFF(PGM, PhysTlbHC.aEntries[1].pMap);
+    GEN_CHECK_OFF(PGM, PhysTlbHC.aEntries[1].pPage);
+    GEN_CHECK_OFF(PGM, PhysTlbHC.aEntries[1].pv);
+    GEN_CHECK_OFF(PGM, HCPhysZeroPg);
+    GEN_CHECK_OFF(PGM, pvZeroPgR3);
+    GEN_CHECK_OFF(PGM, pvZeroPgR0);
+    GEN_CHECK_OFF(PGM, pvZeroPgGC);
+
     GEN_CHECK_SIZE(PGMMAPPING);
     GEN_CHECK_OFF(PGMMAPPING, pNextR3);