Changeset 92383 in vbox for trunk/src

Timestamp:

Nov 11, 2021 10:44:05 PM (3 years ago)

Author:

vboxsync

Message:

VMM/PGM: Tweaking pgmR0PhysAllocateLargePage a bit to hope to speed it up a little bit. bugref:10093

Location:

trunk/src/VBox/VMM

Files:

• VMMR0/PGMR0.cpp (modified) (4 diffs)
• include/PGMInline.h (modified) (1 diff)

trunk/src/VBox/VMM/VMMR0/PGMR0.cpp

@@ -365 +365 @@
     while (cLeft-- > 0)
     {
-        PPGMPAGE pPage;
-        int rc2 = pgmPhysGetPageEx(pGVM, GCPhys, &pPage);
-        AssertRCReturn(rc2, rc2);
-        AssertReturn(PGM_PAGE_GET_TYPE(pPage) == PGMPAGETYPE_RAM, VERR_PGM_PHYS_NOT_RAM);
-        AssertReturn(PGM_PAGE_IS_ZERO(pPage), VERR_PGM_UNEXPECTED_PAGE_STATE);
+        PPGMPAGE const pPage = pgmPhysGetPage(pGVM, GCPhys);
+        AssertReturn(pPage && PGM_PAGE_GET_TYPE(pPage) == PGMPAGETYPE_RAM && PGM_PAGE_IS_ZERO(pPage), VERR_PGM_UNEXPECTED_PAGE_STATE);
 
         /* Make sure there are no zero mappings. */
         uint16_t const u16Tracking = PGM_PAGE_GET_TRACKING(pPage);
         if (u16Tracking == 0)
-        { /* likely */ }
+            Assert(PGM_PAGE_GET_PTE_INDEX(pPage) == 0);
         else
         {
@@ -382 +379 @@
             if (rc3 != VINF_SUCCESS && rc == VINF_SUCCESS)
                 rc = rc3; /** @todo not perfect... */
+            PGM_PAGE_SET_PTE_INDEX(pGVM, pPage, 0);
+            PGM_PAGE_SET_TRACKING(pGVM, pPage, 0);
         }
 
         /* Setup the new page. */
-        STAM_COUNTER_INC(&pGVM->pgm.s.Stats.StatRZPageReplaceZero);
-        pGVM->pgm.s.cZeroPages--;
-        pGVM->pgm.s.cPrivatePages++;
         PGM_PAGE_SET_HCPHYS(pGVM, pPage, HCPhys);
-        PGM_PAGE_SET_PAGEID(pGVM, pPage, idPage);
         PGM_PAGE_SET_STATE(pGVM, pPage, PGM_PAGE_STATE_ALLOCATED);
         PGM_PAGE_SET_PDE_TYPE(pGVM, pPage, PGM_PAGE_PDE_TYPE_PDE);
-        PGM_PAGE_SET_PTE_INDEX(pGVM, pPage, 0);
-        PGM_PAGE_SET_TRACKING(pGVM, pPage, 0);
+        PGM_PAGE_SET_PAGEID(pGVM, pPage, idPage);
         Log3(("PGMR0PhysAllocateLargePage: GCPhys=%RGp: idPage=%#x HCPhys=%RGp (old tracking=%#x)\n",
               GCPhys, idPage, HCPhys, u16Tracking));
@@ -403 +397 @@
     }
 
+    STAM_COUNTER_ADD(&pGVM->pgm.s.Stats.StatRZPageReplaceZero, _2M / PAGE_SIZE);
+    pGVM->pgm.s.cZeroPages    -= _2M / PAGE_SIZE;
+    pGVM->pgm.s.cPrivatePages += _2M / PAGE_SIZE;
+
     /*
      * Flush all TLBs.
      */
     if (!fFlushTLBs)
-    { /* likely */ }
+    { /* likely as we shouldn't normally map zero pages */ }
     else
     {
@@ -418 +416 @@
 
     STAM_PROFILE_STOP(&pGVM->pgm.s.Stats.StatLargePageSetup, b);
-    /** @todo returning info statuses here might not be a great idea... */
-#if 0
+#if 0 /** @todo returning info statuses here might not be a great idea... */
     LogFlow(("PGMR0PhysAllocateLargePage: returns %Rrc\n", VBOXSTRICTRC_VAL(rc) ));
     return VBOXSTRICTRC_TODO(rc);

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

@@ -103 +103 @@
     PPGMRAMRANGE pRam = pVM->pgm.s.CTX_SUFF(apRamRangesTlb)[PGM_RAMRANGE_TLB_IDX(GCPhys)];
     RTGCPHYS off;
-    if (   !pRam
-        || (off = GCPhys - pRam->GCPhys) >= pRam->cb)
-        return pgmPhysGetPageSlow(pVM, GCPhys);
-    STAM_COUNTER_INC(&pVM->pgm.s.Stats.CTX_MID_Z(Stat,RamRangeTlbHits));
-    return &pRam->aPages[off >> PAGE_SHIFT];
+    if (   pRam
+        && (off = GCPhys - pRam->GCPhys) < pRam->cb)
+    {
+        STAM_COUNTER_INC(&pVM->pgm.s.Stats.CTX_MID_Z(Stat,RamRangeTlbHits));
+        return &pRam->aPages[off >> PAGE_SHIFT];
+    }
+    return pgmPhysGetPageSlow(pVM, GCPhys);
 }