Changeset 89980 in vbox for trunk

Timestamp:

Jun 30, 2021 2:22:17 PM (4 years ago)

Author:

vboxsync

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

145442

Message:

VMM/HMVMX: Add debug event and dtrace probe for the split-lock #ACs. bugref:10052

Location:

trunk

Files:

• include/VBox/vmm/dbgf.h (modified) (1 diff)
• src/VBox/Debugger/DBGCEmulateCodeView.cpp (modified) (1 diff)
• src/VBox/VMM/VBoxVMM.d (modified) (1 diff)
• src/VBox/VMM/VMMR0/HMVMXR0.cpp (modified) (4 diffs)

trunk/include/VBox/vmm/dbgf.h

@@ -497 +497 @@
 
 
+    /** @name Misc VT-x and AMD-V execution events.
+     * @{ */
+    DBGFEVENT_VMX_SPLIT_LOCK,           /**< VT-x: Split-lock \#AC triggered by host having detection enabled. */
+    /** @} */
+
+
     /** Access to an unassigned I/O port.
      * @todo not yet implemented. */

trunk/src/VBox/Debugger/DBGCEmulateCodeView.cpp

@@ -680 +680 @@
     { DBGFEVENT_EXIT_SVM_STGI,          "exit_svm_stgi",        NULL,       kDbgcSxEventKind_Plain,     kDbgcEvtState_Disabled, 0,                    NULL },
     { DBGFEVENT_EXIT_SVM_CLGI,          "exit_svm_clgi",        NULL,       kDbgcSxEventKind_Plain,     kDbgcEvtState_Disabled, 0,                    NULL },
+    { DBGFEVENT_VMX_SPLIT_LOCK,         "vmx_split_lock",       NULL,       kDbgcSxEventKind_Plain,     kDbgcEvtState_Disabled, 0,                    NULL },
     { DBGFEVENT_IOPORT_UNASSIGNED,      "pio_unassigned",       NULL,       kDbgcSxEventKind_Plain,     kDbgcEvtState_Disabled, 0,                    NULL },
     { DBGFEVENT_IOPORT_UNUSED,          "pio_unused",           NULL,       kDbgcSxEventKind_Plain,     kDbgcEvtState_Disabled, 0,                    NULL },

trunk/src/VBox/VMM/VBoxVMM.d

@@ -361 +361 @@
 
 
+    /** @name Misc VT-x and AMD-V execution events.
+     * @{ */
+    /** VT-x: Split-lock \#AC triggered by host having detection enabled. */
+    probe vmx__split__lock(struct VMCPU *a_pVCpu, struct CPUMCTX *a_pCtx);
+    /** @} */
+
+
     /** @name IPRT tracepoints we link in.
      * @{ */

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

@@ -14153 +14153 @@
         || !(pVCpu->cpum.GstCtx.eflags.u & X86_EFL_AC) )
     {
+        /*
+         * Check for debug/trace events and import state accordingly.
+         */
         STAM_REL_COUNTER_INC(&pVCpu->hm.s.StatExitGuestACSplitLock);
-#if 0
-        rc = hmR0VmxImportGuestState(pVCpu, pVmxTransient->pVmcsInfo, IEM_CPUMCTX_EXTRN_MUST_MASK);
+        PVM pVM = pVCpu->pVMR0;
+        if (   !DBGF_IS_EVENT_ENABLED(pVM, DBGFEVENT_VMX_SPLIT_LOCK)
+            && !VBOXVMM_VMX_SPLIT_LOCK_ENABLED())
+        {
+#if 0 /** @todo r=bird: This is potentially wrong.  Might have to just do a whole state sync above and mark everything changed to be safe... */
+            rc = hmR0VmxImportGuestState(pVCpu, pVmxTransient->pVmcsInfo, IEM_CPUMCTX_EXTRN_MUST_MASK);
 #else
-        rc = hmR0VmxImportGuestState(pVCpu, pVmxTransient->pVmcsInfo, HMVMX_CPUMCTX_EXTRN_ALL);
+            rc = hmR0VmxImportGuestState(pVCpu, pVmxTransient->pVmcsInfo, HMVMX_CPUMCTX_EXTRN_ALL);
 #endif
-        AssertRCReturn(rc, rc);
+            AssertRCReturn(rc, rc);
+        }
+        else
+        {
+            rc = hmR0VmxImportGuestState(pVCpu, pVmxTransient->pVmcsInfo, HMVMX_CPUMCTX_EXTRN_ALL);
+            AssertRCReturn(rc, rc);
+
+            VBOXVMM_XCPT_DF(pVCpu, &pVCpu->cpum.GstCtx);
+
+            if (DBGF_IS_EVENT_ENABLED(pVM, DBGFEVENT_VMX_SPLIT_LOCK))
+            {
+                VBOXSTRICTRC rcStrict = DBGFEventGenericWithArgs(pVM, pVCpu, DBGFEVENT_VMX_SPLIT_LOCK, DBGFEVENTCTX_HM, 0);
+                if (rcStrict != VINF_SUCCESS)
+                    return rcStrict;
+            }
+        }
+
+        /*
+         * Emulate the instruction.
+         *
+         * We have to ignore the LOCK prefix here as we must not retrigger the
+         * detection on the host.  This isn't all that satisfactory, though...
+         */
         Log8Func(("cs:rip=%#04x:%#RX64 rflags=%#RX64 cr0=%#RX64 split-lock #AC?\n", pVCpu->cpum.GstCtx.cs.Sel,
                   pVCpu->cpum.GstCtx.rip, pVCpu->cpum.GstCtx.rflags, pVCpu->cpum.GstCtx.cr0));
@@ -14166 +14195 @@
         VBOXSTRICTRC rcStrict = IEMExecOneIgnoreLock(pVCpu);
         if (rcStrict == VINF_SUCCESS)
-#if 0       /** @todo r=bird: This is potentially wrong.  Might have to just do a whole
-             *        state sync above and mark everything changed to be safe... */
+#if 0 /** @todo r=bird: This is potentially wrong.  Might have to just do a whole state sync above and mark everything changed to be safe... */
             ASMAtomicUoOrU64(&pVCpu->hm.s.fCtxChanged,
                                HM_CHANGED_GUEST_RIP
@@ -14175 +14203 @@
                              | HM_CHANGED_GUEST_SS);
 #else
-        ASMAtomicUoOrU64(&pVCpu->hm.s.fCtxChanged, HM_CHANGED_ALL_GUEST);
+            ASMAtomicUoOrU64(&pVCpu->hm.s.fCtxChanged, HM_CHANGED_ALL_GUEST);
 #endif
         else if (rcStrict == VINF_IEM_RAISED_XCPT)
@@ -14182 +14210 @@
             rcStrict = VINF_SUCCESS;
         }
-        return VBOXSTRICTRC_VAL(rcStrict);
+        return rcStrict;
     }