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

Timestamp:

Mar 7, 2025 2:09:31 PM (2 months ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

167867

Message:

VMM/GIC: bugref:10404 STAM counters.

Location:

trunk/src/VBox/VMM

Files:

• VMMAll/GICAll.cpp (modified) (8 diffs)
• VMMR3/GICR3.cpp (modified) (1 diff)
• include/GICInternal.h (modified) (1 diff)

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

@@ -3200 +3200 @@
     PGICDEV    pGicDev = PDMDEVINS_2_DATA(pDevIns, PGICDEV);
 
-    int const  rcLock  = PDMDevHlpCritSectEnter(pDevIns, pDevIns->pCritSectRoR3, VERR_IGNORED);
-    PDM_CRITSECT_RELEASE_ASSERT_RC_DEV(pDevIns, pDevIns->pCritSectRoR3, rcLock);
+#ifdef VBOX_WITH_STATISTICS
+    PVMCPU pVCpu = VMMGetCpu(pVM);
+    if (pVCpu)
+        STAM_COUNTER_INC(&pVCpu->gic.s.CTX_SUFF_Z(StatSetSpi));
+#endif
 
 #if 0
@@ -3216 +3219 @@
 
     Assert(idxIntr >= GIC_INTID_RANGE_SPI_START);
-    AssertMsgReturnStmt(idxIntr < sizeof(pGicDev->bmIntrPending) * 8,
-                        ("out-of-range SPI interrupt ID %RU32 (%RU32)\n", uIntId, uSpiIntId),
-                        PDMDevHlpCritSectLeave(pDevIns, pDevIns->pCritSectRoR3),
-                        VERR_INVALID_PARAMETER);
+    AssertMsgReturn(idxIntr < sizeof(pGicDev->bmIntrPending) * 8,
+                    ("out-of-range SPI interrupt ID %RU32 (%RU32)\n", uIntId, uSpiIntId),
+                    VERR_INVALID_PARAMETER);
+
+    int const rcLock = PDMDevHlpCritSectEnter(pDevIns, pDevIns->pCritSectRoR3, VERR_IGNORED);
+    PDM_CRITSECT_RELEASE_ASSERT_RC_DEV(pDevIns, pDevIns->pCritSectRoR3, rcLock);
 
     /* Update the interrupt pending state. */
@@ -3226 +3231 @@
     else
         ASMBitClear(&pGicDev->bmIntrPending[0], idxIntr);
+
     int const rc = VBOXSTRICTRC_VAL(gicDistUpdateIrqState(pVM, pGicDev));
 #endif
@@ -3244 +3250 @@
     PCGICDEV   pGicDev = PDMDEVINS_2_DATA(pDevIns, PCGICDEV);
     PGICCPU    pGicCpu = VMCPU_TO_GICCPU(pVCpu);
-    int const  rcLock  = PDMDevHlpCritSectEnter(pDevIns, pDevIns->pCritSectRoR3, VERR_IGNORED);
-    PDM_CRITSECT_RELEASE_ASSERT_RC_DEV(pDevIns, pDevIns->pCritSectRoR3, rcLock);
 
 #if 0
@@ -3255 +3259 @@
 
     Assert(idxIntr >= GIC_INTID_RANGE_PPI_START);
-    AssertMsgReturnStmt(idxIntr < sizeof(pGicCpu->bmIntrPending) * 8,
-                        ("out-of-range PPI interrupt ID %RU32 (%RU32)\n", uIntId, uPpiIntId),
-                        PDMDevHlpCritSectLeave(pDevIns, pDevIns->pCritSectRoR3),
-                        VERR_INVALID_PARAMETER);
+    AssertMsgReturn(idxIntr < sizeof(pGicCpu->bmIntrPending) * 8,
+                    ("out-of-range PPI interrupt ID %RU32 (%RU32)\n", uIntId, uPpiIntId),
+                    VERR_INVALID_PARAMETER);
+
+    int const  rcLock  = PDMDevHlpCritSectEnter(pDevIns, pDevIns->pCritSectRoR3, VERR_IGNORED);
+    PDM_CRITSECT_RELEASE_ASSERT_RC_DEV(pDevIns, pDevIns->pCritSectRoR3, rcLock);
 
     /* Update the interrupt pending state. */
@@ -3265 +3271 @@
     else
         ASMBitClear(&pGicCpu->bmIntrPending[0], idxIntr);
+
     int const rc = VBOXSTRICTRC_VAL(gicReDistUpdateIrqState(pGicDev, pVCpu));
 #endif
 
     PDMDevHlpCritSectLeave(pDevIns, pDevIns->pCritSectRoR3);
-
     return rc;
 }
@@ -3397 +3403 @@
     VMCPU_ASSERT_EMT(pVCpu);
     Assert(pu64Value);
+
+    STAM_COUNTER_INC(&pVCpu->gic.s.CTX_SUFF_Z(StatSysRegRead));
 
     *pu64Value = 0;
@@ -3598 +3606 @@
     VMCPU_ASSERT_EMT(pVCpu);
     LogFlowFunc(("pVCpu=%p u32Reg=%#x{%s} u64Value=%RX64\n", pVCpu, u32Reg, gicIccGetRegDescription(u32Reg), u64Value));
+
+    STAM_COUNTER_INC(&pVCpu->gic.s.CTX_SUFF_Z(StatSysRegWrite));
 
     PPDMDEVINS pDevIns = VMCPU_TO_DEVINS(pVCpu);

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

@@ -884 +884 @@
         GIC_REG_COUNTER(&pGicCpu->StatSysRegReadR3,  "%u/R3/SysRegRead",  "Number of GIC system register reads in R3.");
         GIC_REG_COUNTER(&pGicCpu->StatSysRegWriteR3, "%u/R3/SysRegWrite", "Number of GIC system register writes in R3.");
+        GIC_REG_COUNTER(&pGicCpu->StatSetSpiR3,      "%u/R3/SetSpi",      "Number of GIC set SPI callbacks in R3.");
+        GIC_REG_COUNTER(&pGicCpu->StatSetPpiR3,      "%u/R3/SetPpi",      "Number of GIC set PPI callbacks in R3.");
     }
 #endif

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

@@ -290 +290 @@
     /** Number of MSR writes in R3. */
     STAMCOUNTER                 StatSysRegWriteR3;
+    /** Number of set SPI callbacks. */
+    STAMCOUNTER                 StatSetSpiR3;
+    /** Number of set PPI callbacks. */
+    STAMCOUNTER                 StatSetPpiR3;
 
 # if 0 /* No R0 for now. */