Changeset 87491 in vbox

Timestamp:

Jan 30, 2021 1:15:50 AM (4 years ago)

Author:

vboxsync

Message:

VMM/HMVMX: Some stats.

Location:

trunk/src/VBox/VMM

Files:

• VMMR0/HMR0A.asm (modified) (2 diffs)
• VMMR0/HMVMXR0.cpp (modified) (1 diff)
• VMMR3/HM.cpp (modified) (3 diffs)
• include/HMInternal.h (modified) (1 diff)
• include/HMInternal.mac (modified) (1 diff)

trunk/src/VBox/VMM/VMMR0/HMR0A.asm

@@ -969 +969 @@
 ALIGNCODE(8)
 .write_host_rip:
+ %ifdef VBOX_WITH_STATISTICS
+        inc     qword [rsi + VMCPU.hm + HMCPU.StatVmxWriteHostRip]
+ %endif
         mov     [r9 + VMXVMCSINFO.uHostRip], rcx
         mov     eax, VMX_VMCS_HOST_RIP                      ;; @todo It is only strictly necessary to write VMX_VMCS_HOST_RIP when
@@ -979 +982 @@
 ALIGNCODE(8)
 .write_host_rsp:
+ %ifdef VBOX_WITH_STATISTICS
+        inc     qword [rsi + VMCPU.hm + HMCPU.StatVmxWriteHostRsp]
+ %endif
         mov     [r9 + VMXVMCSINFO.uHostRsp], rsp
         mov     eax, VMX_VMCS_HOST_RSP

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

@@ -6880 +6880 @@
     pVCpu->cpum.GstCtx.fExtrn |= HMVMX_CPUMCTX_EXTRN_ALL | CPUMCTX_EXTRN_KEEPER_HM;
 
-    /** @todo Add stats for VMRESUME vs VMLAUNCH. */
     PVMXVMCSINFO pVmcsInfo = pVmxTransient->pVmcsInfo;
     bool const   fResumeVM = RT_BOOL(pVmcsInfo->fVmcsState & VMX_V_VMCS_LAUNCH_STATE_LAUNCHED);
+#ifdef VBOX_WITH_STATISTICS
+    if (fResumeVM)
+        STAM_COUNTER_INC(&pVCpu->hm.s.StatVmxVmResume);
+    else
+        STAM_COUNTER_INC(&pVCpu->hm.s.StatVmxVmLaunch);
+#endif
     int rc = pVCpu->hmr0.s.vmx.pfnStartVm(pVmcsInfo, pVCpu, fResumeVM);
     AssertMsg(rc <= VINF_SUCCESS, ("%Rrc\n", rc));

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

@@ -674 +674 @@
      * Statistics.
      */
+#ifdef VBOX_WITH_STATISTICS
+    bool const fCpuSupportsVmx = ASMIsIntelCpu() || ASMIsViaCentaurCpu() || ASMIsShanghaiCpu();
+#endif
     for (VMCPUID idCpu = 0; idCpu < pVM->cCpus; idCpu++)
     {
@@ -818 +821 @@
         HM_REG_COUNTER(&pHmCpu->StatExportHostState,        "/HM/CPU%u/Export/HostState", "VM-entry exporting host-state.");
 
+        if (fCpuSupportsVmx)
+        {
+            HM_REG_COUNTER(&pHmCpu->StatVmxWriteHostRip,    "/HM/CPU%u/WriteHostRIP", "Number of VMX_VMCS_HOST_RIP instructions.");
+            HM_REG_COUNTER(&pHmCpu->StatVmxWriteHostRsp,    "/HM/CPU%u/WriteHostRSP", "Number of VMX_VMCS_HOST_RSP instructions.");
+            HM_REG_COUNTER(&pHmCpu->StatVmxVmLaunch,        "/HM/CPU%u/VMLaunch", "Number of VMLAUNCH instructions.");
+            HM_REG_COUNTER(&pHmCpu->StatVmxVmResume,        "/HM/CPU%u/VMResume", "Number of VMRESUME instructions.");
+        }
+
         HM_REG_COUNTER(&pHmCpu->StatVmxCheckBadRmSelBase,   "/HM/CPU%u/VMXCheck/RMSelBase", "Could not use VMX due to unsuitable real-mode selector base.");
         HM_REG_COUNTER(&pHmCpu->StatVmxCheckBadRmSelLimit,  "/HM/CPU%u/VMXCheck/RMSelLimit", "Could not use VMX due to unsuitable real-mode selector limit.");
@@ -830 +841 @@
         HM_REG_COUNTER(&pHmCpu->StatVmxCheckBadRpl,         "/HM/CPU%u/VMXCheck/RPL", "Could not use VMX due to unsuitable RPL.");
         HM_REG_COUNTER(&pHmCpu->StatVmxCheckPmOk,           "/HM/CPU%u/VMXCheck/VMX_PM", "VMX execution in protected mode OK.");
-
-        bool const fCpuSupportsVmx = ASMIsIntelCpu() || ASMIsViaCentaurCpu() || ASMIsShanghaiCpu();
 
         /*

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

@@ -1103 +1103 @@
      * on the stack. */
     DISCPUSTATE             DisState;
+
+    /* These two comes because they are accessed from assembly and we don't
+       want to detail all the stats in the assembly version of this structure. */
+    STAMCOUNTER             StatVmxWriteHostRip;
+    STAMCOUNTER             StatVmxWriteHostRsp;
+    STAMCOUNTER             StatVmxVmLaunch;
+    STAMCOUNTER             StatVmxVmResume;
 
     STAMPROFILEADV          StatEntry;

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

@@ -193 +193 @@
     .aPdpes                         resq    4
 
+    .DisState                       resb    0d8h
+
+    .StatVmxWriteHostRip            resq    1
+    .StatVmxWriteHostRsp            resq    1
+
     ; The remainer is disassembly state and statistics.
 endstruc