Changeset 4971 in vbox for trunk/src

Timestamp:

Sep 21, 2007 10:19:12 PM (17 years ago)

Author:

vboxsync

Message:

GVM.

Location:

trunk/src/VBox

Files:

• HostDrivers/Support/SUPDRV.h (modified) (3 diffs)
• HostDrivers/Support/SUPDRVShared.c (modified) (6 diffs)
• VMM/Makefile.kmk (modified) (3 diffs)
• VMM/VMM.cpp (modified) (3 diffs)
• VMM/VMMR0/GVMR0.cpp (added)
• VMM/VMMR0/VMMR0.cpp (modified) (13 diffs)

trunk/src/VBox/HostDrivers/Support/SUPDRV.h

@@ -516 +516 @@
     /** Pointer to the next in the global list. */
     struct SUPDRVOBJ * volatile     pNext;
-    /** Pointer to the object destructor. */
+    /** Pointer to the object destructor.
+     * This may be set to NULL if the image containing the destructor get unloaded. */
     PFNSUPDRVDESTRUCTOR             pfnDestructor;
     /** User argument 1. */
@@ -612 +613 @@
 {
     /** Spinlock to serialize the initialization,
-     * usage counting and destruction of the IDT entry override. */
+     * usage counting and destruction of the IDT entry override and objects. */
     RTSPINLOCK              Spinlock;
 
@@ -622 +623 @@
 #endif
 
-    /** List of registered objects. */
+    /** List of registered objects. Protected by the spinlock. */
     PSUPDRVOBJ volatile     pObjs;
     /** List of free object usage records. */

trunk/src/VBox/HostDrivers/Support/SUPDRVShared.c

@@ -88 +88 @@
     { "SUPR0ContAlloc",                         (void *)SUPR0ContAlloc },
     { "SUPR0ContFree",                          (void *)SUPR0ContFree },
+    { "SUPR0LowAlloc",                          (void *)SUPR0LowAlloc },
+    { "SUPR0LowFree",                           (void *)SUPR0LowFree },
     { "SUPR0MemAlloc",                          (void *)SUPR0MemAlloc },
     { "SUPR0MemGetPhys",                        (void *)SUPR0MemGetPhys },
@@ -429 +431 @@
                 RTSpinlockRelease(pDevExt->Spinlock, &SpinlockTmp);
 
-                pObj->pfnDestructor(pObj, pObj->pvUser1, pObj->pvUser2);
+                if (pObj->pfnDestructor)
+                    pObj->pfnDestructor(pObj, pObj->pvUser1, pObj->pvUser2);
                 RTMemFree(pObj);
             }
@@ -1315 +1318 @@
     {
         pObj->u32Magic++;
-        pObj->pfnDestructor(pObj, pObj->pvUser1, pObj->pvUser2);
+        if (pObj->pfnDestructor)
+            pObj->pfnDestructor(pObj, pObj->pvUser1, pObj->pvUser2);
         RTMemFree(pObj);
     }
