Changeset 43509 in vbox for trunk/src/VBox/VMM/VMMR0

Timestamp:

Oct 2, 2012 2:15:17 PM (12 years ago)

Author:

vboxsync

Message:

HM: refactor.

Location:

trunk/src/VBox/VMM/VMMR0

Files:

• HWSVMR0.cpp (modified) (7 diffs)
• HWVMXR0.cpp (modified) (8 diffs)

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

@@ -1004 +1004 @@
             pvVMCB->ctrl.u32InterceptCtrl1 &= ~SVM_CTRL1_INTERCEPT_RDTSC;
             pvVMCB->ctrl.u32InterceptCtrl2 &= ~SVM_CTRL2_INTERCEPT_RDTSCP;
-            STAM_COUNTER_INC(&pVCpu->hm.s.StatTSCOffset);
+            STAM_COUNTER_INC(&pVCpu->hm.s.StatTscOffset);
         }
         else
@@ -1014 +1014 @@
             pvVMCB->ctrl.u32InterceptCtrl1 |= SVM_CTRL1_INTERCEPT_RDTSC;
             pvVMCB->ctrl.u32InterceptCtrl2 |= SVM_CTRL2_INTERCEPT_RDTSCP;
-            STAM_COUNTER_INC(&pVCpu->hm.s.StatTSCInterceptOverFlow);
+            STAM_COUNTER_INC(&pVCpu->hm.s.StatTscInterceptOverFlow);
         }
     }
@@ -1021 +1021 @@
         pvVMCB->ctrl.u32InterceptCtrl1 |= SVM_CTRL1_INTERCEPT_RDTSC;
         pvVMCB->ctrl.u32InterceptCtrl2 |= SVM_CTRL2_INTERCEPT_RDTSCP;
-        STAM_COUNTER_INC(&pVCpu->hm.s.StatTSCIntercept);
+        STAM_COUNTER_INC(&pVCpu->hm.s.StatTscIntercept);
     }
 
@@ -1179 +1179 @@
 #ifdef VBOX_WITH_STATISTICS
     if (pvVMCB->ctrl.TLBCtrl.n.u8TLBFlush == SVM_TLB_FLUSH_NOTHING)
-        STAM_COUNTER_INC(&pVCpu->hm.s.StatNoFlushTLBWorldSwitch);
+        STAM_COUNTER_INC(&pVCpu->hm.s.StatNoFlushTlbWorldSwitch);
     else if (   pvVMCB->ctrl.TLBCtrl.n.u8TLBFlush == SVM_TLB_FLUSH_SINGLE_CONTEXT
              || pvVMCB->ctrl.TLBCtrl.n.u8TLBFlush == SVM_TLB_FLUSH_SINGLE_CONTEXT_RETAIN_GLOBALS)
@@ -1186 +1186 @@
     }
     else
-        STAM_COUNTER_INC(&pVCpu->hm.s.StatFlushTLBWorldSwitch);
+        STAM_COUNTER_INC(&pVCpu->hm.s.StatFlushTlbWorldSwitch);
 #endif
 }
@@ -1797 +1797 @@
 #ifdef VBOX_WITH_STATISTICS
     if (exitCode == SVM_EXIT_NPF)
-        STAM_COUNTER_INC(&pVCpu->hm.s.StatExitReasonNPF);
+        STAM_COUNTER_INC(&pVCpu->hm.s.StatExitReasonNpf);
     else
         STAM_COUNTER_INC(&pVCpu->hm.s.paStatExitReasonR0[exitCode & MASK_EXITREASON_STAT]);
@@ -2523 +2523 @@
                     static uint32_t const aIOSize[4] = { 1, 2, 0, 4 };
 
-                    STAM_COUNTER_INC(&pVCpu->hm.s.StatDRxIOCheck);
+                    STAM_COUNTER_INC(&pVCpu->hm.s.StatDRxIoCheck);
                     for (unsigned i = 0; i < 4; i++)
                     {

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

@@ -2246 +2246 @@
             rc = VMXWriteVMCS(VMX_VMCS_CTRL_PROC_EXEC_CONTROLS, pVCpu->hm.s.vmx.proc_ctls);
             AssertRC(rc);
-            STAM_COUNTER_INC(&pVCpu->hm.s.StatTSCOffset);
+            STAM_COUNTER_INC(&pVCpu->hm.s.StatTscOffset);
         }
         else
