Changeset 19435 in vbox for trunk/src/VBox/VMM

Timestamp:

May 6, 2009 2:01:15 PM (16 years ago)

Author:

vboxsync

Message:

VMM: VMCPU::enmState.

Location:

trunk/src/VBox/VMM

Files:

• VM.cpp (modified) (9 diffs)
• VMEmt.cpp (modified) (6 diffs)
• VMInternal.h (modified) (1 diff)
• VMMR0/GVMMR0.cpp (modified) (1 diff)

trunk/src/VBox/VMM/VM.cpp

@@ -672 +672 @@
     return rc;
 }
+
 
 /**
@@ -1095 +1096 @@
     LogFlow(("vmR3PowerOn: pVM=%p\n", pVM));
 
+    /*
+     * EMT(0) does the actual power on work *before* the other EMTs
+     * get here, they just need to set their state to STARTED so they
+     * get out of the EMT loop and into EM.
+     */
     PVMCPU pVCpu = VMMGetCpu(pVM);
-    /* Only VCPU 0 does the actual work. */
+    VMCPU_SET_STATE(pVCpu, VMCPUSTATE_STARTED);
     if (pVCpu->idCpu != 0)
         return VINF_SUCCESS;
@@ -1199 +1205 @@
 
     PVMCPU pVCpu = VMMGetCpu(pVM);
-    /* Only VCPU 0 does the actual work. */
+    /* Only VCPU 0 does the actual work (*after* all the other CPUs has been here). */
     if (pVCpu->idCpu != 0)
         return VINF_EM_SUSPEND;
@@ -1276 +1282 @@
 
     PVMCPU pVCpu = VMMGetCpu(pVM);
-    /* Only VCPU 0 does the actual work. */
+    /* Only VCPU 0 does the actual work (*before* the others wake up). */
     if (pVCpu->idCpu != 0)
         return VINF_EM_RESUME;
@@ -1376 +1382 @@
      * Change the state and perform the save.
      */
-    /** @todo implement progress support in SSM */
     vmR3SetState(pVM, VMSTATE_SAVING);
     int rc = SSMR3Save(pVM, pszFilename, SSMAFTER_CONTINUE, pfnProgress,  pvUser);
@@ -1550 +1555 @@
     }
 
+    /*
+     * EMT(0) does the actual power off work here *after* all the other EMTs
+     * have been thru and entered the STOPPED state.
+     */
     PVMCPU pVCpu = VMMGetCpu(pVM);
-    /* Only VCPU 0 does the actual work. */
+    VMCPU_SET_STATE(pVCpu, VMCPUSTATE_STOPPED);
     if (pVCpu->idCpu != 0)
         return VINF_EM_OFF;
@@ -2154 +2163 @@
     PVMREQ pReq = NULL;
     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;
@@ -2183 +2188 @@
  * Reset request processor.
  *
- * This is called by the emulation thread as a response to the
+ * This is called by the emulation threads as a response to the
  * reset request issued by VMR3Reset().
  *
@@ -2193 +2198 @@
     PVMCPU pVCpu = VMMGetCpu(pVM);
 
-    /* Only VCPU 0 does the full cleanup. */
+    /*
+     * EMT(0) does the full cleanup *after* all the other EMTs has been
+     * thru here and been told to enter the EMSTATE_WAIT_SIPI state.
+     */
+    VMCPU_ASSERT_STATE(pVCpu, VMCPUSTATE_STARTED);
     if (pVCpu->idCpu != 0)
         return VINF_EM_RESET;

trunk/src/VBox/VMM/VMEmt.cpp

@@ -88 +88 @@
      */
     rc = VINF_SUCCESS;
-    volatile VMSTATE enmBefore = VMSTATE_CREATING; /* volatile because of setjmp */
     Log(("vmR3EmulationThread: Emulation thread starting the days work... Thread=%#x pUVM=%p\n", ThreadSelf, pUVM));
