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

Timestamp:

Jul 9, 2019 4:56:19 AM (6 years ago)

Author:

vboxsync

Message:

VMM/HM: Renamed some stat counters to make it more clear what they are for.

Location:

trunk/src/VBox/VMM

Files:

• VMMR0/HMSVMR0.cpp (modified) (6 diffs)
• VMMR0/HMVMXR0.cpp (modified) (5 diffs)
• VMMR3/HM.cpp (modified) (1 diff)
• include/HMInternal.h (modified) (1 diff)

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

@@ -5973 +5973 @@
                      */
                     Assert(pVmcb->ctrl.ExitIntInfo.n.u3Type != SVM_EVENT_SOFTWARE_INT);
-                    STAM_COUNTER_INC(&pVCpu->hm.s.StatInjectPendingReflect);
+                    STAM_COUNTER_INC(&pVCpu->hm.s.StatInjectReflect);
                     hmR0SvmSetPendingEvent(pVCpu, &pVmcb->ctrl.ExitIntInfo, GCPtrFaultAddress);
 
@@ -6004 +6004 @@
                 else
                 {
-                    STAM_COUNTER_INC(&pVCpu->hm.s.StatInjectPendingReflect);
+                    STAM_COUNTER_INC(&pVCpu->hm.s.StatInjectConvertDF);
                     hmR0SvmSetPendingXcptDF(pVCpu);
                     rc = VINF_HM_DOUBLE_FAULT;
@@ -7219 +7219 @@
         if (pVCpu->hm.s.Event.fPending)
         {
-            STAM_COUNTER_INC(&pVCpu->hm.s.StatInjectPendingInterpret);
+            STAM_COUNTER_INC(&pVCpu->hm.s.StatInjectInterpret);
             return VINF_EM_RAW_INJECT_TRPM_EVENT;
         }
@@ -7299 +7299 @@
      */
     if (pVCpu->hm.s.Event.fPending)
-        STAM_COUNTER_INC(&pVCpu->hm.s.StatInjectPendingNPF);
+        STAM_COUNTER_INC(&pVCpu->hm.s.StatInjectReflectNPF);
 
     return rc;
@@ -7721 +7721 @@
     if (RT_UNLIKELY(pVCpu->hm.s.Event.fPending))
     {
-        STAM_COUNTER_INC(&pVCpu->hm.s.StatInjectPendingInterpret);
+        STAM_COUNTER_INC(&pVCpu->hm.s.StatInjectInterpret);
         return VINF_EM_RAW_INJECT_TRPM_EVENT;
     }
@@ -8233 +8233 @@
     if (pVCpu->hm.s.Event.fPending)
     {
-        STAM_COUNTER_INC(&pVCpu->hm.s.StatInjectPendingInterpret);
+        STAM_COUNTER_INC(&pVCpu->hm.s.StatInjectInterpret);
         return VINF_EM_RAW_INJECT_TRPM_EVENT;
     }

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

@@ -13785 +13785 @@
 
                 /* If uExitVector is #PF, CR2 value will be updated from the VMCS if it's a guest #PF, see hmR0VmxExitXcptPF(). */
-                STAM_COUNTER_INC(&pVCpu->hm.s.StatInjectPendingReflect);
+                STAM_COUNTER_INC(&pVCpu->hm.s.StatInjectReflect);
                 hmR0VmxSetPendingEvent(pVCpu, VMX_ENTRY_INT_INFO_FROM_EXIT_IDT_INFO(pVmxTransient->uIdtVectoringInfo),
                                        0 /* cbInstr */, u32ErrCode, pVCpu->cpum.GstCtx.cr2);
@@ -13814 +13814 @@
                 else
                 {
-                    STAM_COUNTER_INC(&pVCpu->hm.s.StatInjectPendingReflect);
+                    STAM_COUNTER_INC(&pVCpu->hm.s.StatInjectConvertDF);
                     hmR0VmxSetPendingXcptDF(pVCpu);
                     Log4Func(("IDT: Pending vectoring #DF %#RX64 uIdtVector=%#x uExitVector=%#x\n", pVCpu->hm.s.Event.u64IntInfo,
@@ -16194 +16194 @@
         if (RT_UNLIKELY(pVCpu->hm.s.Event.fPending))
         {
-            STAM_COUNTER_INC(&pVCpu->hm.s.StatInjectPendingInterpret);
+            STAM_COUNTER_INC(&pVCpu->hm.s.StatInjectInterpret);
             return VINF_EM_RAW_INJECT_TRPM_EVENT;
         }
@@ -16373 +16373 @@
         if (RT_UNLIKELY(pVCpu->hm.s.Event.fPending))
         {
-            STAM_COUNTER_INC(&pVCpu->hm.s.StatInjectPendingInterpret);
+            STAM_COUNTER_INC(&pVCpu->hm.s.StatInjectInterpret);
             return VINF_EM_RAW_INJECT_TRPM_EVENT;
         }
@@ -16460 +16460 @@
          */
         if (pVCpu->hm.s.Event.fPending)
-            STAM_COUNTER_INC(&pVCpu->hm.s.StatInjectPendingNPF);
+            STAM_COUNTER_INC(&pVCpu->hm.s.StatInjectReflectNPF);
     }
     else

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

@@ -811 +811 @@
         HM_REG_COUNTER(&pVCpu->hm.s.StatInjectInterrupt,        "/HM/CPU%d/EventInject/Interrupt", "Injected an external interrupt into the guest.");
         HM_REG_COUNTER(&pVCpu->hm.s.StatInjectXcpt,             "/HM/CPU%d/EventInject/Trap", "Injected an exception into the guest.");
-        HM_REG_COUNTER(&pVCpu->hm.s.StatInjectPendingReflect,   "/HM/CPU%d/EventInject/PendingReflect", "Reflecting an exception (or #DF) caused due to event injection.");
-        HM_REG_COUNTER(&pVCpu->hm.s.StatInjectPendingInterpret, "/HM/CPU%d/EventInject/PendingInterpret", "Falling to interpreter for handling exception caused due to event injection.");
-        HM_REG_COUNTER(&pVCpu->hm.s.StatInjectPendingNPF,       "/HM/CPU%d/EventInject/PendingNPF", "Reflecting an event that caused an EPT violation / Nested #PF.");
+        HM_REG_COUNTER(&pVCpu->hm.s.StatInjectReflect,          "/HM/CPU%d/EventInject/Reflect", "Reflecting an exception caused due to event injection.");
+        HM_REG_COUNTER(&pVCpu->hm.s.StatInjectConvertDF,        "/HM/CPU%d/EventInject/ReflectDF", "Injected a converted #DF caused due to event injection.");
+        HM_REG_COUNTER(&pVCpu->hm.s.StatInjectInterpret,        "/HM/CPU%d/EventInject/Interpret", "Falling back to interpreter for handling exception caused due to event injection.");
+        HM_REG_COUNTER(&pVCpu->hm.s.StatInjectReflectNPF,       "/HM/CPU%d/EventInject/ReflectNPF", "Reflecting event that caused an EPT violation / nested #PF.");
 
         HM_REG_COUNTER(&pVCpu->hm.s.StatFlushPage,              "/HM/CPU%d/Flush/Page", "Invalidating a guest page on all guest CPUs.");

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

@@ -1121 +1121 @@
     STAMCOUNTER             StatInjectInterrupt;
     STAMCOUNTER             StatInjectXcpt;
-    STAMCOUNTER             StatInjectPendingReflect;
-    STAMCOUNTER             StatInjectPendingInterpret;
-    STAMCOUNTER             StatInjectPendingNPF;
+    STAMCOUNTER             StatInjectReflect;
+    STAMCOUNTER             StatInjectConvertDF;
+    STAMCOUNTER             StatInjectInterpret;
+    STAMCOUNTER             StatInjectReflectNPF;
 
     STAMCOUNTER             StatExitAll;