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

Timestamp:

Nov 5, 2013 6:38:08 PM (11 years ago)

Author:

vboxsync

Message:

SUPDrv: Made dtrace support build against UEKR3.

Location:

trunk/src/VBox/HostDrivers/Support

Files:

• SUPDrv-dtrace.cpp (modified) (7 diffs)
• linux/Makefile (modified) (2 diffs)

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

@@ -47 +47 @@
 # include VBOX_PATH_MACOSX_DTRACE_H
 #elif defined(RT_OS_LINUX)
-/* DTrace experiments with the Unbreakable Enterprise Kernel (UEK)
+/* Avoid type and define conflicts. */
+# undef UINT8_MAX
+# undef UINT16_MAX
+# undef UINT32_MAX
+# undef UINT64_MAX
+# undef INT64_MAX
+# undef INT64_MIN
+# define intptr_t dtrace_intptr_t
+
+# if 0
+/* DTrace experiments with the Unbreakable Enterprise Kernel (UEK2)
    (Oracle Linux).
    1. The dtrace.h here is from the dtrace module source, not
@@ -58 +68 @@
             -e 's/$/\tdrivers\/dtrace\/dtrace\tEXPORT_SYMBOL/' \
       >> Module.symvers
+      Update: Althernative workaround (active), resolve symbols dynamically.
    3. No tracepoints in vboxdrv, vboxnet* or vboxpci yet.  This requires yasm
       and VBoxTpG and build time. */
-# undef UINT8_MAX
-# undef UINT16_MAX
-# undef UINT32_MAX
-# undef UINT64_MAX
-# undef INT64_MAX
-# undef INT64_MIN
-# define intptr_t dtrace_intptr_t
-# include "dtrace.h"
+#  include "dtrace.h"
+# else
+/* DTrace experiments with the Unbreakable Enterprise Kernel (UEKR3)
+   (Oracle Linux).
+   1. To generate the missing entries for the dtrace module in Module.symvers
+      of UEK:
+      nm /lib/modules/....../kernel/drivers/dtrace/dtrace.ko  \
+      | grep _crc_ \
+      | sed -e 's/^......../0x/' -e 's/ A __crc_/\t/' \
+            -e 's/$/\tdrivers\/dtrace\/dtrace\tEXPORT_SYMBOL/' \
+      >> Module.symvers
+      Update: Althernative workaround (active), resolve symbols dynamically.
+   2. No tracepoints in vboxdrv, vboxnet* or vboxpci yet.  This requires yasm
+      and VBoxTpG and build time. */
+#  include <dtrace/provider.h>
+#  include <dtrace/enabling.h> /* Missing from provider.h. */
+#  include <dtrace/arg.h> /* Missing from provider.h. */
+# endif
+# include <linux/kallsyms.h>
+/** Status code fixer (UEK uses linux convension unlike the others). */
 # define FIX_UEK_RC(a_rc) (-(a_rc))
 #else
@@ -192 +215 @@
 *   Global Variables                                                           *
 *******************************************************************************/
-#ifdef RT_OS_DARWIN
-/** @name DTrace kernel interface used on Darwin
+#if defined(RT_OS_DARWIN) || defined(RT_OS_LINUX)
+/** @name DTrace kernel interface used on Darwin and Linux.
  * @{ */
 static void        (* g_pfnDTraceProbeFire)(dtrace_id_t, uint64_t, uint64_t, uint64_t, uint64_t, uint64_t);
@@ -1028 +1051 @@
 const SUPDRVTRACERREG * VBOXCALL supdrvDTraceInit(void)
 {
-#ifdef RT_OS_DARWIN
+#if defined(RT_OS_DARWIN) || defined(RT_OS_LINUX)
     /*
      * Resolve the kernel symbols we need.
      */
+# ifndef RT_OS_LINUX
     RTDBGKRNLINFO hKrnlInfo;
     int rc = RTR0DbgKrnlInfoOpen(&hKrnlInfo, 0);
@@ -1039 +1063 @@
         return NULL;
     }
+# endif
 
     static const struct
@@ -1053 +1078 @@
         { "dtrace_unregister",   (PFNRT*)&dtrace_unregister   },
     };
-    for (unsigned i = 0; i < RT_ELEMENTS(s_aDTraceFunctions); i++)
-    {
+    unsigned i;
+    for (i = 0; i < RT_ELEMENTS(s_aDTraceFunctions); i++)
+    {
+# ifndef RT_OS_LINUX
         rc = RTR0DbgKrnlInfoQuerySymbol(hKrnlInfo, NULL, s_aDTraceFunctions[i].pszName,
                                         (void **)s_aDTraceFunctions[i].ppfn);
@@ -1062 +1089 @@
             break;
         }
-    }
-
+# else
+        unsigned long ulAddr = kallsyms_lookup_name(s_aDTraceFunctions[i].pszName);
+        if (!ulAddr)
+        {
+            SUPR0Printf("supdrvDTraceInit: Failed to resolved '%s' (i=%u).\n", s_aDTraceFunctions[i].pszName, i);
+            break;
+        }
+        SUPR0Printf("supdrvDTraceInit: '%s' -> %lx.\n", s_aDTraceFunctions[i].pszName, ulAddr);
+        *s_aDTraceFunctions[i].ppfn = (PFNRT)ulAddr;
+# endif
+    }
+
+# ifndef RT_OS_LINUX
     RTR0DbgKrnlInfoRelease(hKrnlInfo);
     if (RT_FAILURE(rc))
         return NULL;
+# endif
 #endif
 

trunk/src/VBox/HostDrivers/Support/linux/Makefile

@@ -156 +156 @@
         math/gcc/qdivrem.o \
         math/gcc/udivdi3.o \
-        math/gcc/divdi3.o \
+        math/gcc/divdi3.o \
         math/gcc/umoddi3.o
 endif
@@ -242 +242 @@
  INCL    += $(addprefix -I$(KBUILD_EXTMOD),/ /include /r0drv/linux)
  INCL    += $(addprefix -I$(KBUILD_EXTMOD)/vboxdrv,/ /include /r0drv/linux)
+ ifdef VBOX_WITH_NATIVE_DTRACE
+  INCL   += -I/usr/include/linux -I/usr/include
+ endif
  export INCL
 endif