Changeset 5031

Timestamp:

09/26/07 00:27:37 (1 year ago)

Author:

vboxsync

Message:

Use GVMMR3CreateVM. the new GVM structure is a ring-0 only VM structure. the old VM structure is the shared ring-0, ring-3 and GC VM structure.

Files:

• trunk/include/VBox/gvm.h (added)
• trunk/include/VBox/gvmm.h (modified) (2 diffs)
• trunk/include/VBox/log.h (modified) (2 diffs)
• trunk/include/VBox/pdmapi.h (modified) (2 diffs)
• trunk/include/VBox/vmm.h (modified) (1 diff)
• trunk/src/VBox/HostDrivers/Support/SUPDRVShared.c (modified) (1 diff)
• trunk/src/VBox/HostDrivers/Support/SUPLib.cpp (modified) (1 diff)
• trunk/src/VBox/HostDrivers/Support/SUPR0.def (modified) (2 diffs)
• trunk/src/VBox/VMM/PDM.cpp (modified) (1 diff)
• trunk/src/VBox/VMM/PDMLdr.cpp (modified) (5 diffs)
• trunk/src/VBox/VMM/VM.cpp (modified) (11 diffs)
• trunk/src/VBox/VMM/VMEmt.cpp (modified) (1 diff)
• trunk/src/VBox/VMM/VMMR0/GVMMR0.cpp (modified) (21 diffs)
• trunk/src/VBox/VMM/VMMR0/GVMMR0Internal.h (added)
• trunk/src/VBox/VMM/VMMR0/VMMR0.cpp (modified) (5 diffs)

trunk/include/VBox/gvmm.h

@@ -22 +22 @@
-#include <VBox/cdefs.h>
-#include <VBox/types.h>
+#include <VBox/sup.h>
-
-/** @defgroup grp_GVMM  GVMM - The Global VM Manager.
@@ -46 +47 @@
-#define NIL_GVM_HANDLE 0
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-

trunk/include/VBox/log.h

@@ -169 +169 @@
-    /** EM group. */
-    LOG_GROUP_EM,
+    /** GMM group. */
+    LOG_GROUP_GMM,
-    /** GUI group. */
-    LOG_GROUP_GUI,
+    /** GVMM group. */
+    LOG_GROUP_GVMM,
-    /** HGCM group */
-    LOG_GROUP_HGCM,
@@ -343 +347 @@
-    "DRV_VUSB",     \
-    "EM",           \
+    "GMM",          \
-    "GUI",          \
+    "GVMM",         \
-    "HGCM",         \
-    "HWACCM",       \

trunk/include/VBox/pdmapi.h

@@ -1 +1 @@
-/** @file
- * PDM - Pluggable Device Manager, Core API.
- 
- 
+
+
- * is currently including pdm.h. So, pdm.h is for including all of the
- * PDM stuff, while pdmapi.h is for the core stuff.
@@ -101 +101 @@
- * @{
- */
+
+PDMR3DECL(int)  PDMR3LdrLoadVMMR0(void **ppvOpaque);
+PDMR3DECL(void) PDMR3LdrLoadVMMR0Part2(PVM pVM, void *pvOpaque);
-
-/**

trunk/include/VBox/vmm.h

@@ -356 +356 @@
-    VMMR0_DO_NOP = SUP_VMMR0_DO_NOP,
-
+    /** Ask GVMM to create a new VM. */
+    VMMR0_DO_GVMM_CREATE_VM,
+    /** Ask GVMM to destroy the VM. */
+    VMMR0_DO_GVMM_DESTROY_VM,
-    /** Call VMMR0 Per VM Init. */
-    VMMR0_DO_VMMR0_INIT,

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

