Changeset 91246 in vbox for trunk/src/VBox/VMM

Timestamp:

Sep 15, 2021 11:29:42 AM (3 years ago)

Author:

vboxsync

Message:

VMM/PGM: Some cleanups around large page allocation... bugref:10093

Location:

trunk/src/VBox/VMM

Files:

• VMMAll/PGMAllPhys.cpp (modified) (1 diff)
• VMMR3/PGM.cpp (modified) (1 diff)
• VMMR3/PGMPhys.cpp (modified) (2 diffs)
• VMMR3/VMM.cpp (modified) (1 diff)

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

@@ -947 +947 @@
              */
 # ifdef IN_RING3
-            rc = PGMR3PhysAllocateLargeHandyPage(pVM, GCPhysBase);
+            rc = PGMR3PhysAllocateLargePage(pVM, GCPhysBase);
 # else
             rc = VMMRZCallRing3NoCpu(pVM, VMMCALLRING3_PGM_ALLOCATE_LARGE_HANDY_PAGE, GCPhysBase);

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

@@ -1310 +1310 @@
     PGMSTATS *pStats = pVM->pgm.s.pStatsR3;
 
-    PGM_REG_PROFILE(&pStats->StatAllocLargePage,                "/PGM/LargePage/Prof/Alloc",          "Time spent by the host OS for large page allocation.");
-    PGM_REG_PROFILE(&pStats->StatClearLargePage,                "/PGM/LargePage/Prof/Clear",          "Time spent clearing the newly allocated large pages.");
+    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.");
-    PGM_REG_PROFILE(&pStats->StatR3IsValidLargePage,            "/PGM/LargePage/Prof/R3/IsValid",     "pgmPhysIsValidLargePage profiling - R3.");
-    PGM_REG_PROFILE(&pStats->StatRZIsValidLargePage,            "/PGM/LargePage/Prof/RZ/IsValid",     "pgmPhysIsValidLargePage profiling - RZ.");
+    PGM_REG_PROFILE(&pStats->StatR3IsValidLargePage,            "/PGM/LargePage/IsValidR3",           "pgmPhysIsValidLargePage profiling - R3.");
+    PGM_REG_PROFILE(&pStats->StatRZIsValidLargePage,            "/PGM/LargePage/IsValidRZ",           "pgmPhysIsValidLargePage profiling - RZ.");
 
     PGM_REG_COUNTER(&pStats->StatR3DetectedConflicts,           "/PGM/R3/DetectedConflicts",          "The number of times PGMR3CheckMappingConflicts() detected a conflict.");

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

@@ -4930 +4930 @@
  * @param   GCPhys      GC physical start address of the 2 MB range
  */
-VMMR3DECL(int) PGMR3PhysAllocateLargeHandyPage(PVM pVM, RTGCPHYS GCPhys)
+VMMR3_INT_DECL(int) PGMR3PhysAllocateLargePage(PVM pVM, RTGCPHYS GCPhys)
 {
 #ifdef PGM_WITH_LARGE_PAGES
-    uint64_t u64TimeStamp1, u64TimeStamp2;
-
     PGM_LOCK_VOID(pVM);
 
     STAM_PROFILE_START(&pVM->pgm.s.CTX_SUFF(pStats)->StatAllocLargePage, a);
-    u64TimeStamp1 = RTTimeMilliTS();
+    uint64_t const msAllocStart = RTTimeMilliTS();
     int rc = VMMR3CallR0(pVM, VMMR0_DO_PGM_ALLOCATE_LARGE_HANDY_PAGE, 0, NULL);
-    u64TimeStamp2 = RTTimeMilliTS();
+    uint64_t const cMsElapsed   = RTTimeMilliTS() - msAllocStart;
     STAM_PROFILE_STOP(&pVM->pgm.s.CTX_SUFF(pStats)->StatAllocLargePage, a);
     if (RT_SUCCESS(rc))
@@ -5012 +5010 @@
     {
         static uint32_t cTimeOut = 0;
-        uint64_t u64TimeStampDelta = u64TimeStamp2 - u64TimeStamp1;
-
-        if (u64TimeStampDelta > 100)
+        if (cMsElapsed > 100)
         {
             STAM_COUNTER_INC(&pVM->pgm.s.CTX_SUFF(pStats)->StatLargePageOverflow);
-            if (    ++cTimeOut > 10
-                ||  u64TimeStampDelta > 1000 /* more than one second forces an early retirement from allocating large pages. */)
+            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 %d ms; nr of timeouts %d); DISABLE\n", u64TimeStampDelta, cTimeOut));
+                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)
+        else if (cTimeOut > 0)
             cTimeOut--;
     }

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

@@ -2513 +2513 @@
         case VMMCALLRING3_PGM_ALLOCATE_LARGE_HANDY_PAGE:
         {
-            pVCpu->vmm.s.rcCallRing3 = PGMR3PhysAllocateLargeHandyPage(pVM, pVCpu->vmm.s.u64CallRing3Arg);
+            pVCpu->vmm.s.rcCallRing3 = PGMR3PhysAllocateLargePage(pVM, pVCpu->vmm.s.u64CallRing3Arg);
             break;
         }