Changeset 92368 in vbox for trunk/src/VBox/VMM/VMMR3

Timestamp:

Nov 11, 2021 1:31:21 PM (3 years ago)

Author:

vboxsync

Message:

VMM/PGM,GMM: Baked PGMR3PhysAllocateLargePage into PGMR0PhysAllocateLargePage eliminating VMMCALLRING3_PGM_ALLOCATE_LARGE_HANDY_PAGE; adjusted GMMR0AllocateLargePage to be ring-0 callable. Changed the large page allocation backoff logic a bit. Some more release stats. bugref:10093

Location:

trunk/src/VBox/VMM/VMMR3

Files:

• PGM.cpp (modified) (3 diffs)
• PGMPhys.cpp (modified) (2 diffs)
• VMM.cpp (modified) (1 diff)

trunk/src/VBox/VMM/VMMR3/PGM.cpp

@@ -1157 +1157 @@
     STAM_REL_REG(pVM, &pPGM->cLargePages,                        STAMTYPE_U32,     "/PGM/Page/cLargePages",              STAMUNIT_COUNT,     "The number of large pages allocated (includes disabled).");
     STAM_REL_REG(pVM, &pPGM->cLargePagesDisabled,                STAMTYPE_U32,     "/PGM/Page/cLargePagesDisabled",      STAMUNIT_COUNT,     "The number of disabled large pages.");
-    STAM_REL_REG(pVM, &pPGM->cRelocations,                       STAMTYPE_COUNTER, "/PGM/cRelocations",                  STAMUNIT_OCCURENCES,"Number of hypervisor relocations.");
     STAM_REL_REG(pVM, &pPGM->ChunkR3Map.c,                       STAMTYPE_U32,     "/PGM/ChunkR3Map/c",                  STAMUNIT_COUNT,     "Number of mapped chunks.");
     STAM_REL_REG(pVM, &pPGM->ChunkR3Map.cMax,                    STAMTYPE_U32,     "/PGM/ChunkR3Map/cMax",               STAMUNIT_COUNT,     "Maximum number of mapped chunks.");
@@ -1190 +1189 @@
     STAM_REL_REG_USED(pVM, &pPGM->LiveSave.Mmio2.cMonitoredPages,STAMTYPE_U32,     "/PGM/LiveSave/Mmio2/cMonitoredPages",STAMUNIT_COUNT,     "MMIO2: Write monitored pages.");
 
-#ifdef VBOX_WITH_STATISTICS
-
-# define PGM_REG_COUNTER(a, b, c) \
+#define PGM_REG_COUNTER(a, b, c) \
         rc = STAMR3RegisterF(pVM, a, STAMTYPE_COUNTER, STAMVISIBILITY_ALWAYS, STAMUNIT_OCCURENCES, c, b); \
         AssertRC(rc);
 
-# define PGM_REG_COUNTER_BYTES(a, b, c) \
+#define PGM_REG_COUNTER_BYTES(a, b, c) \
         rc = STAMR3RegisterF(pVM, a, STAMTYPE_COUNTER, STAMVISIBILITY_ALWAYS, STAMUNIT_BYTES, c, b); \
         AssertRC(rc);
 
-# define PGM_REG_PROFILE(a, b, c) \
+#define PGM_REG_PROFILE(a, b, c) \
         rc = STAMR3RegisterF(pVM, a, STAMTYPE_PROFILE, STAMVISIBILITY_ALWAYS, STAMUNIT_TICKS_PER_CALL, c, b); \
         AssertRC(rc);