@@ -99 +99 @@
-    { "RTMemAllocZ",                            (void *)RTMemAllocZ },
-    { "RTMemFree",                              (void *)RTMemFree },
+    /*{ "RTMemDup",                               (void *)RTMemDup },*/
+    { "RTMemRealloc",                           (void *)RTMemRealloc },
+    { "RTR0MemObjAllocLow",                     (void *)RTR0MemObjAllocLow },
+    { "RTR0MemObjAllocPage",                    (void *)RTR0MemObjAllocPage },
+    { "RTR0MemObjAllocPhys",                    (void *)RTR0MemObjAllocPhys },
+    { "RTR0MemObjAllocPhysNC",                  (void *)RTR0MemObjAllocPhysNC },
+    { "RTR0MemObjLockUser",                     (void *)RTR0MemObjLockUser },
+    { "RTR0MemObjMapKernel",                    (void *)RTR0MemObjMapKernel },
+    { "RTR0MemObjMapUser",                      (void *)RTR0MemObjMapUser },
+    { "RTR0MemObjAddress",                      (void *)RTR0MemObjAddress },
+    { "RTR0MemObjAddressR3",                    (void *)RTR0MemObjAddressR3 },
+    { "RTR0MemObjSize",                         (void *)RTR0MemObjSize },
+    { "RTR0MemObjIsMapping",                    (void *)RTR0MemObjIsMapping },
+    { "RTR0MemObjGetPagePhysAddr",              (void *)RTR0MemObjGetPagePhysAddr },
+    { "RTR0MemObjFree",                         (void *)RTR0MemObjFree },
-/* These doesn't work yet on linux - use fast mutexes!
-    { "RTSemMutexCreate",                       (void *)RTSemMutexCreate },

trunk/src/VBox/HostDrivers/Support/SUPLib.cpp

@@ -525 +525 @@
-    {
-        AssertPtrReturn(pReqHdr, VERR_INVALID_POINTER);
-!
+=
-        const size_t cbReq = pReqHdr->cbReq;
-

trunk/src/VBox/HostDrivers/Support/SUPR0.def

@@ -14 +14 @@
-;  distribution. VirtualBox OSE is distributed in the hope that it will
-;  be useful, but WITHOUT ANY WARRANTY of any kind.
+;
-
-LIBRARY SUPR0.dll
@@ -35 +36 @@
-    RTMemAllocZ
-    RTMemFree
+    RTMemRealloc
+    RTR0MemObjAllocLow
+    RTR0MemObjAllocPage
+    RTR0MemObjAllocPhys
+    RTR0MemObjAllocPhysNC
+    RTR0MemObjLockUser
+    RTR0MemObjMapKernel
+    RTR0MemObjMapUser
+    RTR0MemObjAddress
+    RTR0MemObjAddressR3
+    RTR0MemObjSize
+    RTR0MemObjIsMapping
+    RTR0MemObjGetPagePhysAddr
+    RTR0MemObjFree
-    ; broken - RTSemMutexCreate
-    ; broken - RTSemMutexRequest

trunk/src/VBox/VMM/PDM.cpp

@@ -149 +149 @@
-{
-    LogFlow(("PDMR3Init\n"));
+
-    /*
-     * Assert alignment and sizes.

trunk/src/VBox/VMM/PDMLdr.cpp

@@ -69 +69 @@
-
-/**
+ * Loads the VMMR0.r0 module before the VM is created.
+ *
+ * The opqaue VMMR0 module pointer is passed on to PDMR3Init later in
+ * the init process or PDMR3LdrUnloadVMMR0 in case of some init failure before PDMR3Init.
+ *
+ * @returns VBox status code.
+ * @param   ppvOpaque       Where to return the opaque VMMR0.r0 module handle one success.
+ *
+ * @remarks Yes, this is a kind of hacky and should go away. See @todo in VMR3Create.
+ */
+PDMR3DECL(int) PDMR3LdrLoadVMMR0(void **ppvOpaque)
+{
+    *ppvOpaque = NULL;
+
+    /*
+     * Resolve the filename and allocate the module list node.
+     */
+    char *pszFilename = pdmR3FileR0(VMMR0_MAIN_MODULE_NAME);
+    PPDMMOD pModule = (PPDMMOD)RTMemAllocZ(sizeof(*pModule) + strlen(pszFilename));
+    if (!pModule)
+    {
+        RTMemTmpFree(pszFilename);
+        return VERR_NO_MEMORY;
+    }
+    strcpy(pModule->szName, VMMR0_MAIN_MODULE_NAME);
+    pModule->eType = PDMMOD_TYPE_R0;
+    strcpy(pModule->szFilename, pszFilename);
+    RTMemTmpFree(pszFilename);
+
+    /*
+     * Ask the support library to load it.
+     */
+    void *pvImageBase;
+    int rc = SUPLoadModule(pModule->szFilename, pModule->szName, &pvImageBase);
+    if (RT_SUCCESS(rc))
+    {
+        pModule->hLdrMod = NIL_RTLDRMOD;
+        pModule->ImageBase = (uintptr_t)pvImageBase;
+        *ppvOpaque = pModule;
+
+        Log(("PDMR3LdrLoadVMMR0: Loaded %s at %VGvx (%s)\n", pModule->szName, (RTGCPTR)pModule->ImageBase, pModule->szFilename));
+        return VINF_SUCCESS;
+    }
+
+    LogRel(("PDMR3LdrLoadVMMR0: rc=%Vrc szName=%s szFilename=%s\n", rc, pModule->szName, pModule->szFilename));
+    RTMemFree(pModule);
+    return rc;
+}
+
+
+/**
+ * Register the VMMR0.r0 module with the created VM or unload it if
+ * we failed to create the VM (pVM == NULL).
+ *
+ * @param   pVM         The VM pointer. NULL if we failed to create the VM and
+ *                      the module should be unloaded and freed.
+ * @param   pvOpaque    The value returned by PDMR3LDrLoadVMMR0().
+ *
+ * @remarks Yes, this is a kind of hacky and should go away. See @todo in VMR3Create.
+ */
+PDMR3DECL(void) PDMR3LdrLoadVMMR0Part2(PVM pVM, void *pvOpaque)
+{
+    PPDMMOD pModule = (PPDMMOD)pvOpaque;
+    AssertPtrReturnVoid(pModule);
+
+    if (pVM)
+    {
+        /*
+         * Register the R0 module loaded by PDMR3LdrLoadVMMR0
+         */
+        Assert(!pVM->pdm.s.pModules);
+        pModule->pNext = pVM->pdm.s.pModules;
+        pVM->pdm.s.pModules = pModule;
+    }
+    else
+    {
+        /*
+         * Failed, unload the module.
+         */
+        int rc2 = SUPFreeModule((void *)(uintptr_t)pModule->ImageBase);
+        AssertRC(rc2);
+        pModule->ImageBase = 0;
+        RTMemFree(pvOpaque);
+    }
+}
+
+
+/**
- * Init the module loader part of PDM.
- *
@@ -76 +164 @@
- * @returns VBox stutus code.
- * @param   pVM         VM handle.
+ * @param   pvVMMR0Mod  The opqaue returned by PDMR3LdrLoadVMMR0.
- */
-int pdmR3LdrInit(PVM pVM)
@@ -85 +174 @@
-
-    /*
-
-
-
-
-
-
+
+
+
-#endif
-}
+
-
-/**
@@ -521 +608 @@
-        pCur = pCur->pNext;
-    }
+    AssertReturn(!strcmp(pszName, VMMR0_MAIN_MODULE_NAME), VERR_INTERNAL_ERROR);
-
-    /*
@@ -938 +1026 @@
-    char szPath[RTPATH_MAX];
-    int  rc;
-
- 
+
+
-                 : RTPathAppPrivateArch(szPath, sizeof(szPath));
-    if (!VBOX_SUCCESS(rc))

trunk/src/VBox/VMM/VM.cpp

@@ -23 +23 @@
-#include <VBox/cfgm.h>
-#include <VBox/vmm.h>
+#include <VBox/gvmm.h>
-#include <VBox/mm.h>
-#include <VBox/cpum.h>
@@ -175 +176 @@
-
-    /*
-
+ and load the VMMR0.r0 module
-     */
-    PSUPDRVSESSION pSession = 0;
@@ -181 +182 @@
-    if (VBOX_SUCCESS(rc))
-    {
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
-        {
-            Log(("VMR3Create: Allocated pVM=%p pVMR0=%p\n", pVM, pVMR0));
-
-            /*
-Do basic init of the VM structure
+Request GVMM to create a new VM for us
-             */
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
-            {
+                PVM pVM = CreateVMReq.pVMR3;
+                AssertRelease(VALID_PTR(pVM));
+                Log(("VMR3Create: Created pVM=%p pVMR0=%p\n", pVM, pVM->pVMR0));
+                PDMR3LdrLoadVMMR0Part2(pVM, pvVMMR0Opaque);
+
-                /*
-
-
+
-                 */
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
-                if (VBOX_SUCCESS(rc))
-                {
-                    /*
-Issue a VM Create request and wait for it to complete
+Create the EMT thread, it will start up and wait for requests to process
-                     */
-
-
+
+
+
+
-                    if (VBOX_SUCCESS(rc))
-                    {
-
-
+
+
+
+
+
+
-                        if (VBOX_SUCCESS(rc))
-                        {
-
-
-
+
+
+
+
+
+
+
+
+
+
-                        }
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-                    }
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
-                }
-
-
+
+
+
+
+
+
-                AssertRC(rc2);
-            }
-
-
-
-
-
-
-
-
+
+
+
+
+
+
-        }
-        else
-        {
-
-
-
-
-
+
+
-        }
-        RTMemFree(paPages);
-
-        /* terminate SUPLib */
@@ -302 +313 @@
-    else
-    {
-        const char *pszError;
-        /*
-         * An error occurred at support library initialization time (before the
@@ -308 +318 @@
-         * initial callback, as the callback list doesn't exist yet.
-         */
+        const char *pszError;
-        switch (rc)
-        {
@@ -369 +380 @@
-static void vmR3CallVMAtError(PFNVMATERROR pfnVMAtError, void *pvUser, int rc, RT_SRC_POS_DECL, const char *pszError, ...)
-{
+    if (!pfnVMAtError)
+        return;
-    va_list va;
-    va_start(va, pszError);
@@ -874 +887 @@
-}
-
+
-/**
- * Suspends a running VM.
@@ -950 +964 @@
- * @returns VBox error code on failure.
- * @param   pVM         The VM to resume.
-    
+
- */
-static DECLCALLBACK(int) vmR3Resume(PVM pVM)
@@ -1460 +1474 @@
-    rc = HWACCMR3Term(pVM);
-    AssertRC(rc);
-VM
+PG
-    AssertRC(rc);
-PGMR3Term(pVM);
+VMMR3Term(pVM); /* Terminates the ring-0 code! */
-    AssertRC(rc);
-    rc = CPUMR3Term(pVM);
@@ -1490 +1504 @@
-{
-    /*
-s
+
-     */
-    unsigned cReqs = 0;
@@ -1535 +1549 @@
-
-    /*
-Free the VM structure
-
-LowFree(pVM, RT_ALIGN_Z(sizeof(*pVM), PAGE_SIZE) >> PAGE_SHIFT
+Tell GVMM that it can destroy the VM now
+
+CallVMMR0Ex(pVM->pVMR0, VMMR0_DO_GVMM_DESTROY_VM, 0, NULL
-    AssertRC(rc);
-    rc = SUPTerm();

trunk/src/VBox/VMM/VMEmt.cpp

@@ -86 +86 @@
-            break;
-        }
-else 
+
-        {
-            /*

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

@@ -35 +35 @@
-*   Header Files                                                               *
-*******************************************************************************/
-
+M
-#include <VBox/gvmm.h>
-
+
+
-#include <VBox/vm.h>
-#include <VBox/err.h>
-#include <iprt/alloc.h>
-#include <iprt/semaphore.h>
-iprt
+VBox
-#include <iprt/thread.h>
-#include <iprt/param.h>
-#include <iprt/string.h>
+#include <iprt/assert.h>
+#include <iprt/mem.h>
+#include <iprt/memobj.h>
-
-
@@ -61 +65 @@
-    /** Our own index / handle value. */
-    uint16_t            iSelf;
-    /** Whether to free the VM structure or not. */
-    bool                fFreeVM;
-    /** The pointer to the ring-0 only (aka global) VM structure. */
-    PGVM                pGVM;
@@ -111 +113 @@
-static PGVMM g_pGVMM = NULL;
-
+/** Macro for obtaining and validating the g_pGVMM pointer.
+ * On failure it will return from the invoking function with the specified return value.
+ *
+ * @param   pGVMM   The name of the pGVMM variable.
+ * @param   rc      The return value on failure. Use VERR_INTERNAL_ERROR for
+ *                  VBox status codes.
+ */
+#define GVMM_GET_VALID_INSTANCE(pGVMM, rc) \
+    do { \
+        (pGVMM) = g_pGVMM;\
+        AssertPtrReturn((pGVMM), (rc)); \
+        AssertMsgReturn((pGVMM)->u32Magic == GVMM_MAGIC, ("%p - %#x\n", (pGVMM), (pGVMM)->u32Magic), (rc)); \
+    } while (0)
+
+/** Macro for obtaining and validating the g_pGVMM pointer, void function variant.
+ * On failure it will return from the invoking function.
+ *
+ * @param   pGVMM   The name of the pGVMM variable.
+ */
+#define GVMM_GET_VALID_INSTANCE_VOID(pGVMM) \
+    do { \
+        (pGVMM) = g_pGVMM;\
+        AssertPtrReturnVoid((pGVMM)); \
+        AssertMsgReturnVoid((pGVMM)->u32Magic == GVMM_MAGIC, ("%p - %#x\n", (pGVMM), (pGVMM)->u32Magic)); \
+    } while (0)
+
-
-/*******************************************************************************
@@ -201 +229 @@
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-/**
- * Allocates the VM structure and registers it with GVM.
@@ -209 +272 @@
- * @param   ppVM        Where to store the pointer to the VM structure.
- *
-EMT
+Any thread
- */
-GVMMR0DECL(int) GVMMR0CreateVM(PSUPDRVSESSION pSession, PVM *ppVM)
-{
-SUPR0Printf("GVMMR0CreateVM: pSession=%p\n", pSession
- = g_pGVMM
-AssertPtrReturn
+LogFlow(("GVMMR0CreateVM: pSession=%p\n", pSession)
+
+GVMM_GET_VALID_INSTANCE
-
-    AssertPtrReturn(ppVM, VERR_INVALID_POINTER);
-    *ppVM = NULL;
-
-
-
+
-
-    /*
@@ -235 +297 @@
-    if (iHandle)
-    {
-M
+
-
-        /* consistency checks, a bit paranoid as always. */
-        if (    !pHandle->pVM
-/*&&  !pHandle->pGVM */
+&&  !pHandle->pGVM
-            &&  !pHandle->pvObj
-            &&  pHandle->iSelf == iHandle)
@@ -253 +315 @@
-                pGVMM->iUsedHead = iHandle;
-
-                pHandle->fFreeVM = true;
-                pHandle->pVM = NULL;
- /* to be allocated */
+
-                pHandle->pSession = pSession;
-hEMT
+NIL_RTNATIVETHREAD
-
-                rc = SUPR0ObjVerifyAccess(pHandle->pvObj, pSession, NULL);
@@ -263 +324 @@
-                {
-                    /*
-and initialize the VM structure
+the global VM structure (GVM) and initialize it
-                     */
-
-
-
-
-
+
+
-                    {
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-                        if (RT_SUCCESS(rc))
-                        {
-
+
+
-                            pVM->enmVMState = VMSTATE_CREATING;
-                            pVM->paVMPagesR3 = paPagesR3;
-                            pVM->pVMR3 = pVMR3;
-                            pVM->pVMR0 = pVM;
-                            pVM->pSession = pSession;
-                            pVM->hSelf = iHandle;
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+