Changeset 40561 in vbox for trunk

Timestamp:

Mar 21, 2012 11:57:10 AM (13 years ago)

Author:

vboxsync

Message:

Framework for handling VT-x MTF exits.

Location:

trunk/src/VBox/VMM

Files:

• VMMR0/HWVMXR0.cpp (modified) (2 diffs)
• VMMR3/HWACCM.cpp (modified) (2 diffs)
• include/HWACCMInternal.h (modified) (1 diff)

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

@@ -1716 +1716 @@
         AssertRC(rc);
     }
+
+#if 0
+    /* Enable single stepping if requested and CPU supports it. */
+    if (pVM->hwaccm.s.vmx.msr.vmx_proc_ctls.n.allowed1 & VMX_VMCS_CTRL_PROC_EXEC_CONTROLS_MONITOR_TRAP_FLAG)
+        if (DBGFIsStepping(pVCpu))
+        {
+            pVCpu->hwaccm.s.vmx.proc_ctls |= VMX_VMCS_CTRL_PROC_EXEC_CONTROLS_MONITOR_TRAP_FLAG;
+            rc = VMXWriteVMCS(VMX_VMCS_CTRL_PROC_EXEC_CONTROLS, pVCpu->hwaccm.s.vmx.proc_ctls);
+            AssertRC(rc);
+        }
+#endif
 
     if (pVCpu->hwaccm.s.fContextUseFlags & HWACCM_CHANGED_GUEST_CR3)
@@ -4105 +4116 @@
         AssertFailed(); /* can't happen. */
         rc = VERR_EM_INTERPRETER;
+        break;
+
+    case VMX_EXIT_MTF:                  /* 37 Exit due to Monitor Trap Flag. */
+        LogFlow(("VMX_EXIT_MTF at %RGv\n", (RTGCPTR)pCtx->rip));
+        pVCpu->hwaccm.s.vmx.proc_ctls &= ~VMX_VMCS_CTRL_PROC_EXEC_CONTROLS_MONITOR_TRAP_FLAG;
+        rc2 = VMXWriteVMCS(VMX_VMCS_CTRL_PROC_EXEC_CONTROLS, pVCpu->hwaccm.s.vmx.proc_ctls);
+        AssertRC(rc2);
+        STAM_COUNTER_INC(&pVCpu->hwaccm.s.StatExitMTF);
+#if 0
+        DBGFDoneStepping(pVCpu);
+#endif
+        rc = VINF_EM_DBG_STOP;
         break;
 

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

@@ -96 +96 @@
     EXIT_REASON_NIL(),
     EXIT_REASON(VMX_EXIT_MWAIT              , 36, "Guest software executed MWAIT."),
-    EXIT_REASON_NIL(),
+    EXIT_REASON(VMX_EXIT_MTF                , 37, "Monitor Trap Flag."),
     EXIT_REASON_NIL(),
     EXIT_REASON(VMX_EXIT_MONITOR            , 39, "Guest software attempted to execute MONITOR."),
@@ -527 +527 @@
         HWACCM_REG_COUNTER(&pVCpu->hwaccm.s.StatExitMaxResume,          "/HWACCM/CPU%d/Exit/MaxResume");
         HWACCM_REG_COUNTER(&pVCpu->hwaccm.s.StatExitPreemptPending,     "/HWACCM/CPU%d/Exit/PreemptPending");
+        HWACCM_REG_COUNTER(&pVCpu->hwaccm.s.StatExitMTF,                "/HWACCM/CPU%d/Exit/MonitorTrapFlag");
 
         HWACCM_REG_COUNTER(&pVCpu->hwaccm.s.StatSwitchGuestIrq,         "/HWACCM/CPU%d/Switch/IrqPending");

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

@@ -838 +838 @@
     STAMCOUNTER             StatExitMaxResume;
     STAMCOUNTER             StatExitPreemptPending;
+    STAMCOUNTER             StatExitMTF;
     STAMCOUNTER             StatIntReinject;
     STAMCOUNTER             StatPendingHostIrq;