@@ -2258 +2258 @@
             rc = VMXWriteVMCS(VMX_VMCS_CTRL_PROC_EXEC_CONTROLS, pVCpu->hm.s.vmx.proc_ctls);
             AssertRC(rc);
-            STAM_COUNTER_INC(&pVCpu->hm.s.StatTSCInterceptOverFlow);
+            STAM_COUNTER_INC(&pVCpu->hm.s.StatTscInterceptOverFlow);
         }
     }
@@ -2266 +2266 @@
         rc = VMXWriteVMCS(VMX_VMCS_CTRL_PROC_EXEC_CONTROLS, pVCpu->hm.s.vmx.proc_ctls);
         AssertRC(rc);
-        STAM_COUNTER_INC(&pVCpu->hm.s.StatTSCIntercept);
+        STAM_COUNTER_INC(&pVCpu->hm.s.StatTscIntercept);
     }
 
@@ -2553 +2553 @@
         }
         else
-        {
-#ifdef VBOX_WITH_STATISTICS
-            STAM_COUNTER_INC(&pVCpu->hm.s.StatNoFlushTLBWorldSwitch);
-#endif
-        }
-    }
+            STAM_COUNTER_INC(&pVCpu->hm.s.StatNoFlushTlbWorldSwitch);
+    }
+
     pVCpu->hm.s.TlbShootdown.cPages = 0;
     VMCPU_FF_CLEAR(pVCpu, VMCPU_FF_TLB_SHOOTDOWN);
@@ -2631 +2628 @@
 
 #ifdef VBOX_WITH_STATISTICS
+    /** @todo r=ramshankar: this is not accurate anymore with the VPID+EPT
+     *        handling. Should be fixed later. */
     if (pVCpu->hm.s.fForceTLBFlush)
-        STAM_COUNTER_INC(&pVCpu->hm.s.StatFlushTLBWorldSwitch);
+        STAM_COUNTER_INC(&pVCpu->hm.s.StatFlushTlbWorldSwitch);
     else
-        STAM_COUNTER_INC(&pVCpu->hm.s.StatNoFlushTLBWorldSwitch);
+        STAM_COUNTER_INC(&pVCpu->hm.s.StatNoFlushTlbWorldSwitch);
 #endif
 }
@@ -2731 +2730 @@
 
 # ifdef VBOX_WITH_STATISTICS
+    /** @todo r=ramshankar: this is not accurate anymore with EPT+VPID handling.
+     *        Should be fixed later. */
     if (pVCpu->hm.s.fForceTLBFlush)
-        STAM_COUNTER_INC(&pVCpu->hm.s.StatFlushTLBWorldSwitch);
+        STAM_COUNTER_INC(&pVCpu->hm.s.StatFlushTlbWorldSwitch);
     else
-        STAM_COUNTER_INC(&pVCpu->hm.s.StatNoFlushTLBWorldSwitch);
+        STAM_COUNTER_INC(&pVCpu->hm.s.StatNoFlushTlbWorldSwitch);
 # endif
 }
@@ -4034 +4035 @@
             /* We've successfully synced our shadow pages, so let's just continue execution. */
             Log2(("Shadow page fault at %RGv cr2=%RGp error code %x\n", (RTGCPTR)pCtx->rip, exitQualification , errCode));
-            STAM_COUNTER_INC(&pVCpu->hm.s.StatExitReasonNPF);
+            STAM_COUNTER_INC(&pVCpu->hm.s.StatExitReasonNpf);
 
             TRPMResetTrap(pVCpu);
@@ -4512 +4513 @@
                 if (pCtx->dr[7] & X86_DR7_ENABLED_MASK)
                 {
-                    STAM_COUNTER_INC(&pVCpu->hm.s.StatDRxIOCheck);
+                    STAM_COUNTER_INC(&pVCpu->hm.s.StatDRxIoCheck);
                     for (unsigned i = 0; i < 4; i++)
                     {