dl instrumentation: add dlmopen event, trace dlopen flags

Add missing dlmopen(3) instrumentation, and add the "flags" field to
dlopen instrumentation.

Link: http://man7.org/linux/man-pages/man3/dlopen.3.html
Signed-off-by: Mathieu Desnoyers <mathieu.desnoyers@efficios.com>

diff --git a/include/lttng/ust-dlfcn.h b/include/lttng/ust-dlfcn.h
index 7471d94f689e328b77185cbbb91dc8823b957b6e..7cd5bf4811e9e2d3527dfe716f88cd187362fa91 100644 (file)
--- a/include/lttng/ust-dlfcn.h
+++ b/include/lttng/ust-dlfcn.h
@@ -47,7 +47,11 @@
 #define dlclose glibc_dlclose_proto_lies_about_leafness
 #define dlsym glibc_dlsym_proto_lies_about_leafness
 #define dlerror glibc_dlerror_proto_lies_about_leafness
+#define dlmopen glibc_dlmopen_proto_lies_about_leafness
+#define dlvsym glibc_dlvsym_proto_lies_about_leafness
 #include <dlfcn.h>
+#undef dlvsym
+#undef dlmopen
 #undef dlerror
 #undef dlsym
 #undef dlclose
@@ -58,6 +62,12 @@ extern int dlclose(void *__handle) __nonnull ((1));
 extern void *dlsym(void *__restrict __handle,
                __const char *__restrict __name) __nonnull ((2));
 extern char *dlerror(void);
+#ifdef __USE_GNU
+extern void *dlmopen(Lmid_t __nsid, const char *__file, int __mode);
+extern void *dlvsym(void *__restrict __handle,
+               __const char *__restrict __name,
+               __const char *__restrict __version);
+#endif
 #else
 #include <dlfcn.h>
 #endif /* __GLIBC__ */

diff --git a/liblttng-ust-dl/lttng-ust-dl.c b/liblttng-ust-dl/lttng-ust-dl.c
index 81b5bec470ad91dda754776220b9f5bb9435cf3d..b0737b65f9f4222d6beef931b7ce3a07eef0ea1c 100644 (file)
--- a/liblttng-ust-dl/lttng-ust-dl.c
+++ b/liblttng-ust-dl/lttng-ust-dl.c
@@ -37,11 +37,13 @@
 #define TRACEPOINT_DEFINE
 #include "ust_dl.h"
 
-static void *(*__lttng_ust_plibc_dlopen)(const char *filename, int flag);
+static void *(*__lttng_ust_plibc_dlopen)(const char *filename, int flags);
+static void *(*__lttng_ust_plibc_dlmopen)(Lmid_t nsid, const char *filename,
+               int flags);
 static int (*__lttng_ust_plibc_dlclose)(void *handle);
 
 static
-void *_lttng_ust_dl_libc_dlopen(const char *filename, int flag)
+void *_lttng_ust_dl_libc_dlopen(const char *filename, int flags)
 {
        if (!__lttng_ust_plibc_dlopen) {
                __lttng_ust_plibc_dlopen = dlsym(RTLD_NEXT, "dlopen");
@@ -50,7 +52,21 @@ void *_lttng_ust_dl_libc_dlopen(const char *filename, int flag)
                        return NULL;
                }
        }
-       return __lttng_ust_plibc_dlopen(filename, flag);
+       return __lttng_ust_plibc_dlopen(filename, flags);
+}
+
+static
+void *_lttng_ust_dl_libc_dlmopen(Lmid_t nsid, const char *filename,
+               int flags)
+{
+       if (!__lttng_ust_plibc_dlmopen) {
+               __lttng_ust_plibc_dlmopen = dlsym(RTLD_NEXT, "dlmopen");
+               if (!__lttng_ust_plibc_dlmopen) {
+                       fprintf(stderr, "%s\n", dlerror());
+                       return NULL;
+               }
+       }
+       return __lttng_ust_plibc_dlmopen(nsid, filename, flags);
 }
 
 static
@@ -67,7 +83,8 @@ int _lttng_ust_dl_libc_dlclose(void *handle)
 }
 
 static
-void lttng_ust_dl_dlopen(void *so_base, const char *so_name, void *ip)
+void lttng_ust_dl_dlopen(void *so_base, const char *so_name,
+               int flags, void *ip)
 {
        char resolved_path[PATH_MAX];
        struct lttng_ust_elf *elf;
@@ -106,7 +123,7 @@ void lttng_ust_dl_dlopen(void *so_base, const char *so_name, void *ip)
        }
 
        tracepoint(lttng_ust_dl, dlopen,
-               ip, so_base, resolved_path, memsz,
+               ip, so_base, resolved_path, flags, memsz,
                has_build_id, has_debug_link);
 
        if (has_build_id) {
@@ -126,11 +143,72 @@ end:
        return;
 }
 
