Changeset 92177 in vbox for trunk

Timestamp:

Nov 2, 2021 1:48:55 PM (3 years ago)

Author:

vboxsync

Message:

VMM/PGM,NEM: Moved the StatProfQueryGpaRangeDirtyBitmap NEM stat up to PGM. bugref:10122

Location:

trunk/src/VBox/VMM

Files:

• VMMR3/NEMR3Native-win.cpp (modified) (2 diffs)
• VMMR3/PGM.cpp (modified) (1 diff)
• VMMR3/PGMPhys.cpp (modified) (1 diff)
• include/NEMInternal.h (modified) (1 diff)
• include/PGMInternal.h (modified) (1 diff)

trunk/src/VBox/VMM/VMMR3/NEMR3Native-win.cpp

@@ -1389 +1389 @@
                         STAMR3Register(pVM, &pVM->nem.s.StatProfUnmapGpaRange, STAMTYPE_PROFILE, STAMVISIBILITY_ALWAYS,
                                        "/NEM/PagesUnmapGpaRange", STAMUNIT_TICKS_PER_CALL, "Profiling calls to WHvUnmapGpaRange for bigger stuff");
-                        STAMR3Register(pVM, &pVM->nem.s.StatProfQueryGpaRangeDirtyBitmap, STAMTYPE_PROFILE, STAMVISIBILITY_ALWAYS,
-                                       "/NEM/PagesQueryGpaRangeDirtyBitmap", STAMUNIT_TICKS_PER_CALL, "Profiling calls to WHvQueryGpaRangeDirtyBitmap (MMIO2/VRAM)");
 #  endif
 #  ifndef NEM_WIN_USE_HYPERCALLS_FOR_PAGES
@@ -2187 +2185 @@
     RT_NOREF(uNemRange);
 
-    STAM_REL_PROFILE_START(&pVM->nem.s.StatProfQueryGpaRangeDirtyBitmap, a);
+    /* This is being profiled by PGM, see /PGM/Mmio2QueryAndResetDirtyBitmap. */
     HRESULT hrc = WHvQueryGpaRangeDirtyBitmap(pVM->nem.s.hPartition, GCPhys, cb, (UINT64 *)pvBitmap, (uint32_t)cbBitmap);
-    STAM_REL_PROFILE_STOP(&pVM->nem.s.StatProfQueryGpaRangeDirtyBitmap, a);
     if (SUCCEEDED(hrc))
         return VINF_SUCCESS;

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

@@ -1187 +1187 @@
 
     STAM_REL_REG(pVM, &pPGM->StatShModCheck,                     STAMTYPE_PROFILE, "/PGM/ShMod/Check",                   STAMUNIT_TICKS_PER_CALL, "Profiles the shared module checking.");
+    STAM_REL_REG(pVM, &pPGM->StatMmio2QueryAndResetDirtyBitmap,  STAMTYPE_PROFILE, "/PGM/Mmio2QueryAndResetDirtyBitmap", STAMUNIT_TICKS_PER_CALL, "Profiles calls to PGMR3PhysMmio2QueryAndResetDirtyBitmap (sans locking).");
 
     /* Live save */

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

@@ -4039 +4039 @@
     if (RT_SUCCESS(rc))
     {
+        STAM_PROFILE_START(&pVM->pgm.s.StatMmio2QueryAndResetDirtyBitmap, a);
         rc = pgmR3PhysMmio2QueryAndResetDirtyBitmapLocked(pVM, pDevIns, hMmio2, pvBitmap, cbBitmap);
+        STAM_PROFILE_STOP(&pVM->pgm.s.StatMmio2QueryAndResetDirtyBitmap, a);
         PGM_UNLOCK(pVM);
     }

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

@@ -220 +220 @@
     STAMPROFILE                 StatProfMapGpaRange;
     STAMPROFILE                 StatProfUnmapGpaRange;
-    STAMPROFILE                 StatProfQueryGpaRangeDirtyBitmap;
 #  endif
 #  ifndef NEM_WIN_USE_HYPERCALLS_FOR_PAGES

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

@@ -3282 +3282 @@
 
     STAMPROFILE                     StatShModCheck;         /**< Profiles shared module checks. */
+
+    STAMPROFILE                     StatMmio2QueryAndResetDirtyBitmap; /**< Profiling PGMR3PhysMmio2QueryAndResetDirtyBitmap. */
     /** @} */