@@ -3127 +3131 @@
 static int supdrvIOCtl_LdrFree(PSUPDRVDEVEXT pDevExt, PSUPDRVSESSION pSession, PSUPLDRFREE pReq)
 {
+    int             rc;
     PSUPDRVLDRUSAGE pUsagePrev;
     PSUPDRVLDRUSAGE pUsage;
@@ -3153 +3158 @@
      * Check if we can remove anything.
      */
+    rc = VINF_SUCCESS;
     pImage = pUsage->pImage;
     if (pImage->cUsage <= 1 || pUsage->cUsage <= 1)
     {
-        /* unlink it */
-        if (pUsagePrev)
-            pUsagePrev->pNext = pUsage->pNext;
+        /*
+         * Check if there are any objects with destructors in the image, if
+         * so leave it for the session cleanup routine so we get a chance to
+         * clean things up in the right order and not leave them all dangling.
+         */
+        RTSPINLOCKTMP   SpinlockTmp = RTSPINLOCKTMP_INITIALIZER;
+        RTSpinlockAcquire(pDevExt->Spinlock, &SpinlockTmp);
+        if (pImage->cUsage <= 1)
+        {
+            PSUPDRVOBJ pObj;
+            for (pObj = pDevExt->pObjs; pObj; pObj = pObj->pNext)
+                if (RT_UNLIKELY((uintptr_t)pObj->pfnDestructor - (uintptr_t)pImage->pvImage < pImage->cbImage))
+                {
+                    rc = VERR_SHARING_VIOLATION; /** @todo VERR_DANGLING_OBJECTS */
+                    break;
+                }
+        }
         else
-            pSession->pLdrUsage = pUsage->pNext;
-        /* free it */
-        pUsage->pImage = NULL;
-        pUsage->pNext = NULL;
-        RTMemFree(pUsage);
-
-        /*
-         * Derefrence the image.
-         */
-        if (pImage->cUsage <= 1)
-            supdrvLdrFree(pDevExt, pImage);
-        else
-            pImage->cUsage--;
+        {
+            PSUPDRVUSAGE pGenUsage;
+            for (pGenUsage = pSession->pUsage; pGenUsage; pGenUsage = pGenUsage->pNext)
+                if (RT_UNLIKELY((uintptr_t)pGenUsage->pObj->pfnDestructor - (uintptr_t)pImage->pvImage < pImage->cbImage))
+                {
+                    rc = VERR_SHARING_VIOLATION; /** @todo VERR_DANGLING_OBJECTS */
+                    break;
+                }
+        }
+        RTSpinlockRelease(pDevExt->Spinlock, &SpinlockTmp);
+        if (rc == VINF_SUCCESS)
+        {
+            /* unlink it */
+            if (pUsagePrev)
+                pUsagePrev->pNext = pUsage->pNext;
+            else
+                pSession->pLdrUsage = pUsage->pNext;
+
+            /* free it */
+            pUsage->pImage = NULL;
+            pUsage->pNext = NULL;
+            RTMemFree(pUsage);
+
+            /*
+             * Derefrence the image.
+             */
+            if (pImage->cUsage <= 1)
+                supdrvLdrFree(pDevExt, pImage);
+            else
+                pImage->cUsage--;
+        }
     }
     else
@@ -3423 +3461 @@
     if (pDevExt->pvVMMR0 == pImage->pvImage)
         supdrvLdrUnsetR0EP(pDevExt);
+
+    /* check for objects with destructors in this image. (Shouldn't happen.) */
+    if (pDevExt->pObjs)
+    {
+        unsigned        cObjs = 0;
+        PSUPDRVOBJ      pObj;
+        RTSPINLOCKTMP   SpinlockTmp = RTSPINLOCKTMP_INITIALIZER;
+        RTSpinlockAcquire(pDevExt->Spinlock, &SpinlockTmp);
+        for (pObj = pDevExt->pObjs; pObj; pObj = pObj->pNext)
+            if (RT_UNLIKELY((uintptr_t)pObj->pfnDestructor - (uintptr_t)pImage->pvImage < pImage->cbImage))
+            {
+                pObj->pfnDestructor = NULL;
+                cObjs++;
+            }
+        RTSpinlockRelease(pDevExt->Spinlock, &SpinlockTmp);
+        if (cObjs)
+            OSDBGPRINT(("supdrvLdrFree: Image '%s' has %d dangling objects!\n", pImage->szName, cObjs));
+    }
 
     /* call termination function if fully loaded. */

trunk/src/VBox/VMM/Makefile.kmk

@@ -325 +325 @@
 VMMR0_SYSSUFF   = .r0
 VMMR0_SOURCES   = \
+        VMMR0/CPUMR0.cpp \
+        VMMR0/DBGFR0.cpp \
+        VMMR0/GVMR0.cpp \
+        VMMR0/HWACCMR0.cpp \
+        VMMR0/HWACCMR0A.asm \
+        VMMR0/HWSVMR0.cpp \
+        VMMR0/HWVMXR0.cpp \
+        VMMR0/PDMR0Device.cpp \
+        VMMR0/PGMR0.cpp \
+        VMMR0/TRPMR0.cpp \
+        VMMR0/TRPMR0A.asm \
         VMMR0/VMMR0.cpp \
-        VMMR0/DBGFR0.cpp \
+        VMMR0/VMMR0A.asm \
+        VMMAll/CPUMAllA.asm \
+        VMMAll/CPUMAllRegs.cpp \
         VMMAll/DBGFAll.cpp \
-        VMMAll/TRPMAll.cpp \
-        VMMAll/CPUMAllRegs.cpp \
-        VMMAll/CPUMAllA.asm \
+        VMMAll/EMAll.cpp \
+        VMMAll/EMAllA.asm \
+        VMMAll/IOMAll.cpp \
+        VMMAll/IOMAllMMIO.cpp \
         VMMAll/MMAll.cpp \
         VMMAll/MMAllHyper.cpp \
         VMMAll/MMAllPagePool.cpp \
         VMMAll/MMAllPhys.cpp \
-        VMMR0/VMMR0A.asm \
-        VMMR0/HWACCMR0.cpp \
-        VMMR0/HWACCMR0A.asm \
-        VMMR0/HWVMXR0.cpp \
-        VMMR0/HWSVMR0.cpp \
-        VMMR0/CPUMR0.cpp \
-        VMMR0/TRPMR0.cpp \
-        VMMR0/TRPMR0A.asm \
-        VMMR0/PDMR0Device.cpp \
-        VMMR0/PGMR0.cpp \
-        VMMAll/EMAll.cpp \
-        VMMAll/EMAllA.asm \
         VMMAll/PDMAll.cpp \
         VMMAll/PDMAllCritSect.cpp \
@@ -356 +358 @@
         VMMAll/PGMAllPool.cpp \
         VMMAll/REMAll.cpp \
-        VMMAll/IOMAll.cpp \
-        VMMAll/IOMAllMMIO.cpp \
         VMMAll/SELMAll.cpp \
         VMMAll/TMAll.cpp \
@@ -363 +363 @@
         VMMAll/TMAllReal.cpp \
         VMMAll/TMAllVirtual.cpp \
-        VMMAll/VMAll.cpp
+        VMMAll/TRPMAll.cpp \
+        VMMAll/VMAll.cpp \
 
 ifeq ($(VBOX_LDR_FMT),pe)

trunk/src/VBox/VMM/VMM.cpp

@@ -631 +631 @@
         rc = VINF_SUCCESS;
 #else
-        rc = SUPCallVMMR0(pVM->pVMR0, VMMR0_DO_VMMR0_INIT, (void *)VBOX_VERSION);
+        rc = SUPCallVMMR0Ex(pVM->pVMR0, VMMR0_DO_VMMR0_INIT, VBOX_VERSION, NULL);
 #endif
         if (    pVM->vmm.s.pR0Logger
@@ -738 +738 @@
 VMMR3DECL(int) VMMR3Term(PVM pVM)
 {
-    /** @todo must call ring-0 so the logger thread instance can be properly removed. */
+    /*
+     * Call Ring-0 entry with termination code.
+     */
+    int rc;
+    for (;;)
+    {
+#ifdef NO_SUPCALLR0VMM
+        //rc = VERR_GENERAL_FAILURE;
+        rc = VINF_SUCCESS;
+#else
+        rc = SUPCallVMMR0Ex(pVM->pVMR0, VMMR0_DO_VMMR0_TERM, VBOX_VERSION, NULL);
+#endif
+        if (    pVM->vmm.s.pR0Logger
+            &&  pVM->vmm.s.pR0Logger->Logger.offScratch > 0)
+            RTLogFlushToLogger(&pVM->vmm.s.pR0Logger->Logger, NULL);
+        if (rc != VINF_VMM_CALL_HOST)
+            break;
+        rc = vmmR3ServiceCallHostRequest(pVM);
+        if (VBOX_FAILURE(rc) || (rc >= VINF_EM_FIRST && rc <= VINF_EM_LAST))
+            break;
+        break; // remove this when we do setjmp for all ring-0 stuff.
+    }
+    if (VBOX_FAILURE(rc) || (rc >= VINF_EM_FIRST && rc <= VINF_EM_LAST))
+    {
+        LogRel(("VMMR3Term: R0 term failed, rc=%Vra. (warning)\n", rc));
+        if (rc >= VINF_EM_FIRST && rc <= VINF_EM_LAST)
+            rc = VERR_INTERNAL_ERROR;
+    }
 
 #ifdef VBOX_STRICT_VMM_STACK
@@ -747 +774 @@
     RTMemProtect(pVM->vmm.s.pbHCStack + VMM_STACK_SIZE, PAGE_SIZE, RTMEM_PROT_READ | RTMEM_PROT_WRITE);
 #endif
-    return VINF_SUCCESS;
+    return rc;
 }
 

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

@@ -29 +29 @@
 #include "VMMInternal.h"
 #include <VBox/vm.h>
+#include <VBox/gvm.h>
 #include <VBox/intnet.h>
 #include <VBox/hwaccm.h>
@@ -85 +86 @@
 VMMR0DECL(int) ModuleInit(void)
 {
+    LogFlow(("ModuleInit:\n"));
+
+    /*
+     * Initialize GVM.
+     */
+    int rc = GVMR0Init();
+    if (RT_SUCCESS(rc))
+    {
 #ifdef VBOX_WITH_INTERNAL_NETWORKING
-    LogFlow(("ModuleInit: g_pIntNet=%p\n", g_pIntNet));
-    g_pIntNet = NULL;
-    LogFlow(("ModuleInit: g_pIntNet=%p should be NULL now...\n", g_pIntNet));
-    int rc = INTNETR0Create(&g_pIntNet);
-    if (VBOX_SUCCESS(rc))
-    {
-        LogFlow(("ModuleInit: returns success. g_pIntNet=%p\n", g_pIntNet));
-        return 0;
-    }
-    g_pIntNet = NULL;
-    LogFlow(("ModuleTerm: returns %Vrc\n", rc));
+        LogFlow(("ModuleInit: g_pIntNet=%p\n", g_pIntNet));
+        g_pIntNet = NULL;
+        LogFlow(("ModuleInit: g_pIntNet=%p should be NULL now...\n", g_pIntNet));
+        rc = INTNETR0Create(&g_pIntNet);
+        if (VBOX_SUCCESS(rc))
+        {
+            LogFlow(("ModuleInit: returns success. g_pIntNet=%p\n", g_pIntNet));
+            return VINF_SUCCESS;
+        }
+        g_pIntNet = NULL;
+        LogFlow(("ModuleTerm: returns %Vrc\n", rc));
+#else
+        LogFlow(("ModuleInit: returns success.\n"));
+        return VINF_SUCCESS;
+#endif
+    }
+
+    LogFlow(("ModuleInit: failed %Vrc\n", rc));
     return rc;
-#else
-    return 0;
-#endif
 }
 
@@ -110 +123 @@
 VMMR0DECL(void) ModuleTerm(void)
 {
+    LogFlow(("ModuleTerm:\n"));
+
 #ifdef VBOX_WITH_INTERNAL_NETWORKING
-    LogFlow(("ModuleTerm:\n"));
+    /*
+     * Destroy the internal networking instance.
+     */
     if (g_pIntNet)
     {
@@ -117 +134 @@
         g_pIntNet = NULL;
     }
+#endif
+
+    /*
+     * Destroy the GVM instance.
+     */
+    GVMR0Term();
+
     LogFlow(("ModuleTerm: returns\n"));
-#endif
 }
 
@@ -182 +205 @@
     }
 
-
     /*
-     * Init VMXM.
+     * Try register the VM with GVM.
      */
-    int rc = HWACCMR0Init(pVM);
-    if (VBOX_FAILURE(rc))
-    {
-        RTLogSetDefaultInstanceThread(NULL, 0);
-        return rc;
-    }
-
-    /*
-     * Init CPUM.
-     */
-    rc = CPUMR0Init(pVM);
-
-    if (RT_FAILURE(rc))
-        RTLogSetDefaultInstanceThread(NULL, 0);
+    int rc = GVMR0RegisterVM(pVM);
+    if (RT_SUCCESS(rc))
+    {
+        /*
+         * Init HWACCM.
+         */
+        RTCCUINTREG fFlags = ASMIntDisableFlags();
+        rc = HWACCMR0Init(pVM);
+        ASMSetFlags(fFlags);
+        if (RT_SUCCESS(rc))
+        {
+            /*
+             * Init CPUM.
+             */
+            rc = CPUMR0Init(pVM);
+            if (RT_SUCCESS(rc))
+                return rc;
+        }
+
+        GVMR0DeregisterVM(pVM);
+    }
+
+    /* failed */
+    RTLogSetDefaultInstanceThread(NULL, 0);
     return rc;
 }
