Changeset 14811 in vbox for trunk/src/VBox

Timestamp:

Nov 29, 2008 11:48:26 PM (16 years ago)

Author:

vboxsync

Message:

VMM: Always call VMMR0TermVM{HWACCMR0TermVM,PGMR0DynMapTerm}, don't rely on ring-3 always making that call.

Location:

trunk/src/VBox/VMM/VMMR0

Files:

• GVMMR0.cpp (modified) (6 diffs)
• GVMMR0Internal.h (modified) (2 diffs)
• VMMR0.cpp (modified) (3 diffs)

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

@@ -43 +43 @@
 #include <VBox/gvm.h>
 #include <VBox/vm.h>
+#include <VBox/vmm.h>
 #include <VBox/err.h>
 #include <iprt/alloc.h>
@@ -698 +699 @@
     pGVM->gvmm.s.VMPagesMapObj = NIL_RTR0MEMOBJ;
     pGVM->gvmm.s.HaltEventMulti = NIL_RTSEMEVENTMULTI;
+    pGVM->gvmm.s.fDoneVMMR0Init = false;
+    pGVM->gvmm.s.fDoneVMMR0Term = false;
 }
 
@@ -719 +722 @@
     if (RT_SUCCESS(rc))
     {
-        if (pGVM->gvmm.s.HaltEventMulti == NIL_RTSEMEVENTMULTI)
+        if (   !pGVM->gvmm.s.fDoneVMMR0Init
+            && pGVM->gvmm.s.HaltEventMulti == NIL_RTSEMEVENTMULTI)
         {
             rc = RTSemEventMultiCreate(&pGVM->gvmm.s.HaltEventMulti);
@@ -731 +735 @@
     LogFlow(("GVMMR0InitVM: returns %Rrc\n", rc));
     return rc;
+}
+
+
+/**
+ * Indicates that we're done with the ring-0 initialization
+ * of the VM.
+ *
+ * @param   pVM         Pointer to the shared VM structure.
+ */
+GVMMR0DECL(void) GVMMR0DoneInitVM(PVM pVM)
+{
+    /* Validate the VM structure, state and handle. */
+    PGVM pGVM;
+    PGVMM pGVMM;
+    int rc = gvmmR0ByVMAndEMT(pVM, &pGVM, &pGVMM);
+    AssertRCReturnVoid(rc);
+
+    /* Set the indicator. */
+    pGVM->gvmm.s.fDoneVMMR0Init = true;
+}
+
+
+/**
+ * Indicates that we're doing the ring-0 termination of the VM.
+ *
+ * @returns true if termination hasn't been done already, false if it has.
+ * @param   pVM         Pointer to the shared VM structure.
+ * @param   pGVM        Pointer to the global VM structure. Optional.
+ */
+GVMMR0DECL(bool) GVMMR0DoingTermVM(PVM pVM, PGVM pGVM)
+{
+    /* Validate the VM structure, state and handle. */
+    AssertPtrNullReturn(pGVM, false);
+    AssertPtrNullReturn(!pGVM || pGVM->u32Magic == GVM_MAGIC, false);
+    if (!pGVM)
+    {
+        PGVMM pGVMM;
+        int rc = gvmmR0ByVMAndEMT(pVM, &pGVM, &pGVMM);
+        AssertRCReturn(rc, false);
+    }
+
+    /* Set the indicator. */
+    if (pGVM->gvmm.s.fDoneVMMR0Term)
+        return false;
+    pGVM->gvmm.s.fDoneVMMR0Term = true;
+    return true;
 }
 
@@ -807 +857 @@
 
 /**
+ * Performs VM cleanup task as part of object destruction.
+ *
+ * @param   pGVM        The GVM pointer.
+ */
+static void gmmR0CleanupVM(PGVM pGVM)
+{
+    if (    pGVM->gvmm.s.fDoneVMMR0Init
+        &&  !pGVM->gvmm.s.fDoneVMMR0Term)
+    {
+        if (    pGVM->gvmm.s.VMMemObj != NIL_RTR0MEMOBJ
+            &&  RTR0MemObjAddress(pGVM->gvmm.s.VMMemObj) == pGVM->pVM)
+        {
+            LogFlow(("gmmR0CleanupVM: Calling VMMR0TermVM\n"));
+            VMMR0TermVM(pGVM->pVM, pGVM);
+        }
+        else
+            AssertMsgFailed(("gmmR0CleanupVM: VMMemObj=%p pVM=%p\n", pGVM->gvmm.s.VMMemObj, pGVM->pVM));
+    }
+}
+
+
+/**
  * Handle destructor.
  *
- * @param   pvGVMM       The GVM instance pointer.
+ * @param   pvGVMM      The GVM instance pointer.
  * @param   pvHandle    The handle pointer.
  */
@@ -896 +968 @@
         &&  pGVM->u32Magic == GVM_MAGIC)
     {
-        /// @todo GMMR0CleanupVM(pGVM);
+        gmmR0CleanupVM(pGVM);
 
         /*

trunk/src/VBox/VMM/VMMR0/GVMMR0Internal.h

@@ -25 +25 @@
 #include <iprt/mem.h>
 
+
 /**
  * The GVMM per VM data.
@@ -49 +50 @@
     /** The scheduler statistics. */
     GVMMSTATSSCHED      StatsSched;
+
+    /** Whether the per-VM ring-0 initialization has been performed. */
+    bool                fDoneVMMR0Init;
+    /** Whether the per-VM ring-0 termination is being or has been performed. */
+    bool                fDoneVMMR0Term;
 } GVMMPERVM;
 /** Pointer to the GVMM per VM data. */

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

@@ -239 +239 @@
 #endif
                 if (RT_SUCCESS(rc))
+                {
+                    GVMMR0DoneInitVM(pVM);
                     return rc;
+                }
 
                 /* bail out */
@@ -254 +257 @@
  * Terminates the R0 driver for a particular VM instance.
  *
+ * This is normally called by ring-3 as part of the VM termination process, but
+ * may alternatively be called during the support driver session cleanup when
+ * the VM object is destroyed (see GVMM).
+ *
  * @returns VBox status code.
  *
  * @param   pVM         The VM instance in question.
- * @thread  EMT.
- */
-static int vmmR0TermVM(PVM pVM)
-{
-/** @todo @bugref{1865,3202}: Make these tail onto the VM object destruction
- *        to make sure they are *always* executed and don't leave mess behind
- *        when the process is killed. */
+ * @param   pGVM        Pointer to the global VM structure. Optional.
+ * @thread  EMT or session clean up thread.
+ */
+VMMR0DECL(int) VMMR0TermVM(PVM pVM, PGVM pGVM)
+{
+    /*
+     * Tell GVMM what we're up to and check that we only do this once.
+     */
+    if (GVMMR0DoingTermVM(pVM, pGVM))
+    {
 #ifdef VBOX_WITH_2X_4GB_ADDR_SPACE
-    PGMR0DynMapTermVM(pVM);
-#endif
-    HWACCMR0TermVM(pVM);
+        PGMR0DynMapTermVM(pVM);
+#endif
+        HWACCMR0TermVM(pVM);
+    }
 
     /*
@@ -727 +738 @@
          */
         case VMMR0_DO_VMMR0_TERM:
-            return vmmR0TermVM(pVM);
+            return VMMR0TermVM(pVM, NULL);
 
         /*