-void *dlopen(const char *filename, int flag)
+static
+void lttng_ust_dl_dlmopen(void *so_base, Lmid_t nsid, const char *so_name,
+               int flags, void *ip)
+{
+       char resolved_path[PATH_MAX];
+       struct lttng_ust_elf *elf;
+       uint64_t memsz;
+       uint8_t *build_id = NULL;
+       size_t build_id_len;
+       char *dbg_file = NULL;
+       uint32_t crc;
+       int has_build_id = 0, has_debug_link = 0;
+       int ret;
+
+       if (!realpath(so_name, resolved_path)) {
+               ERR("could not resolve path '%s'", so_name);
+               return;
+       }
+
+       elf = lttng_ust_elf_create(resolved_path);
+       if (!elf) {
+               ERR("could not acces file %s", resolved_path);
+               return;
+       }
+
+       ret = lttng_ust_elf_get_memsz(elf, &memsz);
+       if (ret) {
+               goto end;
+       }
+       ret = lttng_ust_elf_get_build_id(
+               elf, &build_id, &build_id_len, &has_build_id);
+       if (ret) {
+               goto end;
+       }
+       ret = lttng_ust_elf_get_debug_link(
+               elf, &dbg_file, &crc, &has_debug_link);
+       if (ret) {
+               goto end;
+       }
+
+       tracepoint(lttng_ust_dl, dlmopen,
+               ip, so_base, nsid, resolved_path, flags, memsz,
+               has_build_id, has_debug_link);
+
+       if (has_build_id) {
+               tracepoint(lttng_ust_dl, build_id,
+                       ip, so_base, build_id, build_id_len);
+       }
+
+       if (has_debug_link) {
+               tracepoint(lttng_ust_dl, debug_link,
+                       ip, so_base, dbg_file, crc);
+       }
+
+end:
+       free(dbg_file);
+       free(build_id);
+       lttng_ust_elf_destroy(elf);
+       return;
+}
+
+void *dlopen(const char *filename, int flags)
 {
        void *handle;
 
-       handle = _lttng_ust_dl_libc_dlopen(filename, flag);
+       handle = _lttng_ust_dl_libc_dlopen(filename, flags);
        if (__tracepoint_ptrs_registered && handle) {
                struct link_map *p = NULL;
                int ret;
@@ -138,12 +216,32 @@ void *dlopen(const char *filename, int flag)
                ret = dlinfo(handle, RTLD_DI_LINKMAP, &p);
                if (ret != -1 && p != NULL && p->l_addr != 0) {
                        lttng_ust_dl_dlopen((void *) p->l_addr,
-                               p->l_name,
+                               p->l_name, flags, LTTNG_UST_CALLER_IP());
+               }
+       }
+       lttng_ust_dl_update(LTTNG_UST_CALLER_IP());
+       return handle;
+}
+
+void *dlmopen(Lmid_t nsid, const char *filename, int flags)
+{
+       void *handle;
+
+       handle = _lttng_ust_dl_libc_dlmopen(nsid, filename, flags);
+       if (__tracepoint_ptrs_registered && handle) {
+               struct link_map *p = NULL;
+               int ret;
+
+               ret = dlinfo(handle, RTLD_DI_LINKMAP, &p);
+               if (ret != -1 && p != NULL && p->l_addr != 0) {
+                       lttng_ust_dl_dlmopen((void *) p->l_addr,
+                               nsid, p->l_name, flags,
                                LTTNG_UST_CALLER_IP());
                }
        }
        lttng_ust_dl_update(LTTNG_UST_CALLER_IP());
        return handle;
+
 }
 
 int dlclose(void *handle)

diff --git a/liblttng-ust-dl/ust_dl.c b/liblttng-ust-dl/ust_dl.c
index b25ba7b902a953b84323107ea260cba6a6c914b7..232414328934a3727d864c83a31a9ce7ed6d7ba5 100644 (file)
--- a/liblttng-ust-dl/ust_dl.c
+++ b/liblttng-ust-dl/ust_dl.c
@@ -16,6 +16,7 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301 USA
  */
 
+#define _GNU_SOURCE
 #define _LGPL_SOURCE
 #define TRACEPOINT_CREATE_PROBES
 #define TP_IP_PARAM ip

diff --git a/liblttng-ust-dl/ust_dl.h b/liblttng-ust-dl/ust_dl.h
index 24c9b70fa1e7ef7fb1bf532c7459504a9897972c..b8cfe822b5c48bf3eaa2b2b3fd87981690322445 100644 (file)
--- a/liblttng-ust-dl/ust_dl.h
+++ b/liblttng-ust-dl/ust_dl.h
@@ -38,12 +38,29 @@ extern "C" {
 #include <lttng/tracepoint.h>
 
 TRACEPOINT_EVENT(lttng_ust_dl, dlopen,
-       TP_ARGS(void *, ip, void *, baddr, const char*, path,
+       TP_ARGS(void *, ip, void *, baddr, const char *, path,
+               int, flags, uint64_t, memsz, uint8_t, has_build_id,
+               uint8_t, has_debug_link),
+       TP_FIELDS(
+               ctf_integer_hex(void *, baddr, baddr)
+               ctf_integer(uint64_t, memsz, memsz)
+               ctf_integer_hex(int, flags, flags)
+               ctf_string(path, path)
+               ctf_integer(uint8_t, has_build_id, has_build_id)
+               ctf_integer(uint8_t, has_debug_link, has_debug_link)
+       )
+)
+
+TRACEPOINT_EVENT(lttng_ust_dl, dlmopen,
+       TP_ARGS(void *, ip, void *, baddr, Lmid_t, nsid,
+               const char *, path, int, flags,
                uint64_t, memsz, uint8_t, has_build_id,
                uint8_t, has_debug_link),
        TP_FIELDS(
                ctf_integer_hex(void *, baddr, baddr)
                ctf_integer(uint64_t, memsz, memsz)
+               ctf_integer(Lmid_t, nsid, nsid)
+               ctf_integer_hex(int, flags, flags)
                ctf_string(path, path)
                ctf_integer(uint8_t, has_build_id, has_build_id)
                ctf_integer(uint8_t, has_debug_link, has_debug_link)