Changeset 37228 in vbox for trunk/src/VBox/HostDrivers/Support

Timestamp:

May 26, 2011 7:25:54 PM (14 years ago)

Author:

vboxsync

Message:

SUPDrv,VMM,VBoxDD*: Implemented native loading of the angnostic modules on solaris (disabled by default).

Location:

trunk/src/VBox/HostDrivers/Support

Files:

• Makefile.kmk (modified) (1 diff)
• SUPDrv.c (modified) (4 diffs)
• SUPDrvInternal.h (modified) (1 diff)
• SUPLib.cpp (modified) (1 diff)
• solaris/SUPDrv-solaris.c (modified) (4 diffs)

trunk/src/VBox/HostDrivers/Support/Makefile.kmk

@@ -446 +446 @@
  vboxdrv_DEFS        += VBOX_WITH_NETFLT
 endif
+ifdef VBOX_WITH_NATIVE_SOLARIS_LOADING
+ vboxdrv_DEFS        += VBOX_WITH_NATIVE_SOLARIS_LOADING
+endif
 vboxdrv_DEPS         += $(VBOX_SVN_REV_KMK)
 vboxdrv_INCS         := $(PATH_SUB_CURRENT)

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

@@ -4277 +4277 @@
     /*
      * Search the symbol strings.
+     *
+     * Note! The int32_t is for native loading on solaris where the data
+     *       and text segments are in very different places.
      */
     pchStrings = pImage->pachStrTab;
