Changeset 20142 in vbox

Timestamp:

May 29, 2009 10:14:02 AM (16 years ago)

Author:

vboxsync

Message:

VT-x/AMD-V: Keep statistics for injected traps & interrupts.

Location:

trunk/src/VBox/VMM

Files:

• HWACCM.cpp (modified) (3 diffs)
• HWACCMInternal.h (modified) (2 diffs)
• VMMR0/HWSVMR0.cpp (modified) (13 diffs)
• VMMR0/HWVMXR0.cpp (modified) (1 diff)

trunk/src/VBox/VMM/HWACCM.cpp

@@ -542 +542 @@
         Assert(pVCpu->hwaccm.s.paStatExitReasonR0 != NIL_RTR0PTR);
 # endif
+
+    rc = MMHyperAlloc(pVM, sizeof(STAMCOUNTER) * 255, 8, MM_TAG_HWACCM, (void **)&pVCpu->hwaccm.s.paStatInjectedIrqs);
+    AssertRCReturn(rc, rc);
+    pVCpu->hwaccm.s.paStatInjectedIrqsR0 = MMHyperR3ToR0(pVM, pVCpu->hwaccm.s.paStatInjectedIrqs);
+    for (unsigned j = 0; j < 255; j++)
+        STAMR3RegisterF(pVM, &pVCpu->hwaccm.s.paStatInjectedIrqs[i], STAMTYPE_COUNTER, STAMVISIBILITY_USED, STAMUNIT_OCCURENCES, "Forwarded interrupts.",
+                        j < 0x20 ? "/HWACCM/CPU%d/Interrupt/Trap/%02X" : "/TRPM/CPU%d/Interrupt/IRQ/%02X", i, j);
+
     }
 #endif /* VBOX_WITH_STATISTICS */
@@ -1296 +1304 @@
         PVMCPU pVCpu = &pVM->aCpus[i];
 
+#ifdef VBOX_WITH_STATISTICS
         if (pVCpu->hwaccm.s.paStatExitReason)
         {
@@ -1302 +1311 @@
             pVCpu->hwaccm.s.paStatExitReasonR0 = NIL_RTR0PTR;
         }
+        if (pVCpu->hwaccm.s.paStatInjectedIrqs)
+        {
+            MMHyperFree(pVM, pVCpu->hwaccm.s.paStatInjectedIrqs);
+            pVCpu->hwaccm.s.paStatInjectedIrqs   = NULL;
+            pVCpu->hwaccm.s.paStatInjectedIrqsR0 = NIL_RTR0PTR;
+        }
+#endif
+
 #ifdef VBOX_WITH_CRASHDUMP_MAGIC
         memset(pVCpu->hwaccm.s.vmx.VMCSCache.aMagic, 0, sizeof(pVCpu->hwaccm.s.vmx.VMCSCache.aMagic));

trunk/src/VBox/VMM/HWACCMInternal.h

@@ -58 +58 @@
 #define MAX_EXITREASON_STAT        0x100
 #define MASK_EXITREASON_STAT       0xff
+#define MASK_INJECT_IRQ_STAT       0xff
 
 /** @name Changed flags
@@ -673 +674 @@
 
 
+#ifdef VBOX_WITH_STATISTICS
     R3PTRTYPE(PSTAMCOUNTER) paStatExitReason;
     R0PTRTYPE(PSTAMCOUNTER) paStatExitReasonR0;
+    R3PTRTYPE(PSTAMCOUNTER) paStatInjectedIrqs;
+    R0PTRTYPE(PSTAMCOUNTER) paStatInjectedIrqsR0;
+#endif
 } HWACCMCPU;
 /** Pointer to HWACCM VM instance data. */

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

@@ -362 +362 @@
  * Injects an event (trap or external interrupt)
  *
- * @param   pVM         The VM to operate on.
+ * @param   pVCpu       The VMCPU to operate on.
  * @param   pVMCB       SVM control block
  * @param   pCtx        CPU Context
  * @param   pIntInfo    SVM interrupt info
  */
