Changeset 6801 in vbox

Timestamp:

Feb 4, 2008 7:36:58 PM (17 years ago)

Author:

vboxsync

Message:

Changed GVM the ownership rules - at long last. EMT is the guy that creates the VM, simple and secure.

Location:

trunk

Files:

• include/VBox/gvmm.h (modified) (1 diff)
• src/VBox/VMM/VMMR0/GVMMR0.cpp (modified) (5 diffs)
• src/VBox/VMM/VMMR0/VMMR0.cpp (modified) (4 diffs)

trunk/include/VBox/gvmm.h

@@ -119 +119 @@
 
 GVMMR0DECL(int)     GVMMR0CreateVM(PSUPDRVSESSION pSession, PVM *ppVM);
-GVMMR0DECL(int)     GVMMR0DisassociateEMTFromVM(PVM pVM);
 GVMMR0DECL(int)     GVMMR0InitVM(PVM pVM);
-GVMMR0DECL(int)     GVMMR0AssociateEMTWithVM(PVM pVM);
 GVMMR0DECL(int)     GVMMR0DestroyVM(PVM pVM);
 GVMMR0DECL(PGVM)    GVMMR0ByHandle(uint32_t hGVM);

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

@@ -486 +486 @@
  * Allocates the VM structure and registers it with GVM.
  *
+ * The caller will become the VM owner and there by the EMT.
+ *
  * @returns VBox status code.
  * @param   pSession    The support driver session.
  * @param   ppVM        Where to store the pointer to the VM structure.
  *
- * @thread  Any thread.
+ * @thread  EMT.
  */
 GVMMR0DECL(int) GVMMR0CreateVM(PSUPDRVSESSION pSession, PVM *ppVM)
@@ -501 +503 @@
     *ppVM = NULL;
 
-    AssertReturn(RTThreadNativeSelf() != NIL_RTNATIVETHREAD, VERR_INTERNAL_ERROR);
+    RTNATIVETHREAD hEMT = RTThreadNativeSelf();
+    AssertReturn(hEMT != NIL_RTNATIVETHREAD, VERR_INTERNAL_ERROR);
 
     /*
@@ -609 +612 @@
                                         pHandle->pVM = pVM;
                                         pHandle->pGVM = pGVM;
+                                        pHandle->hEMT = hEMT;
                                         pGVM->pVM = pVM;
-
+                                        pGVM->hEMT = hEMT;
 
                                         gvmmR0UsedUnlock(pGVMM);
@@ -678 +682 @@
 
 /**
- * Associates an EMT thread with a VM.
- *
- * This is called early during the ring-0 VM initialization so assertions later in
- * the process can be handled gracefully.
- *
- * @returns VBox status code.
- *
- * @param   pVM         The VM instance data (aka handle), ring-0 mapping of course.
- * @thread  EMT.
- */
-GVMMR0DECL(int) GVMMR0AssociateEMTWithVM(PVM pVM)
-{
-    LogFlow(("GVMMR0AssociateEMTWithVM: pVM=%p\n", pVM));
-    PGVMM pGVMM;
-    GVMM_GET_VALID_INSTANCE(pGVMM, VERR_INTERNAL_ERROR);
-
-    /*
-     * Validate the VM structure, state and handle.
-     */
-    AssertPtrReturn(pVM, VERR_INVALID_POINTER);
-    AssertReturn(!((uintptr_t)pVM & PAGE_OFFSET_MASK), VERR_INVALID_POINTER);
-    AssertMsgReturn(pVM->enmVMState == VMSTATE_CREATING, ("%d\n", pVM->enmVMState), VERR_WRONG_ORDER);
-
-    RTNATIVETHREAD hEMT = RTThreadNativeSelf();
-    AssertReturn(hEMT != NIL_RTNATIVETHREAD, VERR_NOT_SUPPORTED);
-
-    const uint16_t hGVM = pVM->hSelf;
-    AssertReturn(hGVM != NIL_GVM_HANDLE, VERR_INVALID_HANDLE);
-    AssertReturn(hGVM < RT_ELEMENTS(pGVMM->aHandles), VERR_INVALID_HANDLE);
-
-    PGVMHANDLE pHandle = &pGVMM->aHandles[hGVM];
-    AssertReturn(pHandle->pVM == pVM, VERR_NOT_OWNER);
-
-    /*
-     * Take the lock, validate the handle and update the structure members.
-     */
-    int rc = gvmmR0CreateDestroyLock(pGVMM);
-    AssertRCReturn(rc, rc);
-    rc = gvmmR0UsedLock(pGVMM);
-    AssertRC(rc);
-
-    if (    pHandle->pVM == pVM
-        &&  VALID_PTR(pHandle->pvObj)
-        &&  VALID_PTR(pHandle->pSession)
-        &&  VALID_PTR(pHandle->pGVM)
-        &&  pHandle->pGVM->u32Magic == GVM_MAGIC)
-    {
-        pHandle->hEMT = hEMT;
-        pHandle->pGVM->hEMT = hEMT;
-    }
-    else
-        rc = VERR_INTERNAL_ERROR;
-
-    gvmmR0UsedUnlock(pGVMM);
-    gvmmR0CreateDestroyUnlock(pGVMM);
-    LogFlow(("GVMMR0AssociateEMTWithVM: returns %Vrc (hEMT=%RTnthrd)\n", rc, hEMT));
-    return rc;
-}
-
-
-/**
  * Does the VM initialization.
  *
@@ -767 +710 @@
 
     LogFlow(("GVMMR0InitVM: returns %Rrc\n", rc));
-    return rc;
-}
-
-
-/**
- * Disassociates the EMT thread from a VM.
- *
- * This is called last in the ring-0 VM termination. After this point anyone is
- * allowed to destroy the VM. Ideally, we should associate the VM with the thread
- * that's going to call GVMMR0DestroyVM for optimal security, but that's impractical
- * at present.
- *
- * @returns VBox status code.
- *
- * @param   pVM         The VM instance data (aka handle), ring-0 mapping of course.
- * @thread  EMT.
- */
-GVMMR0DECL(int) GVMMR0DisassociateEMTFromVM(PVM pVM)
-{
-    LogFlow(("GVMMR0DisassociateEMTFromVM: pVM=%p\n", pVM));
-    PGVMM pGVMM;
-    GVMM_GET_VALID_INSTANCE(pGVMM, VERR_INTERNAL_ERROR);
-
-    /*
-     * Validate the VM structure, state and handle.
-     */
-    AssertPtrReturn(pVM, VERR_INVALID_POINTER);
-    AssertReturn(!((uintptr_t)pVM & PAGE_OFFSET_MASK), VERR_INVALID_POINTER);
-    AssertMsgReturn(pVM->enmVMState >= VMSTATE_CREATING && pVM->enmVMState <= VMSTATE_DESTROYING, ("%d\n", pVM->enmVMState), VERR_WRONG_ORDER);
-
-    RTNATIVETHREAD hEMT = RTThreadNativeSelf();
-    AssertReturn(hEMT != NIL_RTNATIVETHREAD, VERR_NOT_SUPPORTED);
-
-    const uint16_t hGVM = pVM->hSelf;
-    AssertReturn(hGVM != NIL_GVM_HANDLE, VERR_INVALID_HANDLE);
-    AssertReturn(hGVM < RT_ELEMENTS(pGVMM->aHandles), VERR_INVALID_HANDLE);
-
-    PGVMHANDLE pHandle = &pGVMM->aHandles[hGVM];
-    AssertReturn(pHandle->pVM == pVM, VERR_NOT_OWNER);
-
-    /*
-     * Take the lock, validate the handle and update the structure members.
-     */
-    int rc = gvmmR0CreateDestroyLock(pGVMM);
-    AssertRCReturn(rc, rc);
-    rc = gvmmR0UsedLock(pGVMM);
-    AssertRC(rc);
-
-    if (    VALID_PTR(pHandle->pvObj)
-        &&  VALID_PTR(pHandle->pSession)
-        &&  VALID_PTR(pHandle->pGVM)
-        &&  pHandle->pGVM->u32Magic == GVM_MAGIC)
-    {
-        if (    pHandle->pVM == pVM
-            &&  pHandle->hEMT == hEMT)
-        {
-            pHandle->hEMT = NIL_RTNATIVETHREAD;
-            pHandle->pGVM->hEMT = NIL_RTNATIVETHREAD;
-        }
-        else
-            rc = VERR_NOT_OWNER;
-    }
-    else
-        rc = VERR_INVALID_HANDLE;
-
-    gvmmR0UsedUnlock(pGVMM);
-    gvmmR0CreateDestroyUnlock(pGVMM);
-    LogFlow(("GVMMR0DisassociateEMTFromVM: returns %Vrc (hEMT=%RTnthrd)\n", rc, hEMT));
     return rc;
 }

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

