Changeset 85766 in vbox for trunk/src

Timestamp:

Aug 14, 2020 12:27:41 PM (5 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

139917

Message:

SUPDrv: Use symbol_get to resolve dtrace symbols on linux. Needed for 5.7+ and fixes reference issue. (untested) bugref:9733

Location:

trunk/src/VBox/HostDrivers/Support

Files:

• SUPDrv-dtrace.cpp (modified) (3 diffs)
• SUPDrvInternal.h (modified) (1 diff)
• SUPDrvTracer.cpp (modified) (1 diff)

trunk/src/VBox/HostDrivers/Support/SUPDrv-dtrace.cpp

@@ -256 +256 @@
 #define dtrace_unregister       g_pfnDTraceProviderUnregister
 
+/** For dynamical resolving and releasing.   */
+static const struct
+{
+    const char *pszName;
+    uintptr_t  *ppfn; /**< @note Clang 11 nothrow weirdness forced this from PFNRT * to uintptr_t *. */
+} g_aDTraceFunctions[] =
+{
+    { "dtrace_probe",        (uintptr_t *)&dtrace_probe        },
+    { "dtrace_probe_create", (uintptr_t *)&dtrace_probe_create },
+    { "dtrace_probe_lookup", (uintptr_t *)&dtrace_probe_lookup },
+    { "dtrace_register",     (uintptr_t *)&dtrace_register     },
+    { "dtrace_invalidate",   (uintptr_t *)&dtrace_invalidate   },
+    { "dtrace_unregister",   (uintptr_t *)&dtrace_unregister   },
+};
+
 /** @} */
 #endif
@@ -1112 +1127 @@
 # endif
 
-    static const struct
-    {
-        const char *pszName;
-        uintptr_t  *ppfn; /**< @note Clang 11 nothrow weirdness forced this from PFNRT * to uintptr_t *. */
-    } s_aDTraceFunctions[] =
-    {
-        { "dtrace_probe",        (uintptr_t *)&dtrace_probe        },
-        { "dtrace_probe_create", (uintptr_t *)&dtrace_probe_create },
-        { "dtrace_probe_lookup", (uintptr_t *)&dtrace_probe_lookup },
-        { "dtrace_register",     (uintptr_t *)&dtrace_register     },
-        { "dtrace_invalidate",   (uintptr_t *)&dtrace_invalidate   },
-        { "dtrace_unregister",   (uintptr_t *)&dtrace_unregister   },
-    };
     unsigned i;
-    for (i = 0; i < RT_ELEMENTS(s_aDTraceFunctions); i++)
+    for (i = 0; i < RT_ELEMENTS(g_aDTraceFunctions); i++)
     {
 # ifndef RT_OS_LINUX
-        rc = RTR0DbgKrnlInfoQuerySymbol(hKrnlInfo, NULL, s_aDTraceFunctions[i].pszName,
-                                        (void **)s_aDTraceFunctions[i].ppfn);
+        rc = RTR0DbgKrnlInfoQuerySymbol(hKrnlInfo, NULL, g_aDTraceFunctions[i].pszName,
+                                        (void **)g_aDTraceFunctions[i].ppfn);
         if (RT_FAILURE(rc))
         {
-            SUPR0Printf("supdrvDTraceInit: Failed to resolved '%s' (rc=%Rrc, i=%u).\n", s_aDTraceFunctions[i].pszName, rc, i);
+            SUPR0Printf("supdrvDTraceInit: Failed to resolved '%s' (rc=%Rrc, i=%u).\n", g_aDTraceFunctions[i].pszName, rc, i);
             break;
         }
-# else
-        unsigned long ulAddr = kallsyms_lookup_name(s_aDTraceFunctions[i].pszName);
+# else /* RT_OS_LINUX */
+        uintptr_t ulAddr = (uintptr_t)__symbol_get(g_aDTraceFunctions[i].pszName);
         if (!ulAddr)
         {
-            SUPR0Printf("supdrvDTraceInit: Failed to resolved '%s' (i=%u).\n", s_aDTraceFunctions[i].pszName, i);
+            SUPR0Printf("supdrvDTraceInit: Failed to resolved '%s' (i=%u).\n", g_aDTraceFunctions[i].pszName, i);
+            while (i-- > 0)
+            {
+                __symbol_put(g_aDTraceFunctions[i].pszName);
+                *g_aDTraceFunctions[i].ppfn = NULL;
+            }
             return NULL;
         }
-        *s_aDTraceFunctions[i].ppfn = (PFNRT)ulAddr;
-# endif
+        *g_aDTraceFunctions[i].ppfn = (PFNRT)ulAddr;
+# endif /* RT_OS_LINUX */
     }
 
@@ -1151 +1158 @@
     if (RT_FAILURE(rc))
         return NULL;
-# else
-    /** @todo grab a reference to the dtrace module... */
 # endif
 #endif
 
     return &g_VBoxDTraceReg;
+}
+
+/**
+ * Module teardown code.
+ */
+void VBOXCALL supdrvDTraceFini(void)
+{ 
+#ifdef RT_OS_LINUX
+    /* Release the references. */
+    unsigned i;
+    for (i = 0; i < RT_ELEMENTS(g_aDTraceFunctions); i++)
+        if (*g_aDTraceFunctions[i].ppfn)
+        {
+            __symbol_put(g_aDTraceFunctions[i].pszName);
+            *g_aDTraceFunctions[i].ppfn = NULL;
+        }
+#endif
 }
 

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

@@ -1108 +1108 @@
 #ifdef VBOX_WITH_NATIVE_DTRACE
 const SUPDRVTRACERREG * VBOXCALL supdrvDTraceInit(void);
+void                    VBOXCALL supdrvDTraceFini(void);
 #endif
 

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

@@ -2469 +2469 @@
 
     supdrvTracerRemoveAllProviders(pDevExt);
-
+#ifdef VBOX_WITH_NATIVE_DTRACE
+    supdrvDTraceFini();
+#endif
     RTSemFastMutexDestroy(pDevExt->mtxTracer);
     pDevExt->mtxTracer = NIL_RTSEMFASTMUTEX;