Changeset 19322 in vbox

Timestamp:

May 4, 2009 11:54:21 AM (16 years ago)

Author:

vboxsync

Message:

Deal with reset, suspend, resume, poweroff for SMP guests.

Location:

trunk/src/VBox/VMM

Files:

• EM.cpp (modified) (1 diff)
• VM.cpp (modified) (16 diffs)

trunk/src/VBox/VMM/EM.cpp

@@ -3729 +3729 @@
                 case VINF_EM_RESET:
                 {
-                    EMSTATE enmState = emR3Reschedule(pVM, pVCpu, pVCpu->em.s.pCtx);
-                    Log2(("EMR3ExecuteVM: VINF_EM_RESET: %d -> %d (%s)\n", pVCpu->em.s.enmState, enmState, EMR3GetStateName(enmState)));
-                    pVCpu->em.s.enmState = enmState;
+                    if (pVCpu->idCpu == 0)
+                    {
+                        EMSTATE enmState = emR3Reschedule(pVM, pVCpu, pVCpu->em.s.pCtx);
+                        Log2(("EMR3ExecuteVM: VINF_EM_RESET: %d -> %d (%s)\n", pVCpu->em.s.enmState, enmState, EMR3GetStateName(enmState)));
+                        pVCpu->em.s.enmState = enmState;
+                    }
+                    else
+                    {
+                        /* All other VCPUs go into the halted state until woken up again. */
+                        pVCpu->em.s.enmState = EMSTATE_HALTED;
+                    }
                     break;
                 }

trunk/src/VBox/VMM/VM.cpp

@@ -966 +966 @@
 static int vmR3InitDoCompleted(PVM pVM, VMINITCOMPLETED enmWhat)
 {
-
     return VINF_SUCCESS;
 }
@@ -1035 +1034 @@
      */
     PVMREQ pReq;
-    int rc = VMR3ReqCall(pVM, VMCPUID_ANY, &pReq, RT_INDEFINITE_WAIT, (PFNRT)vmR3PowerOn, 1, pVM);
+    int rc = VMR3ReqCall(pVM, 0 /* VCPU 0 */, &pReq, RT_INDEFINITE_WAIT, (PFNRT)vmR3PowerOn, 1, pVM);
     if (RT_SUCCESS(rc))
     {
@@ -1102 +1101 @@
 
     /*
-     * Request the operation in EMT.
-     */
-    PVMREQ pReq;
-    int rc = VMR3ReqCall(pVM, VMCPUID_ANY, &pReq, RT_INDEFINITE_WAIT, (PFNRT)vmR3Suspend, 1, pVM);
+     * Request the operation in EMT. (in reverse order as VCPU 0 does the actual work)
+     */
+    PVMREQ pReq = NULL;
+    int rc = VMR3ReqCall(pVM, VMCPUID_ALL_REVERSE, &pReq, RT_INDEFINITE_WAIT, (PFNRT)vmR3Suspend, 1, pVM);
     if (RT_SUCCESS(rc))
     {
@@ -1111 +1110 @@
         VMR3ReqFree(pReq);
     }
+    else
+        Assert(pReq == NULL);
 
     LogFlow(("VMR3Suspend: returns %Rrc\n", rc));
@@ -1155 +1156 @@
     }
 
+    PVMCPU pVCpu = VMMGetCpu(pVM);
+    /* Only VCPU 0 does the actual work. */
+    if (pVCpu->idCpu != 0)
+        return VINF_EM_SUSPEND;
+
     /*
      * Change the state, notify the components and resume the execution.
@@ -1189 +1195 @@
 
     /*
-     * Request the operation in EMT.
-     */
-    PVMREQ pReq;
-    int rc = VMR3ReqCall(pVM, VMCPUID_ANY, &pReq, RT_INDEFINITE_WAIT, (PFNRT)vmR3Resume, 1, pVM);
+     * Request the operation in EMT. (in VCPU order as VCPU 0 does the actual work)
+     */
+    PVMREQ pReq = NULL;
+    int rc = VMR3ReqCall(pVM, VMCPUID_ALL, &pReq, RT_INDEFINITE_WAIT, (PFNRT)vmR3Resume, 1, pVM);
     if (RT_SUCCESS(rc))
     {
@@ -1198 +1204 @@
         VMR3ReqFree(pReq);
     }
+    else
+        Assert(pReq == NULL);
 
     LogFlow(("VMR3Resume: returns %Rrc\n", rc));
@@ -1224 +1232 @@
         return VERR_VM_INVALID_VM_STATE;
     }
+
+    PVMCPU pVCpu = VMMGetCpu(pVM);
+    /* Only VCPU 0 does the actual work. */
+    if (pVCpu->idCpu != 0)
+        return VINF_EM_RESUME;
 
     /*
@@ -1273 +1286 @@
      */
     PVMREQ pReq;