@@ -216 +248 @@
      * Deregister the logger.
      */
+    GVMR0DeregisterVM(pVM);
     RTLogSetDefaultInstanceThread(NULL, 0);
     return VINF_SUCCESS;
@@ -489 +522 @@
 
         /*
-         * Initialize the R0 part of a VM instance.
-         */
-        case VMMR0_DO_VMMR0_INIT:
-        {
-            RTCCUINTREG fFlags = ASMIntDisableFlags();
-            int rc = VMMR0Init(pVM, (unsigned)(uintptr_t)pvArg);
-            ASMSetFlags(fFlags);
-            return rc;
-        }
-
-        /*
-         * Terminate the R0 part of a VM instance.
-         */
-        case VMMR0_DO_VMMR0_TERM:
-        {
-            RTCCUINTREG fFlags = ASMIntDisableFlags();
-            int rc = VMMR0Term(pVM);
-            ASMSetFlags(fFlags);
-            return rc;
-        }
-
-        /*
          * Switch to GC to execute Hypervisor function.
          */
@@ -522 +533 @@
             RTCCUINTREG fFlags = ASMIntDisableFlags();
             int rc = pVM->vmm.s.pfnR0HostToGuest(pVM);
+            /** @todo dispatch interrupts? */
             ASMSetFlags(fFlags);
             return rc;
