X-Git-Url: https://git.lttng.org/?a=blobdiff_plain;f=lttng-syscalls.c;h=3215564161c1c35987a815106b8638e66db0e745;hb=refs%2Fheads%2Fstable-2.4;hp=37feffbe43c1a90319c2ed2cef161b4e6f5ade74;hpb=bfa949bf033f588fdd6f80ad8b50220ea153446e;p=lttng-modules.git

diff --git a/lttng-syscalls.c b/lttng-syscalls.c
index 37feffbe..32155641 100644
--- a/lttng-syscalls.c
+++ b/lttng-syscalls.c
@@ -23,9 +23,11 @@
 #include <linux/module.h>
 #include <linux/slab.h>
 #include <linux/compat.h>
+#include <linux/err.h>
 #include <asm/ptrace.h>
 #include <asm/syscall.h>
 
+#include "wrapper/tracepoint.h"
 #include "lttng-events.h"
 
 #ifndef CONFIG_COMPAT
@@ -37,6 +39,16 @@
 static
 void syscall_entry_probe(void *__data, struct pt_regs *regs, long id);
 
+/*
+ * Forward declarations for old kernels.
+ */
+struct mmsghdr;
+struct rlimit64;
+struct oldold_utsname;
+struct old_utsname;
+struct sel_arg_struct;
+struct mmap_arg_struct;
+
 /*
  * Take care of NOARGS not supported by mainline.
  */
@@ -49,7 +61,7 @@ void syscall_entry_probe(void *__data, struct pt_regs *regs, long id);
  */
 #define LTTNG_PACKAGE_BUILD
 #define CREATE_TRACE_POINTS
-#define TP_MODULE_OVERRIDE
+#define TP_MODULE_NOINIT
 #define TRACE_INCLUDE_PATH ../instrumentation/syscalls/headers
 
 #define PARAMS(args...)	args
@@ -107,7 +119,7 @@ void syscall_entry_probe(void *__data, struct pt_regs *regs, long id);
 #undef SC_DEFINE_EVENT_NOARGS
 #undef TP_PROBE_CB
 
-#undef TP_MODULE_OVERRIDE
+#undef TP_MODULE_NOINIT
 #undef LTTNG_PACKAGE_BUILD
 #undef CREATE_TRACE_POINTS
 
@@ -311,14 +323,15 @@ int fill_table(const struct trace_syscall_entry *table, size_t table_len,
 		ev.instrumentation = LTTNG_KERNEL_NOOP;
 		chan_table[i] = lttng_event_create(chan, &ev, filter,
 						desc);
-		if (!chan_table[i]) {
+		WARN_ON_ONCE(!chan_table[i]);
+		if (IS_ERR(chan_table[i])) {
 			/*
 			 * If something goes wrong in event registration
 			 * after the first one, we have no choice but to
 			 * leave the previous events in there, until
 			 * deleted by session teardown.
 			 */
-			return -EINVAL;
+			return PTR_ERR(chan_table[i]);
 		}
 	}
 	return 0;
@@ -358,8 +371,9 @@ int lttng_syscalls_register(struct lttng_channel *chan, void *filter)
 		ev.instrumentation = LTTNG_KERNEL_NOOP;
 		chan->sc_unknown = lttng_event_create(chan, &ev, filter,
 						    desc);
-		if (!chan->sc_unknown) {
-			return -EINVAL;
+		WARN_ON_ONCE(!chan->sc_unknown);
+		if (IS_ERR(chan->sc_unknown)) {
+			return PTR_ERR(chan->sc_unknown);
 		}
 	}
 
@@ -373,8 +387,9 @@ int lttng_syscalls_register(struct lttng_channel *chan, void *filter)
 		ev.instrumentation = LTTNG_KERNEL_NOOP;
 		chan->sc_compat_unknown = lttng_event_create(chan, &ev, filter,
 							   desc);
-		if (!chan->sc_compat_unknown) {
-			return -EINVAL;
+		WARN_ON_ONCE(!chan->sc_unknown);
+		if (IS_ERR(chan->sc_compat_unknown)) {
+			return PTR_ERR(chan->sc_compat_unknown);
 		}
 	}
 
@@ -388,8 +403,9 @@ int lttng_syscalls_register(struct lttng_channel *chan, void *filter)
 		ev.instrumentation = LTTNG_KERNEL_NOOP;
 		chan->sc_exit = lttng_event_create(chan, &ev, filter,
 						 desc);
-		if (!chan->sc_exit) {
-			return -EINVAL;
+		WARN_ON_ONCE(!chan->sc_exit);
+		if (IS_ERR(chan->sc_exit)) {
+			return PTR_ERR(chan->sc_exit);
 		}
 	}
 
@@ -403,7 +419,7 @@ int lttng_syscalls_register(struct lttng_channel *chan, void *filter)
 	if (ret)
 		return ret;
 #endif
-	ret = tracepoint_probe_register("sys_enter",
+	ret = kabi_2635_tracepoint_probe_register("sys_enter",
 			(void *) syscall_entry_probe, chan);
 	if (ret)
 		return ret;
@@ -411,11 +427,11 @@ int lttng_syscalls_register(struct lttng_channel *chan, void *filter)
 	 * We change the name of sys_exit tracepoint due to namespace
 	 * conflict with sys_exit syscall entry.
 	 */
-	ret = tracepoint_probe_register("sys_exit",
+	ret = kabi_2635_tracepoint_probe_register("sys_exit",
 			(void *) __event_probe__exit_syscall,
 			chan->sc_exit);
 	if (ret) {
-		WARN_ON_ONCE(tracepoint_probe_unregister("sys_enter",
+		WARN_ON_ONCE(kabi_2635_tracepoint_probe_unregister("sys_enter",
 			(void *) syscall_entry_probe, chan));
 	}
 	return ret;
@@ -430,12 +446,12 @@ int lttng_syscalls_unregister(struct lttng_channel *chan)
 
 	if (!chan->sc_table)
 		return 0;
-	ret = tracepoint_probe_unregister("sys_exit",
+	ret = kabi_2635_tracepoint_probe_unregister("sys_exit",
 			(void *) __event_probe__exit_syscall,
 			chan->sc_exit);
 	if (ret)
 		return ret;
-	ret = tracepoint_probe_unregister("sys_enter",
+	ret = kabi_2635_tracepoint_probe_unregister("sys_enter",
 			(void *) syscall_entry_probe, chan);
 	if (ret)
 		return ret;