Changeset 88346 in vbox for trunk/src/VBox/VMM/VMMR3

Timestamp:

Apr 1, 2021 1:16:25 PM (4 years ago)

Author:

vboxsync

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

143577

Message:

Forward ported r143574 from 6.1: VMM: Must do vmR3SetHaltMethodCallback on all EMTs or only one of them will be doing halting in ring-0. oem2ticketref:40

Location:

trunk/src/VBox/VMM/VMMR3

Files:

• VMEmt.cpp (modified) (2 diffs)
• VMM.cpp (modified) (1 diff)

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

@@ -1253 +1253 @@
 static DECLCALLBACK(VBOXSTRICTRC) vmR3SetHaltMethodCallback(PVM pVM, PVMCPU pVCpu, void *pvUser)
 {
-    PUVM        pUVM = pVM->pUVM;
-    uintptr_t   i    = (uintptr_t)pvUser;
+    PUVM      pUVM = pVM->pUVM;
+    int       rc   = VINF_SUCCESS;
+    uintptr_t i    = (uintptr_t)pvUser;
     Assert(i < RT_ELEMENTS(g_aHaltMethods));
-    NOREF(pVCpu);
-
-    /*
-     * Terminate the old one.
-     */
-    if (    pUVM->vm.s.enmHaltMethod != VMHALTMETHOD_INVALID
-        &&  g_aHaltMethods[pUVM->vm.s.iHaltMethod].pfnTerm)
-    {
-        g_aHaltMethods[pUVM->vm.s.iHaltMethod].pfnTerm(pUVM);
-        pUVM->vm.s.enmHaltMethod = VMHALTMETHOD_INVALID;
-    }
-
-    /* Assert that the failure fallback is where we expect. */
-    Assert(g_aHaltMethods[0].enmHaltMethod == VMHALTMETHOD_BOOTSTRAP);
-    Assert(!g_aHaltMethods[0].pfnTerm && !g_aHaltMethods[0].pfnInit);
-
-    /*
-     * Init the new one.
-     */
-    int rc = VINF_SUCCESS;
-    memset(&pUVM->vm.s.Halt, 0, sizeof(pUVM->vm.s.Halt));
-    if (g_aHaltMethods[i].pfnInit)
-    {
-        rc = g_aHaltMethods[i].pfnInit(pUVM);
-        if (RT_FAILURE(rc))
-        {
-            /* Fall back on the bootstrap method. This requires no
-               init/term (see assertion above), and will always work. */
-            AssertLogRelRC(rc);
-            i = 0;
-        }
-    }
-
-    /*
-     * Commit it.
-     */
-    pUVM->vm.s.enmHaltMethod = g_aHaltMethods[i].enmHaltMethod;
-    ASMAtomicWriteU32(&pUVM->vm.s.iHaltMethod, i);
-
+
+    /*
+     * Main job is done once on EMT0 (it goes thru here first).
+     */
+    if (pVCpu->idCpu == 0)
+    {
+        /*
+         * Terminate the old one.
+         */
+        if (    pUVM->vm.s.enmHaltMethod != VMHALTMETHOD_INVALID
+            &&  g_aHaltMethods[pUVM->vm.s.iHaltMethod].pfnTerm)
+        {
+            g_aHaltMethods[pUVM->vm.s.iHaltMethod].pfnTerm(pUVM);
+            pUVM->vm.s.enmHaltMethod = VMHALTMETHOD_INVALID;
+        }
+
+        /* Assert that the failure fallback is where we expect. */
+        Assert(g_aHaltMethods[0].enmHaltMethod == VMHALTMETHOD_BOOTSTRAP);
+        Assert(!g_aHaltMethods[0].pfnTerm && !g_aHaltMethods[0].pfnInit);
+
+        /*
+         * Init the new one.
+         */
+        memset(&pUVM->vm.s.Halt, 0, sizeof(pUVM->vm.s.Halt));
+        if (g_aHaltMethods[i].pfnInit)
+        {
+            rc = g_aHaltMethods[i].pfnInit(pUVM);
+            if (RT_FAILURE(rc))
+            {
+                /* Fall back on the bootstrap method. This requires no
+                   init/term (see assertion above), and will always work. */
+                AssertLogRelRC(rc);
+                i = 0;
+            }
+        }
+
+        /*
+         * Commit it.
+         */
+        pUVM->vm.s.enmHaltMethod = g_aHaltMethods[i].enmHaltMethod;
+        ASMAtomicWriteU32(&pUVM->vm.s.iHaltMethod, i);
+    }
+    else
+        i = pUVM->vm.s.iHaltMethod;
+
+    /*
+     * All EMTs must update their ring-0 halt configuration.
+     */
     VMMR3SetMayHaltInRing0(pVCpu, g_aHaltMethods[i].fMayHaltInRing0,
                            g_aHaltMethods[i].enmHaltMethod == VMHALTMETHOD_GLOBAL_1
@@ -1351 +1361 @@
      * This needs to be done while the other EMTs are not sleeping or otherwise messing around.
      */
-    return VMMR3EmtRendezvous(pVM, VMMEMTRENDEZVOUS_FLAGS_TYPE_ONCE, vmR3SetHaltMethodCallback, (void *)(uintptr_t)i);
+    return VMMR3EmtRendezvous(pVM, VMMEMTRENDEZVOUS_FLAGS_TYPE_ASCENDING, vmR3SetHaltMethodCallback, (void *)(uintptr_t)i);
 }
 

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

@@ -2134 +2134 @@
 VMMR3_INT_DECL(void) VMMR3SetMayHaltInRing0(PVMCPU pVCpu, bool fMayHaltInRing0, uint32_t cNsSpinBlockThreshold)
 {
+    LogFlow(("VMMR3SetMayHaltInRing0(#%u, %d, %u)\n", pVCpu->idCpu, fMayHaltInRing0, cNsSpinBlockThreshold));
     pVCpu->vmm.s.fMayHaltInRing0       = fMayHaltInRing0;
     pVCpu->vmm.s.cNsSpinBlockThreshold = cNsSpinBlockThreshold;