@@ -83 +83 @@
     if (RT_SUCCESS(rc))
     {
-//#ifdef VBOX_WITH_NEW_PHYS_CODE /* need to test on windows, solaris and darwin. */
         rc = GMMR0Init();
-//#endif
         if (RT_SUCCESS(rc))
         {
@@ -134 +132 @@
      * Destroy the GMM and GVMM instances.
      */
-//#ifdef VBOX_WITH_NEW_PHYS_CODE
     GMMR0Term();
-//#endif
     GVMMR0Term();
 
@@ -206 +202 @@
 
     /*
-     * Associate the ring-0 EMT thread with the GVM
-     * and initalize the GVMM and GMM per VM data.
+     * nitalize the per VM data for GVMM and GMM.
      */
-    int rc = GVMMR0AssociateEMTWithVM(pVM);
+    int rc = GVMMR0InitVM(pVM);
+//    if (RT_SUCCESS(rc))
+//        rc = GMMR0InitPerVMData(pVM);
     if (RT_SUCCESS(rc))
     {
-        rc = GVMMR0InitVM(pVM);
-        //if (RT_SUCCESS(rc))
-        //    rc = GMMR0InitVM(pVM);
+        /*
+         * Init HWACCM.
+         */
+        RTCCUINTREG fFlags = ASMIntDisableFlags();
+        rc = HWACCMR0Init(pVM);
+        ASMSetFlags(fFlags);
         if (RT_SUCCESS(rc))
         {
             /*
-             * Init HWACCM.
+             * Init CPUM.
              */
-            RTCCUINTREG fFlags = ASMIntDisableFlags();
-            rc = HWACCMR0Init(pVM);
-            ASMSetFlags(fFlags);
+            rc = CPUMR0Init(pVM);
             if (RT_SUCCESS(rc))
-            {
-                /*
-                 * Init CPUM.
-                 */
-                rc = CPUMR0Init(pVM);
-                if (RT_SUCCESS(rc))
-                    return rc;
-            }
+                return rc;
         }
     }
@@ -254 +245 @@
      * Deregister the logger.
      */
-    GVMMR0DisassociateEMTFromVM(pVM);
     RTLogSetDefaultInstanceThread(NULL, 0);
     return VINF_SUCCESS;