+    VMSTATE enmBefore = VMSTATE_CREATED; /* (only used for logging atm.) */
     for (;;)
     {
-        /* Requested to exit the EMT thread out of sync? (currently only VMR3WaitForResume) */
-        if (setjmp(pUVCpu->vm.s.emtJumpEnv) != 0)
-        {
-            rc = VINF_SUCCESS;
-            break;
-        }
-
         /*
          * During early init there is no pVM, so make a special path
@@ -148 +141 @@
         else
         {
-
             /*
              * Pending requests which needs servicing?
@@ -216 +208 @@
 
         /*
-         * Some requests (both VMR3Req* and the DBGF) can potentially
-         * resume or start the VM, in that case we'll get a change in
-         * VM status indicating that we're now running.
+         * Some requests (both VMR3Req* and the DBGF) can potentially resume
+         * or start the VM, in that case we'll get a change in VM status
+         * indicating that we're now running.
          */
         if (    RT_SUCCESS(rc)
-            &&  pUVM->pVM
-            &&  enmBefore != pUVM->pVM->enmVMState
-            &&  pUVM->pVM->enmVMState == VMSTATE_RUNNING)
-        {
-            PVM    pVM   = pUVM->pVM;
+            &&  pUVM->pVM)
+        {
+            PVM     pVM  = pUVM->pVM;
             PVMCPU pVCpu = &pVM->aCpus[idCpu];
-
-            rc = EMR3ExecuteVM(pVM, pVCpu);
-            Log(("vmR3EmulationThread: EMR3ExecuteVM() -> rc=%Rrc, enmVMState=%d\n", rc, pVM->enmVMState));
-            if (   EMGetState(pVCpu) == EMSTATE_GURU_MEDITATION
-                && pVM->enmVMState == VMSTATE_RUNNING)
-                vmR3SetState(pVM, VMSTATE_GURU_MEDITATION);
+            if (    pVM->enmVMState == VMSTATE_RUNNING
+                &&  VMCPUSTATE_IS_STARTED(VMCPU_GET_STATE(pVCpu)))
+            {
+                rc = EMR3ExecuteVM(pVM, pVCpu);
+                Log(("vmR3EmulationThread: EMR3ExecuteVM() -> rc=%Rrc, enmVMState=%d\n", rc, pVM->enmVMState));
+                if (   EMGetState(pVCpu) == EMSTATE_GURU_MEDITATION
+                    && pVM->enmVMState == VMSTATE_RUNNING)
+                    vmR3SetState(pVM, VMSTATE_GURU_MEDITATION);
+            }
         }
 
@@ -260 +253 @@
 }
 
