Changeset 90000 in vbox for trunk/src

Timestamp:

Jul 2, 2021 2:26:30 PM (4 years ago)

Author:

vboxsync

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

145478

Message:

VMM/HMVMX: Only go to ring-3 for split-lock #AC emulation for SMP VMs. bugref:10052

File:

• trunk/src/VBox/VMM/VMMR0/HMVMXR0.cpp (modified) (2 diffs)

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

@@ -14157 +14157 @@
          */
         STAM_REL_COUNTER_INC(&pVCpu->hm.s.StatExitGuestACSplitLock);
-        PVM pVM = pVCpu->pVMR0;
+        PVMCC pVM = pVCpu->pVMR0;
         if (   !DBGF_IS_EVENT_ENABLED(pVM, DBGFEVENT_VMX_SPLIT_LOCK)
             && !VBOXVMM_VMX_SPLIT_LOCK_ENABLED())
         {
+            if (pVM->cCpus == 1)
+            {
 #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);
+                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
@@ -14189 +14192 @@
          * detection on the host.  This isn't all that satisfactory, though...
          */
-#if 0
-        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));
-
-        /** @todo For SMP configs we should do a rendezvous here. */
-        VBOXSTRICTRC rcStrict = IEMExecOneIgnoreLock(pVCpu);
-        if (rcStrict == VINF_SUCCESS)
+        if (pVM->cCpus == 1)
+        {
+            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));
+
+            /** @todo For SMP configs we should do a rendezvous here. */
+            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... */
-            ASMAtomicUoOrU64(&pVCpu->hm.s.fCtxChanged,
-                               HM_CHANGED_GUEST_RIP
-                             | HM_CHANGED_GUEST_RFLAGS
-                             | HM_CHANGED_GUEST_GPRS_MASK
-                             | HM_CHANGED_GUEST_CS
-                             | HM_CHANGED_GUEST_SS);
+                ASMAtomicUoOrU64(&pVCpu->hm.s.fCtxChanged,
+                                   HM_CHANGED_GUEST_RIP
+                                 | HM_CHANGED_GUEST_RFLAGS
+                                 | HM_CHANGED_GUEST_GPRS_MASK
+                                 | HM_CHANGED_GUEST_CS
+                                 | 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)
-        {
-            ASMAtomicUoOrU64(&pVCpu->hm.s.fCtxChanged, HM_CHANGED_RAISED_XCPT_MASK);
-            rcStrict = VINF_SUCCESS;
-        }
-        return rcStrict;
-#else
+            else if (rcStrict == VINF_IEM_RAISED_XCPT)
+            {
+                ASMAtomicUoOrU64(&pVCpu->hm.s.fCtxChanged, HM_CHANGED_RAISED_XCPT_MASK);
+                rcStrict = VINF_SUCCESS;
+            }
+            return rcStrict;
+        }
         Log8Func(("cs:rip=%#04x:%#RX64 rflags=%#RX64 cr0=%#RX64 split-lock #AC -> VINF_EM_EMULATE_SPLIT_LOCK\n",
                   pVCpu->cpum.GstCtx.cs.Sel, pVCpu->cpum.GstCtx.rip, pVCpu->cpum.GstCtx.rflags, pVCpu->cpum.GstCtx.cr0));
         return VINF_EM_EMULATE_SPLIT_LOCK;
-#endif
     }