Changeset 100139 in vbox

Timestamp:

Jun 9, 2023 2:31:28 PM (23 months ago)

Author:

vboxsync

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

157832

Message:

VMM/HM: More statistics for HMCanExecuteVmxGuest, making sure all return cases are coverted.

Location:

trunk/src/VBox/VMM

Files:

• VMMAll/HMVMXAll.cpp (modified) (6 diffs)
• VMMR3/HM.cpp (modified) (1 diff)
• include/HMInternal.h (modified) (1 diff)

trunk/src/VBox/VMM/VMMAll/HMVMXAll.cpp

@@ -746 +746 @@
                     }
                 }
+                STAM_COUNTER_INC(&pVCpu->hm.s.StatVmxCheckPmOk);
             }
         }
@@ -756 +757 @@
                     /* Requires a fake TSS for real mode - stored in the VMM device heap: */
                     || CPUMIsGuestInRealModeEx(pCtx))
+                {
+                    STAM_COUNTER_INC(&pVCpu->hm.s.StatVmxCheck1);
                     return false;
+                }
 
                 /* Too early for VT-x; Solaris guests will fail with a guru meditation otherwise; same for XP. */
                 if (pCtx->idtr.pIdt == 0 || pCtx->idtr.cbIdt == 0 || pCtx->tr.Sel == 0)
+                {
+                    STAM_COUNTER_INC(&pVCpu->hm.s.StatVmxCheck1);
                     return false;
+                }
 
                 /*
@@ -769 +776 @@
                 /** @todo Is this supposed recompiler bug still relevant with IEM? */
                 if (pCtx->cs.Attr.n.u1Present == 0)
+                {
+                    STAM_COUNTER_INC(&pVCpu->hm.s.StatVmxCheck1);
                     return false;
+                }
                 if (pCtx->ss.Attr.n.u1Present == 0)
+                {
+                    STAM_COUNTER_INC(&pVCpu->hm.s.StatVmxCheck1);
                     return false;
+                }
 
                 /*
@@ -781 +794 @@
                  *        stack segment into account. But, it does the job for now. */
                 if (pCtx->rsp >= pCtx->ss.u32Limit)
+                {
+                    STAM_COUNTER_INC(&pVCpu->hm.s.StatVmxCheck1);
                     return false;
+                }
             }
         }
@@ -805 +821 @@
         }
         if ((pCtx->cr0 & uCr0Mask) != uCr0Mask)
+        {
+            STAM_COUNTER_INC(&pVCpu->hm.s.StatVmxCheck2);
             return false;
+        }
 
         /* If bit N is cleared in cr0_fixed1, then it must be zero in the guest's cr0. */
         uCr0Mask = (uint32_t)~CTX_EXPR(pVM->hm.s.ForR3.vmx.Msrs.u64Cr0Fixed1, g_HmMsrs.u.vmx.u64Cr0Fixed1, RT_NOTHING);
         if ((pCtx->cr0 & uCr0Mask) != 0)
+        {
+            STAM_COUNTER_INC(&pVCpu->hm.s.StatVmxCheck2);
             return false;
+        }
 
         /* If bit N is set in cr4_fixed0, then it must be set in the guest's cr4. */
@@ -816 +838 @@
         uCr0Mask &= ~X86_CR4_VMXE;
         if ((pCtx->cr4 & uCr0Mask) != uCr0Mask)
+        {
+            STAM_COUNTER_INC(&pVCpu->hm.s.StatVmxCheck2);
             return false;
+        }
 
         /* If bit N is cleared in cr4_fixed1, then it must be zero in the guest's cr4. */
         uCr0Mask = (uint32_t)~CTX_EXPR(pVM->hm.s.ForR3.vmx.Msrs.u64Cr4Fixed1, g_HmMsrs.u.vmx.u64Cr4Fixed1, RT_NOTHING);
         if ((pCtx->cr4 & uCr0Mask) != 0)
+        {
+            STAM_COUNTER_INC(&pVCpu->hm.s.StatVmxCheck2);
             return false;
+        }
 
         pVCpu->hm.s.fActive = true;
+        STAM_COUNTER_INC(&pVCpu->hm.s.StatVmxCheckOk);
         return true;
     }
 
+    STAM_COUNTER_INC(&pVCpu->hm.s.StatVmxCheckDisabled);
     return false;
 }

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

@@ -976 +976 @@
         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.");
+        HM_REG_COUNTER(&pHmCpu->StatVmxCheck1,              "/HM/CPU%u/VMXCheck/1", "Could not use VMX due to unsuitable state and no VMMDev heap");
+        HM_REG_COUNTER(&pHmCpu->StatVmxCheck2,              "/HM/CPU%u/VMXCheck/2", "CR0/CR4 fixed stuff.");
+        HM_REG_COUNTER(&pHmCpu->StatVmxCheckDisabled,       "/HM/CPU%u/VMXCheck/Disabled", "VMX is not enabled.");
+        HM_REG_COUNTER(&pHmCpu->StatVmxCheckOk,             "/HM/CPU%u/VMXCheck/Ok", "We could do VMX!");
 #endif
         if (fCpuSupportsVmx)

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

@@ -991 +991 @@
     STAMCOUNTER             StatVmxCheckBadRpl;
     STAMCOUNTER             StatVmxCheckPmOk;
+    STAMCOUNTER             StatVmxCheck1;
+    STAMCOUNTER             StatVmxCheck2;
+    STAMCOUNTER             StatVmxCheckDisabled;
+    STAMCOUNTER             StatVmxCheckOk;
 
     STAMCOUNTER             StatVmxPreemptionRecalcingDeadline;