Changeset 46871 in vbox for trunk/src/VBox/VMM/VMMR0/HMVMXR0.cpp

Timestamp:

Jun 28, 2013 4:25:06 PM (12 years ago)

Author:

vboxsync

Message:

VMM/HM: Cleanup event injection statistics.

File:

• trunk/src/VBox/VMM/VMMR0/HMVMXR0.cpp (modified) (9 diffs)

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

@@ -4711 +4711 @@
  * @param   GCPtrFaultAddress   The fault-address (CR2) in case it's a
  *                              page-fault.
+ *
+ * @remarks Statistics counter assumes this is a guest event being injected or
+ *          re-injected into the guest, i.e. 'StatInjectPendingReflect' is
+ *          always incremented.
  */
 DECLINLINE(void) hmR0VmxSetPendingEvent(PVMCPU pVCpu, uint32_t u32IntrInfo, uint32_t cbInstr, uint32_t u32ErrCode,
@@ -4721 +4725 @@
     pVCpu->hm.s.Event.cbInstr           = cbInstr;
     pVCpu->hm.s.Event.GCPtrFaultAddress = GCPtrFaultAddress;
+
+    STAM_COUNTER_INC(&pVCpu->hm.s.StatInjectPendingReflect);
 }
 
@@ -4858 +4864 @@
                 Log4(("IDT: vcpu[%RU32] Pending vectoring event %#RX64 Err=%#RX32\n", pVCpu->idCpu,
                       pVCpu->hm.s.Event.u64IntrInfo, pVCpu->hm.s.Event.u32ErrCode));
+
                 break;
             }
@@ -4867 +4874 @@
                 Log4(("IDT: vcpu[%RU32] Pending vectoring #DF %#RX64 uIdtVector=%#x uExitVector=%#x\n", pVCpu->idCpu,
                       pVCpu->hm.s.Event.u64IntrInfo, uIdtVector, uExitVector));
+
                 break;
             }
@@ -5798 +5806 @@
     Log4(("TRPM->HM event: u32IntrInfo=%#RX32 enmTrpmEvent=%d cbInstr=%u uErrCode=%#RX32 GCPtrFaultAddress=%#RGv\n",
          u32IntrInfo, enmTrpmEvent, cbInstr, uErrCode, GCPtrFaultAddress));
+
     hmR0VmxSetPendingEvent(pVCpu, u32IntrInfo, cbInstr, uErrCode, GCPtrFaultAddress);
+    STAM_COUNTER_DEC(&pVCpu->hm.s.StatInjectPendingReflect);
 }
 
@@ -6096 +6106 @@
             AssertRCReturn(rc, rc);
             pVCpu->hm.s.Event.fPending = false;
-            STAM_COUNTER_INC(&pVCpu->hm.s.StatIntReinject);
+
+#ifdef VBOX_WITH_STATISTICS
+            if (uIntrType == VMX_EXIT_INTERRUPTION_INFO_TYPE_EXT_INT)
+                STAM_COUNTER_INC(&pVCpu->hm.s.StatInjectInterrupt);
+            else
+                STAM_COUNTER_INC(&pVCpu->hm.s.StatInjectXcpt);
+#endif
         }
         else
@@ -6114 +6130 @@
             AssertRCReturn(rc, rc);
             VMCPU_FF_CLEAR(pVCpu, VMCPU_FF_INTERRUPT_NMI);
+
+            STAM_COUNTER_INC(&pVCpu->hm.s.StatInjectXcpt);
         }
         else
@@ -6137 +6155 @@
                 rc = hmR0VmxInjectEventVmcs(pVCpu, pMixedCtx, u32IntrInfo, 0 /* cbInstr */,  0 /* u32ErrCode */,
                                             0 /* GCPtrFaultAddress */, &uIntrState);
-                STAM_COUNTER_INC(&pVCpu->hm.s.StatIntInject);
+
+                STAM_COUNTER_INC(&pVCpu->hm.s.StatInjectInterrupt);
             }
             else
@@ -8717 +8736 @@
         return VERR_EM_INTERPRETER;
     }
+
     hmR0VmxSetPendingEvent(pVCpu, VMX_VMCS_CTRL_ENTRY_IRQ_INFO_FROM_EXIT_INT_INFO(pVmxTransient->uExitIntrInfo),
                            pVmxTransient->cbInstr, pVmxTransient->uExitIntrErrorCode, 0 /* GCPtrFaultAddress */);