Changeset 19265 in vbox for trunk/src/VBox/VMM/VM.cpp

Timestamp:

Apr 29, 2009 2:11:45 PM (16 years ago)

Author:

vboxsync

Message:

SMP cleanup fixes.

File:

• trunk/src/VBox/VMM/VM.cpp (modified) (4 diffs)

trunk/src/VBox/VMM/VM.cpp

@@ -1627 +1627 @@
     {
         /*
-         * Request EMT to do the larger part of the destruction.
+         * Request EMT to do the larger part of the destruction. (in reverse order as VCPU 0 does the real cleanup)
          */
-        PVMREQ pReq = NULL;
-        int rc = VMR3ReqCallU(pUVM, VMREQDEST_ANY, &pReq, RT_INDEFINITE_WAIT, 0, (PFNRT)vmR3Destroy, 1, pVM);
-        if (RT_SUCCESS(rc))
-            rc = pReq->iStatus;
-        AssertRC(rc);
-        VMR3ReqFree(pReq);
+        for (int idCpu = pVM->cCPUs - 1;idCpu>=0;idCpu--)
+        {
+            PVMREQ pReq = NULL;
+            int rc = VMR3ReqCallU(pUVM, (VMREQDEST)idCpu, &pReq, RT_INDEFINITE_WAIT, 0, (PFNRT)vmR3Destroy, 1, pVM);
+            if (RT_SUCCESS(rc))
+                rc = pReq->iStatus;
+            AssertRC(rc);
+            VMR3ReqFree(pReq);
+        }
 
         /*
@@ -1659 +1662 @@
 {
     PUVM pUVM = pVM->pUVM;
+    PVMCPU pVCpu = VMMGetCpu(pVM);
+
     NOREF(pUVM);
     LogFlow(("vmR3Destroy: pVM=%p pUVM=%p\n", pVM, pUVM));
     VM_ASSERT_EMT(pVM);
+
+    /* Only VCPU 0 does the full cleanup. */
+    if (pVCpu->idCpu != 0)
+        return VINF_EM_TERMINATE;
 
     /*
@@ -1739 +1748 @@
     if (pUVM->pVM)
     {
+        PVMCPU pVCpu = VMMGetCpu(pUVM->pVM);
+
+        /* VCPU 0 does all the cleanup work. */
+        if (pVCpu->idCpu != 0)
+            return;
+
         /*
          * Modify state and then terminate MM.
@@ -1858 +1873 @@
     }
 
+    /* 
+     * Now all queued VCPU requests (again, there shouldn't be any).
+     */
+    for (VMCPUID i = 0; i < pUVM->cCpus; i++)
+    {
+        PUVMCPU pUVCpu = &pUVM->aCpus[i];
+
+        for (unsigned i = 0; i < 10; i++)
+        {
+            PVMREQ pReqHead = (PVMREQ)ASMAtomicXchgPtr((void *volatile *)&pUVCpu->vm.s.pReqs, NULL);
+            AssertMsg(!pReqHead, ("This isn't supposed to happen! VMR3Destroy caller has to serialize this.\n"));
+            if (!pReqHead)
+                break;
+            for (PVMREQ pReq = pReqHead; pReq; pReq = pReq->pNext)
+            {
+                ASMAtomicUoWriteSize(&pReq->iStatus, VERR_INTERNAL_ERROR);
+                ASMAtomicWriteSize(&pReq->enmState, VMREQSTATE_INVALID);
+                RTSemEventSignal(pReq->EventSem);
+                RTThreadSleep(2);
+                RTSemEventDestroy(pReq->EventSem);
+            }
+            /* give them a chance to respond before we free the request memory. */
+            RTThreadSleep(32);
+        }
+    }
+
     /*
      * Make sure the VMMR0.r0 module and whatever else is unloaded.