-
-    PGMSTATS *pStats = &pVM->pgm.s.Stats;
-
-    PGM_REG_PROFILE(&pStats->StatAllocLargePage,                "/PGM/LargePage/Alloc",               "Time spent by the host OS for large page allocation.");
-    PGM_REG_PROFILE(&pStats->StatClearLargePage,                "/PGM/LargePage/Clear",               "Time spent clearing the newly allocated large pages.");
-    PGM_REG_COUNTER(&pStats->StatLargePageOverflow,             "/PGM/LargePage/Overflow",            "The number of times allocating a large page took too long.");
+#define PGM_REG_PROFILE_NS(a, b, c) \
+        rc = STAMR3RegisterF(pVM, a, STAMTYPE_PROFILE, STAMVISIBILITY_ALWAYS, STAMUNIT_NS_PER_CALL, c, b); \
+        AssertRC(rc);
+
+#ifdef VBOX_WITH_STATISTICS
+    PGMSTATS *pStats = &pPGM->Stats;
+#endif
+
+    PGM_REG_PROFILE_NS(&pPGM->StatLargePageAlloc,               "/PGM/LargePage/Alloc",               "Time spent by the host OS for large page allocation.");
+    PGM_REG_COUNTER(&pPGM->StatLargePageOverflow,               "/PGM/LargePage/Overflow",            "The number of times allocating a large page took too long.");
+#ifdef VBOX_WITH_STATISTICS
+    PGM_REG_PROFILE(&pStats->StatLargePageSetup,                "/PGM/LargePage/Setup",               "Time spent setting up the newly allocated large pages.");
     PGM_REG_PROFILE(&pStats->StatR3IsValidLargePage,            "/PGM/LargePage/IsValidR3",           "pgmPhysIsValidLargePage profiling - R3.");
     PGM_REG_PROFILE(&pStats->StatRZIsValidLargePage,            "/PGM/LargePage/IsValidRZ",           "pgmPhysIsValidLargePage profiling - RZ.");
@@ -1287 +1290 @@
     PGM_REG_COUNTER(&pStats->StatTrackNoExtentsLeft,            "/PGM/Track/NoExtentLeft",            "The number of times the extent list was exhausted.");
     PGM_REG_PROFILE(&pStats->StatTrackDeref,                    "/PGM/Track/Deref",                   "Profiling of SyncPageWorkerTrackDeref (expensive).");
-
-# undef PGM_REG_COUNTER
-# undef PGM_REG_PROFILE
 #endif
+
+#undef PGM_REG_COUNTER
+#undef PGM_REG_PROFILE
+#undef PGM_REG_PROFILE_NS
 
     /*

trunk/src/VBox/VMM/VMMR3/PGMPhys.cpp

@@ -2176 +2176 @@
     /*
      * Flush the handy pages updates to make sure no shared pages are hiding
-     * in there.  (No unlikely if the VM shuts down, apparently.)
+     * in there.  (Not unlikely if the VM shuts down, apparently.)
      */
     rc = VMMR3CallR0(pVM, VMMR0_DO_PGM_FLUSH_HANDY_PAGES, 0, NULL);