@@ -4282 +4285 @@
     for (i = 0; i < pImage->cSymbols; i++)
     {
-        if (    paSyms[i].offSymbol < pImage->cbImageBits /* paranoia */
-            &&  paSyms[i].offName + cbSymbol <= pImage->cbStrTab
+        if (    paSyms[i].offName + cbSymbol <= pImage->cbStrTab
             &&  !memcmp(pchStrings + paSyms[i].offName, pReq->u.In.szSymbol, cbSymbol))
         {
-            pvSymbol = (uint8_t *)pImage->pvImage + paSyms[i].offSymbol;
+            pvSymbol = (uint8_t *)pImage->pvImage + (int32_t)paSyms[i].offSymbol;
             rc = VINF_SUCCESS;
             break;
@@ -4366 +4368 @@
             for (i = 0; i < pImage->cSymbols; i++)
             {
-                if (    paSyms[i].offSymbol < pImage->cbImageBits /* paranoia */
-                    &&  paSyms[i].offName + cbSymbol <= pImage->cbStrTab
+                if (    paSyms[i].offName + cbSymbol <= pImage->cbStrTab
                     &&  !memcmp(pchStrings + paSyms[i].offName, pszSymbol, cbSymbol))
                 {
@@ -4373 +4374 @@
                      * Found it! Calc the symbol address and add a reference to the module.
                      */
-                    pReq->u.Out.pfnSymbol = (PFNRT)((uint8_t *)pImage->pvImage + paSyms[i].offSymbol);
+                    pReq->u.Out.pfnSymbol = (PFNRT)((uint8_t *)pImage->pvImage + (int32_t)paSyms[i].offSymbol);
                     rc = supdrvLdrAddUsage(pSession, pImage);
                     break;

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

@@ -299 +299 @@
     RTR0MEMOBJ                      hMemLock;
 #endif
+#if defined(RT_OS_SOLARIS) && defined(VBOX_WITH_NATIVE_SOLARIS_LOADING)
+    /** The Solaris module ID. */
+    int                             idSolMod;
+    /** Pointer to the module control structure. */
+    struct modctl                  *pSolModCtl;
+#endif
     /** Whether it's loaded by the native loader or not. */
     bool                            fNative;

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

@@ -1689 +1689 @@
 
     /*
+     * Symbols that are undefined by convention.
+     */
+#ifdef RT_OS_SOLARIS
+    static const char * const s_apszConvSyms[] =
+    {
+        "", "mod_getctl",
+        "", "mod_install",
+        "", "mod_remove",
+        "", "mod_info",
+        "", "mod_miscops",
+    };
+    for (unsigned i = 0; i < RT_ELEMENTS(s_apszConvSyms); i += 2)
+    {
+        if (   !RTStrCmp(s_apszConvSyms[i],     pszModule)
+            && !RTStrCmp(s_apszConvSyms[i + 1], pszSymbol))
+        {
+            *pValue = ~(uintptr_t)0;
+            return VINF_SUCCESS;
+        }
+    }
+#endif
+
+    /*
      * Despair.
      */

trunk/src/VBox/HostDrivers/Support/solaris/SUPDrv-solaris.c

@@ -35 +35 @@
 #include <sys/buf.h>
 #include <sys/modctl.h>
+#include <sys/kobj.h>
 #include <sys/open.h>
 #include <sys/conf.h>
@@ -51 +52 @@
 #include <iprt/spinlock.h>
 #include <iprt/mp.h>
+#include <iprt/path.h>
 #include <iprt/power.h>
 #include <iprt/process.h>
@@ -893 +895 @@
 }
 
+#if  defined(VBOX_WITH_NATIVE_SOLARIS_LOADING) \
+ && !defined(VBOX_WITHOUT_NATIVE_R0_LOADER)
 
 int  VBOXCALL   supdrvOSLdrOpen(PSUPDRVDEVEXT pDevExt, PSUPDRVLDRIMAGE pImage, const char *pszFilename)
 {
-    /** @todo This is something that shouldn't be impossible to implement
-     *  here and would make a few people happy. */
+    pImage->idSolMod   = -1;
+    pImage->pSolModCtl = NULL;
+
+# if 1 /* This approach requires _init/_fini/_info stubs. */
+    /*
+     * Construct a filename that escapes the module search path and let us
+     * specify a root path.
+     */
+    const char *pszName = RTPathFilename(pszFilename);
+    AssertReturn(pszName, VERR_INVALID_PARAMETER);
+    char *pszSubDir = RTStrAPrintf2("../../../../../../../../../../../%.*s", pszName - pszFilename, pszFilename);
+    if (!pszSubDir)
+        return VERR_NO_STR_MEMORY;
+
+    int idMod = modload(pszSubDir, pszName);
+    RTStrFree(pszSubDir);
+    if (idMod == -1)
+    {
+        LogRel(("modload(,%s): failed, could be anything...\n", pszFilename));
+        return VERR_LDR_GENERAL_FAILURE;
+    }
+
+    modctl_t *pModCtl = mod_hold_by_id(idMod);
+    if (!pModCtl)
+    {
+        LogRel(("mod_hold_by_id(,%s): failed, weird.\n", pszFilename));
+        /* No point in calling modunload. */
+        return VERR_LDR_GENERAL_FAILURE;
+    }
+    pModCtl->mod_loadflags |= MOD_NOAUTOUNLOAD | MOD_NOUNLOAD; /* paranoia */
+
+# else
+
+    const int idMod = -1;
+    modctl_t *pModCtl = mod_hold_by_name(pszFilename);
+    if (!pModCtl)
+    {
+        LogRel(("mod_hold_by_name failed for '%s'\n", pszFilename));
+        return VERR_LDR_GENERAL_FAILURE;
+    }
+
+    int rc = kobj_load_module(pModCtl, 0 /*use_path*/);
+    if (rc != 0)
+    {
+        LogRel(("kobj_load_module failed with rc=%d for '%s'\n", rc, pszFilename));
+        mod_release_mod(pModCtl);
+        return RTErrConvertFromErrno(rc);
+    }
+# endif
+
+    /*
+     * Get the module info.
+     */
+    struct modinfo ModInfo;
+    kobj_getmodinfo(pModCtl->mod_mp, &ModInfo);
+    pImage->pvImage    = ModInfo.mi_base;
+    pImage->idSolMod   = idMod;
+    pImage->pSolModCtl = pModCtl;
+
+    mod_release_mod(pImage->pSolModCtl);
+    LogRel(("supdrvOSLdrOpen: succeeded for '%s' (mi_base=%p mi_base=%#x), id=%d ctl=%p\n",
+            pszFilename, ModInfo.mi_base, ModInfo.mi_size, idMod, pModCtl));
+    return VINF_SUCCESS;
+}
+
+
+int  VBOXCALL   supdrvOSLdrValidatePointer(PSUPDRVDEVEXT pDevExt, PSUPDRVLDRIMAGE pImage, void *pv, const uint8_t *pbImageBits)
+{
+    NOREF(pDevExt); NOREF(pImage); NOREF(pv); NOREF(pbImageBits);
+    if (kobj_addrcheck(pImage->pSolModCtl->mod_mp, pv))
+        return VERR_INVALID_PARAMETER;
+    return VINF_SUCCESS;
+}
+
+
+int  VBOXCALL   supdrvOSLdrLoad(PSUPDRVDEVEXT pDevExt, PSUPDRVLDRIMAGE pImage, const uint8_t *pbImageBits)
+{
+    /*
+     * Comparing is very very difficult since text and data may be allocated
+     * separately.
+     */
+    size_t cbCompare = RT_MIN(pImage->cbImageBits, 64);
+    if (memcmp(pImage->pvImage, pbImageBits, cbCompare))
+    {
+        LogRel(("Image mismatch: %s\n", pImage->szName));
+        LogRel(("Native: %.*Rhxs\n", cbCompare, pImage->pvImage));
+        LogRel(("SUPLib: %.*Rhxs\n", cbCompare, pbImageBits));
+        return VERR_LDR_MISMATCH_NATIVE;
+    }
+
+
+    /*
+     * Get the symbol addresses.
+     */
+    int rc;
+    modctl_t *pModCtl = mod_hold_by_id(pImage->idSolMod);
+    if (pModCtl && pModCtl == pImage->pSolModCtl)
+    {
+        uint32_t iSym = pImage->cSymbols;
+        while (iSym-- > 0)
+        {
+            const char *pszSymbol = &pImage->pachStrTab[pImage->paSymbols[iSym].offName];
+            uintptr_t uValue = modlookup_by_modctl(pImage->pSolModCtl, pszSymbol);
+            if (!uValue)
+            {
+                LogRel(("supdrvOSLdrLoad on %s failed to resolve the exported symbol: '%s'\n", pImage->szName, pszSymbol));
+                break;
+            }
+            uintptr_t offSymbol = uValue - (uintptr_t)pImage->pvImage;
+            pImage->paSymbols[iSym].offSymbol = offSymbol;
+            if (pImage->paSymbols[iSym].offSymbol != (int32_t)offSymbol)
+            {
+                LogRel(("supdrvOSLdrLoad on %s symbol out of range: %p (%s) \n", pImage->szName, offSymbol, pszSymbol));
+                break;
+            }
+        }
+
+        rc = iSym == UINT32_MAX ? VINF_SUCCESS : VERR_LDR_GENERAL_FAILURE;
+        mod_release_mod(pImage->pSolModCtl);
+    }
+    else
+    {
+        LogRel(("mod_hold_by_id failed in supdrvOSLdrLoad on %s: %p\n", pImage->szName, pModCtl));
+        rc = VERR_LDR_MISMATCH_NATIVE;
+    }
+    return rc;
+}
+
+
+void VBOXCALL   supdrvOSLdrUnload(PSUPDRVDEVEXT pDevExt, PSUPDRVLDRIMAGE pImage)
+{
+# if 1
+    pImage->pSolModCtl->mod_loadflags &= ~MOD_NOUNLOAD;
+    int rc = modunload(pImage->idSolMod);
+    if (rc)
+        LogRel(("modunload(%u (%s)) failed: %d\n", pImage->idSolMod, pImage->szName, rc));
+# else
+    kobj_unload_module(pImage->pSolModCtl);
+# endif
+    pImage->pSolModCtl = NULL;
+    pImage->idSolMod   = NULL;
+}
+
+#else /* !VBOX_WITH_NATIVE_SOLARIS_LOADING */
+
+int  VBOXCALL   supdrvOSLdrOpen(PSUPDRVDEVEXT pDevExt, PSUPDRVLDRIMAGE pImage, const char *pszFilename)
+{
     NOREF(pDevExt); NOREF(pImage); NOREF(pszFilename);
     return VERR_NOT_SUPPORTED;
@@ -921 +1070 @@
     NOREF(pDevExt); NOREF(pImage);
 }
+
+#endif /* !VBOX_WITH_NATIVE_SOLARIS_LOADING */