X-Git-Url: https://git.lttng.org/?a=blobdiff_plain;f=lttng-syscalls.c;h=5023c2f9dcc2ff8c588ad159303255dabab92ac6;hb=b43aa94e8a0725ff0c8fa44da0b7d0ec5e1ae89b;hp=60c5fd997a4b42c3d5b5a9a937d959bfa65c56f3;hpb=5b7ac358ff8a054b10f1e6c4ed6ea45820d9ced2;p=lttng-modules.git diff --git a/lttng-syscalls.c b/lttng-syscalls.c index 60c5fd99..5023c2f9 100644 --- a/lttng-syscalls.c +++ b/lttng-syscalls.c @@ -25,6 +25,8 @@ #include #include #include +#include +#include #include #include @@ -70,13 +72,6 @@ struct mmap_arg_struct; #define NR_compat_syscalls NR_syscalls #endif -/* - * Take care of NOARGS not supported by mainline. - */ -#define DECLARE_EVENT_CLASS_NOARGS(name, tstruct, assign, print) -#define DEFINE_EVENT_NOARGS(template, name) -#define TRACE_EVENT_NOARGS(name, struct, assign, print) - /* * Create LTTng tracepoint probes. */ @@ -92,18 +87,32 @@ struct mmap_arg_struct; #include "instrumentation/syscalls/headers/syscalls_unknown.h" #undef TRACE_SYSTEM +#define SC_ENTER + +#undef sc_exit +#define sc_exit(...) +#undef sc_in +#define sc_in(...) __VA_ARGS__ +#undef sc_out +#define sc_out(...) +#undef sc_inout +#define sc_inout(...) __VA_ARGS__ /* Hijack probe callback for system call enter */ #undef TP_PROBE_CB #define TP_PROBE_CB(_template) &syscall_entry_probe -#define SC_TRACE_EVENT(_name, _proto, _args, _struct, _assign, _printk) \ - TRACE_EVENT(syscall_enter_##_name, PARAMS(_proto), PARAMS(_args),\ +#define SC_LTTNG_TRACEPOINT_EVENT(_name, _proto, _args, _struct, _assign, _printk) \ + LTTNG_TRACEPOINT_EVENT(syscall_enter_##_name, PARAMS(_proto), PARAMS(_args), \ PARAMS(_struct), PARAMS(_assign), PARAMS(_printk)) -#define SC_DECLARE_EVENT_CLASS_NOARGS(_name, _struct, _assign, _printk) \ - DECLARE_EVENT_CLASS_NOARGS(syscall_enter_##_name, PARAMS(_struct), PARAMS(_assign),\ +#define SC_LTTNG_TRACEPOINT_EVENT_CODE(_name, _proto, _args, _locvar, _code, _struct, _assign, _printk) \ + LTTNG_TRACEPOINT_EVENT_CODE(syscall_enter_##_name, PARAMS(_proto), PARAMS(_args), \ + PARAMS(_locvar), PARAMS(_code), \ + PARAMS(_struct), PARAMS(_assign), PARAMS(_printk)) +#define SC_LTTNG_TRACEPOINT_EVENT_CLASS_NOARGS(_name, _struct, _assign, _printk) \ + LTTNG_TRACEPOINT_EVENT_CLASS_NOARGS(syscall_enter_##_name, PARAMS(_struct), PARAMS(_assign), \ PARAMS(_printk)) -#define SC_DEFINE_EVENT_NOARGS(_template, _name) \ - DEFINE_EVENT_NOARGS(syscall_enter_##_template, syscall_enter_##_name) +#define SC_LTTNG_TRACEPOINT_EVENT_INSTANCE_NOARGS(_template, _name) \ + LTTNG_TRACEPOINT_EVENT_INSTANCE_NOARGS(syscall_enter_##_template, syscall_enter_##_name) #undef TRACE_SYSTEM #define TRACE_SYSTEM syscall_enter_integers #define TRACE_INCLUDE_FILE syscalls_integers @@ -115,25 +124,29 @@ struct mmap_arg_struct; #include "instrumentation/syscalls/headers/syscalls_pointers.h" #undef TRACE_INCLUDE_FILE #undef TRACE_SYSTEM -#undef SC_TRACE_EVENT -#undef SC_DECLARE_EVENT_CLASS_NOARGS -#undef SC_DEFINE_EVENT_NOARGS +#undef SC_LTTNG_TRACEPOINT_EVENT_CODE +#undef SC_LTTNG_TRACEPOINT_EVENT +#undef SC_LTTNG_TRACEPOINT_EVENT_CLASS_NOARGS +#undef SC_LTTNG_TRACEPOINT_EVENT_INSTANCE_NOARGS #undef TP_PROBE_CB -#undef _TRACE_SYSCALLS_integers_H -#undef _TRACE_SYSCALLS_pointers_H - +#undef _TRACE_SYSCALLS_INTEGERS_H +#undef _TRACE_SYSCALLS_POINTERS_H /* Hijack probe callback for compat system call enter */ #define TP_PROBE_CB(_template) &syscall_entry_probe -#define SC_TRACE_EVENT(_name, _proto, _args, _struct, _assign, _printk) \ - TRACE_EVENT(compat_syscall_enter_##_name, PARAMS(_proto), PARAMS(_args), \ - PARAMS(_struct), PARAMS(_assign), \ +#define SC_LTTNG_TRACEPOINT_EVENT(_name, _proto, _args, _struct, _assign, _printk) \ + LTTNG_TRACEPOINT_EVENT(compat_syscall_enter_##_name, PARAMS(_proto), PARAMS(_args), \ + PARAMS(_struct), PARAMS(_assign), \ PARAMS(_printk)) -#define SC_DECLARE_EVENT_CLASS_NOARGS(_name, _struct, _assign, _printk) \ - DECLARE_EVENT_CLASS_NOARGS(compat_syscall_enter_##_name, PARAMS(_struct), \ +#define SC_LTTNG_TRACEPOINT_EVENT_CODE(_name, _proto, _args, _locvar, _code, _struct, _assign, _printk) \ + LTTNG_TRACEPOINT_EVENT_CODE(compat_syscall_enter_##_name, PARAMS(_proto), PARAMS(_args), \ + PARAMS(_locvar), PARAMS(_code), \ + PARAMS(_struct), PARAMS(_assign), PARAMS(_printk)) +#define SC_LTTNG_TRACEPOINT_EVENT_CLASS_NOARGS(_name, _struct, _assign, _printk) \ + LTTNG_TRACEPOINT_EVENT_CLASS_NOARGS(compat_syscall_enter_##_name, PARAMS(_struct), \ PARAMS(_assign), PARAMS(_printk)) -#define SC_DEFINE_EVENT_NOARGS(_template, _name) \ - DEFINE_EVENT_NOARGS(compat_syscall_enter_##_template, \ +#define SC_LTTNG_TRACEPOINT_EVENT_INSTANCE_NOARGS(_template, _name) \ + LTTNG_TRACEPOINT_EVENT_INSTANCE_NOARGS(compat_syscall_enter_##_template, \ compat_syscall_enter_##_name) #define TRACE_SYSTEM compat_syscall_enter_integers #define TRACE_INCLUDE_FILE compat_syscalls_integers @@ -145,24 +158,41 @@ struct mmap_arg_struct; #include "instrumentation/syscalls/headers/compat_syscalls_pointers.h" #undef TRACE_INCLUDE_FILE #undef TRACE_SYSTEM -#undef SC_TRACE_EVENT -#undef SC_DECLARE_EVENT_CLASS_NOARGS -#undef SC_DEFINE_EVENT_NOARGS +#undef SC_LTTNG_TRACEPOINT_EVENT_CODE +#undef SC_LTTNG_TRACEPOINT_EVENT +#undef SC_LTTNG_TRACEPOINT_EVENT_CLASS_NOARGS +#undef SC_LTTNG_TRACEPOINT_EVENT_INSTANCE_NOARGS #undef TP_PROBE_CB -#undef _TRACE_SYSCALLS_integers_H -#undef _TRACE_SYSCALLS_pointers_H +#undef _TRACE_SYSCALLS_INTEGERS_H +#undef _TRACE_SYSCALLS_POINTERS_H +#undef SC_ENTER + +#define SC_EXIT + +#undef sc_exit +#define sc_exit(...) __VA_ARGS__ +#undef sc_in +#define sc_in(...) +#undef sc_out +#define sc_out(...) __VA_ARGS__ +#undef sc_inout +#define sc_inout(...) __VA_ARGS__ /* Hijack probe callback for system call exit */ #define TP_PROBE_CB(_template) &syscall_exit_probe -#define SC_TRACE_EVENT(_name, _proto, _args, _struct, _assign, _printk) \ - TRACE_EVENT(syscall_exit_##_name, PARAMS(_proto), PARAMS(_args),\ +#define SC_LTTNG_TRACEPOINT_EVENT(_name, _proto, _args, _struct, _assign, _printk) \ + LTTNG_TRACEPOINT_EVENT(syscall_exit_##_name, PARAMS(_proto), PARAMS(_args), \ + PARAMS(_struct), PARAMS(_assign), PARAMS(_printk)) +#define SC_LTTNG_TRACEPOINT_EVENT_CODE(_name, _proto, _args, _locvar, _code, _struct, _assign, _printk) \ + LTTNG_TRACEPOINT_EVENT_CODE(syscall_exit_##_name, PARAMS(_proto), PARAMS(_args), \ + PARAMS(_locvar), PARAMS(_code), \ PARAMS(_struct), PARAMS(_assign), PARAMS(_printk)) -#define SC_DECLARE_EVENT_CLASS_NOARGS(_name, _struct, _assign, _printk) \ - DECLARE_EVENT_CLASS_NOARGS(syscall_exit_##_name, PARAMS(_struct), \ +#define SC_LTTNG_TRACEPOINT_EVENT_CLASS_NOARGS(_name, _struct, _assign, _printk) \ + LTTNG_TRACEPOINT_EVENT_CLASS_NOARGS(syscall_exit_##_name, PARAMS(_struct), \ PARAMS(_assign), PARAMS(_printk)) -#define SC_DEFINE_EVENT_NOARGS(_template, _name) \ - DEFINE_EVENT_NOARGS(syscall_exit_##_template, \ +#define SC_LTTNG_TRACEPOINT_EVENT_INSTANCE_NOARGS(_template, _name) \ + LTTNG_TRACEPOINT_EVENT_INSTANCE_NOARGS(syscall_exit_##_template, \ syscall_exit_##_name) #define TRACE_SYSTEM syscall_exit_integers #define TRACE_INCLUDE_FILE syscalls_integers @@ -174,24 +204,29 @@ struct mmap_arg_struct; #include "instrumentation/syscalls/headers/syscalls_pointers.h" #undef TRACE_INCLUDE_FILE #undef TRACE_SYSTEM -#undef SC_TRACE_EVENT -#undef SC_DECLARE_EVENT_CLASS_NOARGS -#undef SC_DEFINE_EVENT_NOARGS +#undef SC_LTTNG_TRACEPOINT_EVENT_CODE +#undef SC_LTTNG_TRACEPOINT_EVENT +#undef SC_LTTNG_TRACEPOINT_EVENT_CLASS_NOARGS +#undef SC_LTTNG_TRACEPOINT_EVENT_INSTANCE_NOARGS #undef TP_PROBE_CB -#undef _TRACE_SYSCALLS_integers_H -#undef _TRACE_SYSCALLS_pointers_H +#undef _TRACE_SYSCALLS_INTEGERS_H +#undef _TRACE_SYSCALLS_POINTERS_H /* Hijack probe callback for compat system call exit */ #define TP_PROBE_CB(_template) &syscall_exit_probe -#define SC_TRACE_EVENT(_name, _proto, _args, _struct, _assign, _printk) \ - TRACE_EVENT(compat_syscall_exit_##_name, PARAMS(_proto), PARAMS(_args), \ +#define SC_LTTNG_TRACEPOINT_EVENT(_name, _proto, _args, _struct, _assign, _printk) \ + LTTNG_TRACEPOINT_EVENT(compat_syscall_exit_##_name, PARAMS(_proto), PARAMS(_args), \ PARAMS(_struct), PARAMS(_assign), PARAMS(_printk)) -#define SC_DECLARE_EVENT_CLASS_NOARGS(_name, _struct, _assign, _printk) \ - DECLARE_EVENT_CLASS_NOARGS(compat_syscall_exit_##_name, PARAMS(_struct), \ +#define SC_LTTNG_TRACEPOINT_EVENT_CODE(_name, _proto, _args, _locvar, _code, _struct, _assign, _printk) \ + LTTNG_TRACEPOINT_EVENT_CODE(compat_syscall_exit_##_name, PARAMS(_proto), PARAMS(_args), \ + PARAMS(_locvar), PARAMS(_code), \ + PARAMS(_struct), PARAMS(_assign), PARAMS(_printk)) +#define SC_LTTNG_TRACEPOINT_EVENT_CLASS_NOARGS(_name, _struct, _assign, _printk) \ + LTTNG_TRACEPOINT_EVENT_CLASS_NOARGS(compat_syscall_exit_##_name, PARAMS(_struct), \ PARAMS(_assign), PARAMS(_printk)) -#define SC_DEFINE_EVENT_NOARGS(_template, _name) \ - DEFINE_EVENT_NOARGS(compat_syscall_exit_##_template, \ +#define SC_LTTNG_TRACEPOINT_EVENT_INSTANCE_NOARGS(_template, _name) \ + LTTNG_TRACEPOINT_EVENT_INSTANCE_NOARGS(compat_syscall_exit_##_template, \ compat_syscall_exit_##_name) #define TRACE_SYSTEM compat_syscall_exit_integers #define TRACE_INCLUDE_FILE compat_syscalls_integers @@ -203,13 +238,15 @@ struct mmap_arg_struct; #include "instrumentation/syscalls/headers/compat_syscalls_pointers.h" #undef TRACE_INCLUDE_FILE #undef TRACE_SYSTEM -#undef SC_TRACE_EVENT -#undef SC_DECLARE_EVENT_CLASS_NOARGS -#undef SC_DEFINE_EVENT_NOARGS +#undef SC_LTTNG_TRACEPOINT_EVENT_CODE +#undef SC_LTTNG_TRACEPOINT_EVENT +#undef SC_LTTNG_TRACEPOINT_EVENT_CLASS_NOARGS +#undef SC_LTTNG_TRACEPOINT_EVENT_INSTANCE_NOARGS #undef TP_PROBE_CB -#undef _TRACE_SYSCALLS_integers_H -#undef _TRACE_SYSCALLS_pointers_H +#undef _TRACE_SYSCALLS_INTEGERS_H +#undef _TRACE_SYSCALLS_POINTERS_H +#undef SC_EXIT #undef TP_MODULE_NOINIT #undef LTTNG_PACKAGE_BUILD @@ -224,6 +261,11 @@ struct trace_syscall_entry { #define CREATE_SYSCALL_TABLE +#define SC_ENTER + +#undef sc_exit +#define sc_exit(...) + #undef TRACE_SYSCALL_TABLE #define TRACE_SYSCALL_TABLE(_template, _name, _nr, _nrargs) \ [ _nr ] = { \ @@ -254,6 +296,13 @@ const struct trace_syscall_entry compat_sc_table[] = { #include "instrumentation/syscalls/headers/compat_syscalls_pointers.h" }; +#undef SC_ENTER + +#define SC_EXIT + +#undef sc_exit +#define sc_exit(...) __VA_ARGS__ + #undef TRACE_SYSCALL_TABLE #define TRACE_SYSCALL_TABLE(_template, _name, _nr, _nrargs) \ [ _nr ] = { \ @@ -284,6 +333,8 @@ const struct trace_syscall_entry compat_sc_exit_table[] = { #include "instrumentation/syscalls/headers/compat_syscalls_pointers.h" }; +#undef SC_EXIT + #undef CREATE_SYSCALL_TABLE struct lttng_syscall_filter { @@ -511,47 +562,51 @@ void syscall_exit_probe(void *__data, struct pt_regs *regs, long ret) switch (entry->nrargs) { case 0: { - void (*fptr)(void *__data) = entry->func; + void (*fptr)(void *__data, long ret) = entry->func; - fptr(event); + fptr(event, ret); break; } case 1: { void (*fptr)(void *__data, + long ret, unsigned long arg0) = entry->func; unsigned long args[1]; syscall_get_arguments(current, regs, 0, entry->nrargs, args); - fptr(event, args[0]); + fptr(event, ret, args[0]); break; } case 2: { void (*fptr)(void *__data, + long ret, unsigned long arg0, unsigned long arg1) = entry->func; unsigned long args[2]; syscall_get_arguments(current, regs, 0, entry->nrargs, args); - fptr(event, args[0], args[1]); + fptr(event, ret, args[0], args[1]); break; } case 3: { void (*fptr)(void *__data, + long ret, unsigned long arg0, unsigned long arg1, unsigned long arg2) = entry->func; unsigned long args[3]; syscall_get_arguments(current, regs, 0, entry->nrargs, args); - fptr(event, args[0], args[1], args[2]); + fptr(event, ret, args[0], args[1], args[2]); break; } case 4: { void (*fptr)(void *__data, + long ret, unsigned long arg0, unsigned long arg1, unsigned long arg2, @@ -559,12 +614,13 @@ void syscall_exit_probe(void *__data, struct pt_regs *regs, long ret) unsigned long args[4]; syscall_get_arguments(current, regs, 0, entry->nrargs, args); - fptr(event, args[0], args[1], args[2], args[3]); + fptr(event, ret, args[0], args[1], args[2], args[3]); break; } case 5: { void (*fptr)(void *__data, + long ret, unsigned long arg0, unsigned long arg1, unsigned long arg2, @@ -573,12 +629,13 @@ void syscall_exit_probe(void *__data, struct pt_regs *regs, long ret) unsigned long args[5]; syscall_get_arguments(current, regs, 0, entry->nrargs, args); - fptr(event, args[0], args[1], args[2], args[3], args[4]); + fptr(event, ret, args[0], args[1], args[2], args[3], args[4]); break; } case 6: { void (*fptr)(void *__data, + long ret, unsigned long arg0, unsigned long arg1, unsigned long arg2, @@ -588,7 +645,7 @@ void syscall_exit_probe(void *__data, struct pt_regs *regs, long ret) unsigned long args[6]; syscall_get_arguments(current, regs, 0, entry->nrargs, args); - fptr(event, args[0], args[1], args[2], + fptr(event, ret, args[0], args[1], args[2], args[3], args[4], args[5]); break; }