Changeset 92420 in vbox

Timestamp:

Nov 15, 2021 8:47:32 AM (3 years ago)

Author:

vboxsync

Message:

VMM/PGM: Deal with VERR_NOT_SUPPORTED by RTR0MemObjLargeAlloc/GMMR0AllocateLargePage. Statistics. bugref:10093 bugref:5324

Location:

trunk/src/VBox/VMM

Files:

• VMMR0/PGMR0.cpp (modified) (3 diffs)
• VMMR3/PGM.cpp (modified) (1 diff)
• include/PGMInternal.h (modified) (2 diffs)

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

@@ -363 +363 @@
 int pgmR0PhysAllocateLargePage(PGVM pGVM, VMCPUID idCpu, RTGCPHYS GCPhys)
 {
-    STAM_PROFILE_ADV_START(&pGVM->pgm.s.Stats.StatLargePageAlloc2, a);
+    STAM_PROFILE_START(&pGVM->pgm.s.Stats.StatLargePageAlloc2, a);
     PGM_LOCK_ASSERT_OWNER_EX(pGVM, &pGVM->aCpus[idCpu]);
 
@@ -411 +411 @@
         {
             Log(("PGMR0PhysAllocateLargePage: Failed: %Rrc\n", rc));
+            STAM_REL_COUNTER_INC(&pGVM->pgm.s.StatLargePageAllocFailed);
+            if (rc == VERR_NOT_SUPPORTED)
+            {
+                LogRel(("PGM: Disabling large pages because of VERR_NOT_SUPPORTED status.\n"));
+                PGMSetLargePageUsage(pGVM, false);
+            }
             return rc;
         }
     }
 
-    STAM_PROFILE_ADV_STOP_START(&pGVM->pgm.s.Stats.StatLargePageAlloc2, &pGVM->pgm.s.Stats.StatLargePageSetup, a);
+    STAM_PROFILE_STOP_START(&pGVM->pgm.s.Stats.StatLargePageAlloc2, &pGVM->pgm.s.Stats.StatLargePageSetup, a);
 
     /*
@@ -475 +481 @@
     pgmPhysInvalidatePageMapTLB(pGVM);
 
-    STAM_PROFILE_ADV_STOP(&pGVM->pgm.s.Stats.StatLargePageSetup, a);
+    STAM_PROFILE_STOP(&pGVM->pgm.s.Stats.StatLargePageSetup, a);
 #if 0 /** @todo returning info statuses here might not be a great idea... */
     LogFlow(("PGMR0PhysAllocateLargePage: returns %Rrc\n", VBOXSTRICTRC_VAL(rc) ));

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

@@ -1221 +1221 @@
 
     PGM_REG_PROFILE_NS(&pPGM->StatLargePageAlloc,               "/PGM/LargePage/Alloc",               "Time spent by the host OS for large page allocation.");
+    PGM_REG_COUNTER(&pPGM->StatLargePageAllocFailed,            "/PGM/LargePage/AllocFailed",         "Number of allocation failures.");
     PGM_REG_COUNTER(&pPGM->StatLargePageOverflow,               "/PGM/LargePage/Overflow",            "The number of times allocating a large page took too long.");
     PGM_REG_COUNTER(&pPGM->StatLargePageTlbFlush,               "/PGM/LargePage/TlbFlush",            "The number of times a full VCPU TLB flush was required after a large allocation.");

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

@@ -3015 +3015 @@
     STAMPROFILE StatTrackDeref;                     /**< Profiling of SyncPageWorkerTrackDeref (expensive). */
 
-    STAMPROFILEADV StatLargePageAlloc2;            /**< Time spent setting up newly allocated large pages. */
-    STAMPROFILEADV StatLargePageSetup;             /**< Time spent setting up newly allocated large pages. */
+    STAMPROFILE StatLargePageAlloc2;                /**< Time spent setting up newly allocated large pages. */
+    STAMPROFILE StatLargePageSetup;                 /**< Time spent setting up newly allocated large pages. */
     /** pgmPhysIsValidLargePage profiling - R3 */
     STAMPROFILE StatR3IsValidLargePage;
@@ -3323 +3323 @@
 
     STAMPROFILE                     StatLargePageAlloc;     /**< Time spent by the host OS for large page allocation. */
+    STAMCOUNTER                     StatLargePageAllocFailed; /**< Count allocation failures. */
     STAMCOUNTER                     StatLargePageOverflow;  /**< The number of times allocating a large pages takes more than the allowed period. */
     STAMCOUNTER                     StatLargePageReused;    /**< The number of large pages we've reused.*/