Changeset 30473 in vbox for trunk/src/VBox/VMM/VMEmt.cpp

Timestamp:

Jun 28, 2010 3:45:22 PM (14 years ago)

Author:

vboxsync

Message:

VMM: First shot at the fatal error misbehavior (PAE).

File:

• trunk/src/VBox/VMM/VMEmt.cpp (modified) (11 diffs)

trunk/src/VBox/VMM/VMEmt.cpp

@@ -149 +149 @@
             PVM pVM = pUVM->pVM;
             enmBefore = pVM->enmVMState;
-            if (    VM_FF_ISSET(pVM, VM_FF_TERMINATE)
-                ||  pUVM->vm.s.fTerminateEMT)
+            if (pUVM->vm.s.fTerminateEMT)
             {
                 rc = VINF_EM_TERMINATE;
@@ -211 +210 @@
              */
             if (    rc == VINF_EM_TERMINATE
-                ||  pUVM->vm.s.fTerminateEMT
-                ||  (   pUVM->pVM /* pVM may have become invalid by now. */
-                     && VM_FF_ISSET(pUVM->pVM, VM_FF_TERMINATE)))
+                ||  pUVM->vm.s.fTerminateEMT)
                 break;
         }
@@ -242 +239 @@
     /*
      * Cleanup and exit.
-     * If EMT(0) called VMR3Destroy, EMT(0) will do all the terminating here.
      */
     Log(("vmR3EmulationThread: Terminating emulation thread! Thread=%#x pUVM=%p rc=%Rrc enmBefore=%d enmVMState=%d\n",
          ThreadSelf, pUVM, rc, enmBefore, pUVM->pVM ? pUVM->pVM->enmVMState : VMSTATE_TERMINATED));
-    if (    pUVM->vm.s.fEMTDoesTheCleanup
-        &&  idCpu == 0)
-    {
-        Log(("vmR3EmulationThread: executing delayed Destroy\n"));
-        Assert(pUVM->pVM);
-        vmR3Destroy(pUVM->pVM);
-        vmR3DestroyFinalBitFromEMT(pUVM, idCpu);
-        /* The pUVM structure is now invliad. */
-        pUVCpu = NULL;
-        pUVM = NULL;
-    }
-    else
-    {
-        vmR3DestroyFinalBitFromEMT(pUVM, idCpu);
-        pUVCpu->vm.s.NativeThreadEMT = NIL_RTNATIVETHREAD;
-    }
+    if (   idCpu == 0
+        && pUVM->pVM)
+    {
+        PVM pVM = pUVM->pVM;
+        vmR3SetTerminated(pVM);
+        pUVM->pVM = NULL;
+
+        /** @todo SMP: This isn't 100% safe. We should wait for the other
+         *        threads to finish before destroy the VM. */
+        int rc2 = SUPR3CallVMMR0Ex(pVM->pVMR0, 0 /*idCpu*/, VMMR0_DO_GVMM_DESTROY_VM, 0, NULL);
+        AssertLogRelRC(rc2);
+    }
+
+    pUVCpu->vm.s.NativeThreadEMT = NIL_RTNATIVETHREAD;
     Log(("vmR3EmulationThread: EMT is terminated.\n"));
     return rc;
@@ -289 +283 @@
 
 /**
+ * Signal a fatal wait error.
+ *
+ * @returns Fatal error code to be propagated up the call stack.
+ * @param   pUVCpu              The user mode per CPU structure of the calling
+ *                              EMT.
+ * @param   pszFmt              The error format with a single %Rrc in it.
+ * @param   rcFmt               The status code to format.
+ */
+static int vmR3FatalWaitError(PUVMCPU pUVCpu, const char *pszFmt, int rcFmt)
+{
+    /** @todo This is wrong ... raise a fatal error / guru meditation
+     *        instead. */
+    AssertLogRelMsgFailed((pszFmt, rcFmt));
+    ASMAtomicUoWriteBool(&pUVCpu->pUVM->vm.s.fTerminateEMT, true);
+    if (pUVCpu->pVM)
+        VM_FF_SET(pUVCpu->pVM, VM_FF_CHECK_VM_STATE);
+    return VERR_INTERNAL_ERROR;
+}
+
+
+/**
  * The old halt loop.
  */
