Changeset 48565 in vbox

Timestamp:

Sep 19, 2013 10:16:00 PM (12 years ago)

Author:

vboxsync

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

89117

Message:

VMM/HM: Added total VM-exits STAM.

Location:

trunk

Files:

• include/VBox/vmm/hm.h (modified) (6 diffs)
• src/VBox/VMM/VMMR0/HMSVMR0.cpp (modified) (1 diff)
• src/VBox/VMM/VMMR0/HMVMXR0.cpp (modified) (2 diffs)
• src/VBox/VMM/VMMR3/HM.cpp (modified) (4 diffs)
• src/VBox/VMM/include/HMInternal.h (modified) (1 diff)

trunk/include/VBox/vmm/hm.h

@@ -71 +71 @@
 #define VMCPU_HMCF_IS_PENDING(pVCpu, fFlags)    RT_BOOL((pVCpu)->hm.s.fContextUseFlags & (fFlags))
 
+/** @def VMCPU_HMCF_RESET_TO
+ * Resets the HM-context flags to the specified value.
+ *
+ * @param   pVCpu   Pointer to the VMCPU.
+ * @param   fFlags  The reset value.
+ */
+#define VMCPU_HMCF_RESET_TO(pVCpu, fFlags)      ((pVCpu)->hm.s.fContextUseFlags = (fFlags))
+
 /**
  * Checks whether HM (VT-x/AMD-V) is being used by this VM.
@@ -82 +90 @@
  */
 #if defined(VBOX_STRICT) && defined(IN_RING3)
-# define HMIsEnabled(a_pVM)   HMIsEnabledNotMacro(a_pVM)
+# define HMIsEnabled(a_pVM)                 HMIsEnabledNotMacro(a_pVM)
 #else
-# define HMIsEnabled(a_pVM)   ((a_pVM)->fHMEnabled)
+# define HMIsEnabled(a_pVM)                 ((a_pVM)->fHMEnabled)
 #endif
 
@@ -98 +106 @@
  */
 #if HC_ARCH_BITS == 64
-# define HMIsRawModeCtxNeeded(a_pVM)   (!HMIsEnabled(a_pVM))
+# define HMIsRawModeCtxNeeded(a_pVM)        (!HMIsEnabled(a_pVM))
 #else
-# define HMIsRawModeCtxNeeded(a_pVM)   (!HMIsEnabled(a_pVM) || (a_pVM)->fHMNeedRawModeCtx)
+# define HMIsRawModeCtxNeeded(a_pVM)        (!HMIsEnabled(a_pVM) || (a_pVM)->fHMNeedRawModeCtx)
 #endif
 
@@ -110 +118 @@
  * @internal
  */
-#define HMCanEmulateIoBlock(a_pVCpu)     (!CPUMIsGuestInPagedProtectedMode(a_pVCpu))
+#define HMCanEmulateIoBlock(a_pVCpu)        (!CPUMIsGuestInPagedProtectedMode(a_pVCpu))
 
  /**
@@ -119 +127 @@
  * @internal
  */
-#define HMCanEmulateIoBlockEx(a_pCtx)   (!CPUMIsGuestInPagedProtectedModeEx(a_pCtx))
+#define HMCanEmulateIoBlockEx(a_pCtx)       (!CPUMIsGuestInPagedProtectedModeEx(a_pCtx))
 
 /**
@@ -128 +136 @@
  */
 #ifdef IN_RING0
-# define HMIsInHwVirtCtx(a_pVCpu)       (VMCPU_GET_STATE(a_pVCpu) == VMCPUSTATE_STARTED_HM)
+# define HMIsInHwVirtCtx(a_pVCpu)           (VMCPU_GET_STATE(a_pVCpu) == VMCPUSTATE_STARTED_HM)
 #else
-# define HMIsInHwVirtCtx(a_pVCpu)       (false)
+# define HMIsInHwVirtCtx(a_pVCpu)           (false)
 #endif
 

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

@@ -44 +44 @@
 #ifdef VBOX_WITH_STATISTICS
 # define HMSVM_EXITCODE_STAM_COUNTER_INC(u64ExitCode) do { \
