X-Git-Url: https://git.lttng.org/?a=blobdiff_plain;f=src%2Flttng-syscalls.c;h=bd836c001d658257e5bf529d61a3cbeabc84a168;hb=HEAD;hp=a49a253caa25854f5a73800da2982dbaf5584fc3;hpb=ca62543e449b59f079b98ec94ffbed851c4e81e6;p=lttng-modules.git

diff --git a/src/lttng-syscalls.c b/src/lttng-syscalls.c
index a49a253c..827ca1d3 100644
--- a/src/lttng-syscalls.c
+++ b/src/lttng-syscalls.c
@@ -25,13 +25,13 @@
 
 #include <lttng/bitfield.h>
 #include <wrapper/tracepoint.h>
-#include <wrapper/file.h>
 #include <wrapper/rcu.h>
 #include <wrapper/syscall.h>
 #include <wrapper/limits.h>
 #include <lttng/events.h>
 #include <lttng/events-internal.h>
 #include <lttng/utils.h>
+#include <lttng/kernel-version.h>
 
 #include "lttng-syscalls.h"
 
@@ -43,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 {
@@ -66,30 +73,6 @@ enum sc_type {
 void syscall_entry_event_probe(void *__data, struct pt_regs *regs, long id);
 void syscall_exit_event_probe(void *__data, struct pt_regs *regs, long ret);
 
-/*
- * Forward declarations for old kernels.
- */
-struct mmsghdr;
-struct rlimit64;
-struct oldold_utsname;
-struct old_utsname;
-struct sel_arg_struct;
-struct mmap_arg_struct;
-struct file_handle;
-struct user_msghdr;
-
-/*
- * Forward declaration for kernels >= 5.6
- */
-struct timex;
-struct timeval;
-struct itimerval;
-struct itimerspec;
-
-#if (LTTNG_LINUX_VERSION_CODE >= LTTNG_KERNEL_VERSION(5,6,0))
-typedef __kernel_old_time_t time_t;
-#endif
-
 #ifdef IA32_NR_syscalls
 #define NR_compat_syscalls IA32_NR_syscalls
 #else
@@ -102,14 +85,14 @@ typedef __kernel_old_time_t time_t;
 #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
@@ -266,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;
 
@@ -444,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())) {
@@ -821,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;
 		}
@@ -840,7 +835,7 @@ int lttng_event_enabler_create_syscall_events_if_missing(struct lttng_event_enab
 
 	lttng_syscall_event_enabler_create_matching_events(syscall_event_enabler);
 
-	return ret;
+	return 0;
 }
 
 int lttng_syscalls_unregister_syscall_table(struct lttng_kernel_syscall_table *syscall_table)
@@ -850,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;
@@ -1315,35 +1310,3 @@ long lttng_syscall_table_get_active_mask(struct lttng_kernel_syscall_table *sysc
 	kfree(tmp_mask);
 	return ret;
 }
-
-int lttng_abi_syscall_list(void)
-{
-	struct file *syscall_list_file;
-	int file_fd, ret;
-
-	file_fd = lttng_get_unused_fd();
-	if (file_fd < 0) {
-		ret = file_fd;
-		goto fd_error;
-	}
-
-	syscall_list_file = anon_inode_getfile("[lttng_syscall_list]",
-					  &lttng_syscall_list_fops,
-					  NULL, O_RDWR);
-	if (IS_ERR(syscall_list_file)) {
-		ret = PTR_ERR(syscall_list_file);
-		goto file_error;
-	}
-	ret = lttng_syscall_list_fops.open(NULL, syscall_list_file);
-	if (ret < 0)
-		goto open_error;
-	fd_install(file_fd, syscall_list_file);
-	return file_fd;
-
-open_error:
-	fput(syscall_list_file);
-file_error:
-	put_unused_fd(file_fd);
-fd_error:
-	return ret;
-}