Changeset 40656 in vbox

Timestamp:

Mar 26, 2012 8:07:36 PM (13 years ago)

Author:

vboxsync

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

77088

Message:

Added counters so that VT-x exit stats add up.

Location:

trunk

Files:

• include/VBox/vmm/vm.h (modified) (2 diffs)
• src/VBox/VMM/VMMR0/HWVMXR0.cpp (modified) (4 diffs)
• src/VBox/VMM/VMMR3/HWACCM.cpp (modified) (2 diffs)
• src/VBox/VMM/include/HWACCMInternal.h (modified) (2 diffs)

trunk/include/VBox/vmm/vm.h

@@ -138 +138 @@
         struct HWACCMCPU    s;
 #endif
-        uint8_t             padding[5312];      /* multiple of 64 */
+        uint8_t             padding[5376];      /* multiple of 64 */
     } hwaccm;
 
@@ -215 +215 @@
 
     /** Align the following members on page boundary. */
-    uint8_t                 abAlignment2[1024];
+    uint8_t                 abAlignment2[1024 - 64];
 
     /** PGM part. */

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

@@ -3025 +3025 @@
 #endif
                 /* Need to go back to the recompiler to emulate the instruction. */
+                STAM_COUNTER_INC(&pVCpu->hwaccm.s.StatExitShadowPFEM);
                 TRPMResetTrap(pVCpu);
                 break;
@@ -3102 +3103 @@
             case X86_XCPT_BP:   /* Breakpoint. */
             {
+                STAM_COUNTER_INC(&pVCpu->hwaccm.s.StatExitGuestBP);
                 rc = DBGFRZTrap03Handler(pVM, pVCpu, CPUMCTX2CORE(pCtx));
                 if (rc == VINF_EM_RAW_GUEST_TRAP)
@@ -3389 +3391 @@
                     STAM_COUNTER_INC(&pVCpu->hwaccm.s.StatExitGuestNP);
                     break;
+                case X86_XCPT_XF:
+                    STAM_COUNTER_INC(&pVCpu->hwaccm.s.StatExitGuestXF);
+                    break;
                 }
 
@@ -3400 +3405 @@
 #endif
             default:
+                STAM_COUNTER_INC(&pVCpu->hwaccm.s.StatExitGuestXcpUnk);
                 if (    CPUMIsGuestInRealModeEx(pCtx)
                     &&  pVM->hwaccm.s.vmx.pRealModeTSS)

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

@@ -492 +492 @@
         HWACCM_REG_COUNTER(&pVCpu->hwaccm.s.StatExitGuestNM,            "/HWACCM/CPU%d/Exit/Trap/Gst/#NM");
         HWACCM_REG_COUNTER(&pVCpu->hwaccm.s.StatExitShadowPF,           "/HWACCM/CPU%d/Exit/Trap/Shw/#PF");
+        HWACCM_REG_COUNTER(&pVCpu->hwaccm.s.StatExitShadowPFEM,         "/HWACCM/CPU%d/Exit/Trap/Shw/#PF-EM");
         HWACCM_REG_COUNTER(&pVCpu->hwaccm.s.StatExitGuestPF,            "/HWACCM/CPU%d/Exit/Trap/Gst/#PF");
         HWACCM_REG_COUNTER(&pVCpu->hwaccm.s.StatExitGuestUD,            "/HWACCM/CPU%d/Exit/Trap/Gst/#UD");
@@ -500 +501 @@
         HWACCM_REG_COUNTER(&pVCpu->hwaccm.s.StatExitGuestDE,            "/HWACCM/CPU%d/Exit/Trap/Gst/#DE");
         HWACCM_REG_COUNTER(&pVCpu->hwaccm.s.StatExitGuestDB,            "/HWACCM/CPU%d/Exit/Trap/Gst/#DB");
+        HWACCM_REG_COUNTER(&pVCpu->hwaccm.s.StatExitGuestBP,            "/HWACCM/CPU%d/Exit/Trap/Gst/#BP");
+        HWACCM_REG_COUNTER(&pVCpu->hwaccm.s.StatExitGuestXF,            "/HWACCM/CPU%d/Exit/Trap/Gst/#XF");
+        HWACCM_REG_COUNTER(&pVCpu->hwaccm.s.StatExitGuestXcpUnk,        "/HWACCM/CPU%d/Exit/Trap/Gst/Other");
         HWACCM_REG_COUNTER(&pVCpu->hwaccm.s.StatExitInvpg,              "/HWACCM/CPU%d/Exit/Instr/Invlpg");
         HWACCM_REG_COUNTER(&pVCpu->hwaccm.s.StatExitInvd,               "/HWACCM/CPU%d/Exit/Instr/Invd");

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

@@ -801 +801 @@
     STAMCOUNTER             StatExitGuestNM;
     STAMCOUNTER             StatExitShadowPF;
+    STAMCOUNTER             StatExitShadowPFEM;
     STAMCOUNTER             StatExitGuestPF;
     STAMCOUNTER             StatExitGuestUD;
@@ -809 +810 @@
     STAMCOUNTER             StatExitGuestDB;
     STAMCOUNTER             StatExitGuestMF;
+    STAMCOUNTER             StatExitGuestBP;
+    STAMCOUNTER             StatExitGuestXF;
+    STAMCOUNTER             StatExitGuestXcpUnk;
     STAMCOUNTER             StatExitInvpg;
     STAMCOUNTER             StatExitInvd;