+        STAM_COUNTER_INC(&pVCpu->hm.s.StatExitAll); \
         if ((u64ExitCode) == SVM_EXIT_NPF) \
             STAM_COUNTER_INC(&pVCpu->hm.s.StatExitReasonNpf); \

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

@@ -7800 +7800 @@
         /* Handle the VM-exit. */
         AssertMsg(VmxTransient.uExitReason <= VMX_EXIT_MAX, ("%#x\n", VmxTransient.uExitReason));
+        STAM_COUNTER_INC(&pVCpu->hm.s.StatExitAll);
         STAM_COUNTER_INC(&pVCpu->hm.s.paStatExitReasonR0[VmxTransient.uExitReason & MASK_EXITREASON_STAT]);
         STAM_PROFILE_ADV_STOP_START(&pVCpu->hm.s.StatExit1, &pVCpu->hm.s.StatExit2, x);
@@ -7874 +7875 @@
         /* Handle the VM-exit. */
         AssertMsg(VmxTransient.uExitReason <= VMX_EXIT_MAX, ("%#x\n", VmxTransient.uExitReason));
+        STAM_COUNTER_INC(&pVCpu->hm.s.StatExitAll);
         STAM_COUNTER_INC(&pVCpu->hm.s.paStatExitReasonR0[VmxTransient.uExitReason & MASK_EXITREASON_STAT]);
         STAM_PROFILE_ADV_STOP_START(&pVCpu->hm.s.StatExit1, &pVCpu->hm.s.StatExit2, x);

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

@@ -647 +647 @@
 
 #ifdef VBOX_WITH_STATISTICS
+        HM_REG_COUNTER(&pVCpu->hm.s.StatExitAll,                "/HM/CPU%d/Exit/All", "Exits (total).");
         HM_REG_COUNTER(&pVCpu->hm.s.StatExitShadowNM,           "/HM/CPU%d/Exit/Trap/Shw/#NM", "Shadow #NM (device not available, no math co-processor) exception.");
         HM_REG_COUNTER(&pVCpu->hm.s.StatExitGuestNM,            "/HM/CPU%d/Exit/Trap/Gst/#NM", "Guest #NM (device not available, no math co-processor) exception.");
@@ -1628 +1629 @@
 VMMR3_INT_DECL(void) HMR3ResetCpu(PVMCPU pVCpu)
 {
-    /* Sync. entire state on VM reset R0-reentry. It's safe to update
+    /* Sync. entire state on VM reset R0-reentry. It's safe to reset
        the HM flags here, all other EMTs are in ring-3. See VMR3Reset(). */
-    pVCpu->hm.s.fContextUseFlags = (HM_CHANGED_HOST_CONTEXT | HM_CHANGED_ALL_GUEST);
+    VMCPU_HMCF_RESET_TO(pVCpu, HM_CHANGED_HOST_CONTEXT | HM_CHANGED_ALL_GUEST);
 
     pVCpu->hm.s.vmx.u32CR0Mask     = 0;
@@ -2648 +2649 @@
 VMMR3_INT_DECL(void) HMR3NotifyScheduled(PVMCPU pVCpu)
 {
-    pVCpu->hm.s.fContextUseFlags |= HM_CHANGED_ALL_GUEST;
+    VMCPU_HMCF_SET(pVCpu, HM_CHANGED_ALL_GUEST);
 }
 
@@ -2659 +2660 @@
 VMMR3_INT_DECL(void) HMR3NotifyEmulated(PVMCPU pVCpu)
 {
-    pVCpu->hm.s.fContextUseFlags |= HM_CHANGED_ALL_GUEST;
+    VMCPU_HMCF_SET(pVCpu, HM_CHANGED_ALL_GUEST);
 }
 

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

@@ -771 +771 @@
     STAMCOUNTER             StatInjectPendingReflect;
 
+    STAMCOUNTER             StatExitAll;
     STAMCOUNTER             StatExitShadowNM;
     STAMCOUNTER             StatExitGuestNM;