@@ -5815 +5815 @@
 
 /**
- * Response to VMMCALLRING3_PGM_ALLOCATE_LARGE_HANDY_PAGE to allocate a large
- * (2MB) page for use with a nested paging PDE.
- *
- * @returns The following VBox status codes.
- * @retval  VINF_SUCCESS on success.
- * @retval  VINF_EM_NO_MEMORY if we're out of memory.
- *
- * @param   pVM         The cross context VM structure.
- * @param   GCPhys      GC physical start address of the 2 MB range
- */
-VMMR3_INT_DECL(int) PGMR3PhysAllocateLargePage(PVM pVM, RTGCPHYS GCPhys)
-{
-#ifdef PGM_WITH_LARGE_PAGES
-    PGM_LOCK_VOID(pVM);
-
-    STAM_PROFILE_START(&pVM->pgm.s.Stats.StatAllocLargePage, a);
-    uint64_t const msAllocStart = RTTimeMilliTS();
-    int rc = VMMR3CallR0(pVM, VMMR0_DO_PGM_ALLOCATE_LARGE_HANDY_PAGE, 0, NULL);
-    uint64_t const cMsElapsed   = RTTimeMilliTS() - msAllocStart;
-    STAM_PROFILE_STOP(&pVM->pgm.s.Stats.StatAllocLargePage, a);
-    if (RT_SUCCESS(rc))
-    {
-        Assert(pVM->pgm.s.cLargeHandyPages == 1);
-
-        uint32_t idPage = pVM->pgm.s.aLargeHandyPage[0].idPage;
-        RTHCPHYS HCPhys = pVM->pgm.s.aLargeHandyPage[0].HCPhysGCPhys;
-        Assert(pVM->pgm.s.aLargeHandyPage[0].fZeroed);
-
-        /*
-         * Enter the pages into PGM.
-         */
-        STAM_PROFILE_START(&pVM->pgm.s.Stats.StatClearLargePage, b);
-        for (unsigned i = 0; i < _2M/PAGE_SIZE; i++)
-        {
-            PPGMPAGE pPage;
-            rc = pgmPhysGetPageEx(pVM, GCPhys, &pPage);
-            AssertRC(rc);
-
-            Assert(PGM_PAGE_IS_ZERO(pPage));
-            STAM_COUNTER_INC(&pVM->pgm.s.Stats.StatRZPageReplaceZero);
-            pVM->pgm.s.cZeroPages--;
-
-            /*
-             * Do the PGMPAGE modifications.
-             */
-            pVM->pgm.s.cPrivatePages++;
-            PGM_PAGE_SET_HCPHYS(pVM, pPage, HCPhys);
-            PGM_PAGE_SET_PAGEID(pVM, pPage, idPage);
-            PGM_PAGE_SET_STATE(pVM, pPage, PGM_PAGE_STATE_ALLOCATED);
-            PGM_PAGE_SET_PDE_TYPE(pVM, pPage, PGM_PAGE_PDE_TYPE_PDE);
-            PGM_PAGE_SET_PTE_INDEX(pVM, pPage, 0);
-            PGM_PAGE_SET_TRACKING(pVM, pPage, 0);
-
-            /* Somewhat dirty assumption that page ids are increasing. */
-            idPage++;
-
-            HCPhys += PAGE_SIZE;
-            GCPhys += PAGE_SIZE;
-            Log3(("PGMR3PhysAllocateLargePage: idPage=%#x HCPhys=%RGp\n", idPage, HCPhys));
-        }
-        STAM_PROFILE_STOP(&pVM->pgm.s.Stats.StatClearLargePage, b);
-
-        /* Flush all TLBs. */
-        PGM_INVL_ALL_VCPU_TLBS(pVM);
-        pgmPhysInvalidatePageMapTLB(pVM);
-
-        pVM->pgm.s.cLargeHandyPages = 0;
-    }
-
-    if (RT_SUCCESS(rc))
-    {
-        static uint32_t cTimeOut = 0;
-        if (cMsElapsed > 100)
-        {
-            STAM_COUNTER_INC(&pVM->pgm.s.Stats.StatLargePageOverflow);
-            if (   ++cTimeOut > 10
-                || cMsElapsed > 1000 /* more than one second forces an early retirement from allocating large pages. */)
-            {
-                /* If repeated attempts to allocate a large page takes more than 100 ms, then we fall back to normal 4k pages.
-                 * E.g. Vista 64 tries to move memory around, which takes a huge amount of time.
-                 */
-                LogRel(("PGMR3PhysAllocateLargePage: allocating large pages takes too long (last attempt %RU64 ms; nr of timeouts %d); DISABLE\n", cMsElapsed, cTimeOut));
-                PGMSetLargePageUsage(pVM, false);
-            }
-        }
-        else if (cTimeOut > 0)
-            cTimeOut--;
-    }
-
-    PGM_UNLOCK(pVM);
-    return rc;
-#else
-    RT_NOREF(pVM, GCPhys);
-    return VERR_NOT_IMPLEMENTED;
-#endif /* PGM_WITH_LARGE_PAGES */
-}
-
-
-/**
  * Response to VM_FF_PGM_NEED_HANDY_PAGES and VMMCALLRING3_PGM_ALLOCATE_HANDY_PAGES.
  *

trunk/src/VBox/VMM/VMMR3/VMM.cpp

@@ -2509 +2509 @@
 
         /*
-         * Allocates a large page.
-         */
-        case VMMCALLRING3_PGM_ALLOCATE_LARGE_HANDY_PAGE:
-        {
-            pVCpu->vmm.s.rcCallRing3 = PGMR3PhysAllocateLargePage(pVM, pVCpu->vmm.s.u64CallRing3Arg);
-            break;
-        }
-
-        /*
          * Signal a ring 0 hypervisor assertion.
          * Cancel the longjmp operation that's in progress.