X-Git-Url: https://git.lttng.org/?a=blobdiff_plain;f=src%2Flttng-syscalls.c;h=5ec6be5a498514375a17bd54669096fd37471709;hb=92e2c5feecb39cdd4796da89f2b684e395403040;hp=d93df2e1306e00ca0e60c3504177e7254b1a692e;hpb=2a059b14c2cbbf828ebc2fc6db643cf81b51abed;p=lttng-modules.git

diff --git a/src/lttng-syscalls.c b/src/lttng-syscalls.c
index d93df2e1..5ec6be5a 100644
--- a/src/lttng-syscalls.c
+++ b/src/lttng-syscalls.c
@@ -31,6 +31,7 @@
 #include <lttng/events.h>
 #include <lttng/events-internal.h>
 #include <lttng/utils.h>
+#include <lttng/kernel-version.h>
 
 #include "lttng-syscalls.h"
 
@@ -42,7 +43,14 @@
 
 /* in_compat_syscall appears in kernel 4.6. */
 #ifndef in_compat_syscall
- #define in_compat_syscall()	is_compat_task()
+# define in_compat_syscall()	is_compat_task()
+#endif
+
+/* in_x32_syscall appears in kernel 4.7. */
+#if (LTTNG_LINUX_VERSION_CODE < LTTNG_KERNEL_VERSION(4,7,0))
+# ifdef CONFIG_X86_X32_ABI
+#  define in_x32_syscall()	is_x32_task()
+# endif
 #endif
 
 enum sc_type {
@@ -77,14 +85,14 @@ void syscall_exit_event_probe(void *__data, struct pt_regs *regs, long ret);
 #define LTTNG_PACKAGE_BUILD
 #define CREATE_TRACE_POINTS
 #define TP_MODULE_NOINIT
-#define TRACE_INCLUDE_PATH instrumentation/syscalls/headers
+#define TRACE_INCLUDE_PATH instrumentation/syscalls
 
 #define PARAMS(args...)	args
 
 /* Handle unknown syscalls */
 #undef TRACE_SYSTEM
 #define TRACE_SYSTEM syscalls_unknown
-#include <instrumentation/syscalls/headers/syscalls_unknown.h>
+#include <instrumentation/syscalls/syscalls_unknown.h>
 #undef TRACE_SYSTEM
 
 #undef TP_PROBE_CB
@@ -241,6 +249,12 @@ void syscall_entry_event_probe(void *__data, struct pt_regs *regs, long id)
 	const struct trace_syscall_entry *table, *entry;
 	size_t table_len;
 
+#ifdef CONFIG_X86_X32_ABI
+	if (in_x32_syscall()) {
+		/* x32 system calls are not supported. */
+		return;
+	}
+#endif
 	if (unlikely(in_compat_syscall())) {
 		struct lttng_syscall_filter *filter = syscall_table->sc_filter;
 
@@ -419,6 +433,12 @@ void syscall_exit_event_probe(void *__data, struct pt_regs *regs, long ret)
 	size_t table_len;
 	long id;
 
+#ifdef CONFIG_X86_X32_ABI
+	if (in_x32_syscall()) {
+		/* x32 system calls are not supported. */
+		return;
+	}
+#endif
 	id = syscall_get_nr(current, regs);
 
 	if (unlikely(in_compat_syscall())) {
@@ -796,17 +816,17 @@ int lttng_event_enabler_create_syscall_events_if_missing(struct lttng_event_enab
 	}
 
 	if (!syscall_table->sys_enter_registered) {
-		ret = lttng_wrapper_tracepoint_probe_register("sys_enter",
+		ret = lttng_tracepoint_probe_register("sys_enter",
 				(void *) syscall_entry_event_probe, syscall_table);
 		if (ret)
 			return ret;
 		syscall_table->sys_enter_registered = 1;
 	}
 	if (!syscall_table->sys_exit_registered) {
-		ret = lttng_wrapper_tracepoint_probe_register("sys_exit",
+		ret = lttng_tracepoint_probe_register("sys_exit",
 				(void *) syscall_exit_event_probe, syscall_table);
 		if (ret) {
-			WARN_ON_ONCE(lttng_wrapper_tracepoint_probe_unregister("sys_enter",
+			WARN_ON_ONCE(lttng_tracepoint_probe_unregister("sys_enter",
 				(void *) syscall_entry_event_probe, syscall_table));
 			return ret;
 		}
@@ -825,14 +845,14 @@ int lttng_syscalls_unregister_syscall_table(struct lttng_kernel_syscall_table *s
 	if (!syscall_table->syscall_dispatch)
 		return 0;
 	if (syscall_table->sys_enter_registered) {
-		ret = lttng_wrapper_tracepoint_probe_unregister("sys_enter",
+		ret = lttng_tracepoint_probe_unregister("sys_enter",
 				(void *) syscall_entry_event_probe, syscall_table);
 		if (ret)
 			return ret;
 		syscall_table->sys_enter_registered = 0;
 	}
 	if (syscall_table->sys_exit_registered) {
-		ret = lttng_wrapper_tracepoint_probe_unregister("sys_exit",
+		ret = lttng_tracepoint_probe_unregister("sys_exit",
 				(void *) syscall_exit_event_probe, syscall_table);
 		if (ret)
 			return ret;