@@ -661 +673 @@
         case VMMR0_DO_VMMR0_INIT:
         {
-            RTCCUINTREG fFlags = ASMIntDisableFlags();
             int rc = VMMR0Init(pVM, (unsigned)u64Arg);
-            ASMSetFlags(fFlags);
             return rc;
         }
@@ -672 +682 @@
         case VMMR0_DO_VMMR0_TERM:
         {
-            RTCCUINTREG fFlags = ASMIntDisableFlags();
             int rc = VMMR0Term(pVM);
-            ASMSetFlags(fFlags);
             return rc;
         }
@@ -701 +709 @@
             RTCCUINTREG fFlags = ASMIntDisableFlags();
             int rc = pVM->vmm.s.pfnR0HostToGuest(pVM);
+            /** @todo dispatch interrupts? */
             ASMSetFlags(fFlags);
             return rc;
@@ -907 +916 @@
 }
 
-/** Runtime assert implementation for Native Win32 Ring-0. */
+
 DECLEXPORT(void) RTCALL AssertMsg1(const char *pszExpr, unsigned uLine, const char *pszFile, const char *pszFunction)
 {
+    SUPR0Printf("\n!!R0-Assertion Failed!!\n"
+                "Expression: %s\n"
+                "Location  : %s(%d) %s\n",
+                pszExpr, pszFile, uLine, pszFunction);
+
     LogRel(("\n!!R0-Assertion Failed!!\n"
-         "Expression: %s\n"
-         "Location  : %s(%d) %s\n",
-         pszExpr, pszFile, uLine, pszFunction));
-}
+            "Expression: %s\n"
+            "Location  : %s(%d) %s\n",
+            pszExpr, pszFile, uLine, pszFunction));
+}
+
 
 /**
@@ -922 +937 @@
 static DECLCALLBACK(size_t) rtLogOutput(void *pv, const char *pachChars, size_t cbChars)
 {
-    for (size_t i=0;i<cbChars;i++)
+    for (size_t i = 0; i < cbChars; i++)
+    {
         LogRel(("%c", pachChars[i]));
+        SUPR0Printf("%c", pachChars[i]);
+    }
 
     return cbChars;
 }
+
 
 DECLEXPORT(void) RTCALL AssertMsg2(const char *pszFormat, ...)