#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"
/* 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 {
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;
-struct __kernel_old_itimerval;
-struct open_how;
-struct mount_attr;
-struct futex_waitv;
-
-/*
- * 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
#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
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;
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())) {
}
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;
}
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;
struct file *syscall_list_file;
int file_fd, ret;
- file_fd = lttng_get_unused_fd();
+ file_fd = get_unused_fd_flags(0);
if (file_fd < 0) {
ret = file_fd;
goto fd_error;