@@ -362 +377 @@
         else if (RT_FAILURE(rc))
         {
-            AssertRC(rc != VERR_INTERRUPTED);
-            AssertMsgFailed(("RTSemEventWait->%Rrc\n", rc));
-            ASMAtomicUoWriteBool(&pUVCpu->vm.s.fTerminateEMT, true);
-            VM_FF_SET(pVM, VM_FF_TERMINATE);
-            rc = VERR_INTERNAL_ERROR;
+            rc = vmR3FatalWaitError(pUVCpu, "RTSemEventWait->%Rrc\n", rc);
             break;
         }
@@ -551 +562 @@
             else if (RT_FAILURE(rc))
             {
-                AssertRC(rc != VERR_INTERRUPTED);
-                AssertMsgFailed(("RTSemEventWait->%Rrc\n", rc));
-                ASMAtomicUoWriteBool(&pUVCpu->vm.s.fTerminateEMT, true);
-                VM_FF_SET(pVM, VM_FF_TERMINATE);
-                rc = VERR_INTERNAL_ERROR;
+                rc = vmR3FatalWaitError(pUVCpu, "RTSemEventWait->%Rrc\n", rc);
                 break;
             }
@@ -662 +669 @@
             else if (RT_FAILURE(rc))
             {
-                AssertMsgFailed(("VMMR0_DO_GVMM_SCHED_HALT->%Rrc\n", rc));
-                ASMAtomicUoWriteBool(&pUVCpu->vm.s.fTerminateEMT, true);
-                VM_FF_SET(pVM, VM_FF_TERMINATE);
-                rc = VERR_INTERNAL_ERROR;
+                rc = vmR3FatalWaitError(pUVCpu, "VMMR0_DO_GVMM_SCHED_HALT->%Rrc\n", rc);
                 break;
             }
@@ -720 +724 @@
         else if (RT_FAILURE(rc))
         {
-            AssertMsgFailed(("RTSemEventWait->%Rrc\n", rc));
-            ASMAtomicUoWriteBool(&pUVCpu->vm.s.fTerminateEMT, true);
-            VM_FF_SET(pVM, VM_FF_TERMINATE);
-            rc = VERR_INTERNAL_ERROR;
-            break;
-        }
-
+            rc = vmR3FatalWaitError(pUVCpu, "VMMR0_DO_GVMM_SCHED_HALT->%Rrc\n", rc);
+            break;
+        }
     }
 
@@ -798 +798 @@
             )
             break;
-        if (pUVCpu->vm.s.fTerminateEMT)
+        if (pUVM->vm.s.fTerminateEMT)
             break;
 
@@ -810 +810 @@
         else if (RT_FAILURE(rc))
         {
-            AssertMsgFailed(("RTSemEventWait->%Rrc\n", rc));
-            ASMAtomicUoWriteBool(&pUVCpu->vm.s.fTerminateEMT, true);
-            if (pUVCpu->pVM)
-                VM_FF_SET(pUVCpu->pVM, VM_FF_TERMINATE);
-            rc = VERR_INTERNAL_ERROR;
-            break;
-        }
-
+            rc = vmR3FatalWaitError(pUVCpu, "RTSemEventWait->%Rrc\n", rc);
+            break;
+        }
     }
 
@@ -873 +868 @@
         else if (RT_FAILURE(rc))
         {
-            AssertMsgFailed(("RTSemEventWait->%Rrc\n", rc));
-            ASMAtomicUoWriteBool(&pUVCpu->vm.s.fTerminateEMT, true);
-            VM_FF_SET(pVM, VM_FF_TERMINATE);
-            rc = VERR_INTERNAL_ERROR;
-            break;
-        }
-
+            rc = vmR3FatalWaitError(pUVCpu, "RTSemEventWait->%Rrc", rc);
+            break;
+        }
     }