X-Git-Url: https://git.lttng.org/?a=blobdiff_plain;f=src%2Flttng-syscalls.c;h=6b52b69bbf7dd2c3d0f50e2dfaa6b2f2d96a160f;hb=e42c4f49c15b;hp=a5b5f403fe359e6531650111fc05cb82a6c60aba;hpb=cfa6cc1d0f01c2cfcc1a679abf3a6572d411c309;p=lttng-modules.git diff --git a/src/lttng-syscalls.c b/src/lttng-syscalls.c index a5b5f403..6b52b69b 100644 --- a/src/lttng-syscalls.c +++ b/src/lttng-syscalls.c @@ -19,6 +19,7 @@ #include #include #include +#include #include #include @@ -28,6 +29,10 @@ #include #include #include +#include +#include + +#include "lttng-syscalls.h" #ifndef CONFIG_COMPAT # ifndef is_compat_task @@ -57,10 +62,13 @@ enum sc_type { #define SYSCALL_EXIT_STR __stringify(SYSCALL_EXIT_TOK) #define COMPAT_SYSCALL_EXIT_STR __stringify(COMPAT_SYSCALL_EXIT_TOK) -static -void syscall_entry_probe(void *__data, struct pt_regs *regs, long id); -static -void syscall_exit_probe(void *__data, struct pt_regs *regs, long ret); +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); + +void syscall_entry_event_notifier_probe(void *__data, struct pt_regs *regs, + long id); +void syscall_exit_event_notifier_probe(void *__data, struct pt_regs *regs, + long ret); /* * Forward declarations for old kernels. @@ -82,7 +90,7 @@ struct timeval; struct itimerval; struct itimerspec; -#if (LINUX_VERSION_CODE >= KERNEL_VERSION(5,6,0)) +#if (LTTNG_LINUX_VERSION_CODE >= LTTNG_KERNEL_VERSION(5,6,0)) typedef __kernel_old_time_t time_t; #endif @@ -108,359 +116,78 @@ typedef __kernel_old_time_t time_t; #include #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_LTTNG_TRACEPOINT_EVENT(_name, _proto, _args, _fields) \ - LTTNG_TRACEPOINT_EVENT(syscall_entry_##_name, PARAMS(_proto), PARAMS(_args), \ - PARAMS(_fields)) -#define SC_LTTNG_TRACEPOINT_EVENT_CODE(_name, _proto, _args, _locvar, _code_pre, _fields, _code_post) \ - LTTNG_TRACEPOINT_EVENT_CODE(syscall_entry_##_name, PARAMS(_proto), PARAMS(_args), \ - PARAMS(_locvar), PARAMS(_code_pre), \ - PARAMS(_fields), PARAMS(_code_post)) -#define SC_LTTNG_TRACEPOINT_EVENT_CLASS_NOARGS(_name, _fields) \ - LTTNG_TRACEPOINT_EVENT_CLASS_NOARGS(syscall_entry_##_name, PARAMS(_fields)) -#define SC_LTTNG_TRACEPOINT_EVENT_INSTANCE_NOARGS(_template, _name) \ - LTTNG_TRACEPOINT_EVENT_INSTANCE_NOARGS(syscall_entry_##_template, syscall_entry_##_name) -/* Enumerations only defined at first inclusion. */ -#define SC_LTTNG_TRACEPOINT_ENUM(_name, _values) \ - LTTNG_TRACEPOINT_ENUM(_name, PARAMS(_values)) -#undef TRACE_SYSTEM -#define TRACE_SYSTEM syscall_entry_integers -#define TRACE_INCLUDE_FILE syscalls_integers -#include -#undef TRACE_INCLUDE_FILE -#undef TRACE_SYSTEM -#define TRACE_SYSTEM syscall_entry_pointers -#define TRACE_INCLUDE_FILE syscalls_pointers -#include -#undef TRACE_INCLUDE_FILE -#undef TRACE_SYSTEM -#undef SC_LTTNG_TRACEPOINT_ENUM -#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 - -/* Hijack probe callback for compat system call enter */ -#define TP_PROBE_CB(_template) &syscall_entry_probe -#define LTTNG_SC_COMPAT -#define SC_LTTNG_TRACEPOINT_EVENT(_name, _proto, _args, _fields) \ - LTTNG_TRACEPOINT_EVENT(compat_syscall_entry_##_name, PARAMS(_proto), PARAMS(_args), \ - PARAMS(_fields)) -#define SC_LTTNG_TRACEPOINT_EVENT_CODE(_name, _proto, _args, _locvar, _code_pre, _fields, _code_post) \ - LTTNG_TRACEPOINT_EVENT_CODE(compat_syscall_entry_##_name, PARAMS(_proto), PARAMS(_args), \ - PARAMS(_locvar), PARAMS(_code_pre), PARAMS(_fields), PARAMS(_code_post)) -#define SC_LTTNG_TRACEPOINT_EVENT_CLASS_NOARGS(_name, _fields) \ - LTTNG_TRACEPOINT_EVENT_CLASS_NOARGS(compat_syscall_entry_##_name, PARAMS(_fields)) -#define SC_LTTNG_TRACEPOINT_EVENT_INSTANCE_NOARGS(_template, _name) \ - LTTNG_TRACEPOINT_EVENT_INSTANCE_NOARGS(compat_syscall_entry_##_template, \ - compat_syscall_entry_##_name) -/* Enumerations only defined at inital inclusion (not here). */ -#define SC_LTTNG_TRACEPOINT_ENUM(_name, _values) -#define TRACE_SYSTEM compat_syscall_entry_integers -#define TRACE_INCLUDE_FILE compat_syscalls_integers -#include -#undef TRACE_INCLUDE_FILE -#undef TRACE_SYSTEM -#define TRACE_SYSTEM compat_syscall_entry_pointers -#define TRACE_INCLUDE_FILE compat_syscalls_pointers -#include -#undef TRACE_INCLUDE_FILE -#undef TRACE_SYSTEM -#undef SC_LTTNG_TRACEPOINT_ENUM -#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 LTTNG_SC_COMPAT - -#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_LTTNG_TRACEPOINT_EVENT(_name, _proto, _args, _fields) \ - LTTNG_TRACEPOINT_EVENT(syscall_exit_##_name, PARAMS(_proto), PARAMS(_args), \ - PARAMS(_fields)) -#define SC_LTTNG_TRACEPOINT_EVENT_CODE(_name, _proto, _args, _locvar, _code_pre, _fields, _code_post) \ - LTTNG_TRACEPOINT_EVENT_CODE(syscall_exit_##_name, PARAMS(_proto), PARAMS(_args), \ - PARAMS(_locvar), PARAMS(_code_pre), PARAMS(_fields), PARAMS(_code_post)) -#define SC_LTTNG_TRACEPOINT_EVENT_CLASS_NOARGS(_name, _fields) \ - LTTNG_TRACEPOINT_EVENT_CLASS_NOARGS(syscall_exit_##_name, PARAMS(_fields)) -#define SC_LTTNG_TRACEPOINT_EVENT_INSTANCE_NOARGS(_template, _name) \ - LTTNG_TRACEPOINT_EVENT_INSTANCE_NOARGS(syscall_exit_##_template, \ - syscall_exit_##_name) -/* Enumerations only defined at inital inclusion (not here). */ -#define SC_LTTNG_TRACEPOINT_ENUM(_name, _values) -#define TRACE_SYSTEM syscall_exit_integers -#define TRACE_INCLUDE_FILE syscalls_integers -#include -#undef TRACE_INCLUDE_FILE -#undef TRACE_SYSTEM -#define TRACE_SYSTEM syscall_exit_pointers -#define TRACE_INCLUDE_FILE syscalls_pointers -#include -#undef TRACE_INCLUDE_FILE -#undef TRACE_SYSTEM -#undef SC_LTTNG_TRACEPOINT_ENUM -#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 - - -/* Hijack probe callback for compat system call exit */ -#define TP_PROBE_CB(_template) &syscall_exit_probe -#define LTTNG_SC_COMPAT -#define SC_LTTNG_TRACEPOINT_EVENT(_name, _proto, _args, _fields) \ - LTTNG_TRACEPOINT_EVENT(compat_syscall_exit_##_name, PARAMS(_proto), PARAMS(_args), \ - PARAMS(_fields)) -#define SC_LTTNG_TRACEPOINT_EVENT_CODE(_name, _proto, _args, _locvar, _code_pre, _fields, _code_post) \ - LTTNG_TRACEPOINT_EVENT_CODE(compat_syscall_exit_##_name, PARAMS(_proto), PARAMS(_args), \ - PARAMS(_locvar), PARAMS(_code_pre), PARAMS(_fields), PARAMS(_code_post)) -#define SC_LTTNG_TRACEPOINT_EVENT_CLASS_NOARGS(_name, _fields) \ - LTTNG_TRACEPOINT_EVENT_CLASS_NOARGS(compat_syscall_exit_##_name, PARAMS(_fields)) -#define SC_LTTNG_TRACEPOINT_EVENT_INSTANCE_NOARGS(_template, _name) \ - LTTNG_TRACEPOINT_EVENT_INSTANCE_NOARGS(compat_syscall_exit_##_template, \ - compat_syscall_exit_##_name) -/* Enumerations only defined at inital inclusion (not here). */ -#define SC_LTTNG_TRACEPOINT_ENUM(_name, _values) -#define TRACE_SYSTEM compat_syscall_exit_integers -#define TRACE_INCLUDE_FILE compat_syscalls_integers -#include -#undef TRACE_INCLUDE_FILE -#undef TRACE_SYSTEM -#define TRACE_SYSTEM compat_syscall_exit_pointers -#define TRACE_INCLUDE_FILE compat_syscalls_pointers -#include -#undef TRACE_INCLUDE_FILE -#undef TRACE_SYSTEM -#undef SC_LTTNG_TRACEPOINT_ENUM -#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 LTTNG_SC_COMPAT -#undef SC_EXIT +extern const struct trace_syscall_table sc_table; +extern const struct trace_syscall_table compat_sc_table; -#undef TP_MODULE_NOINIT -#undef LTTNG_PACKAGE_BUILD -#undef CREATE_TRACE_POINTS +/* Event syscall exit table */ +extern const struct trace_syscall_table sc_exit_table; +extern const struct trace_syscall_table compat_sc_exit_table; -struct trace_syscall_entry { - void *func; - const struct lttng_event_desc *desc; - const struct lttng_event_field *fields; - unsigned int nrargs; -}; - -#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 ] = { \ - .func = __event_probe__syscall_entry_##_template, \ - .nrargs = (_nrargs), \ - .fields = __event_fields___syscall_entry_##_template, \ - .desc = &__event_desc___syscall_entry_##_name, \ - }, - -/* Syscall enter tracing table */ -static const struct trace_syscall_entry sc_table[] = { -#include -#include -}; - -#undef TRACE_SYSCALL_TABLE -#define TRACE_SYSCALL_TABLE(_template, _name, _nr, _nrargs) \ - [ _nr ] = { \ - .func = __event_probe__compat_syscall_entry_##_template, \ - .nrargs = (_nrargs), \ - .fields = __event_fields___compat_syscall_entry_##_template, \ - .desc = &__event_desc___compat_syscall_entry_##_name, \ - }, - -/* Compat syscall enter table */ -const struct trace_syscall_entry compat_sc_table[] = { -#include -#include -}; - -#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 ] = { \ - .func = __event_probe__syscall_exit_##_template, \ - .nrargs = (_nrargs), \ - .fields = __event_fields___syscall_exit_##_template, \ - .desc = &__event_desc___syscall_exit_##_name, \ - }, - -/* Syscall exit table */ -static const struct trace_syscall_entry sc_exit_table[] = { -#include -#include -}; - -#undef TRACE_SYSCALL_TABLE -#define TRACE_SYSCALL_TABLE(_template, _name, _nr, _nrargs) \ - [ _nr ] = { \ - .func = __event_probe__compat_syscall_exit_##_template, \ - .nrargs = (_nrargs), \ - .fields = __event_fields___compat_syscall_exit_##_template, \ - .desc = &__event_desc___compat_syscall_exit_##_name, \ - }, - -/* Compat syscall exit table */ -const struct trace_syscall_entry compat_sc_exit_table[] = { -#include -#include -}; #undef SC_EXIT #undef CREATE_SYSCALL_TABLE struct lttng_syscall_filter { - DECLARE_BITMAP(sc, NR_syscalls); - DECLARE_BITMAP(sc_compat, NR_compat_syscalls); + DECLARE_BITMAP(sc_entry, NR_syscalls); + DECLARE_BITMAP(sc_exit, NR_syscalls); + DECLARE_BITMAP(sc_compat_entry, NR_compat_syscalls); + DECLARE_BITMAP(sc_compat_exit, NR_compat_syscalls); }; -static void syscall_entry_unknown(struct lttng_event *event, - struct pt_regs *regs, unsigned int id) +static void syscall_entry_event_unknown(struct hlist_head *unknown_action_list_head, + struct pt_regs *regs, long id) { unsigned long args[LTTNG_SYSCALL_NR_ARGS]; + struct lttng_kernel_event_common_private *event_priv; lttng_syscall_get_arguments(current, regs, args); - if (unlikely(in_compat_syscall())) - __event_probe__compat_syscall_entry_unknown(event, id, args); - else - __event_probe__syscall_entry_unknown(event, id, args); + lttng_hlist_for_each_entry_rcu(event_priv, unknown_action_list_head, u.syscall.node) { + if (unlikely(in_compat_syscall())) + __event_probe__compat_syscall_entry_unknown(event_priv->pub, id, args); + else + __event_probe__syscall_entry_unknown(event_priv->pub, id, args); + } } -void syscall_entry_probe(void *__data, struct pt_regs *regs, long id) +static __always_inline +void syscall_entry_event_call_func(struct hlist_head *action_list, + void *func, unsigned int nrargs, + struct pt_regs *regs) { - struct lttng_channel *chan = __data; - struct lttng_event *event, *unknown_event; - const struct trace_syscall_entry *table, *entry; - size_t table_len; - - if (unlikely(in_compat_syscall())) { - struct lttng_syscall_filter *filter; - - filter = lttng_rcu_dereference(chan->sc_filter); - if (filter) { - if (id < 0 || id >= NR_compat_syscalls - || !test_bit(id, filter->sc_compat)) { - /* System call filtered out. */ - return; - } - } - table = compat_sc_table; - table_len = ARRAY_SIZE(compat_sc_table); - unknown_event = chan->sc_compat_unknown; - } else { - struct lttng_syscall_filter *filter; - - filter = lttng_rcu_dereference(chan->sc_filter); - if (filter) { - if (id < 0 || id >= NR_syscalls - || !test_bit(id, filter->sc)) { - /* System call filtered out. */ - return; - } - } - table = sc_table; - table_len = ARRAY_SIZE(sc_table); - unknown_event = chan->sc_unknown; - } - if (unlikely(id < 0 || id >= table_len)) { - syscall_entry_unknown(unknown_event, regs, id); - return; - } - if (unlikely(in_compat_syscall())) - event = chan->compat_sc_table[id]; - else - event = chan->sc_table[id]; - if (unlikely(!event)) { - syscall_entry_unknown(unknown_event, regs, id); - return; - } - entry = &table[id]; - WARN_ON_ONCE(!entry); + struct lttng_kernel_event_common_private *event_priv; - switch (entry->nrargs) { + switch (nrargs) { case 0: { - void (*fptr)(void *__data) = entry->func; + void (*fptr)(void *__data) = func; - fptr(event); + lttng_hlist_for_each_entry_rcu(event_priv, action_list, u.syscall.node) + fptr(event_priv->pub); break; } case 1: { - void (*fptr)(void *__data, unsigned long arg0) = entry->func; + void (*fptr)(void *__data, unsigned long arg0) = func; unsigned long args[LTTNG_SYSCALL_NR_ARGS]; lttng_syscall_get_arguments(current, regs, args); - fptr(event, args[0]); + lttng_hlist_for_each_entry_rcu(event_priv, action_list, u.syscall.node) + fptr(event_priv->pub, args[0]); break; } case 2: { void (*fptr)(void *__data, unsigned long arg0, - unsigned long arg1) = entry->func; + unsigned long arg1) = func; unsigned long args[LTTNG_SYSCALL_NR_ARGS]; lttng_syscall_get_arguments(current, regs, args); - fptr(event, args[0], args[1]); + lttng_hlist_for_each_entry_rcu(event_priv, action_list, u.syscall.node) + fptr(event_priv->pub, args[0], args[1]); break; } case 3: @@ -468,11 +195,12 @@ void syscall_entry_probe(void *__data, struct pt_regs *regs, long id) void (*fptr)(void *__data, unsigned long arg0, unsigned long arg1, - unsigned long arg2) = entry->func; + unsigned long arg2) = func; unsigned long args[LTTNG_SYSCALL_NR_ARGS]; lttng_syscall_get_arguments(current, regs, args); - fptr(event, args[0], args[1], args[2]); + lttng_hlist_for_each_entry_rcu(event_priv, action_list, u.syscall.node) + fptr(event_priv->pub, args[0], args[1], args[2]); break; } case 4: @@ -481,11 +209,12 @@ void syscall_entry_probe(void *__data, struct pt_regs *regs, long id) unsigned long arg0, unsigned long arg1, unsigned long arg2, - unsigned long arg3) = entry->func; + unsigned long arg3) = func; unsigned long args[LTTNG_SYSCALL_NR_ARGS]; lttng_syscall_get_arguments(current, regs, args); - fptr(event, args[0], args[1], args[2], args[3]); + lttng_hlist_for_each_entry_rcu(event_priv, action_list, u.syscall.node) + fptr(event_priv->pub, args[0], args[1], args[2], args[3]); break; } case 5: @@ -495,11 +224,12 @@ void syscall_entry_probe(void *__data, struct pt_regs *regs, long id) unsigned long arg1, unsigned long arg2, unsigned long arg3, - unsigned long arg4) = entry->func; + unsigned long arg4) = func; unsigned long args[LTTNG_SYSCALL_NR_ARGS]; lttng_syscall_get_arguments(current, regs, args); - fptr(event, args[0], args[1], args[2], args[3], args[4]); + lttng_hlist_for_each_entry_rcu(event_priv, action_list, u.syscall.node) + fptr(event_priv->pub, args[0], args[1], args[2], args[3], args[4]); break; } case 6: @@ -510,12 +240,13 @@ void syscall_entry_probe(void *__data, struct pt_regs *regs, long id) unsigned long arg2, unsigned long arg3, unsigned long arg4, - unsigned long arg5) = entry->func; + unsigned long arg5) = func; unsigned long args[LTTNG_SYSCALL_NR_ARGS]; lttng_syscall_get_arguments(current, regs, args); - fptr(event, args[0], args[1], args[2], - args[3], args[4], args[5]); + lttng_hlist_for_each_entry_rcu(event_priv, action_list, u.syscall.node) + fptr(event_priv->pub, args[0], args[1], args[2], + args[3], args[4], args[5]); break; } default: @@ -523,89 +254,159 @@ void syscall_entry_probe(void *__data, struct pt_regs *regs, long id) } } -static void syscall_exit_unknown(struct lttng_event *event, - struct pt_regs *regs, int id, long ret) +void syscall_entry_event_probe(void *__data, struct pt_regs *regs, long id) { - unsigned long args[LTTNG_SYSCALL_NR_ARGS]; + struct lttng_channel *chan = __data; + struct hlist_head *action_list, *unknown_action_list; + const struct trace_syscall_entry *table, *entry; + size_t table_len; - lttng_syscall_get_arguments(current, regs, args); - if (unlikely(in_compat_syscall())) - __event_probe__compat_syscall_exit_unknown(event, id, ret, - args); - else - __event_probe__syscall_exit_unknown(event, id, ret, args); + if (unlikely(in_compat_syscall())) { + struct lttng_syscall_filter *filter = chan->sc_filter; + + if (id < 0 || id >= NR_compat_syscalls + || (!READ_ONCE(chan->syscall_all_entry) && !test_bit(id, filter->sc_compat_entry))) { + /* System call filtered out. */ + return; + } + table = compat_sc_table.table; + table_len = compat_sc_table.len; + unknown_action_list = &chan->sc_compat_unknown; + } else { + struct lttng_syscall_filter *filter = chan->sc_filter; + + if (id < 0 || id >= NR_syscalls + || (!READ_ONCE(chan->syscall_all_entry) && !test_bit(id, filter->sc_entry))) { + /* System call filtered out. */ + return; + } + table = sc_table.table; + table_len = sc_table.len; + unknown_action_list = &chan->sc_unknown; + } + if (unlikely(id < 0 || id >= table_len)) { + syscall_entry_event_unknown(unknown_action_list, regs, id); + return; + } + + entry = &table[id]; + if (!entry->event_func) { + syscall_entry_event_unknown(unknown_action_list, regs, id); + return; + } + + if (unlikely(in_compat_syscall())) { + action_list = &chan->compat_sc_table[id]; + } else { + action_list = &chan->sc_table[id]; + } + if (unlikely(hlist_empty(action_list))) + return; + + syscall_entry_event_call_func(action_list, entry->event_func, entry->nrargs, regs); } -void syscall_exit_probe(void *__data, struct pt_regs *regs, long ret) +void syscall_entry_event_notifier_probe(void *__data, struct pt_regs *regs, + long id) { - struct lttng_channel *chan = __data; - struct lttng_event *event, *unknown_event; + struct lttng_event_notifier_group *group = __data; const struct trace_syscall_entry *table, *entry; + struct hlist_head *dispatch_list, *unknown_dispatch_list; size_t table_len; - long id; - id = syscall_get_nr(current, regs); if (unlikely(in_compat_syscall())) { - struct lttng_syscall_filter *filter; - - filter = lttng_rcu_dereference(chan->sc_filter); - if (filter) { - if (id < 0 || id >= NR_compat_syscalls - || !test_bit(id, filter->sc_compat)) { - /* System call filtered out. */ - return; - } + struct lttng_syscall_filter *filter = group->sc_filter; + + if (id < 0 || id >= NR_compat_syscalls + || (!READ_ONCE(group->syscall_all_entry) && + !test_bit(id, filter->sc_compat_entry))) { + /* System call filtered out. */ + return; } - table = compat_sc_exit_table; - table_len = ARRAY_SIZE(compat_sc_exit_table); - unknown_event = chan->compat_sc_exit_unknown; + table = compat_sc_table.table; + table_len = compat_sc_table.len; + unknown_dispatch_list = &group->event_notifier_compat_unknown_syscall_dispatch; } else { - struct lttng_syscall_filter *filter; - - filter = lttng_rcu_dereference(chan->sc_filter); - if (filter) { - if (id < 0 || id >= NR_syscalls - || !test_bit(id, filter->sc)) { - /* System call filtered out. */ - return; - } + struct lttng_syscall_filter *filter = group->sc_filter; + + if (id < 0 || id >= NR_syscalls + || (!READ_ONCE(group->syscall_all_entry) && + !test_bit(id, filter->sc_entry))) { + /* System call filtered out. */ + return; } - table = sc_exit_table; - table_len = ARRAY_SIZE(sc_exit_table); - unknown_event = chan->sc_exit_unknown; + table = sc_table.table; + table_len = sc_table.len; + unknown_dispatch_list = &group->event_notifier_unknown_syscall_dispatch; } + /* Check if the syscall id is out of bound. */ if (unlikely(id < 0 || id >= table_len)) { - syscall_exit_unknown(unknown_event, regs, id, ret); + syscall_entry_event_unknown(unknown_dispatch_list, + regs, id); return; } - if (unlikely(in_compat_syscall())) - event = chan->compat_sc_exit_table[id]; - else - event = chan->sc_exit_table[id]; - if (unlikely(!event)) { - syscall_exit_unknown(unknown_event, regs, id, ret); + + entry = &table[id]; + if (!entry->event_func) { + syscall_entry_event_unknown(unknown_dispatch_list, + regs, id); return; } - entry = &table[id]; - WARN_ON_ONCE(!entry); - switch (entry->nrargs) { + if (unlikely(in_compat_syscall())) { + dispatch_list = &group->event_notifier_compat_syscall_dispatch[id]; + } else { + dispatch_list = &group->event_notifier_syscall_dispatch[id]; + } + if (unlikely(hlist_empty(dispatch_list))) + return; + + syscall_entry_event_call_func(dispatch_list, + entry->event_func, entry->nrargs, regs); +} + +static void syscall_exit_event_unknown(struct hlist_head *unknown_action_list_head, + struct pt_regs *regs, long id, long ret) +{ + unsigned long args[LTTNG_SYSCALL_NR_ARGS]; + struct lttng_kernel_event_common_private *event_priv; + + lttng_syscall_get_arguments(current, regs, args); + lttng_hlist_for_each_entry_rcu(event_priv, unknown_action_list_head, u.syscall.node) { + if (unlikely(in_compat_syscall())) + __event_probe__compat_syscall_exit_unknown(event_priv->pub, id, ret, + args); + else + __event_probe__syscall_exit_unknown(event_priv->pub, id, ret, args); + } +} + +static __always_inline +void syscall_exit_event_call_func(struct hlist_head *action_list, + void *func, unsigned int nrargs, + struct pt_regs *regs, long ret) +{ + struct lttng_kernel_event_common_private *event_priv; + + switch (nrargs) { case 0: { - void (*fptr)(void *__data, long ret) = entry->func; + void (*fptr)(void *__data, long ret) = func; - fptr(event, ret); + lttng_hlist_for_each_entry_rcu(event_priv, action_list, u.syscall.node) + fptr(event_priv->pub, ret); break; } case 1: { void (*fptr)(void *__data, long ret, - unsigned long arg0) = entry->func; + unsigned long arg0) = func; unsigned long args[LTTNG_SYSCALL_NR_ARGS]; lttng_syscall_get_arguments(current, regs, args); - fptr(event, ret, args[0]); + lttng_hlist_for_each_entry_rcu(event_priv, action_list, u.syscall.node) + fptr(event_priv->pub, ret, args[0]); break; } case 2: @@ -613,11 +414,12 @@ void syscall_exit_probe(void *__data, struct pt_regs *regs, long ret) void (*fptr)(void *__data, long ret, unsigned long arg0, - unsigned long arg1) = entry->func; + unsigned long arg1) = func; unsigned long args[LTTNG_SYSCALL_NR_ARGS]; lttng_syscall_get_arguments(current, regs, args); - fptr(event, ret, args[0], args[1]); + lttng_hlist_for_each_entry_rcu(event_priv, action_list, u.syscall.node) + fptr(event_priv->pub, ret, args[0], args[1]); break; } case 3: @@ -626,11 +428,12 @@ void syscall_exit_probe(void *__data, struct pt_regs *regs, long ret) long ret, unsigned long arg0, unsigned long arg1, - unsigned long arg2) = entry->func; + unsigned long arg2) = func; unsigned long args[LTTNG_SYSCALL_NR_ARGS]; lttng_syscall_get_arguments(current, regs, args); - fptr(event, ret, args[0], args[1], args[2]); + lttng_hlist_for_each_entry_rcu(event_priv, action_list, u.syscall.node) + fptr(event_priv->pub, ret, args[0], args[1], args[2]); break; } case 4: @@ -640,11 +443,12 @@ void syscall_exit_probe(void *__data, struct pt_regs *regs, long ret) unsigned long arg0, unsigned long arg1, unsigned long arg2, - unsigned long arg3) = entry->func; + unsigned long arg3) = func; unsigned long args[LTTNG_SYSCALL_NR_ARGS]; lttng_syscall_get_arguments(current, regs, args); - fptr(event, ret, args[0], args[1], args[2], args[3]); + lttng_hlist_for_each_entry_rcu(event_priv, action_list, u.syscall.node) + fptr(event_priv->pub, ret, args[0], args[1], args[2], args[3]); break; } case 5: @@ -655,11 +459,12 @@ void syscall_exit_probe(void *__data, struct pt_regs *regs, long ret) unsigned long arg1, unsigned long arg2, unsigned long arg3, - unsigned long arg4) = entry->func; + unsigned long arg4) = func; unsigned long args[LTTNG_SYSCALL_NR_ARGS]; lttng_syscall_get_arguments(current, regs, args); - fptr(event, ret, args[0], args[1], args[2], args[3], args[4]); + lttng_hlist_for_each_entry_rcu(event_priv, action_list, u.syscall.node) + fptr(event_priv->pub, ret, args[0], args[1], args[2], args[3], args[4]); break; } case 6: @@ -671,12 +476,13 @@ void syscall_exit_probe(void *__data, struct pt_regs *regs, long ret) unsigned long arg2, unsigned long arg3, unsigned long arg4, - unsigned long arg5) = entry->func; + unsigned long arg5) = func; unsigned long args[LTTNG_SYSCALL_NR_ARGS]; lttng_syscall_get_arguments(current, regs, args); - fptr(event, ret, args[0], args[1], args[2], - args[3], args[4], args[5]); + lttng_hlist_for_each_entry_rcu(event_priv, action_list, u.syscall.node) + fptr(event_priv->pub, ret, args[0], args[1], args[2], + args[3], args[4], args[5]); break; } default: @@ -684,71 +490,201 @@ void syscall_exit_probe(void *__data, struct pt_regs *regs, long ret) } } +void syscall_exit_event_probe(void *__data, struct pt_regs *regs, long ret) +{ + struct lttng_channel *chan = __data; + struct hlist_head *action_list, *unknown_action_list; + const struct trace_syscall_entry *table, *entry; + size_t table_len; + long id; + + id = syscall_get_nr(current, regs); + + if (unlikely(in_compat_syscall())) { + struct lttng_syscall_filter *filter = chan->sc_filter; + + if (id < 0 || id >= NR_compat_syscalls + || (!READ_ONCE(chan->syscall_all_exit) && !test_bit(id, filter->sc_compat_exit))) { + /* System call filtered out. */ + return; + } + table = compat_sc_exit_table.table; + table_len = compat_sc_exit_table.len; + unknown_action_list = &chan->compat_sc_exit_unknown; + } else { + struct lttng_syscall_filter *filter = chan->sc_filter; + + if (id < 0 || id >= NR_syscalls + || (!READ_ONCE(chan->syscall_all_exit) && !test_bit(id, filter->sc_exit))) { + /* System call filtered out. */ + return; + } + table = sc_exit_table.table; + table_len = sc_exit_table.len; + unknown_action_list = &chan->sc_exit_unknown; + } + if (unlikely(id < 0 || id >= table_len)) { + syscall_exit_event_unknown(unknown_action_list, regs, id, ret); + return; + } + + entry = &table[id]; + if (!entry->event_func) { + syscall_exit_event_unknown(unknown_action_list, regs, id, ret); + return; + } + + if (unlikely(in_compat_syscall())) { + action_list = &chan->compat_sc_exit_table[id]; + } else { + action_list = &chan->sc_exit_table[id]; + } + if (unlikely(hlist_empty(action_list))) + return; + + syscall_exit_event_call_func(action_list, entry->event_func, entry->nrargs, + regs, ret); +} + +void syscall_exit_event_notifier_probe(void *__data, struct pt_regs *regs, + long ret) +{ + struct lttng_event_notifier_group *group = __data; + const struct trace_syscall_entry *table, *entry; + struct hlist_head *dispatch_list, *unknown_dispatch_list; + size_t table_len; + long id; + + id = syscall_get_nr(current, regs); + + if (unlikely(in_compat_syscall())) { + struct lttng_syscall_filter *filter = group->sc_filter; + + if (id < 0 || id >= NR_compat_syscalls + || (!READ_ONCE(group->syscall_all_exit) && + !test_bit(id, filter->sc_compat_exit))) { + /* System call filtered out. */ + return; + } + table = compat_sc_exit_table.table; + table_len = compat_sc_exit_table.len; + unknown_dispatch_list = &group->event_notifier_exit_compat_unknown_syscall_dispatch; + } else { + struct lttng_syscall_filter *filter = group->sc_filter; + + if (id < 0 || id >= NR_syscalls + || (!READ_ONCE(group->syscall_all_exit) && + !test_bit(id, filter->sc_exit))) { + /* System call filtered out. */ + return; + } + table = sc_exit_table.table; + table_len = sc_exit_table.len; + unknown_dispatch_list = &group->event_notifier_exit_unknown_syscall_dispatch; + } + /* Check if the syscall id is out of bound. */ + if (unlikely(id < 0 || id >= table_len)) { + syscall_exit_event_unknown(unknown_dispatch_list, + regs, id, ret); + return; + } + + entry = &table[id]; + if (!entry->event_func) { + syscall_entry_event_unknown(unknown_dispatch_list, + regs, id); + return; + } + + if (unlikely(in_compat_syscall())) { + dispatch_list = &group->event_notifier_exit_compat_syscall_dispatch[id]; + } else { + dispatch_list = &group->event_notifier_exit_syscall_dispatch[id]; + } + if (unlikely(hlist_empty(dispatch_list))) + return; + + syscall_exit_event_call_func(dispatch_list, + entry->event_func, entry->nrargs, regs, ret); +} /* * noinline to diminish caller stack size. * Should be called with sessions lock held. */ static -int fill_table(const struct trace_syscall_entry *table, size_t table_len, - struct lttng_event **chan_table, struct lttng_channel *chan, - void *filter, enum sc_type type) +int lttng_create_syscall_event_if_missing(const struct trace_syscall_entry *table, size_t table_len, + struct hlist_head *chan_table, struct lttng_event_enabler *event_enabler, + enum sc_type type) { - const struct lttng_event_desc *desc; + struct lttng_channel *chan = event_enabler->chan; + struct lttng_kernel_session *session = chan->session; unsigned int i; - /* Allocate events for each syscall, insert into table */ + /* Allocate events for each syscall matching enabler, insert into table */ for (i = 0; i < table_len; i++) { - struct lttng_kernel_event ev; - desc = table[i].desc; + const struct lttng_kernel_event_desc *desc = table[i].desc; + struct lttng_kernel_abi_event ev; + struct lttng_kernel_event_recorder_private *event_recorder_priv; + struct lttng_kernel_event_recorder *event_recorder; + struct hlist_head *head; + bool found = false; if (!desc) { /* Unknown syscall */ continue; } + if (lttng_desc_match_enabler(desc, + lttng_event_enabler_as_enabler(event_enabler)) <= 0) + continue; /* - * Skip those already populated by previous failed - * register for this channel. + * Check if already created. */ - if (chan_table[i]) + head = utils_borrow_hash_table_bucket( + session->priv->events_ht.table, LTTNG_EVENT_HT_SIZE, + desc->event_name); + lttng_hlist_for_each_entry(event_recorder_priv, head, hlist) { + if (event_recorder_priv->parent.desc == desc + && event_recorder_priv->pub->chan == event_enabler->chan) + found = true; + } + if (found) continue; + + /* We need to create an event for this syscall/enabler. */ memset(&ev, 0, sizeof(ev)); switch (type) { case SC_TYPE_ENTRY: - strncpy(ev.name, SYSCALL_ENTRY_STR, - LTTNG_KERNEL_SYM_NAME_LEN); + ev.u.syscall.entryexit = LTTNG_KERNEL_ABI_SYSCALL_ENTRY; + ev.u.syscall.abi = LTTNG_KERNEL_ABI_SYSCALL_ABI_NATIVE; break; case SC_TYPE_EXIT: - strncpy(ev.name, SYSCALL_EXIT_STR, - LTTNG_KERNEL_SYM_NAME_LEN); + ev.u.syscall.entryexit = LTTNG_KERNEL_ABI_SYSCALL_EXIT; + ev.u.syscall.abi = LTTNG_KERNEL_ABI_SYSCALL_ABI_NATIVE; break; case SC_TYPE_COMPAT_ENTRY: - strncpy(ev.name, COMPAT_SYSCALL_ENTRY_STR, - LTTNG_KERNEL_SYM_NAME_LEN); + ev.u.syscall.entryexit = LTTNG_KERNEL_ABI_SYSCALL_ENTRY; + ev.u.syscall.abi = LTTNG_KERNEL_ABI_SYSCALL_ABI_COMPAT; break; case SC_TYPE_COMPAT_EXIT: - strncpy(ev.name, COMPAT_SYSCALL_EXIT_STR, - LTTNG_KERNEL_SYM_NAME_LEN); - break; - default: - BUG_ON(1); + ev.u.syscall.entryexit = LTTNG_KERNEL_ABI_SYSCALL_EXIT; + ev.u.syscall.abi = LTTNG_KERNEL_ABI_SYSCALL_ABI_COMPAT; break; } - strncat(ev.name, desc->name, - LTTNG_KERNEL_SYM_NAME_LEN - strlen(ev.name) - 1); - ev.name[LTTNG_KERNEL_SYM_NAME_LEN - 1] = '\0'; - ev.instrumentation = LTTNG_KERNEL_SYSCALL; - chan_table[i] = _lttng_event_create(chan, &ev, filter, - desc, ev.instrumentation); - WARN_ON_ONCE(!chan_table[i]); - if (IS_ERR(chan_table[i])) { + strncpy(ev.name, desc->event_name, LTTNG_KERNEL_ABI_SYM_NAME_LEN - 1); + ev.name[LTTNG_KERNEL_ABI_SYM_NAME_LEN - 1] = '\0'; + ev.instrumentation = LTTNG_KERNEL_ABI_SYSCALL; + event_recorder = _lttng_kernel_event_recorder_create(chan, &ev, desc, ev.instrumentation); + WARN_ON_ONCE(!event_recorder); + if (IS_ERR(event_recorder)) { /* * 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 PTR_ERR(chan_table[i]); + return PTR_ERR(event_recorder); } + hlist_add_head(&event_recorder->priv->parent.u.syscall.node, &chan_table[i]); } return 0; } @@ -756,24 +692,25 @@ int fill_table(const struct trace_syscall_entry *table, size_t table_len, /* * Should be called with sessions lock held. */ -int lttng_syscalls_register(struct lttng_channel *chan, void *filter) +int lttng_syscalls_register_event(struct lttng_event_enabler *event_enabler) { - struct lttng_kernel_event ev; + struct lttng_channel *chan = event_enabler->chan; + struct lttng_kernel_abi_event ev; int ret; wrapper_vmalloc_sync_mappings(); if (!chan->sc_table) { /* create syscall table mapping syscall to events */ - chan->sc_table = kzalloc(sizeof(struct lttng_event *) - * ARRAY_SIZE(sc_table), GFP_KERNEL); + chan->sc_table = kzalloc(sizeof(struct lttng_kernel_event_recorder *) + * sc_table.len, GFP_KERNEL); if (!chan->sc_table) return -ENOMEM; } if (!chan->sc_exit_table) { /* create syscall table mapping syscall to events */ - chan->sc_exit_table = kzalloc(sizeof(struct lttng_event *) - * ARRAY_SIZE(sc_exit_table), GFP_KERNEL); + chan->sc_exit_table = kzalloc(sizeof(struct lttng_kernel_event_recorder *) + * sc_exit_table.len, GFP_KERNEL); if (!chan->sc_exit_table) return -ENOMEM; } @@ -782,111 +719,130 @@ int lttng_syscalls_register(struct lttng_channel *chan, void *filter) #ifdef CONFIG_COMPAT if (!chan->compat_sc_table) { /* create syscall table mapping compat syscall to events */ - chan->compat_sc_table = kzalloc(sizeof(struct lttng_event *) - * ARRAY_SIZE(compat_sc_table), GFP_KERNEL); + chan->compat_sc_table = kzalloc(sizeof(struct lttng_kernel_event_recorder *) + * compat_sc_table.len, GFP_KERNEL); if (!chan->compat_sc_table) return -ENOMEM; } if (!chan->compat_sc_exit_table) { /* create syscall table mapping compat syscall to events */ - chan->compat_sc_exit_table = kzalloc(sizeof(struct lttng_event *) - * ARRAY_SIZE(compat_sc_exit_table), GFP_KERNEL); + chan->compat_sc_exit_table = kzalloc(sizeof(struct lttng_kernel_event_recorder *) + * compat_sc_exit_table.len, GFP_KERNEL); if (!chan->compat_sc_exit_table) return -ENOMEM; } #endif - if (!chan->sc_unknown) { - const struct lttng_event_desc *desc = + if (hlist_empty(&chan->sc_unknown)) { + const struct lttng_kernel_event_desc *desc = &__event_desc___syscall_entry_unknown; + struct lttng_kernel_event_recorder *event_recorder; memset(&ev, 0, sizeof(ev)); - strncpy(ev.name, desc->name, LTTNG_KERNEL_SYM_NAME_LEN); - ev.name[LTTNG_KERNEL_SYM_NAME_LEN - 1] = '\0'; - ev.instrumentation = LTTNG_KERNEL_SYSCALL; - chan->sc_unknown = _lttng_event_create(chan, &ev, filter, - desc, - ev.instrumentation); - WARN_ON_ONCE(!chan->sc_unknown); - if (IS_ERR(chan->sc_unknown)) { - return PTR_ERR(chan->sc_unknown); + strncpy(ev.name, desc->event_name, LTTNG_KERNEL_ABI_SYM_NAME_LEN); + ev.name[LTTNG_KERNEL_ABI_SYM_NAME_LEN - 1] = '\0'; + ev.instrumentation = LTTNG_KERNEL_ABI_SYSCALL; + ev.u.syscall.entryexit = LTTNG_KERNEL_ABI_SYSCALL_ENTRY; + ev.u.syscall.abi = LTTNG_KERNEL_ABI_SYSCALL_ABI_NATIVE; + event_recorder = _lttng_kernel_event_recorder_create(chan, &ev, desc, + ev.instrumentation); + WARN_ON_ONCE(!event_recorder); + if (IS_ERR(event_recorder)) { + return PTR_ERR(event_recorder); } + hlist_add_head(&event_recorder->priv->parent.u.syscall.node, &chan->sc_unknown); } - if (!chan->sc_compat_unknown) { - const struct lttng_event_desc *desc = + if (hlist_empty(&chan->sc_compat_unknown)) { + const struct lttng_kernel_event_desc *desc = &__event_desc___compat_syscall_entry_unknown; + struct lttng_kernel_event_recorder *event_recorder; memset(&ev, 0, sizeof(ev)); - strncpy(ev.name, desc->name, LTTNG_KERNEL_SYM_NAME_LEN); - ev.name[LTTNG_KERNEL_SYM_NAME_LEN - 1] = '\0'; - ev.instrumentation = LTTNG_KERNEL_SYSCALL; - chan->sc_compat_unknown = _lttng_event_create(chan, &ev, filter, - desc, - ev.instrumentation); - WARN_ON_ONCE(!chan->sc_unknown); - if (IS_ERR(chan->sc_compat_unknown)) { - return PTR_ERR(chan->sc_compat_unknown); + strncpy(ev.name, desc->event_name, LTTNG_KERNEL_ABI_SYM_NAME_LEN); + ev.name[LTTNG_KERNEL_ABI_SYM_NAME_LEN - 1] = '\0'; + ev.instrumentation = LTTNG_KERNEL_ABI_SYSCALL; + ev.u.syscall.entryexit = LTTNG_KERNEL_ABI_SYSCALL_ENTRY; + ev.u.syscall.abi = LTTNG_KERNEL_ABI_SYSCALL_ABI_COMPAT; + event_recorder = _lttng_kernel_event_recorder_create(chan, &ev, desc, + ev.instrumentation); + WARN_ON_ONCE(!event_recorder); + if (IS_ERR(event_recorder)) { + return PTR_ERR(event_recorder); } + hlist_add_head(&event_recorder->priv->parent.u.syscall.node, &chan->sc_compat_unknown); } - if (!chan->compat_sc_exit_unknown) { - const struct lttng_event_desc *desc = + if (hlist_empty(&chan->compat_sc_exit_unknown)) { + const struct lttng_kernel_event_desc *desc = &__event_desc___compat_syscall_exit_unknown; + struct lttng_kernel_event_recorder *event_recorder; memset(&ev, 0, sizeof(ev)); - strncpy(ev.name, desc->name, LTTNG_KERNEL_SYM_NAME_LEN); - ev.name[LTTNG_KERNEL_SYM_NAME_LEN - 1] = '\0'; - ev.instrumentation = LTTNG_KERNEL_SYSCALL; - chan->compat_sc_exit_unknown = _lttng_event_create(chan, &ev, - filter, desc, - ev.instrumentation); - WARN_ON_ONCE(!chan->compat_sc_exit_unknown); - if (IS_ERR(chan->compat_sc_exit_unknown)) { - return PTR_ERR(chan->compat_sc_exit_unknown); + strncpy(ev.name, desc->event_name, LTTNG_KERNEL_ABI_SYM_NAME_LEN); + ev.name[LTTNG_KERNEL_ABI_SYM_NAME_LEN - 1] = '\0'; + ev.instrumentation = LTTNG_KERNEL_ABI_SYSCALL; + ev.u.syscall.entryexit = LTTNG_KERNEL_ABI_SYSCALL_EXIT; + ev.u.syscall.abi = LTTNG_KERNEL_ABI_SYSCALL_ABI_COMPAT; + event_recorder = _lttng_kernel_event_recorder_create(chan, &ev, desc, + ev.instrumentation); + WARN_ON_ONCE(!event_recorder); + if (IS_ERR(event_recorder)) { + return PTR_ERR(event_recorder); } + hlist_add_head(&event_recorder->priv->parent.u.syscall.node, &chan->compat_sc_exit_unknown); } - if (!chan->sc_exit_unknown) { - const struct lttng_event_desc *desc = + if (hlist_empty(&chan->sc_exit_unknown)) { + const struct lttng_kernel_event_desc *desc = &__event_desc___syscall_exit_unknown; + struct lttng_kernel_event_recorder *event_recorder; memset(&ev, 0, sizeof(ev)); - strncpy(ev.name, desc->name, LTTNG_KERNEL_SYM_NAME_LEN); - ev.name[LTTNG_KERNEL_SYM_NAME_LEN - 1] = '\0'; - ev.instrumentation = LTTNG_KERNEL_SYSCALL; - chan->sc_exit_unknown = _lttng_event_create(chan, &ev, filter, - desc, ev.instrumentation); - WARN_ON_ONCE(!chan->sc_exit_unknown); - if (IS_ERR(chan->sc_exit_unknown)) { - return PTR_ERR(chan->sc_exit_unknown); + strncpy(ev.name, desc->event_name, LTTNG_KERNEL_ABI_SYM_NAME_LEN); + ev.name[LTTNG_KERNEL_ABI_SYM_NAME_LEN - 1] = '\0'; + ev.instrumentation = LTTNG_KERNEL_ABI_SYSCALL; + ev.u.syscall.entryexit = LTTNG_KERNEL_ABI_SYSCALL_EXIT; + ev.u.syscall.abi = LTTNG_KERNEL_ABI_SYSCALL_ABI_NATIVE; + event_recorder = _lttng_kernel_event_recorder_create(chan, &ev, desc, + ev.instrumentation); + WARN_ON_ONCE(!event_recorder); + if (IS_ERR(event_recorder)) { + return PTR_ERR(event_recorder); } + hlist_add_head(&event_recorder->priv->parent.u.syscall.node, &chan->sc_exit_unknown); } - ret = fill_table(sc_table, ARRAY_SIZE(sc_table), - chan->sc_table, chan, filter, SC_TYPE_ENTRY); + ret = lttng_create_syscall_event_if_missing(sc_table.table, sc_table.len, + chan->sc_table, event_enabler, SC_TYPE_ENTRY); if (ret) return ret; - ret = fill_table(sc_exit_table, ARRAY_SIZE(sc_exit_table), - chan->sc_exit_table, chan, filter, SC_TYPE_EXIT); + ret = lttng_create_syscall_event_if_missing(sc_exit_table.table, sc_exit_table.len, + chan->sc_exit_table, event_enabler, SC_TYPE_EXIT); if (ret) return ret; #ifdef CONFIG_COMPAT - ret = fill_table(compat_sc_table, ARRAY_SIZE(compat_sc_table), - chan->compat_sc_table, chan, filter, - SC_TYPE_COMPAT_ENTRY); + ret = lttng_create_syscall_event_if_missing(compat_sc_table.table, compat_sc_table.len, + chan->compat_sc_table, event_enabler, SC_TYPE_COMPAT_ENTRY); if (ret) return ret; - ret = fill_table(compat_sc_exit_table, ARRAY_SIZE(compat_sc_exit_table), - chan->compat_sc_exit_table, chan, filter, - SC_TYPE_COMPAT_EXIT); + ret = lttng_create_syscall_event_if_missing(compat_sc_exit_table.table, compat_sc_exit_table.len, + chan->compat_sc_exit_table, event_enabler, SC_TYPE_COMPAT_EXIT); if (ret) return ret; #endif + + if (!chan->sc_filter) { + chan->sc_filter = kzalloc(sizeof(struct lttng_syscall_filter), + GFP_KERNEL); + if (!chan->sc_filter) + return -ENOMEM; + } + if (!chan->sys_enter_registered) { ret = lttng_wrapper_tracepoint_probe_register("sys_enter", - (void *) syscall_entry_probe, chan); + (void *) syscall_entry_event_probe, chan); if (ret) return ret; chan->sys_enter_registered = 1; @@ -897,10 +853,10 @@ int lttng_syscalls_register(struct lttng_channel *chan, void *filter) */ if (!chan->sys_exit_registered) { ret = lttng_wrapper_tracepoint_probe_register("sys_exit", - (void *) syscall_exit_probe, chan); + (void *) syscall_exit_event_probe, chan); if (ret) { WARN_ON_ONCE(lttng_wrapper_tracepoint_probe_unregister("sys_enter", - (void *) syscall_entry_probe, chan)); + (void *) syscall_entry_event_probe, chan)); return ret; } chan->sys_exit_registered = 1; @@ -909,9 +865,380 @@ int lttng_syscalls_register(struct lttng_channel *chan, void *filter) } /* - * Only called at session destruction. + * Should be called with sessions lock held. + */ +int lttng_syscalls_register_event_notifier( + struct lttng_event_notifier_enabler *event_notifier_enabler) +{ + struct lttng_event_notifier_group *group = event_notifier_enabler->group; + unsigned int i; + int ret = 0; + + wrapper_vmalloc_sync_mappings(); + + if (!group->event_notifier_syscall_dispatch) { + group->event_notifier_syscall_dispatch = + kzalloc(sizeof(struct hlist_head) * sc_table.len, + GFP_KERNEL); + if (!group->event_notifier_syscall_dispatch) + return -ENOMEM; + + /* Initialize all list_head */ + for (i = 0; i < sc_table.len; i++) + INIT_HLIST_HEAD(&group->event_notifier_syscall_dispatch[i]); + + /* Init the unknown syscall notifier list. */ + INIT_HLIST_HEAD(&group->event_notifier_unknown_syscall_dispatch); + } + + if (!group->event_notifier_exit_syscall_dispatch) { + group->event_notifier_exit_syscall_dispatch = + kzalloc(sizeof(struct hlist_head) * sc_table.len, + GFP_KERNEL); + if (!group->event_notifier_exit_syscall_dispatch) + return -ENOMEM; + + /* Initialize all list_head */ + for (i = 0; i < sc_table.len; i++) + INIT_HLIST_HEAD(&group->event_notifier_exit_syscall_dispatch[i]); + + /* Init the unknown exit syscall notifier list. */ + INIT_HLIST_HEAD(&group->event_notifier_exit_unknown_syscall_dispatch); + } + +#ifdef CONFIG_COMPAT + if (!group->event_notifier_compat_syscall_dispatch) { + group->event_notifier_compat_syscall_dispatch = + kzalloc(sizeof(struct hlist_head) * compat_sc_table.len, + GFP_KERNEL); + if (!group->event_notifier_syscall_dispatch) + return -ENOMEM; + + /* Initialize all list_head */ + for (i = 0; i < compat_sc_table.len; i++) + INIT_HLIST_HEAD(&group->event_notifier_compat_syscall_dispatch[i]); + + /* Init the unknown syscall notifier list. */ + INIT_HLIST_HEAD(&group->event_notifier_compat_unknown_syscall_dispatch); + } + + if (!group->event_notifier_exit_compat_syscall_dispatch) { + group->event_notifier_exit_compat_syscall_dispatch = + kzalloc(sizeof(struct hlist_head) * compat_sc_exit_table.len, + GFP_KERNEL); + if (!group->event_notifier_exit_syscall_dispatch) + return -ENOMEM; + + /* Initialize all list_head */ + for (i = 0; i < compat_sc_exit_table.len; i++) + INIT_HLIST_HEAD(&group->event_notifier_exit_compat_syscall_dispatch[i]); + + /* Init the unknown exit syscall notifier list. */ + INIT_HLIST_HEAD(&group->event_notifier_exit_compat_unknown_syscall_dispatch); + } +#endif + + if (!group->sc_filter) { + group->sc_filter = kzalloc(sizeof(struct lttng_syscall_filter), + GFP_KERNEL); + if (!group->sc_filter) + return -ENOMEM; + } + + if (!group->sys_enter_registered) { + ret = lttng_wrapper_tracepoint_probe_register("sys_enter", + (void *) syscall_entry_event_notifier_probe, group); + if (ret) + return ret; + group->sys_enter_registered = 1; + } + + if (!group->sys_exit_registered) { + ret = lttng_wrapper_tracepoint_probe_register("sys_exit", + (void *) syscall_exit_event_notifier_probe, group); + if (ret) { + WARN_ON_ONCE(lttng_wrapper_tracepoint_probe_unregister("sys_enter", + (void *) syscall_entry_event_notifier_probe, group)); + return ret; + } + group->sys_exit_registered = 1; + } + + return ret; +} + +static +int create_unknown_event_notifier( + struct lttng_event_notifier_enabler *event_notifier_enabler, + enum sc_type type) +{ + struct lttng_kernel_event_notifier_private *event_notifier_priv; + struct lttng_kernel_event_notifier *event_notifier; + const struct lttng_kernel_event_desc *desc; + struct lttng_event_notifier_group *group = event_notifier_enabler->group; + struct lttng_kernel_abi_event_notifier event_notifier_param; + uint64_t user_token = event_notifier_enabler->base.user_token; + uint64_t error_counter_index = event_notifier_enabler->error_counter_index; + struct lttng_enabler *base_enabler = lttng_event_notifier_enabler_as_enabler( + event_notifier_enabler); + struct hlist_head *unknown_dispatch_list; + int ret = 0; + bool found = false; + enum lttng_kernel_abi_syscall_abi abi; + enum lttng_kernel_abi_syscall_entryexit entryexit; + struct hlist_head *head; + + switch (type) { + case SC_TYPE_ENTRY: + desc = &__event_desc___syscall_entry_unknown; + unknown_dispatch_list = &group->event_notifier_unknown_syscall_dispatch; + entryexit = LTTNG_KERNEL_ABI_SYSCALL_ENTRY; + abi = LTTNG_KERNEL_ABI_SYSCALL_ABI_NATIVE; + break; + case SC_TYPE_EXIT: + desc = &__event_desc___syscall_exit_unknown; + unknown_dispatch_list = &group->event_notifier_exit_unknown_syscall_dispatch; + entryexit = LTTNG_KERNEL_ABI_SYSCALL_EXIT; + abi = LTTNG_KERNEL_ABI_SYSCALL_ABI_NATIVE; + break; + case SC_TYPE_COMPAT_ENTRY: + desc = &__event_desc___compat_syscall_entry_unknown; + unknown_dispatch_list = &group->event_notifier_compat_unknown_syscall_dispatch; + entryexit = LTTNG_KERNEL_ABI_SYSCALL_ENTRY; + abi = LTTNG_KERNEL_ABI_SYSCALL_ABI_COMPAT; + break; + case SC_TYPE_COMPAT_EXIT: + desc = &__event_desc___compat_syscall_exit_unknown; + unknown_dispatch_list = &group->event_notifier_exit_compat_unknown_syscall_dispatch; + entryexit = LTTNG_KERNEL_ABI_SYSCALL_EXIT; + abi = LTTNG_KERNEL_ABI_SYSCALL_ABI_COMPAT; + break; + default: + BUG_ON(1); + } + + /* + * Check if already created. + */ + head = utils_borrow_hash_table_bucket(group->event_notifiers_ht.table, + LTTNG_EVENT_NOTIFIER_HT_SIZE, desc->event_name); + lttng_hlist_for_each_entry(event_notifier_priv, head, hlist) { + if (event_notifier_priv->parent.desc == desc && + event_notifier_priv->parent.user_token == base_enabler->user_token) + found = true; + } + if (found) + goto end; + + memset(&event_notifier_param, 0, sizeof(event_notifier_param)); + strncat(event_notifier_param.event.name, desc->event_name, + LTTNG_KERNEL_ABI_SYM_NAME_LEN - strlen(event_notifier_param.event.name) - 1); + + event_notifier_param.event.name[LTTNG_KERNEL_ABI_SYM_NAME_LEN - 1] = '\0'; + + event_notifier_param.event.instrumentation = LTTNG_KERNEL_ABI_SYSCALL; + event_notifier_param.event.u.syscall.abi = abi; + event_notifier_param.event.u.syscall.entryexit = entryexit; + + event_notifier = _lttng_event_notifier_create(desc, user_token, + error_counter_index, group, &event_notifier_param, + event_notifier_param.event.instrumentation); + if (IS_ERR(event_notifier)) { + printk(KERN_INFO "Unable to create unknown notifier %s\n", + desc->event_name); + ret = -ENOMEM; + goto end; + } + + hlist_add_head_rcu(&event_notifier->priv->parent.u.syscall.node, unknown_dispatch_list); + +end: + return ret; +} + +static int create_matching_event_notifiers( + struct lttng_event_notifier_enabler *event_notifier_enabler, + const struct trace_syscall_entry *table, + size_t table_len, enum sc_type type) +{ + struct lttng_event_notifier_group *group = event_notifier_enabler->group; + const struct lttng_kernel_event_desc *desc; + uint64_t user_token = event_notifier_enabler->base.user_token; + uint64_t error_counter_index = event_notifier_enabler->error_counter_index; + unsigned int i; + int ret = 0; + + /* iterate over all syscall and create event_notifier that match */ + for (i = 0; i < table_len; i++) { + struct lttng_kernel_event_notifier_private *event_notifier_priv; + struct lttng_kernel_event_notifier *event_notifier; + struct lttng_kernel_abi_event_notifier event_notifier_param; + struct hlist_head *head; + int found = 0; + + desc = table[i].desc; + if (!desc) { + /* Unknown syscall */ + continue; + } + + if (!lttng_desc_match_enabler(desc, + lttng_event_notifier_enabler_as_enabler(event_notifier_enabler))) + continue; + + /* + * Check if already created. + */ + head = utils_borrow_hash_table_bucket(group->event_notifiers_ht.table, + LTTNG_EVENT_NOTIFIER_HT_SIZE, desc->event_name); + lttng_hlist_for_each_entry(event_notifier_priv, head, hlist) { + if (event_notifier_priv->parent.desc == desc + && event_notifier_priv->parent.user_token == event_notifier_enabler->base.user_token) + found = 1; + } + if (found) + continue; + + memset(&event_notifier_param, 0, sizeof(event_notifier_param)); + switch (type) { + case SC_TYPE_ENTRY: + event_notifier_param.event.u.syscall.entryexit = LTTNG_KERNEL_ABI_SYSCALL_ENTRY; + event_notifier_param.event.u.syscall.abi = LTTNG_KERNEL_ABI_SYSCALL_ABI_NATIVE; + break; + case SC_TYPE_EXIT: + event_notifier_param.event.u.syscall.entryexit = LTTNG_KERNEL_ABI_SYSCALL_EXIT; + event_notifier_param.event.u.syscall.abi = LTTNG_KERNEL_ABI_SYSCALL_ABI_NATIVE; + break; + case SC_TYPE_COMPAT_ENTRY: + event_notifier_param.event.u.syscall.entryexit = LTTNG_KERNEL_ABI_SYSCALL_ENTRY; + event_notifier_param.event.u.syscall.abi = LTTNG_KERNEL_ABI_SYSCALL_ABI_COMPAT; + break; + case SC_TYPE_COMPAT_EXIT: + event_notifier_param.event.u.syscall.entryexit = LTTNG_KERNEL_ABI_SYSCALL_EXIT; + event_notifier_param.event.u.syscall.abi = LTTNG_KERNEL_ABI_SYSCALL_ABI_COMPAT; + break; + } + strncat(event_notifier_param.event.name, desc->event_name, + LTTNG_KERNEL_ABI_SYM_NAME_LEN - strlen(event_notifier_param.event.name) - 1); + event_notifier_param.event.name[LTTNG_KERNEL_ABI_SYM_NAME_LEN - 1] = '\0'; + event_notifier_param.event.instrumentation = LTTNG_KERNEL_ABI_SYSCALL; + + event_notifier = _lttng_event_notifier_create(desc, user_token, + error_counter_index, group, &event_notifier_param, + event_notifier_param.event.instrumentation); + if (IS_ERR(event_notifier)) { + printk(KERN_INFO "Unable to create event_notifier %s\n", + desc->event_name); + ret = -ENOMEM; + goto end; + } + + event_notifier->priv->parent.u.syscall.syscall_id = i; + } + +end: + return ret; + +} + +int lttng_syscalls_create_matching_event_notifiers( + struct lttng_event_notifier_enabler *event_notifier_enabler) +{ + int ret; + struct lttng_enabler *base_enabler = + lttng_event_notifier_enabler_as_enabler(event_notifier_enabler); + enum lttng_kernel_abi_syscall_entryexit entryexit = + base_enabler->event_param.u.syscall.entryexit; + + if (entryexit == LTTNG_KERNEL_ABI_SYSCALL_ENTRY || entryexit == LTTNG_KERNEL_ABI_SYSCALL_ENTRYEXIT) { + ret = create_matching_event_notifiers(event_notifier_enabler, + sc_table.table, sc_table.len, SC_TYPE_ENTRY); + if (ret) + goto end; + + ret = create_matching_event_notifiers(event_notifier_enabler, + compat_sc_table.table, compat_sc_table.len, + SC_TYPE_COMPAT_ENTRY); + if (ret) + goto end; + + ret = create_unknown_event_notifier(event_notifier_enabler, + SC_TYPE_ENTRY); + if (ret) + goto end; + + ret = create_unknown_event_notifier(event_notifier_enabler, + SC_TYPE_COMPAT_ENTRY); + if (ret) + goto end; + } + + if (entryexit == LTTNG_KERNEL_ABI_SYSCALL_EXIT || entryexit == LTTNG_KERNEL_ABI_SYSCALL_ENTRYEXIT) { + ret = create_matching_event_notifiers(event_notifier_enabler, + sc_exit_table.table, sc_exit_table.len, + SC_TYPE_EXIT); + if (ret) + goto end; + + ret = create_unknown_event_notifier(event_notifier_enabler, + SC_TYPE_EXIT); + if (ret) + goto end; + + ret = create_matching_event_notifiers(event_notifier_enabler, + compat_sc_exit_table.table, compat_sc_exit_table.len, + SC_TYPE_COMPAT_EXIT); + if (ret) + goto end; + + ret = create_unknown_event_notifier(event_notifier_enabler, + SC_TYPE_COMPAT_EXIT); + if (ret) + goto end; + } + +end: + return ret; +} + +/* + * Unregister the syscall event_notifier probes from the callsites. */ -int lttng_syscalls_unregister(struct lttng_channel *chan) +int lttng_syscalls_unregister_event_notifier_group( + struct lttng_event_notifier_group *event_notifier_group) +{ + int ret; + + /* + * Only register the event_notifier probe on the `sys_enter` callsite for now. + * At the moment, we don't think it's desirable to have one fired + * event_notifier for the entry and one for the exit of a syscall. + */ + if (event_notifier_group->sys_enter_registered) { + ret = lttng_wrapper_tracepoint_probe_unregister("sys_enter", + (void *) syscall_entry_event_notifier_probe, event_notifier_group); + if (ret) + return ret; + event_notifier_group->sys_enter_registered = 0; + } + if (event_notifier_group->sys_exit_registered) { + ret = lttng_wrapper_tracepoint_probe_unregister("sys_exit", + (void *) syscall_exit_event_notifier_probe, event_notifier_group); + if (ret) + return ret; + event_notifier_group->sys_enter_registered = 0; + } + + kfree(event_notifier_group->event_notifier_syscall_dispatch); + kfree(event_notifier_group->event_notifier_exit_syscall_dispatch); +#ifdef CONFIG_COMPAT + kfree(event_notifier_group->event_notifier_compat_syscall_dispatch); + kfree(event_notifier_group->event_notifier_exit_compat_syscall_dispatch); +#endif + return 0; +} + +int lttng_syscalls_unregister_channel(struct lttng_channel *chan) { int ret; @@ -919,19 +1246,23 @@ int lttng_syscalls_unregister(struct lttng_channel *chan) return 0; if (chan->sys_enter_registered) { ret = lttng_wrapper_tracepoint_probe_unregister("sys_enter", - (void *) syscall_entry_probe, chan); + (void *) syscall_entry_event_probe, chan); if (ret) return ret; chan->sys_enter_registered = 0; } if (chan->sys_exit_registered) { ret = lttng_wrapper_tracepoint_probe_unregister("sys_exit", - (void *) syscall_exit_probe, chan); + (void *) syscall_exit_event_probe, chan); if (ret) return ret; chan->sys_exit_registered = 0; } - /* lttng_event destroy will be performed by lttng_session_destroy() */ + return 0; +} + +int lttng_syscalls_destroy_event(struct lttng_channel *chan) +{ kfree(chan->sc_table); kfree(chan->sc_exit_table); #ifdef CONFIG_COMPAT @@ -948,14 +1279,14 @@ int get_syscall_nr(const char *syscall_name) int syscall_nr = -1; int i; - for (i = 0; i < ARRAY_SIZE(sc_table); i++) { + for (i = 0; i < sc_table.len; i++) { const struct trace_syscall_entry *entry; const char *it_name; - entry = &sc_table[i]; + entry = &sc_table.table[i]; if (!entry->desc) continue; - it_name = entry->desc->name; + it_name = entry->desc->event_name; it_name += strlen(SYSCALL_ENTRY_STR); if (!strcmp(syscall_name, it_name)) { syscall_nr = i; @@ -971,14 +1302,14 @@ int get_compat_syscall_nr(const char *syscall_name) int syscall_nr = -1; int i; - for (i = 0; i < ARRAY_SIZE(compat_sc_table); i++) { + for (i = 0; i < compat_sc_table.len; i++) { const struct trace_syscall_entry *entry; const char *it_name; - entry = &compat_sc_table[i]; + entry = &compat_sc_table.table[i]; if (!entry->desc) continue; - it_name = entry->desc->name; + it_name = entry->desc->event_name; it_name += strlen(COMPAT_SYSCALL_ENTRY_STR); if (!strcmp(syscall_name, it_name)) { syscall_nr = i; @@ -991,139 +1322,256 @@ int get_compat_syscall_nr(const char *syscall_name) static uint32_t get_sc_tables_len(void) { - return ARRAY_SIZE(sc_table) + ARRAY_SIZE(compat_sc_table); + return sc_table.len + compat_sc_table.len; } -int lttng_syscall_filter_enable(struct lttng_channel *chan, - const char *name) +static +const char *get_syscall_name(const char *desc_name, + enum lttng_syscall_abi abi, + enum lttng_syscall_entryexit entryexit) { - int syscall_nr, compat_syscall_nr, ret; - struct lttng_syscall_filter *filter; + size_t prefix_len = 0; - WARN_ON_ONCE(!chan->sc_table); - if (!name) { - /* Enable all system calls by removing filter */ - if (chan->sc_filter) { - filter = chan->sc_filter; - rcu_assign_pointer(chan->sc_filter, NULL); - synchronize_trace(); - kfree(filter); + switch (entryexit) { + case LTTNG_SYSCALL_ENTRY: + switch (abi) { + case LTTNG_SYSCALL_ABI_NATIVE: + prefix_len = strlen(SYSCALL_ENTRY_STR); + break; + case LTTNG_SYSCALL_ABI_COMPAT: + prefix_len = strlen(COMPAT_SYSCALL_ENTRY_STR); + break; } - chan->syscall_all = 1; - return 0; + break; + case LTTNG_SYSCALL_EXIT: + switch (abi) { + case LTTNG_SYSCALL_ABI_NATIVE: + prefix_len = strlen(SYSCALL_EXIT_STR); + break; + case LTTNG_SYSCALL_ABI_COMPAT: + prefix_len = strlen(COMPAT_SYSCALL_EXIT_STR); + break; + } + break; } + WARN_ON_ONCE(prefix_len == 0); + return desc_name + prefix_len; +} - if (!chan->sc_filter) { - if (chan->syscall_all) { - /* - * All syscalls are already enabled. - */ - return -EEXIST; +static +int lttng_syscall_filter_enable( + struct lttng_syscall_filter *filter, + const char *desc_name, enum lttng_syscall_abi abi, + enum lttng_syscall_entryexit entryexit) +{ + const char *syscall_name; + unsigned long *bitmap; + int syscall_nr; + + syscall_name = get_syscall_name(desc_name, abi, entryexit); + + switch (abi) { + case LTTNG_SYSCALL_ABI_NATIVE: + syscall_nr = get_syscall_nr(syscall_name); + break; + case LTTNG_SYSCALL_ABI_COMPAT: + syscall_nr = get_compat_syscall_nr(syscall_name); + break; + default: + return -EINVAL; + } + if (syscall_nr < 0) + return -ENOENT; + + switch (entryexit) { + case LTTNG_SYSCALL_ENTRY: + switch (abi) { + case LTTNG_SYSCALL_ABI_NATIVE: + bitmap = filter->sc_entry; + break; + case LTTNG_SYSCALL_ABI_COMPAT: + bitmap = filter->sc_compat_entry; + break; + default: + return -EINVAL; } - filter = kzalloc(sizeof(struct lttng_syscall_filter), - GFP_KERNEL); - if (!filter) - return -ENOMEM; - } else { - filter = chan->sc_filter; - } - syscall_nr = get_syscall_nr(name); - compat_syscall_nr = get_compat_syscall_nr(name); - if (syscall_nr < 0 && compat_syscall_nr < 0) { - ret = -ENOENT; - goto error; - } - if (syscall_nr >= 0) { - if (test_bit(syscall_nr, filter->sc)) { - ret = -EEXIST; - goto error; + break; + case LTTNG_SYSCALL_EXIT: + switch (abi) { + case LTTNG_SYSCALL_ABI_NATIVE: + bitmap = filter->sc_exit; + break; + case LTTNG_SYSCALL_ABI_COMPAT: + bitmap = filter->sc_compat_exit; + break; + default: + return -EINVAL; } - bitmap_set(filter->sc, syscall_nr, 1); + break; + default: + return -EINVAL; } - if (compat_syscall_nr >= 0) { - if (test_bit(compat_syscall_nr, filter->sc_compat)) { - ret = -EEXIST; - goto error; + if (test_bit(syscall_nr, bitmap)) + return -EEXIST; + bitmap_set(bitmap, syscall_nr, 1); + return 0; +} + +int lttng_syscall_filter_enable_event_notifier( + struct lttng_kernel_event_notifier *event_notifier) +{ + struct lttng_event_notifier_group *group = event_notifier->priv->group; + unsigned int syscall_id = event_notifier->priv->parent.u.syscall.syscall_id; + struct hlist_head *dispatch_list; + int ret = 0; + + WARN_ON_ONCE(event_notifier->priv->parent.instrumentation != LTTNG_KERNEL_ABI_SYSCALL); + + ret = lttng_syscall_filter_enable(group->sc_filter, + event_notifier->priv->parent.desc->event_name, + event_notifier->priv->parent.u.syscall.abi, + event_notifier->priv->parent.u.syscall.entryexit); + if (ret) { + goto end; + } + + switch (event_notifier->priv->parent.u.syscall.entryexit) { + case LTTNG_SYSCALL_ENTRY: + switch (event_notifier->priv->parent.u.syscall.abi) { + case LTTNG_SYSCALL_ABI_NATIVE: + dispatch_list = &group->event_notifier_syscall_dispatch[syscall_id]; + break; + case LTTNG_SYSCALL_ABI_COMPAT: + dispatch_list = &group->event_notifier_compat_syscall_dispatch[syscall_id]; + break; + default: + ret = -EINVAL; + goto end; + } + break; + case LTTNG_SYSCALL_EXIT: + switch (event_notifier->priv->parent.u.syscall.abi) { + case LTTNG_SYSCALL_ABI_NATIVE: + dispatch_list = &group->event_notifier_exit_syscall_dispatch[syscall_id]; + break; + case LTTNG_SYSCALL_ABI_COMPAT: + dispatch_list = &group->event_notifier_exit_compat_syscall_dispatch[syscall_id]; + break; + default: + ret = -EINVAL; + goto end; } - bitmap_set(filter->sc_compat, compat_syscall_nr, 1); + break; + default: + ret = -EINVAL; + goto end; } - if (!chan->sc_filter) - rcu_assign_pointer(chan->sc_filter, filter); - return 0; -error: - if (!chan->sc_filter) - kfree(filter); - return ret; + hlist_add_head_rcu(&event_notifier->priv->parent.u.syscall.node, dispatch_list); + +end: + return ret ; } -int lttng_syscall_filter_disable(struct lttng_channel *chan, - const char *name) +int lttng_syscall_filter_enable_event( + struct lttng_channel *channel, + struct lttng_kernel_event_recorder *event_recorder) { - int syscall_nr, compat_syscall_nr, ret; - struct lttng_syscall_filter *filter; + WARN_ON_ONCE(event_recorder->priv->parent.instrumentation != LTTNG_KERNEL_ABI_SYSCALL); - WARN_ON_ONCE(!chan->sc_table); + return lttng_syscall_filter_enable(channel->sc_filter, + event_recorder->priv->parent.desc->event_name, + event_recorder->priv->parent.u.syscall.abi, + event_recorder->priv->parent.u.syscall.entryexit); +} - if (!chan->sc_filter) { - if (!chan->syscall_all) - return -EEXIST; - filter = kzalloc(sizeof(struct lttng_syscall_filter), - GFP_KERNEL); - if (!filter) - return -ENOMEM; - /* Trace all system calls, then apply disable. */ - bitmap_set(filter->sc, 0, NR_syscalls); - bitmap_set(filter->sc_compat, 0, NR_compat_syscalls); - } else { - filter = chan->sc_filter; - } +static +int lttng_syscall_filter_disable( + struct lttng_syscall_filter *filter, + const char *desc_name, enum lttng_syscall_abi abi, + enum lttng_syscall_entryexit entryexit) +{ + const char *syscall_name; + unsigned long *bitmap; + int syscall_nr; - if (!name) { - /* Fail if all syscalls are already disabled. */ - if (bitmap_empty(filter->sc, NR_syscalls) - && bitmap_empty(filter->sc_compat, - NR_compat_syscalls)) { - ret = -EEXIST; - goto error; - } + syscall_name = get_syscall_name(desc_name, abi, entryexit); - /* Disable all system calls */ - bitmap_clear(filter->sc, 0, NR_syscalls); - bitmap_clear(filter->sc_compat, 0, NR_compat_syscalls); - goto apply_filter; - } - syscall_nr = get_syscall_nr(name); - compat_syscall_nr = get_compat_syscall_nr(name); - if (syscall_nr < 0 && compat_syscall_nr < 0) { - ret = -ENOENT; - goto error; - } - if (syscall_nr >= 0) { - if (!test_bit(syscall_nr, filter->sc)) { - ret = -EEXIST; - goto error; - } - bitmap_clear(filter->sc, syscall_nr, 1); + switch (abi) { + case LTTNG_SYSCALL_ABI_NATIVE: + syscall_nr = get_syscall_nr(syscall_name); + break; + case LTTNG_SYSCALL_ABI_COMPAT: + syscall_nr = get_compat_syscall_nr(syscall_name); + break; + default: + return -EINVAL; } - if (compat_syscall_nr >= 0) { - if (!test_bit(compat_syscall_nr, filter->sc_compat)) { - ret = -EEXIST; - goto error; + if (syscall_nr < 0) + return -ENOENT; + + switch (entryexit) { + case LTTNG_SYSCALL_ENTRY: + switch (abi) { + case LTTNG_SYSCALL_ABI_NATIVE: + bitmap = filter->sc_entry; + break; + case LTTNG_SYSCALL_ABI_COMPAT: + bitmap = filter->sc_compat_entry; + break; + default: + return -EINVAL; } - bitmap_clear(filter->sc_compat, compat_syscall_nr, 1); + break; + case LTTNG_SYSCALL_EXIT: + switch (abi) { + case LTTNG_SYSCALL_ABI_NATIVE: + bitmap = filter->sc_exit; + break; + case LTTNG_SYSCALL_ABI_COMPAT: + bitmap = filter->sc_compat_exit; + break; + default: + return -EINVAL; + } + break; + default: + return -EINVAL; } -apply_filter: - if (!chan->sc_filter) - rcu_assign_pointer(chan->sc_filter, filter); - chan->syscall_all = 0; + if (!test_bit(syscall_nr, bitmap)) + return -EEXIST; + bitmap_clear(bitmap, syscall_nr, 1); + return 0; +} -error: - if (!chan->sc_filter) - kfree(filter); - return ret; +int lttng_syscall_filter_disable_event_notifier( + struct lttng_kernel_event_notifier *event_notifier) +{ + struct lttng_event_notifier_group *group = event_notifier->priv->group; + int ret; + + WARN_ON_ONCE(event_notifier->priv->parent.instrumentation != LTTNG_KERNEL_ABI_SYSCALL); + + ret = lttng_syscall_filter_disable(group->sc_filter, + event_notifier->priv->parent.desc->event_name, + event_notifier->priv->parent.u.syscall.abi, + event_notifier->priv->parent.u.syscall.entryexit); + WARN_ON_ONCE(ret != 0); + + hlist_del_rcu(&event_notifier->priv->parent.u.syscall.node); + return 0; +} + +int lttng_syscall_filter_disable_event( + struct lttng_channel *channel, + struct lttng_kernel_event_recorder *event_recorder) +{ + return lttng_syscall_filter_disable(channel->sc_filter, + event_recorder->priv->parent.desc->event_name, + event_recorder->priv->parent.u.syscall.abi, + event_recorder->priv->parent.u.syscall.entryexit); } static @@ -1132,14 +1580,14 @@ const struct trace_syscall_entry *syscall_list_get_entry(loff_t *pos) const struct trace_syscall_entry *entry; int iter = 0; - for (entry = sc_table; - entry < sc_table + ARRAY_SIZE(sc_table); + for (entry = sc_table.table; + entry < sc_table.table + sc_table.len; entry++) { if (iter++ >= *pos) return entry; } - for (entry = compat_sc_table; - entry < compat_sc_table + ARRAY_SIZE(compat_sc_table); + for (entry = compat_sc_table.table; + entry < compat_sc_table.table + compat_sc_table.len; entry++) { if (iter++ >= *pos) return entry; @@ -1171,21 +1619,21 @@ int get_sc_table(const struct trace_syscall_entry *entry, const struct trace_syscall_entry **table, unsigned int *bitness) { - if (entry >= sc_table && entry < sc_table + ARRAY_SIZE(sc_table)) { + if (entry >= sc_table.table && entry < sc_table.table + sc_table.len) { if (bitness) *bitness = BITS_PER_LONG; if (table) - *table = sc_table; + *table = sc_table.table; return 0; } - if (!(entry >= compat_sc_table - && entry < compat_sc_table + ARRAY_SIZE(compat_sc_table))) { + if (!(entry >= compat_sc_table.table + && entry < compat_sc_table.table + compat_sc_table.len)) { return -EINVAL; } if (bitness) *bitness = 32; if (table) - *table = compat_sc_table; + *table = compat_sc_table.table; return 0; } @@ -1203,12 +1651,12 @@ int syscall_list_show(struct seq_file *m, void *p) return ret; if (!entry->desc) return 0; - if (table == sc_table) { + if (table == sc_table.table) { index = entry - table; - name = &entry->desc->name[strlen(SYSCALL_ENTRY_STR)]; + name = &entry->desc->event_name[strlen(SYSCALL_ENTRY_STR)]; } else { - index = (entry - table) + ARRAY_SIZE(sc_table); - name = &entry->desc->name[strlen(COMPAT_SYSCALL_ENTRY_STR)]; + index = (entry - table) + sc_table.len; + name = &entry->desc->event_name[strlen(COMPAT_SYSCALL_ENTRY_STR)]; } seq_printf(m, "syscall { index = %lu; name = %s; bitness = %u; };\n", index, name, bitness); @@ -1237,8 +1685,11 @@ const struct file_operations lttng_syscall_list_fops = { .release = seq_release, }; +/* + * A syscall is enabled if it is traced for either entry or exit. + */ long lttng_channel_syscall_mask(struct lttng_channel *channel, - struct lttng_kernel_syscall_mask __user *usyscall_mask) + struct lttng_kernel_abi_syscall_mask __user *usyscall_mask) { uint32_t len, sc_tables_len, bitmask_len; int ret = 0, bit; @@ -1259,12 +1710,14 @@ long lttng_channel_syscall_mask(struct lttng_channel *channel, return -ENOMEM; filter = channel->sc_filter; - for (bit = 0; bit < ARRAY_SIZE(sc_table); bit++) { + for (bit = 0; bit < sc_table.len; bit++) { char state; if (channel->sc_table) { - if (filter) - state = test_bit(bit, filter->sc); + if (!(READ_ONCE(channel->syscall_all_entry) + || READ_ONCE(channel->syscall_all_exit)) && filter) + state = test_bit(bit, filter->sc_entry) + || test_bit(bit, filter->sc_exit); else state = 1; } else { @@ -1276,9 +1729,12 @@ long lttng_channel_syscall_mask(struct lttng_channel *channel, char state; if (channel->compat_sc_table) { - if (filter) - state = test_bit(bit - ARRAY_SIZE(sc_table), - filter->sc_compat); + if (!(READ_ONCE(channel->syscall_all_entry) + || READ_ONCE(channel->syscall_all_exit)) && filter) + state = test_bit(bit - sc_table.len, + filter->sc_compat_entry) + || test_bit(bit - sc_table.len, + filter->sc_compat_exit); else state = 1; } else {