X-Git-Url: https://git.lttng.org/?a=blobdiff_plain;f=src%2Flttng-syscalls.c;h=bf1f2b732217397cf3e489bdb3e5f260f24dc361;hb=1d303f6942646f60243dcf456ed886557472bc4b;hp=3d9f3736a6fa842e7f3361e04b53f61cad57a97a;hpb=2d6d88c64dad61235a5693bcf4854765ec62d095;p=lttng-modules.git diff --git a/src/lttng-syscalls.c b/src/lttng-syscalls.c index 3d9f3736..bf1f2b73 100644 --- a/src/lttng-syscalls.c +++ b/src/lttng-syscalls.c @@ -29,6 +29,10 @@ #include #include #include +#include +#include + +#include "lttng-syscalls.h" #ifndef CONFIG_COMPAT # ifndef is_compat_task @@ -58,9 +62,7 @@ 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_event_probe(void *__data, struct pt_regs *regs, long id); -static void syscall_exit_event_probe(void *__data, struct pt_regs *regs, long ret); /* @@ -83,7 +85,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 @@ -109,260 +111,15 @@ 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_event_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_event_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_event_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_event_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 - -#undef TP_MODULE_NOINIT -#undef LTTNG_PACKAGE_BUILD -#undef CREATE_TRACE_POINTS - -struct trace_syscall_entry { - void *event_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 ] = { \ - .event_func = __event_probe__syscall_entry_##_template, \ - .nrargs = (_nrargs), \ - .fields = __event_fields___syscall_entry_##_template, \ - .desc = &__event_desc___syscall_entry_##_name, \ - }, - -/* Event 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 ] = { \ - .event_func = __event_probe__compat_syscall_entry_##_template, \ - .nrargs = (_nrargs), \ - .fields = __event_fields___compat_syscall_entry_##_template, \ - .desc = &__event_desc___compat_syscall_entry_##_name, \ - }, - -/* Event 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 ] = { \ - .event_func = __event_probe__syscall_exit_##_template, \ - .nrargs = (_nrargs), \ - .fields = __event_fields___syscall_exit_##_template, \ - .desc = &__event_desc___syscall_exit_##_name, \ - }, +extern const struct trace_syscall_table sc_table; +extern const struct trace_syscall_table compat_sc_table; /* Event syscall exit table */ -static const struct trace_syscall_entry sc_exit_table[] = { -#include -#include -}; +extern const struct trace_syscall_table sc_exit_table; +extern const struct trace_syscall_table compat_sc_exit_table; -#undef TRACE_SYSCALL_TABLE -#define TRACE_SYSCALL_TABLE(_template, _name, _nr, _nrargs) \ - [ _nr ] = { \ - .event_func = __event_probe__compat_syscall_exit_##_template, \ - .nrargs = (_nrargs), \ - .fields = __event_fields___compat_syscall_exit_##_template, \ - .desc = &__event_desc___compat_syscall_exit_##_name, \ - }, - -/* Event compat syscall exit table */ -const struct trace_syscall_entry compat_sc_exit_table[] = { -#include -#include -}; #undef SC_EXIT @@ -375,89 +132,57 @@ struct lttng_syscall_filter { DECLARE_BITMAP(sc_compat_exit, NR_compat_syscalls); }; -static void syscall_entry_event_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_event_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 = chan->sc_filter; + struct lttng_kernel_event_common_private *event_priv; - if (id < 0 || id >= NR_compat_syscalls - || (!READ_ONCE(chan->syscall_all) && !test_bit(id, filter->sc_compat_entry))) { - /* 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 = chan->sc_filter; - - if (id < 0 || id >= NR_syscalls - || (!READ_ONCE(chan->syscall_all) && !test_bit(id, filter->sc_entry))) { - /* 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_event_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_event_unknown(unknown_event, regs, id); - return; - } - entry = &table[id]; - WARN_ON_ONCE(!entry); - - switch (entry->nrargs) { + switch (nrargs) { case 0: { - void (*fptr)(void *__data) = entry->event_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->event_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->event_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: @@ -465,11 +190,12 @@ void syscall_entry_event_probe(void *__data, struct pt_regs *regs, long id) void (*fptr)(void *__data, unsigned long arg0, unsigned long arg1, - unsigned long arg2) = entry->event_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: @@ -478,11 +204,12 @@ void syscall_entry_event_probe(void *__data, struct pt_regs *regs, long id) unsigned long arg0, unsigned long arg1, unsigned long arg2, - unsigned long arg3) = entry->event_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: @@ -492,11 +219,12 @@ void syscall_entry_event_probe(void *__data, struct pt_regs *regs, long id) unsigned long arg1, unsigned long arg2, unsigned long arg3, - unsigned long arg4) = entry->event_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: @@ -507,12 +235,13 @@ void syscall_entry_event_probe(void *__data, struct pt_regs *regs, long id) unsigned long arg2, unsigned long arg3, unsigned long arg4, - unsigned long arg5) = entry->event_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: @@ -520,83 +249,100 @@ void syscall_entry_event_probe(void *__data, struct pt_regs *regs, long id) } } -static void syscall_exit_event_unknown(struct lttng_event *event, - struct pt_regs *regs, int id, long ret) -{ - unsigned long args[LTTNG_SYSCALL_NR_ARGS]; - - 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); -} - -void syscall_exit_event_probe(void *__data, struct pt_regs *regs, long ret) +void syscall_entry_event_probe(void *__data, struct pt_regs *regs, long id) { - struct lttng_channel *chan = __data; - struct lttng_event *event, *unknown_event; + struct lttng_kernel_syscall_table *syscall_table = __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; + struct lttng_syscall_filter *filter = syscall_table->sc_filter; if (id < 0 || id >= NR_compat_syscalls - || (!READ_ONCE(chan->syscall_all) && !test_bit(id, filter->sc_compat_exit))) { + || (!READ_ONCE(syscall_table->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_action_list = &syscall_table->compat_unknown_syscall_dispatch; } else { - struct lttng_syscall_filter *filter = chan->sc_filter; + struct lttng_syscall_filter *filter = syscall_table->sc_filter; if (id < 0 || id >= NR_syscalls - || (!READ_ONCE(chan->syscall_all) && !test_bit(id, filter->sc_exit))) { + || (!READ_ONCE(syscall_table->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_action_list = &syscall_table->unknown_syscall_dispatch; } if (unlikely(id < 0 || id >= table_len)) { - syscall_exit_event_unknown(unknown_event, regs, id, ret); + syscall_entry_event_unknown(unknown_action_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_event_unknown(unknown_event, regs, id, ret); + + entry = &table[id]; + if (!entry->event_func) { + syscall_entry_event_unknown(unknown_action_list, regs, id); return; } - entry = &table[id]; - WARN_ON_ONCE(!entry); - switch (entry->nrargs) { + if (unlikely(in_compat_syscall())) { + action_list = &syscall_table->compat_syscall_dispatch[id]; + } else { + action_list = &syscall_table->syscall_dispatch[id]; + } + if (unlikely(hlist_empty(action_list))) + return; + + syscall_entry_event_call_func(action_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->event_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->event_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: @@ -604,11 +350,12 @@ void syscall_exit_event_probe(void *__data, struct pt_regs *regs, long ret) void (*fptr)(void *__data, long ret, unsigned long arg0, - unsigned long arg1) = entry->event_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: @@ -617,11 +364,12 @@ void syscall_exit_event_probe(void *__data, struct pt_regs *regs, long ret) long ret, unsigned long arg0, unsigned long arg1, - unsigned long arg2) = entry->event_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: @@ -631,11 +379,12 @@ void syscall_exit_event_probe(void *__data, struct pt_regs *regs, long ret) unsigned long arg0, unsigned long arg1, unsigned long arg2, - unsigned long arg3) = entry->event_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: @@ -646,11 +395,12 @@ void syscall_exit_event_probe(void *__data, struct pt_regs *regs, long ret) unsigned long arg1, unsigned long arg2, unsigned long arg3, - unsigned long arg4) = entry->event_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: @@ -662,12 +412,13 @@ void syscall_exit_event_probe(void *__data, struct pt_regs *regs, long ret) unsigned long arg2, unsigned long arg3, unsigned long arg4, - unsigned long arg5) = entry->event_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: @@ -675,277 +426,456 @@ void syscall_exit_event_probe(void *__data, struct pt_regs *regs, long ret) } } -/* - * noinline to diminish caller stack size. - * Should be called with sessions lock held. - */ -static -int fill_event_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) +void syscall_exit_event_probe(void *__data, struct pt_regs *regs, long ret) { - const struct lttng_event_desc *desc; - unsigned int i; + struct lttng_kernel_syscall_table *syscall_table = __data; + struct hlist_head *action_list, *unknown_action_list; + const struct trace_syscall_entry *table, *entry; + size_t table_len; + long id; - /* Allocate events for each syscall, insert into table */ - for (i = 0; i < table_len; i++) { - struct lttng_kernel_event ev; - desc = table[i].desc; + id = syscall_get_nr(current, regs); - if (!desc) { - /* Unknown syscall */ - continue; + if (unlikely(in_compat_syscall())) { + struct lttng_syscall_filter *filter = syscall_table->sc_filter; + + if (id < 0 || id >= NR_compat_syscalls + || (!READ_ONCE(syscall_table->syscall_all_exit) && !test_bit(id, filter->sc_compat_exit))) { + /* System call filtered out. */ + return; } - /* - * Skip those already populated by previous failed - * register for this channel. - */ - if (chan_table[i]) - continue; + table = compat_sc_exit_table.table; + table_len = compat_sc_exit_table.len; + unknown_action_list = &syscall_table->compat_unknown_syscall_exit_dispatch; + } else { + struct lttng_syscall_filter *filter = syscall_table->sc_filter; + + if (id < 0 || id >= NR_syscalls + || (!READ_ONCE(syscall_table->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 = &syscall_table->unknown_syscall_exit_dispatch; + } + 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 = &syscall_table->compat_syscall_exit_dispatch[id]; + } else { + action_list = &syscall_table->syscall_exit_dispatch[id]; + } + if (unlikely(hlist_empty(action_list))) + return; + + syscall_exit_event_call_func(action_list, entry->event_func, entry->nrargs, + regs, ret); +} + +static +struct lttng_kernel_syscall_table *get_syscall_table_from_enabler(struct lttng_event_enabler_common *event_enabler) +{ + switch (event_enabler->enabler_type) { + case LTTNG_EVENT_ENABLER_TYPE_RECORDER: + { + struct lttng_event_recorder_enabler *event_recorder_enabler = + container_of(event_enabler, struct lttng_event_recorder_enabler, parent); + return &event_recorder_enabler->chan->priv->parent.syscall_table; + } + case LTTNG_EVENT_ENABLER_TYPE_NOTIFIER: + { + struct lttng_event_notifier_enabler *event_notifier_enabler = + container_of(event_enabler, struct lttng_event_notifier_enabler, parent); + return &event_notifier_enabler->group->syscall_table; + } + default: + return NULL; + } +} + +static +struct lttng_kernel_syscall_table *get_syscall_table_from_event(struct lttng_kernel_event_common *event) +{ + switch (event->type) { + case LTTNG_KERNEL_EVENT_TYPE_RECORDER: + { + struct lttng_kernel_event_recorder *event_recorder = + container_of(event, struct lttng_kernel_event_recorder, parent); + return &event_recorder->chan->priv->parent.syscall_table; + } + case LTTNG_KERNEL_EVENT_TYPE_NOTIFIER: + { + struct lttng_kernel_event_notifier *event_notifier = + container_of(event, struct lttng_kernel_event_notifier, parent); + return &event_notifier->priv->group->syscall_table; + } + default: + return NULL; + } +} + +static +void lttng_syscall_event_enabler_create_event(struct lttng_event_enabler_common *syscall_event_enabler, + const struct lttng_kernel_event_desc *desc, struct hlist_head *dispatch_table, + enum sc_type type, unsigned int syscall_nr) +{ + struct lttng_kernel_event_common *event; + + switch (syscall_event_enabler->enabler_type) { + case LTTNG_EVENT_ENABLER_TYPE_RECORDER: + { + struct lttng_event_recorder_enabler *syscall_event_recorder_enabler = + container_of(syscall_event_enabler, struct lttng_event_recorder_enabler, parent); + struct lttng_event_recorder_enabler *event_recorder_enabler; + struct lttng_kernel_abi_event ev; + + /* We need to create an event for this syscall/enabler. */ memset(&ev, 0, sizeof(ev)); switch (type) { case SC_TYPE_ENTRY: - ev.u.syscall.entryexit = LTTNG_KERNEL_SYSCALL_ENTRY; - ev.u.syscall.abi = LTTNG_KERNEL_SYSCALL_ABI_NATIVE; + ev.u.syscall.entryexit = LTTNG_KERNEL_ABI_SYSCALL_ENTRY; + ev.u.syscall.abi = LTTNG_KERNEL_ABI_SYSCALL_ABI_NATIVE; break; case SC_TYPE_EXIT: - ev.u.syscall.entryexit = LTTNG_KERNEL_SYSCALL_EXIT; - ev.u.syscall.abi = LTTNG_KERNEL_SYSCALL_ABI_NATIVE; + 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: - ev.u.syscall.entryexit = LTTNG_KERNEL_SYSCALL_ENTRY; - ev.u.syscall.abi = LTTNG_KERNEL_SYSCALL_ABI_COMPAT; + 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: - ev.u.syscall.entryexit = LTTNG_KERNEL_SYSCALL_EXIT; - ev.u.syscall.abi = LTTNG_KERNEL_SYSCALL_ABI_COMPAT; + ev.u.syscall.entryexit = LTTNG_KERNEL_ABI_SYSCALL_EXIT; + ev.u.syscall.abi = LTTNG_KERNEL_ABI_SYSCALL_ABI_COMPAT; break; } - strncpy(ev.name, desc->name, LTTNG_KERNEL_SYM_NAME_LEN - 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])) { - /* - * 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]); + 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_enabler = lttng_event_recorder_enabler_create(LTTNG_ENABLER_FORMAT_NAME, &ev, + syscall_event_recorder_enabler->chan); + WARN_ON_ONCE(!event_recorder_enabler); + if (!event_recorder_enabler) + return; + event = _lttng_kernel_event_create(&event_recorder_enabler->parent, desc); + WARN_ON_ONCE(IS_ERR(event)); + lttng_event_enabler_destroy(&event_recorder_enabler->parent); + if (IS_ERR(event)) { + printk(KERN_INFO "Unable to create event recorder %s\n", desc->event_name); + return; } + event->priv->u.syscall.syscall_id = syscall_nr; + if (dispatch_table) + hlist_add_head_rcu(&event->priv->u.syscall.node, dispatch_table); + break; + } + case LTTNG_EVENT_ENABLER_TYPE_NOTIFIER: + { + struct lttng_event_notifier_enabler *syscall_event_notifier_enabler = + container_of(syscall_event_enabler, struct lttng_event_notifier_enabler, parent); + struct lttng_event_notifier_enabler *event_notifier_enabler; + struct lttng_kernel_abi_event_notifier event_notifier_param; + uint64_t user_token = syscall_event_enabler->user_token; + uint64_t error_counter_index = syscall_event_notifier_enabler->error_counter_index; + + 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_param.event.token = user_token; + event_notifier_param.error_counter_index = error_counter_index; + + event_notifier_enabler = lttng_event_notifier_enabler_create(LTTNG_ENABLER_FORMAT_NAME, + &event_notifier_param, syscall_event_notifier_enabler->group); + WARN_ON_ONCE(!event_notifier_enabler); + event = _lttng_kernel_event_create(&event_notifier_enabler->parent, desc); + WARN_ON_ONCE(IS_ERR(event)); + lttng_event_enabler_destroy(&event_notifier_enabler->parent); + if (IS_ERR(event)) { + printk(KERN_INFO "Unable to create event notifier %s\n", desc->event_name); + return; + } + event->priv->u.syscall.syscall_id = syscall_nr; + if (dispatch_table) + hlist_add_head_rcu(&event->priv->u.syscall.node, dispatch_table); + break; + } + default: + break; } - return 0; } -/* - * Should be called with sessions lock held. - */ -int lttng_syscalls_register_event(struct lttng_channel *chan, void *filter) +static +void lttng_syscall_event_enabler_create_matching_syscall_table_events(struct lttng_event_enabler_common *syscall_event_enabler_common, + const struct trace_syscall_entry *table, size_t table_len, enum sc_type type) { - struct lttng_kernel_event ev; - int ret; + struct lttng_event_ht *events_ht = lttng_get_event_ht_from_enabler(syscall_event_enabler_common); + const struct lttng_kernel_event_desc *desc; + unsigned int i; - wrapper_vmalloc_sync_mappings(); +#ifndef CONFIG_COMPAT + if (type == SC_TYPE_COMPAT_ENTRY || type == SC_TYPE_COMPAT_EXIT) + return; +#endif + /* iterate over all syscall and create event that match */ + for (i = 0; i < table_len; i++) { + struct lttng_kernel_event_common_private *event_priv; + struct hlist_head *head; + bool found = false; - 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); - 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); - if (!chan->sc_exit_table) - return -ENOMEM; - } + desc = table[i].desc; + if (!desc) { + /* Unknown syscall */ + continue; + } + if (!lttng_desc_match_enabler(desc, syscall_event_enabler_common)) + continue; -#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); - if (!chan->compat_sc_table) - return -ENOMEM; - } + /* + * Check if already created. + */ + head = utils_borrow_hash_table_bucket(events_ht->table, LTTNG_EVENT_HT_SIZE, desc->event_name); + lttng_hlist_for_each_entry(event_priv, head, hlist_node) { + if (lttng_event_enabler_desc_match_event(syscall_event_enabler_common, desc, event_priv->pub)) { + found = true; + break; + } + } + if (found) + continue; - 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); - if (!chan->compat_sc_exit_table) - return -ENOMEM; + lttng_syscall_event_enabler_create_event(syscall_event_enabler_common, desc, NULL, type, i); } +} + +static +bool lttng_syscall_event_enabler_is_wildcard_all(struct lttng_event_enabler_common *event_enabler) +{ + if (event_enabler->event_param.instrumentation != LTTNG_KERNEL_ABI_SYSCALL) + return false; + if (event_enabler->event_param.u.syscall.abi != LTTNG_KERNEL_ABI_SYSCALL_ABI_ALL) + return false; + if (event_enabler->event_param.u.syscall.match != LTTNG_KERNEL_ABI_SYSCALL_MATCH_NAME) + return false; + if (strcmp(event_enabler->event_param.name, "*")) + return false; + return true; +} + +static +void create_unknown_syscall_event(struct lttng_event_enabler_common *event_enabler, enum sc_type type) +{ + struct lttng_kernel_syscall_table *syscall_table = get_syscall_table_from_enabler(event_enabler); + struct lttng_event_ht *events_ht = lttng_get_event_ht_from_enabler(event_enabler); + struct lttng_kernel_event_common_private *event_priv; + const struct lttng_kernel_event_desc *desc; + struct hlist_head *unknown_dispatch_list; + bool found = false; + struct hlist_head *head; + +#ifndef CONFIG_COMPAT + if (type == SC_TYPE_COMPAT_ENTRY || type == SC_TYPE_COMPAT_EXIT) + return; #endif - if (!chan->sc_unknown) { - const struct lttng_event_desc *desc = - &__event_desc___syscall_entry_unknown; + /* + * Considering that currently system calls can only be enabled on a per + * name basis (or wildcard based on a name), unknown syscall events are + * only used when matching *all* system calls, because this is the only + * case which can be associated with an unknown system call. + * + * When enabling system call on a per system call number basis will be + * supported, this will need to be revisited. + */ + if (!lttng_syscall_event_enabler_is_wildcard_all(event_enabler)) + return; - 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; - ev.u.syscall.entryexit = LTTNG_KERNEL_SYSCALL_ENTRY; - ev.u.syscall.abi = LTTNG_KERNEL_SYSCALL_ABI_NATIVE; - 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); - } + switch (type) { + case SC_TYPE_ENTRY: + desc = &__event_desc___syscall_entry_unknown; + unknown_dispatch_list = &syscall_table->unknown_syscall_dispatch; + break; + case SC_TYPE_EXIT: + desc = &__event_desc___syscall_exit_unknown; + unknown_dispatch_list = &syscall_table->unknown_syscall_exit_dispatch; + break; + case SC_TYPE_COMPAT_ENTRY: + desc = &__event_desc___compat_syscall_entry_unknown; + unknown_dispatch_list = &syscall_table->compat_unknown_syscall_dispatch; + break; + case SC_TYPE_COMPAT_EXIT: + desc = &__event_desc___compat_syscall_exit_unknown; + unknown_dispatch_list = &syscall_table->compat_unknown_syscall_exit_dispatch; + break; + default: + WARN_ON_ONCE(1); } - if (!chan->sc_compat_unknown) { - const struct lttng_event_desc *desc = - &__event_desc___compat_syscall_entry_unknown; - - 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; - ev.u.syscall.entryexit = LTTNG_KERNEL_SYSCALL_ENTRY; - ev.u.syscall.abi = LTTNG_KERNEL_SYSCALL_ABI_COMPAT; - 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); + /* + * Check if already created. + */ + head = utils_borrow_hash_table_bucket(events_ht->table, LTTNG_EVENT_HT_SIZE, desc->event_name); + lttng_hlist_for_each_entry(event_priv, head, hlist_node) { + if (lttng_event_enabler_desc_match_event(event_enabler, desc, event_priv->pub)) { + found = true; + break; } } + if (!found) + lttng_syscall_event_enabler_create_event(event_enabler, desc, unknown_dispatch_list, type, -1U); +} - if (!chan->compat_sc_exit_unknown) { - const struct lttng_event_desc *desc = - &__event_desc___compat_syscall_exit_unknown; +static +void lttng_syscall_event_enabler_create_matching_events(struct lttng_event_enabler_common *event_enabler) +{ + enum lttng_kernel_abi_syscall_entryexit entryexit = event_enabler->event_param.u.syscall.entryexit; + + if (entryexit == LTTNG_KERNEL_ABI_SYSCALL_ENTRY || entryexit == LTTNG_KERNEL_ABI_SYSCALL_ENTRYEXIT) { + lttng_syscall_event_enabler_create_matching_syscall_table_events(event_enabler, + sc_table.table, sc_table.len, SC_TYPE_ENTRY); + lttng_syscall_event_enabler_create_matching_syscall_table_events(event_enabler, + compat_sc_table.table, compat_sc_table.len, SC_TYPE_COMPAT_ENTRY); + create_unknown_syscall_event(event_enabler, SC_TYPE_ENTRY); + create_unknown_syscall_event(event_enabler, SC_TYPE_COMPAT_ENTRY); + } - 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; - ev.u.syscall.entryexit = LTTNG_KERNEL_SYSCALL_EXIT; - ev.u.syscall.abi = LTTNG_KERNEL_SYSCALL_ABI_COMPAT; - 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); - } + if (entryexit == LTTNG_KERNEL_ABI_SYSCALL_EXIT || entryexit == LTTNG_KERNEL_ABI_SYSCALL_ENTRYEXIT) { + lttng_syscall_event_enabler_create_matching_syscall_table_events(event_enabler, + sc_exit_table.table, sc_exit_table.len, SC_TYPE_EXIT); + lttng_syscall_event_enabler_create_matching_syscall_table_events(event_enabler, + compat_sc_exit_table.table, compat_sc_exit_table.len, SC_TYPE_COMPAT_EXIT); + create_unknown_syscall_event(event_enabler, SC_TYPE_EXIT); + create_unknown_syscall_event(event_enabler, SC_TYPE_COMPAT_EXIT); } +} - if (!chan->sc_exit_unknown) { - const struct lttng_event_desc *desc = - &__event_desc___syscall_exit_unknown; +/* + * Should be called with sessions lock held. + */ +int lttng_event_enabler_create_syscall_events_if_missing(struct lttng_event_enabler_common *syscall_event_enabler) +{ + struct lttng_kernel_syscall_table *syscall_table = get_syscall_table_from_enabler(syscall_event_enabler); + int ret; - 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; - ev.u.syscall.entryexit = LTTNG_KERNEL_SYSCALL_EXIT; - ev.u.syscall.abi = LTTNG_KERNEL_SYSCALL_ABI_NATIVE; - 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); - } + if (!syscall_table->syscall_dispatch) { + /* create syscall table mapping syscall to events */ + syscall_table->syscall_dispatch = kzalloc(sizeof(struct hlist_head) * sc_table.len, GFP_KERNEL); + if (!syscall_table->syscall_dispatch) + return -ENOMEM; + } + if (!syscall_table->syscall_exit_dispatch) { + /* create syscall table mapping syscall to events */ + syscall_table->syscall_exit_dispatch = kzalloc(sizeof(struct hlist_head) * sc_exit_table.len, GFP_KERNEL); + if (!syscall_table->syscall_exit_dispatch) + return -ENOMEM; } - - ret = fill_event_table(sc_table, ARRAY_SIZE(sc_table), - chan->sc_table, chan, filter, SC_TYPE_ENTRY); - if (ret) - return ret; - ret = fill_event_table(sc_exit_table, ARRAY_SIZE(sc_exit_table), - chan->sc_exit_table, chan, filter, SC_TYPE_EXIT); - if (ret) - return ret; #ifdef CONFIG_COMPAT - ret = fill_event_table(compat_sc_table, ARRAY_SIZE(compat_sc_table), - chan->compat_sc_table, chan, filter, - SC_TYPE_COMPAT_ENTRY); - if (ret) - return ret; - ret = fill_event_table(compat_sc_exit_table, ARRAY_SIZE(compat_sc_exit_table), - chan->compat_sc_exit_table, chan, filter, - SC_TYPE_COMPAT_EXIT); - if (ret) - return ret; -#endif + if (!syscall_table->compat_syscall_dispatch) { + /* create syscall table mapping compat syscall to events */ + syscall_table->compat_syscall_dispatch = kzalloc(sizeof(struct hlist_head) * compat_sc_table.len, GFP_KERNEL); + if (!syscall_table->compat_syscall_dispatch) + return -ENOMEM; + } - if (!chan->sc_filter) { - chan->sc_filter = kzalloc(sizeof(struct lttng_syscall_filter), + if (!syscall_table->compat_syscall_exit_dispatch) { + /* create syscall table mapping compat syscall to events */ + syscall_table->compat_syscall_exit_dispatch = kzalloc(sizeof(struct hlist_head) * compat_sc_exit_table.len, GFP_KERNEL); + if (!syscall_table->compat_syscall_exit_dispatch) + return -ENOMEM; + } +#endif + if (!syscall_table->sc_filter) { + syscall_table->sc_filter = kzalloc(sizeof(struct lttng_syscall_filter), GFP_KERNEL); - if (!chan->sc_filter) + if (!syscall_table->sc_filter) return -ENOMEM; } - if (!chan->sys_enter_registered) { + if (!syscall_table->sys_enter_registered) { ret = lttng_wrapper_tracepoint_probe_register("sys_enter", - (void *) syscall_entry_event_probe, chan); + (void *) syscall_entry_event_probe, syscall_table); if (ret) return ret; - chan->sys_enter_registered = 1; + syscall_table->sys_enter_registered = 1; } - /* - * We change the name of sys_exit tracepoint due to namespace - * conflict with sys_exit syscall entry. - */ - if (!chan->sys_exit_registered) { + if (!syscall_table->sys_exit_registered) { ret = lttng_wrapper_tracepoint_probe_register("sys_exit", - (void *) syscall_exit_event_probe, chan); + (void *) syscall_exit_event_probe, syscall_table); if (ret) { WARN_ON_ONCE(lttng_wrapper_tracepoint_probe_unregister("sys_enter", - (void *) syscall_entry_event_probe, chan)); + (void *) syscall_entry_event_probe, syscall_table)); return ret; } - chan->sys_exit_registered = 1; + syscall_table->sys_exit_registered = 1; } + + lttng_syscall_event_enabler_create_matching_events(syscall_event_enabler); + return ret; } -/* - * Only called at session destruction. - */ -int lttng_syscalls_unregister_event(struct lttng_channel *chan) +int lttng_syscalls_unregister_syscall_table(struct lttng_kernel_syscall_table *syscall_table) { int ret; - if (!chan->sc_table) + if (!syscall_table->syscall_dispatch) return 0; - if (chan->sys_enter_registered) { + if (syscall_table->sys_enter_registered) { ret = lttng_wrapper_tracepoint_probe_unregister("sys_enter", - (void *) syscall_entry_event_probe, chan); + (void *) syscall_entry_event_probe, syscall_table); if (ret) return ret; - chan->sys_enter_registered = 0; + syscall_table->sys_enter_registered = 0; } - if (chan->sys_exit_registered) { + if (syscall_table->sys_exit_registered) { ret = lttng_wrapper_tracepoint_probe_unregister("sys_exit", - (void *) syscall_exit_event_probe, chan); + (void *) syscall_exit_event_probe, syscall_table); if (ret) return ret; - chan->sys_exit_registered = 0; + syscall_table->sys_exit_registered = 0; } return 0; } -int lttng_syscalls_destroy_event(struct lttng_channel *chan) +int lttng_syscalls_destroy_syscall_table(struct lttng_kernel_syscall_table *syscall_table) { - kfree(chan->sc_table); - kfree(chan->sc_exit_table); + kfree(syscall_table->syscall_dispatch); + kfree(syscall_table->syscall_exit_dispatch); #ifdef CONFIG_COMPAT - kfree(chan->compat_sc_table); - kfree(chan->compat_sc_exit_table); + kfree(syscall_table->compat_syscall_dispatch); + kfree(syscall_table->compat_syscall_exit_dispatch); #endif - kfree(chan->sc_filter); + kfree(syscall_table->sc_filter); return 0; } @@ -955,14 +885,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; @@ -978,14 +908,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; @@ -998,19 +928,20 @@ 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; } static -const char *get_syscall_name(struct lttng_event *event) +const char *get_syscall_name(const char *desc_name, + enum lttng_syscall_abi abi, + enum lttng_syscall_entryexit entryexit) { size_t prefix_len = 0; - WARN_ON_ONCE(event->instrumentation != LTTNG_KERNEL_SYSCALL); - switch (event->u.syscall.entryexit) { + switch (entryexit) { case LTTNG_SYSCALL_ENTRY: - switch (event->u.syscall.abi) { + switch (abi) { case LTTNG_SYSCALL_ABI_NATIVE: prefix_len = strlen(SYSCALL_ENTRY_STR); break; @@ -1020,7 +951,7 @@ const char *get_syscall_name(struct lttng_event *event) } break; case LTTNG_SYSCALL_EXIT: - switch (event->u.syscall.abi) { + switch (abi) { case LTTNG_SYSCALL_ABI_NATIVE: prefix_len = strlen(SYSCALL_EXIT_STR); break; @@ -1031,22 +962,22 @@ const char *get_syscall_name(struct lttng_event *event) break; } WARN_ON_ONCE(prefix_len == 0); - return event->desc->name + prefix_len; + return desc_name + prefix_len; } -int lttng_syscall_filter_enable_event(struct lttng_channel *chan, - struct lttng_event *event) +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) { - struct lttng_syscall_filter *filter = chan->sc_filter; const char *syscall_name; unsigned long *bitmap; int syscall_nr; - WARN_ON_ONCE(!chan->sc_table); + syscall_name = get_syscall_name(desc_name, abi, entryexit); - syscall_name = get_syscall_name(event); - - switch (event->u.syscall.abi) { + switch (abi) { case LTTNG_SYSCALL_ABI_NATIVE: syscall_nr = get_syscall_nr(syscall_name); break; @@ -1059,9 +990,9 @@ int lttng_syscall_filter_enable_event(struct lttng_channel *chan, if (syscall_nr < 0) return -ENOENT; - switch (event->u.syscall.entryexit) { + switch (entryexit) { case LTTNG_SYSCALL_ENTRY: - switch (event->u.syscall.abi) { + switch (abi) { case LTTNG_SYSCALL_ABI_NATIVE: bitmap = filter->sc_entry; break; @@ -1073,7 +1004,7 @@ int lttng_syscall_filter_enable_event(struct lttng_channel *chan, } break; case LTTNG_SYSCALL_EXIT: - switch (event->u.syscall.abi) { + switch (abi) { case LTTNG_SYSCALL_ABI_NATIVE: bitmap = filter->sc_exit; break; @@ -1093,19 +1024,70 @@ int lttng_syscall_filter_enable_event(struct lttng_channel *chan, return 0; } -int lttng_syscall_filter_disable_event(struct lttng_channel *chan, - struct lttng_event *event) +int lttng_syscall_filter_enable_event(struct lttng_kernel_event_common *event) +{ + struct lttng_kernel_syscall_table *syscall_table = get_syscall_table_from_event(event); + unsigned int syscall_id = event->priv->u.syscall.syscall_id; + struct hlist_head *dispatch_list; + int ret; + + WARN_ON_ONCE(event->priv->instrumentation != LTTNG_KERNEL_ABI_SYSCALL); + + ret = lttng_syscall_filter_enable(syscall_table->sc_filter, + event->priv->desc->event_name, event->priv->u.syscall.abi, + event->priv->u.syscall.entryexit); + if (ret) + return ret; + + switch (event->priv->u.syscall.entryexit) { + case LTTNG_SYSCALL_ENTRY: + switch (event->priv->u.syscall.abi) { + case LTTNG_SYSCALL_ABI_NATIVE: + dispatch_list = &syscall_table->syscall_dispatch[syscall_id]; + break; + case LTTNG_SYSCALL_ABI_COMPAT: + dispatch_list = &syscall_table->compat_syscall_dispatch[syscall_id]; + break; + default: + ret = -EINVAL; + goto end; + } + break; + case LTTNG_SYSCALL_EXIT: + switch (event->priv->u.syscall.abi) { + case LTTNG_SYSCALL_ABI_NATIVE: + dispatch_list = &syscall_table->syscall_exit_dispatch[syscall_id]; + break; + case LTTNG_SYSCALL_ABI_COMPAT: + dispatch_list = &syscall_table->compat_syscall_exit_dispatch[syscall_id]; + break; + default: + ret = -EINVAL; + goto end; + } + break; + default: + ret = -EINVAL; + goto end; + } + + hlist_add_head_rcu(&event->priv->u.syscall.node, dispatch_list); +end: + return ret; +} + +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) { - struct lttng_syscall_filter *filter = chan->sc_filter; const char *syscall_name; unsigned long *bitmap; int syscall_nr; - WARN_ON_ONCE(!chan->sc_table); + syscall_name = get_syscall_name(desc_name, abi, entryexit); - syscall_name = get_syscall_name(event); - - switch (event->u.syscall.abi) { + switch (abi) { case LTTNG_SYSCALL_ABI_NATIVE: syscall_nr = get_syscall_nr(syscall_name); break; @@ -1118,9 +1100,9 @@ int lttng_syscall_filter_disable_event(struct lttng_channel *chan, if (syscall_nr < 0) return -ENOENT; - switch (event->u.syscall.entryexit) { + switch (entryexit) { case LTTNG_SYSCALL_ENTRY: - switch (event->u.syscall.abi) { + switch (abi) { case LTTNG_SYSCALL_ABI_NATIVE: bitmap = filter->sc_entry; break; @@ -1132,7 +1114,7 @@ int lttng_syscall_filter_disable_event(struct lttng_channel *chan, } break; case LTTNG_SYSCALL_EXIT: - switch (event->u.syscall.abi) { + switch (abi) { case LTTNG_SYSCALL_ABI_NATIVE: bitmap = filter->sc_exit; break; @@ -1153,20 +1135,50 @@ int lttng_syscall_filter_disable_event(struct lttng_channel *chan, return 0; } +int lttng_syscall_filter_disable_event(struct lttng_kernel_event_common *event) +{ + struct lttng_kernel_syscall_table *syscall_table = get_syscall_table_from_event(event); + int ret; + + ret = lttng_syscall_filter_disable(syscall_table->sc_filter, + event->priv->desc->event_name, event->priv->u.syscall.abi, + event->priv->u.syscall.entryexit); + if (ret) + return ret; + hlist_del_rcu(&event->priv->u.syscall.node); + return 0; +} + +void lttng_syscall_table_set_wildcard_all(struct lttng_event_enabler_common *event_enabler) +{ + struct lttng_kernel_syscall_table *syscall_table = get_syscall_table_from_enabler(event_enabler); + enum lttng_kernel_abi_syscall_entryexit entryexit; + int enabled = event_enabler->enabled; + + if (!lttng_syscall_event_enabler_is_wildcard_all(event_enabler)) + return; + entryexit = event_enabler->event_param.u.syscall.entryexit; + if (entryexit == LTTNG_KERNEL_ABI_SYSCALL_ENTRY || entryexit == LTTNG_KERNEL_ABI_SYSCALL_ENTRYEXIT) + WRITE_ONCE(syscall_table->syscall_all_entry, enabled); + + if (entryexit == LTTNG_KERNEL_ABI_SYSCALL_EXIT || entryexit == LTTNG_KERNEL_ABI_SYSCALL_ENTRYEXIT) + WRITE_ONCE(syscall_table->syscall_all_exit, enabled); +} + static 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; @@ -1198,21 +1210,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; } @@ -1230,12 +1242,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); @@ -1267,8 +1279,8 @@ const struct file_operations lttng_syscall_list_fops = { /* * 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) +long lttng_syscall_table_get_active_mask(struct lttng_kernel_syscall_table *syscall_table, + struct lttng_kernel_abi_syscall_mask __user *usyscall_mask) { uint32_t len, sc_tables_len, bitmask_len; int ret = 0, bit; @@ -1287,13 +1299,14 @@ long lttng_channel_syscall_mask(struct lttng_channel *channel, tmp_mask = kzalloc(bitmask_len, GFP_KERNEL); if (!tmp_mask) return -ENOMEM; - filter = channel->sc_filter; + filter = syscall_table->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 (!READ_ONCE(channel->syscall_all) && filter) + if (syscall_table->syscall_dispatch) { + if (!(READ_ONCE(syscall_table->syscall_all_entry) + || READ_ONCE(syscall_table->syscall_all_exit)) && filter) state = test_bit(bit, filter->sc_entry) || test_bit(bit, filter->sc_exit); else @@ -1306,11 +1319,12 @@ long lttng_channel_syscall_mask(struct lttng_channel *channel, for (; bit < sc_tables_len; bit++) { char state; - if (channel->compat_sc_table) { - if (!READ_ONCE(channel->syscall_all) && filter) - state = test_bit(bit - ARRAY_SIZE(sc_table), + if (syscall_table->compat_syscall_dispatch) { + if (!(READ_ONCE(syscall_table->syscall_all_entry) + || READ_ONCE(syscall_table->syscall_all_exit)) && filter) + state = test_bit(bit - sc_table.len, filter->sc_compat_entry) - || test_bit(bit - ARRAY_SIZE(sc_table), + || test_bit(bit - sc_table.len, filter->sc_compat_exit); else state = 1;