-
-#if 0 /* not used */
-/**
- * Wait for VM to be resumed. Handle events like vmR3EmulationThread does.
- * In case the VM is stopped, clean up and long jump to the main EMT loop.
- *
- * @returns VINF_SUCCESS or doesn't return
- * @param   pVM             VM handle.
- */
-VMMR3DECL(int) VMR3WaitForResume(PVM pVM)
-{
-    /*
-     * The request loop.
-     */
-    PUVMCPU pUVCpu;
-    PUVM    pUVM = pVM->pUVM;
-    VMSTATE enmBefore;
-    int     rc;
-
-    pUVCpu = (PUVMCPU)RTTlsGet(pUVM->vm.s.idxTLS);
-    AssertReturn(pUVCpu, VERR_INTERNAL_ERROR);
-
-    for (;;)
-    {
-
-        /*
-         * Pending requests which needs servicing?
-         *
-         * We check for state changes in addition to status codes when
-         * servicing requests. (Look after the ifs.)
-         */
-        enmBefore = pVM->enmVMState;
-        if (    VM_FF_ISSET(pVM, VM_FF_TERMINATE)
-            ||  pUVM->vm.s.fTerminateEMT)
-        {
-            rc = VINF_EM_TERMINATE;
-            break;
-        }
-        else if (pUVM->vm.s.pReqs)
-        {
-            /*
-             * Service execute in EMT request.
-             */
-            rc = VMR3ReqProcessU(pUVM, VMCPUID_ANY);
-            Log(("vmR3EmulationThread: Req rc=%Rrc, VM state %d -> %d\n", rc, enmBefore, pVM->enmVMState));
-        }
-        else if (pUVCpu->vm.s.pReqs)
-        {
-            /*
-             * Service execute in EMT request.
-             */
-            rc = VMR3ReqProcessU(pUVM, pUVCpu->idCpu);
-            Log(("vmR3EmulationThread: Req (cpu=%u) rc=%Rrc, VM state %d -> %d\n", pUVCpu->idCpu, rc, enmBefore, pVM->enmVMState));
-        }
-        else if (VM_FF_ISSET(pVM, VM_FF_DBGF))
-        {
-            /*
-             * Service the debugger request.
-             */
-            rc = DBGFR3VMMForcedAction(pVM);
-            Log(("vmR3EmulationThread: Dbg rc=%Rrc, VM state %d -> %d\n", rc, enmBefore, pVM->enmVMState));
-        }
-        else if (VM_FF_TESTANDCLEAR(pVM, VM_FF_RESET_BIT))
-        {
-            /*
-             * Service a delay reset request.
-             */
-            rc = VMR3Reset(pVM);
-            VM_FF_CLEAR(pVM, VM_FF_RESET);
-            Log(("vmR3EmulationThread: Reset rc=%Rrc, VM state %d -> %d\n", rc, enmBefore, pVM->enmVMState));
-        }
-        else
-        {
-            /*
-             * Nothing important is pending, so wait for something.
-             */
-            rc = VMR3WaitU(pUVCpu);
-            if (RT_FAILURE(rc))
-                break;
-        }
-
-        /*
-         * Check for termination requests, these are extremely high priority.
-         */
-        if (    rc == VINF_EM_TERMINATE
-            ||  VM_FF_ISSET(pVM, VM_FF_TERMINATE)
-            ||  pUVM->vm.s.fTerminateEMT)
-            break;
-
-        /*
-         * Some requests (both VMR3Req* and the DBGF) can potentially
-         * resume or start the VM, in that case we'll get a change in
-         * VM status indicating that we're now running.
-         */
-        if (    RT_SUCCESS(rc)
-            &&  enmBefore != pVM->enmVMState
-            &&  pVM->enmVMState == VMSTATE_RUNNING)
-        {
-            /* Only valid exit reason. */
-            return VINF_SUCCESS;
-        }
-
-    } /* forever */
-
-    /* Return to the main loop in vmR3EmulationThread, which will clean up for us. */
-    longjmp(pUVCpu->vm.s.emtJumpEnv, 1);
-}
-#endif
 
 /**
@@ -848 +733 @@
     }
     else if (   (fFlags & VMNOTIFYFF_FLAGS_POKE)
-             && pUVCpu->pUVM->pVM
-             && pUVCpu->pUVM->pVM->aCpus[pUVCpu->idCpu].enmState == VMCPUSTATE_RUN_EXEC) /** @todo make this easier to access. (pUVCpu->pVCpu) */
+             && pUVCpu->pVCpu
+             && pUVCpu->pVCpu->enmState == VMCPUSTATE_STARTED_EXEC)
     {
         int rc = SUPCallVMMR0Ex(pUVCpu->pVM->pVMR0, pUVCpu->idCpu, VMMR0_DO_GVMM_SCHED_POKE, 0, NULL);
@@ -1125 +1010 @@
      * Do the halt.
      */
+    Assert(VMCPU_GET_STATE(pVCpu) == VMCPUSTATE_STARTED);
+    VMCPU_SET_STATE(pVCpu, VMCPUSTATE_STARTED_HALTED);
     PUVM pUVM = pUVCpu->pUVM;
     int rc = g_aHaltMethods[pUVM->vm.s.iHaltMethod].pfnHalt(pUVCpu, fMask, u64Now);
+    VMCPU_SET_STATE(pVCpu, VMCPUSTATE_STARTED);
 
     /*

trunk/src/VBox/VMM/VMInternal.h

@@ -449 +449 @@
     STAMPROFILE                     StatHaltPoll;
     /** @} */
-
-    /** vmR3EmulationThread longjmp buffer. Must be last in the structure. */
-    jmp_buf                         emtJumpEnv;
 } VMINTUSERPERVMCPU;
 

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

@@ -1669 +1669 @@
 DECLINLINE(int) gvmmR0SchedPokeOne(PGVM pGVM, PVMCPU pVCpu)
 {
-    if (pVCpu->enmState != VMCPUSTATE_RUN_EXEC)
+    if (pVCpu->enmState != VMCPUSTATE_STARTED_EXEC)
         return VINF_GVM_NOT_BUSY_IN_GC;