-inline void SVMR0InjectEvent(PVM pVM, SVM_VMCB *pVMCB, CPUMCTX *pCtx, SVM_EVENT* pEvent)
+inline void SVMR0InjectEvent(PVMCPU pVCpu, SVM_VMCB *pVMCB, CPUMCTX *pCtx, SVM_EVENT* pEvent)
 {
+#ifdef VBOX_WITH_STATISTICS
+    STAM_COUNTER_INC(&pVCpu->hwaccm.s.paStatInjectedIrqsR0[pEvent->n.u8Vector & MASK_INJECT_IRQ_STAT]);
+#endif
+
 #ifdef VBOX_STRICT
     if (pEvent->n.u8Vector == 0xE)
@@ -378 +382 @@
     {
         Log(("INJ-EI: %x at %RGv\n", pEvent->n.u8Vector, (RTGCPTR)pCtx->rip));
-        Assert(!VMCPU_FF_ISSET(VMMGetCpu(pVM), VMCPU_FF_INHIBIT_INTERRUPTS));
+        Assert(!VMCPU_FF_ISSET(pVCpu, VMCPU_FF_INHIBIT_INTERRUPTS));
         Assert(pCtx->eflags.u32 & X86_EFL_IF);
     }
@@ -409 +413 @@
         STAM_COUNTER_INC(&pVCpu->hwaccm.s.StatIntReinject);
         Event.au64[0] = pVCpu->hwaccm.s.Event.intInfo;
-        SVMR0InjectEvent(pVM, pVMCB, pCtx, &Event);
+        SVMR0InjectEvent(pVCpu, pVMCB, pCtx, &Event);
 
         pVCpu->hwaccm.s.Event.fPending = false;
@@ -424 +428 @@
         Event.n.u3Type       = SVM_EVENT_NMI;
 
-        SVMR0InjectEvent(pVM, pVMCB, pCtx, &Event);
+        SVMR0InjectEvent(pVCpu, pVMCB, pCtx, &Event);
         pVM->hwaccm.s.fInjectNMI = false;
         return VINF_SUCCESS;
@@ -531 +535 @@
 
         STAM_COUNTER_INC(&pVCpu->hwaccm.s.StatIntInject);
-        SVMR0InjectEvent(pVM, pVMCB, pCtx, &Event);
+        SVMR0InjectEvent(pVCpu, pVMCB, pCtx, &Event);
     } /* if (interrupts can be dispatched) */
 
@@ -1392 +1396 @@
                 Event.n.u8Vector = X86_XCPT_DB;
 
-                SVMR0InjectEvent(pVM, pVMCB, pCtx, &Event);
+                SVMR0InjectEvent(pVCpu, pVMCB, pCtx, &Event);
 
                 STAM_PROFILE_ADV_STOP(&pVCpu->hwaccm.s.StatExit1, x);
@@ -1428 +1432 @@
             Event.n.u8Vector = X86_XCPT_NM;
 
-            SVMR0InjectEvent(pVM, pVMCB, pCtx, &Event);
+            SVMR0InjectEvent(pVCpu, pVMCB, pCtx, &Event);
             STAM_PROFILE_ADV_STOP(&pVCpu->hwaccm.s.StatExit1, x);
             goto ResumeExecution;
@@ -1456 +1460 @@
                 Event.n.u32ErrorCode        = errCode;
 
-                SVMR0InjectEvent(pVM, pVMCB, pCtx, &Event);
+                SVMR0InjectEvent(pVCpu, pVMCB, pCtx, &Event);
 
                 STAM_PROFILE_ADV_STOP(&pVCpu->hwaccm.s.StatExit1, x);
@@ -1576 +1580 @@
                 Event.n.u32ErrorCode        = errCode;
 
-                SVMR0InjectEvent(pVM, pVMCB, pCtx, &Event);
+                SVMR0InjectEvent(pVCpu, pVMCB, pCtx, &Event);
 
                 STAM_PROFILE_ADV_STOP(&pVCpu->hwaccm.s.StatExit1, x);
@@ -1607 +1611 @@
             Event.n.u8Vector = X86_XCPT_MF;
 
-            SVMR0InjectEvent(pVM, pVMCB, pCtx, &Event);
+            SVMR0InjectEvent(pVCpu, pVMCB, pCtx, &Event);
 
             STAM_PROFILE_ADV_STOP(&pVCpu->hwaccm.s.StatExit1, x);
@@ -1651 +1655 @@
             }
             Log(("Trap %x at %04x:%RGv esi=%x\n", vector, pCtx->cs, (RTGCPTR)pCtx->rip, pCtx->esi));
-            SVMR0InjectEvent(pVM, pVMCB, pCtx, &Event);
+            SVMR0InjectEvent(pVCpu, pVMCB, pCtx, &Event);
 
             STAM_PROFILE_ADV_STOP(&pVCpu->hwaccm.s.StatExit1, x);
@@ -2110 +2114 @@
                             Event.n.u8Vector = X86_XCPT_DB;
 
-                            SVMR0InjectEvent(pVM, pVMCB, pCtx, &Event);
+                            SVMR0InjectEvent(pVCpu, pVMCB, pCtx, &Event);
 
                             STAM_PROFILE_ADV_STOP(&pVCpu->hwaccm.s.StatExit1, x);
@@ -2188 +2192 @@
 
         Log(("Forced #UD trap at %RGv\n", (RTGCPTR)pCtx->rip));
-        SVMR0InjectEvent(pVM, pVMCB, pCtx, &Event);
+        SVMR0InjectEvent(pVCpu, pVMCB, pCtx, &Event);
 
         STAM_PROFILE_ADV_STOP(&pVCpu->hwaccm.s.StatExit1, x);

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

@@ -627 +627 @@
     int         rc;
     uint32_t    iGate = VMX_EXIT_INTERRUPTION_INFO_VECTOR(intInfo);
+
+#ifdef VBOX_WITH_STATISTICS
+    STAM_COUNTER_INC(&pVCpu->hwaccm.s.paStatInjectedIrqsR0[iGate & MASK_INJECT_IRQ_STAT]);
+#endif
 
 #ifdef VBOX_STRICT