-    int rc = VMR3ReqCall(pVM, VMCPUID_ANY, &pReq, RT_INDEFINITE_WAIT, (PFNRT)vmR3Save, 4, pVM, pszFilename, pfnProgress, pvUser);
+    int rc = VMR3ReqCall(pVM, 0 /* VCPU 0 */, &pReq, RT_INDEFINITE_WAIT, (PFNRT)vmR3Save, 4, pVM, pszFilename, pfnProgress, pvUser);
     if (RT_SUCCESS(rc))
     {
@@ -1368 +1381 @@
      */
     PVMREQ pReq;
-    int rc = VMR3ReqCall(pVM, VMCPUID_ANY, &pReq, RT_INDEFINITE_WAIT, (PFNRT)vmR3Load, 4, pVM, pszFilename, pfnProgress, pvUser);
+    int rc = VMR3ReqCall(pVM, 0 /* VCPU 0 */, &pReq, RT_INDEFINITE_WAIT, (PFNRT)vmR3Load, 4, pVM, pszFilename, pfnProgress, pvUser);
     if (RT_SUCCESS(rc))
     {
@@ -1454 +1467 @@
 
     /*
-     * Request the operation in EMT.
-     */
-    PVMREQ pReq;
-    int rc = VMR3ReqCall(pVM, VMCPUID_ANY, &pReq, RT_INDEFINITE_WAIT, (PFNRT)vmR3PowerOff, 1, pVM);
+     * Request the operation in EMT. (in reverse order as VCPU 0 does the actual work)
+     */
+    PVMREQ pReq = NULL;
+    int rc = VMR3ReqCall(pVM, VMCPUID_ALL_REVERSE, &pReq, RT_INDEFINITE_WAIT, (PFNRT)vmR3PowerOff, 1, pVM);
     if (RT_SUCCESS(rc))
     {
@@ -1463 +1476 @@
         VMR3ReqFree(pReq);
     }
+    else
+        Assert(pReq == NULL);
 
     LogFlow(("VMR3PowerOff: returns %Rrc\n", rc));
@@ -1492 +1507 @@
         return VERR_VM_INVALID_VM_STATE;
     }
+
+    PVMCPU pVCpu = VMMGetCpu(pVM);
+    /* Only VCPU 0 does the actual work. */
+    if (pVCpu->idCpu != 0)
+        return VINF_EM_TERMINATE;
 
     /*
@@ -1616 +1636 @@
 
     /*
-     * If we are the EMT we'll delay the cleanup till later.
-     */
-    if (VM_IS_EMT(pVM))
+     * If we are the EMT of VCPU 0, then we'll delay the cleanup till later.
+     */
+    if (VMMGetCpuId(pVM) == 0)
     {
         pUVM->vm.s.fEMTDoesTheCleanup = true;
         pUVM->vm.s.fTerminateEMT = true;
         VM_FF_SET(pVM, VM_FF_TERMINATE);
+
+        /* Inform all other VCPUs too. */
+        for (VMCPUID idCpu = 1; idCpu < pVM->cCPUs; idCpu++)
+        {
+            /*
+             * Request EMT to do the larger part of the destruction.
+             */
+            PVMREQ pReq = NULL;
+            int rc = VMR3ReqCallU(pUVM, idCpu, &pReq, RT_INDEFINITE_WAIT, 0, (PFNRT)vmR3Destroy, 1, pVM);
+            if (RT_SUCCESS(rc))
+                rc = pReq->iStatus;
+            AssertRC(rc);
+            VMR3ReqFree(pReq);
+        }
     }
     else
@@ -2074 +2108 @@
     /*
      * Queue reset request to the emulation thread
-     * and wait for it to be processed.
+     * and wait for it to be processed. (in reverse order as VCPU 0 does the real cleanup)
      */
     PVMREQ pReq = NULL;
-    rc = VMR3ReqCall(pVM, VMCPUID_ANY, &pReq, 0, (PFNRT)vmR3Reset, 1, pVM);
+    rc = VMR3ReqCall(pVM, VMCPUID_ALL_REVERSE, &pReq, RT_INDEFINITE_WAIT, (PFNRT)vmR3Reset, 1, pVM);
+    /** @note Can this really happen?? */
     while (rc == VERR_TIMEOUT)
         rc = VMR3ReqWait(pReq, RT_INDEFINITE_WAIT);
+
     if (RT_SUCCESS(rc))
         rc = pReq->iStatus;
+    AssertRC(rc);
     VMR3ReqFree(pReq);
 
@@ -2112 +2149 @@
 static DECLCALLBACK(int) vmR3Reset(PVM pVM)
 {
+    PVMCPU pVCpu = VMMGetCpu(pVM);
+
+    /* Only VCPU 0 does the full cleanup. */
+    if (pVCpu->idCpu != 0)
+        return VINF_EM_RESET;
+
     /*
      * As a safety precaution we temporarily change the state while resetting.