wrapper: remove uprobes wrapper

diff --git a/lttng-events.h b/lttng-events.h
index 8197eb83a5bafc8c11e17f1a3d3f0bbdc5599262..dc1bd0e6b094b322b79ab43010018339f114051f 100644 (file)
--- a/lttng-events.h
+++ b/lttng-events.h
@@ -16,7 +16,7 @@
 #include <linux/kref.h>
 #include <lttng-cpuhotplug.h>
 #include <linux/uuid.h>
-#include <wrapper/uprobes.h>
+#include <linux/uprobes.h>
 #include <lttng-tracer.h>
 #include <lttng-abi.h>
 #include <lttng-abi-old.h>

diff --git a/probes/lttng-uprobes.c b/probes/lttng-uprobes.c
index 330fae8ab827ca3fe3b3c83db7b94441eea64333..c5d28c33983e4efcb40c6719e8b74b8e3824e491 100644 (file)
--- a/probes/lttng-uprobes.c
+++ b/probes/lttng-uprobes.c
@@ -15,11 +15,11 @@
 #include <linux/namei.h>
 #include <linux/slab.h>
 #include <linux/uaccess.h>
+#include <linux/uprobes.h>
 #include <lttng-events.h>
 #include <lttng-tracer.h>
 #include <wrapper/irqflags.h>
 #include <wrapper/ringbuffer/frontend_types.h>
-#include <wrapper/uprobes.h>
 
 static
 int lttng_uprobes_handler_pre(struct uprobe_consumer *uc, struct pt_regs *regs)
@@ -167,8 +167,8 @@ int lttng_uprobes_add_callsite(struct lttng_event *event,
                goto register_error;
        }
 
-       ret = wrapper_uprobe_register(event->u.uprobe.inode,
-                     uprobe_handler->offset, &uprobe_handler->up_consumer);
+       ret = uprobe_register(event->u.uprobe.inode,
+                             uprobe_handler->offset, &uprobe_handler->up_consumer);
        if (ret) {
                printk(KERN_WARNING "Error registering probe on inode %lu "
                       "and offset 0x%llx\n", event->u.uprobe.inode->i_ino,
@@ -225,8 +225,8 @@ void lttng_uprobes_unregister(struct lttng_event *event)
         * and free the struct.
         */
        list_for_each_entry_safe(iter, tmp, &event->u.uprobe.head, node) {
-               wrapper_uprobe_unregister(event->u.uprobe.inode, iter->offset,
-                       &iter->up_consumer);
+               uprobe_unregister(event->u.uprobe.inode, iter->offset,
+                                 &iter->up_consumer);
                list_del(&iter->node);
                kfree(iter);
        }

diff --git a/wrapper/uprobes.h b/wrapper/uprobes.h
deleted file mode 100644 (file)
index d511850..0000000
--- a/wrapper/uprobes.h
+++ /dev/null
@@ -1,75 +0,0 @@
-/* SPDX-License-Identifier: (GPL-2.0-only or LGPL-2.1-only)
- *
- * wrapper/uprobes.h
- *
- * wrapper around uprobes. Using KALLSYMS to get its address when
- * available, else we need to have a kernel that exports this function to GPL
- * modules.
- *
- * Copyright (C) 2013 Yannick Brosseau <yannick.brosseau@gmail.com>
- * Copyright (C) 2017 Francis Deslauriers <francis.deslauriers@efficios.com>
- *
- */
-
-#ifndef _LTTNG_WRAPPER_UPROBES_H
-#define _LTTNG_WRAPPER_UPROBES_H
-
-#include <linux/version.h>
-
-#if (LINUX_VERSION_CODE >= KERNEL_VERSION(3,5,0))
-#include <linux/uprobes.h>
-
-/* Use kallsym lookup for version before 3.9. */
-#if (LINUX_VERSION_CODE >= KERNEL_VERSION(3,9,0))
-
-static inline
-int wrapper_uprobe_register(struct inode *inode, loff_t offset, struct uprobe_consumer *uc)
-{
-       return uprobe_register(inode, offset, uc);
-}
-
-static inline
-void wrapper_uprobe_unregister(struct inode *inode, loff_t offset, struct uprobe_consumer *uc)
-{
-       uprobe_unregister(inode, offset, uc);
-}
-
-#else /* Version < 3.9, use kallsym lookup. */
-#include "kallsyms.h"
-
-static inline
-int wrapper_uprobe_register(struct inode *inode, loff_t offset, struct uprobe_consumer *uc)
-{
-       int (*uprobe_register_sym)(struct inode *inode, loff_t offset, struct uprobe_consumer *uc);
-
-       uprobe_register_sym = (void *) kallsyms_lookup_funcptr("uprobe_register");
-
-       if (uprobe_register_sym) {
-               return uprobe_register_sym(inode, offset, uc);
-       } else {
-                printk(KERN_WARNING "LTTng: uprobe_register symbol lookup failed.\n");
-                return -EINVAL;
-       }
-}
-
-static inline
-void wrapper_uprobe_unregister(struct inode *inode, loff_t offset, struct uprobe_consumer *uc)
-{
-        int (*uprobe_unregister_sym)(struct inode *inode, loff_t offset, struct uprobe_consumer *uc);
-
-        uprobe_unregister_sym = (void *) kallsyms_lookup_funcptr("uprobe_unregister");
-
-        if (uprobe_unregister_sym) {
-                uprobe_unregister_sym(inode, offset, uc);
-        } else {
-                printk(KERN_WARNING "LTTng: uprobe_unregister symbol lookup failed.\n");
-                WARN_ON(1);
-        }
-}
-#endif
-#else
-/* Version <  3.5, before uprobe was added. */
-struct uprobe_consumer {};
-
-#endif
-#endif