X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=src%2Flttng-syscalls.c;h=eb813147b36545b4bcbfa90e141c2db5086ba682;hb=refs%2Fheads%2Fsow-2020-0002-rev3;hp=c18a1418468f3ca81de3e019a99a0b932c26cf6d;hpb=8ced8896fe832af52b749d429b8eceb872a83d1b;p=deliverable%2Flttng-modules.git diff --git a/src/lttng-syscalls.c b/src/lttng-syscalls.c index c18a1418..eb813147 100644 --- a/src/lttng-syscalls.c +++ b/src/lttng-syscalls.c @@ -67,6 +67,9 @@ void syscall_exit_event_probe(void *__data, struct pt_regs *regs, long ret); static void syscall_entry_event_notifier_probe(void *__data, struct pt_regs *regs, long id); +static +void syscall_exit_event_notifier_probe(void *__data, struct pt_regs *regs, + long ret); /* * Forward declarations for old kernels. @@ -88,7 +91,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 @@ -385,42 +388,168 @@ 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_event *event; 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, unknown_action_list_head, u.syscall.node) { + if (unlikely(in_compat_syscall())) + __event_probe__compat_syscall_entry_unknown(event, id, args); + else + __event_probe__syscall_entry_unknown(event, id, args); + } } static void syscall_entry_event_notifier_unknown( - struct lttng_event_notifier_group *notifier_group, - struct pt_regs *regs, unsigned int id) + struct hlist_head *unknown_dispatch_list_head, + struct pt_regs *regs, long id) { unsigned long args[LTTNG_SYSCALL_NR_ARGS]; - struct lttng_event *event; + struct lttng_event_notifier *notifier; + + lttng_syscall_get_arguments(current, regs, args); + lttng_hlist_for_each_entry_rcu(notifier, unknown_dispatch_list_head, u.syscall.node) { + if (unlikely(in_compat_syscall())) + __event_notifier_probe__compat_syscall_entry_unknown(notifier, id, args); + else + __event_notifier_probe__syscall_entry_unknown(notifier, id, args); + } +} + +static void syscall_exit_event_notifier_unknown( + struct hlist_head *unknown_dispatch_list_head, + struct pt_regs *regs, long id, long ret) +{ + unsigned long args[LTTNG_SYSCALL_NR_ARGS]; + struct lttng_event_notifier *notifier; lttng_syscall_get_arguments(current, regs, args); - if (unlikely(in_compat_syscall())) - __event_probe__compat_syscall_notifier_entry_unknown(event, id, args); - else - __event_probe__syscall_notifier_entry_unknown(event, id, args); + lttng_hlist_for_each_entry_rcu(notifier, unknown_dispatch_list_head, u.syscall.node) { + if (unlikely(in_compat_syscall())) + __event_notifier_probe__compat_syscall_exit_unknown(notifier, id, ret, args); + else + __event_notifier_probe__syscall_exit_unknown(notifier, id, ret, args); + } } static __always_inline -void syscall_entry_call_func(void *func, unsigned int nrargs, void *data, +void syscall_entry_call_func(struct hlist_head *action_list, + void *func, unsigned int nrargs, struct pt_regs *regs) { + struct lttng_event *event; + + switch (nrargs) { + case 0: + { + void (*fptr)(void *__data) = func; + + lttng_hlist_for_each_entry_rcu(event, action_list, u.syscall.node) + fptr(event); + break; + } + case 1: + { + void (*fptr)(void *__data, unsigned long arg0) = func; + unsigned long args[LTTNG_SYSCALL_NR_ARGS]; + + lttng_syscall_get_arguments(current, regs, args); + lttng_hlist_for_each_entry_rcu(event, action_list, u.syscall.node) + fptr(event, args[0]); + break; + } + case 2: + { + void (*fptr)(void *__data, + unsigned long arg0, + unsigned long arg1) = func; + unsigned long args[LTTNG_SYSCALL_NR_ARGS]; + + lttng_syscall_get_arguments(current, regs, args); + lttng_hlist_for_each_entry_rcu(event, action_list, u.syscall.node) + fptr(event, args[0], args[1]); + break; + } + case 3: + { + void (*fptr)(void *__data, + unsigned long arg0, + unsigned long arg1, + unsigned long arg2) = func; + unsigned long args[LTTNG_SYSCALL_NR_ARGS]; + + lttng_syscall_get_arguments(current, regs, args); + lttng_hlist_for_each_entry_rcu(event, action_list, u.syscall.node) + fptr(event, args[0], args[1], args[2]); + break; + } + case 4: + { + void (*fptr)(void *__data, + unsigned long arg0, + unsigned long arg1, + unsigned long arg2, + unsigned long arg3) = func; + unsigned long args[LTTNG_SYSCALL_NR_ARGS]; + + lttng_syscall_get_arguments(current, regs, args); + lttng_hlist_for_each_entry_rcu(event, action_list, u.syscall.node) + fptr(event, args[0], args[1], args[2], args[3]); + break; + } + case 5: + { + void (*fptr)(void *__data, + unsigned long arg0, + unsigned long arg1, + unsigned long arg2, + unsigned long arg3, + unsigned long arg4) = func; + unsigned long args[LTTNG_SYSCALL_NR_ARGS]; + + lttng_syscall_get_arguments(current, regs, args); + lttng_hlist_for_each_entry_rcu(event, action_list, u.syscall.node) + fptr(event, args[0], args[1], args[2], args[3], args[4]); + break; + } + case 6: + { + void (*fptr)(void *__data, + unsigned long arg0, + unsigned long arg1, + unsigned long arg2, + unsigned long arg3, + unsigned long arg4, + unsigned long arg5) = func; + unsigned long args[LTTNG_SYSCALL_NR_ARGS]; + + lttng_syscall_get_arguments(current, regs, args); + lttng_hlist_for_each_entry_rcu(event, action_list, u.syscall.node) + fptr(event, args[0], args[1], args[2], + args[3], args[4], args[5]); + break; + } + default: + break; + } +} + +static __always_inline +void syscall_entry_event_notifier_call_func(struct hlist_head *dispatch_list, + void *func, unsigned int nrargs, struct pt_regs *regs) +{ + struct lttng_event_notifier *notifier; + switch (nrargs) { case 0: { void (*fptr)(void *__data) = func; - fptr(data); + lttng_hlist_for_each_entry_rcu(notifier, dispatch_list, u.syscall.node) + fptr(notifier); break; } case 1: @@ -429,7 +558,8 @@ void syscall_entry_call_func(void *func, unsigned int nrargs, void *data, unsigned long args[LTTNG_SYSCALL_NR_ARGS]; lttng_syscall_get_arguments(current, regs, args); - fptr(data, args[0]); + lttng_hlist_for_each_entry_rcu(notifier, dispatch_list, u.syscall.node) + fptr(notifier, args[0]); break; } case 2: @@ -440,7 +570,8 @@ void syscall_entry_call_func(void *func, unsigned int nrargs, void *data, unsigned long args[LTTNG_SYSCALL_NR_ARGS]; lttng_syscall_get_arguments(current, regs, args); - fptr(data, args[0], args[1]); + lttng_hlist_for_each_entry_rcu(notifier, dispatch_list, u.syscall.node) + fptr(notifier, args[0], args[1]); break; } case 3: @@ -452,7 +583,8 @@ void syscall_entry_call_func(void *func, unsigned int nrargs, void *data, unsigned long args[LTTNG_SYSCALL_NR_ARGS]; lttng_syscall_get_arguments(current, regs, args); - fptr(data, args[0], args[1], args[2]); + lttng_hlist_for_each_entry_rcu(notifier, dispatch_list, u.syscall.node) + fptr(notifier, args[0], args[1], args[2]); break; } case 4: @@ -465,7 +597,8 @@ void syscall_entry_call_func(void *func, unsigned int nrargs, void *data, unsigned long args[LTTNG_SYSCALL_NR_ARGS]; lttng_syscall_get_arguments(current, regs, args); - fptr(data, args[0], args[1], args[2], args[3]); + lttng_hlist_for_each_entry_rcu(notifier, dispatch_list, u.syscall.node) + fptr(notifier, args[0], args[1], args[2], args[3]); break; } case 5: @@ -479,7 +612,8 @@ void syscall_entry_call_func(void *func, unsigned int nrargs, void *data, unsigned long args[LTTNG_SYSCALL_NR_ARGS]; lttng_syscall_get_arguments(current, regs, args); - fptr(data, args[0], args[1], args[2], args[3], args[4]); + lttng_hlist_for_each_entry_rcu(notifier, dispatch_list, u.syscall.node) + fptr(notifier, args[0], args[1], args[2], args[3], args[4]); break; } case 6: @@ -494,8 +628,8 @@ void syscall_entry_call_func(void *func, unsigned int nrargs, void *data, unsigned long args[LTTNG_SYSCALL_NR_ARGS]; lttng_syscall_get_arguments(current, regs, args); - fptr(data, args[0], args[1], args[2], - args[3], args[4], args[5]); + lttng_hlist_for_each_entry_rcu(notifier, dispatch_list, u.syscall.node) + fptr(notifier, args[0], args[1], args[2], args[3], args[4], args[5]); break; } default: @@ -505,166 +639,319 @@ void syscall_entry_call_func(void *func, unsigned int nrargs, void *data, 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_event_container *container = __data; + struct hlist_head *action_list, *unknown_action_list; 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_syscall_filter *filter = container->sc_filter; if (id < 0 || id >= NR_compat_syscalls - || (!READ_ONCE(chan->syscall_all) && !test_bit(id, filter->sc_compat_entry))) { + || (!READ_ONCE(container->syscall_all_entry) && !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; + unknown_action_list = &container->sc_compat_unknown; } else { - struct lttng_syscall_filter *filter = chan->sc_filter; + struct lttng_syscall_filter *filter = container->sc_filter; if (id < 0 || id >= NR_syscalls - || (!READ_ONCE(chan->syscall_all) && !test_bit(id, filter->sc_entry))) { + || (!READ_ONCE(container->syscall_all_entry) && !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; + unknown_action_list = &container->sc_unknown; } if (unlikely(id < 0 || id >= table_len)) { - syscall_entry_event_unknown(unknown_event, regs, id); + syscall_entry_event_unknown(unknown_action_list, 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); + + entry = &table[id]; + if (!entry->event_func) { + syscall_entry_event_unknown(unknown_action_list, regs, id); return; } - entry = &table[id]; - WARN_ON_ONCE(!entry); - syscall_entry_call_func(entry->event_func, entry->nrargs, event, regs); + + if (unlikely(in_compat_syscall())) { + action_list = &container->compat_sc_table[id]; + } else { + action_list = &container->sc_table[id]; + } + if (unlikely(hlist_empty(action_list))) + return; + + syscall_entry_call_func(action_list, entry->event_func, entry->nrargs, regs); } -void syscall_entry_event_notifier_probe(void *__data, struct pt_regs *regs, long id) +void syscall_entry_event_notifier_probe(void *__data, struct pt_regs *regs, + long id) { - struct lttng_event_notifier_group *event_notifier_group = __data; - const struct trace_syscall_entry *entry; - struct list_head *dispatch_list; - struct lttng_event_notifier *iter; + 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; if (unlikely(in_compat_syscall())) { - table_len = ARRAY_SIZE(compat_sc_table); - if (unlikely(id < 0 || id >= table_len)) { + 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; } - entry = &compat_sc_table[id]; - dispatch_list = &event_notifier_group->event_notifier_compat_syscall_dispatch[id]; + table = compat_sc_table; + table_len = ARRAY_SIZE(compat_sc_table); + unknown_dispatch_list = &group->event_notifier_compat_unknown_syscall_dispatch; } else { - table_len = ARRAY_SIZE(sc_table); - if (unlikely(id < 0 || id >= table_len)) { + 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; } - entry = &sc_table[id]; - dispatch_list = &event_notifier_group->event_notifier_syscall_dispatch[id]; + table = sc_table; + table_len = ARRAY_SIZE(sc_table); + 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_entry_event_notifier_unknown(event_notifier_group, regs, id); + syscall_entry_event_notifier_unknown(unknown_dispatch_list, + regs, id); return; } - /* TODO handle unknown syscall */ + entry = &table[id]; + if (!entry->event_notifier_func) { + syscall_entry_event_notifier_unknown(unknown_dispatch_list, + regs, id); + return; + } - list_for_each_entry_rcu(iter, dispatch_list, u.syscall.node) { - BUG_ON(iter->u.syscall.syscall_id != id); - syscall_entry_call_func(entry->event_notifier_func, - entry->nrargs, iter, regs); + 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_notifier_call_func(dispatch_list, + entry->event_notifier_func, entry->nrargs, regs); } -static void syscall_exit_event_unknown(struct lttng_event *event, - struct pt_regs *regs, int id, long ret) +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_event *event; 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); + lttng_hlist_for_each_entry_rcu(event, unknown_action_list_head, u.syscall.node) { + 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); + } +} + +static __always_inline +void syscall_exit_call_func(struct hlist_head *action_list, + void *func, unsigned int nrargs, + struct pt_regs *regs, long ret) +{ + struct lttng_event *event; + + switch (nrargs) { + case 0: + { + void (*fptr)(void *__data, long ret) = func; + + lttng_hlist_for_each_entry_rcu(event, action_list, u.syscall.node) + fptr(event, ret); + break; + } + case 1: + { + void (*fptr)(void *__data, + long ret, + unsigned long arg0) = func; + unsigned long args[LTTNG_SYSCALL_NR_ARGS]; + + lttng_syscall_get_arguments(current, regs, args); + lttng_hlist_for_each_entry_rcu(event, action_list, u.syscall.node) + fptr(event, ret, args[0]); + break; + } + case 2: + { + void (*fptr)(void *__data, + long ret, + unsigned long arg0, + unsigned long arg1) = func; + unsigned long args[LTTNG_SYSCALL_NR_ARGS]; + + lttng_syscall_get_arguments(current, regs, args); + lttng_hlist_for_each_entry_rcu(event, action_list, u.syscall.node) + fptr(event, ret, args[0], args[1]); + break; + } + case 3: + { + void (*fptr)(void *__data, + long ret, + unsigned long arg0, + unsigned long arg1, + unsigned long arg2) = func; + unsigned long args[LTTNG_SYSCALL_NR_ARGS]; + + lttng_syscall_get_arguments(current, regs, args); + lttng_hlist_for_each_entry_rcu(event, action_list, u.syscall.node) + fptr(event, ret, args[0], args[1], args[2]); + break; + } + case 4: + { + void (*fptr)(void *__data, + long ret, + unsigned long arg0, + unsigned long arg1, + unsigned long arg2, + unsigned long arg3) = func; + unsigned long args[LTTNG_SYSCALL_NR_ARGS]; + + lttng_syscall_get_arguments(current, regs, args); + lttng_hlist_for_each_entry_rcu(event, action_list, u.syscall.node) + fptr(event, ret, args[0], args[1], args[2], args[3]); + break; + } + case 5: + { + void (*fptr)(void *__data, + long ret, + unsigned long arg0, + unsigned long arg1, + unsigned long arg2, + unsigned long arg3, + unsigned long arg4) = func; + unsigned long args[LTTNG_SYSCALL_NR_ARGS]; + + lttng_syscall_get_arguments(current, regs, args); + lttng_hlist_for_each_entry_rcu(event, action_list, u.syscall.node) + fptr(event, ret, args[0], args[1], args[2], args[3], args[4]); + break; + } + case 6: + { + void (*fptr)(void *__data, + long ret, + unsigned long arg0, + unsigned long arg1, + unsigned long arg2, + unsigned long arg3, + unsigned long arg4, + unsigned long arg5) = func; + unsigned long args[LTTNG_SYSCALL_NR_ARGS]; + + lttng_syscall_get_arguments(current, regs, args); + lttng_hlist_for_each_entry_rcu(event, action_list, u.syscall.node) + fptr(event, ret, args[0], args[1], args[2], + args[3], args[4], args[5]); + break; + } + default: + break; + } } void syscall_exit_event_probe(void *__data, struct pt_regs *regs, long ret) { - struct lttng_channel *chan = __data; - struct lttng_event *event, *unknown_event; + struct lttng_event_container *container = __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 = container->sc_filter; if (id < 0 || id >= NR_compat_syscalls - || (!READ_ONCE(chan->syscall_all) && !test_bit(id, filter->sc_compat_exit))) { + || (!READ_ONCE(container->syscall_all_exit) && !test_bit(id, filter->sc_compat_exit))) { /* 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; + unknown_action_list = &container->compat_sc_exit_unknown; } else { - struct lttng_syscall_filter *filter = chan->sc_filter; + struct lttng_syscall_filter *filter = container->sc_filter; if (id < 0 || id >= NR_syscalls - || (!READ_ONCE(chan->syscall_all) && !test_bit(id, filter->sc_exit))) { + || (!READ_ONCE(container->syscall_all_exit) && !test_bit(id, filter->sc_exit))) { /* System call filtered out. */ return; } table = sc_exit_table; table_len = ARRAY_SIZE(sc_exit_table); - unknown_event = chan->sc_exit_unknown; + unknown_action_list = &container->sc_exit_unknown; } if (unlikely(id < 0 || id >= table_len)) { - syscall_exit_event_unknown(unknown_event, regs, id, ret); + syscall_exit_event_unknown(unknown_action_list, regs, id, ret); 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_exit_event_unknown(unknown_action_list, regs, id, ret); return; } - entry = &table[id]; - WARN_ON_ONCE(!entry); - switch (entry->nrargs) { + if (unlikely(in_compat_syscall())) { + action_list = &container->compat_sc_exit_table[id]; + } else { + action_list = &container->sc_exit_table[id]; + } + if (unlikely(hlist_empty(action_list))) + return; + + syscall_exit_call_func(action_list, entry->event_func, entry->nrargs, + regs, ret); +} + +static __always_inline +void syscall_exit_event_notifier_call_func(struct hlist_head *dispatch_list, + void *func, unsigned int nrargs, struct pt_regs *regs, long ret) +{ + struct lttng_event_notifier *notifier; + + 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(notifier, dispatch_list, u.syscall.node) + fptr(notifier, ret); break; } case 1: { - void (*fptr)(void *__data, - long ret, - unsigned long arg0) = entry->event_func; + void (*fptr)(void *__data, long ret, 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(notifier, dispatch_list, u.syscall.node) + fptr(notifier, ret, args[0]); break; } case 2: @@ -672,11 +959,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(notifier, dispatch_list, u.syscall.node) + fptr(notifier, ret, args[0], args[1]); break; } case 3: @@ -685,11 +973,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(notifier, dispatch_list, u.syscall.node) + fptr(notifier, ret, args[0], args[1], args[2]); break; } case 4: @@ -699,11 +988,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(notifier, dispatch_list, u.syscall.node) + fptr(notifier, ret, args[0], args[1], args[2], args[3]); break; } case 5: @@ -714,11 +1004,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(notifier, dispatch_list, u.syscall.node) + fptr(notifier, ret, args[0], args[1], args[2], args[3], args[4]); break; } case 6: @@ -730,12 +1021,12 @@ 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(notifier, dispatch_list, u.syscall.node) + fptr(notifier, ret, args[0], args[1], args[2], args[3], args[4], args[5]); break; } default: @@ -743,33 +1034,95 @@ void syscall_exit_event_probe(void *__data, struct pt_regs *regs, long ret) } } +static +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_len = ARRAY_SIZE(compat_sc_exit_table); + 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_len = ARRAY_SIZE(sc_exit_table); + 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_notifier_unknown(unknown_dispatch_list, + regs, id, ret); + return; + } + + entry = &table[id]; + if (!entry->event_notifier_func) { + syscall_entry_event_notifier_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_notifier_call_func(dispatch_list, + entry->event_notifier_func, entry->nrargs, regs, 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, +int lttng_create_syscall_event_if_missing(const struct trace_syscall_entry *table, size_t table_len, + struct hlist_head *container_table, struct lttng_event_enabler *event_enabler, void *filter, enum sc_type type) { - const struct lttng_event_desc *desc; + struct lttng_event_container *container = event_enabler->container; 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++) { + const struct lttng_event_desc *desc = table[i].desc; struct lttng_kernel_event ev; - desc = table[i].desc; + struct lttng_event *event; if (!desc) { /* Unknown syscall */ continue; } - /* - * Skip those already populated by previous failed - * register for this channel. - */ - if (chan_table[i]) + if (lttng_desc_match_enabler(desc, + lttng_event_enabler_as_enabler(event_enabler)) <= 0) continue; + + /* We need to create an event for this syscall/enabler. */ memset(&ev, 0, sizeof(ev)); switch (type) { case SC_TYPE_ENTRY: @@ -792,18 +1145,22 @@ int fill_event_table(const struct trace_syscall_entry *table, size_t table_len, 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])) { + event = _lttng_event_create(container, &ev, &event_enabler->key, filter, + desc, ev.instrumentation, + event_enabler->base.user_token); + /* Skip if event is already found. */ + if (IS_ERR(event) && PTR_ERR(event) == -EEXIST) + continue; + if (IS_ERR(event)) { /* * 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); } + hlist_add_head(&event->u.syscall.node, &container_table[i]); } return 0; } @@ -811,49 +1168,51 @@ int fill_event_table(const struct trace_syscall_entry *table, size_t table_len, /* * Should be called with sessions lock held. */ -int lttng_syscalls_register_event(struct lttng_channel *chan, void *filter) +int lttng_syscalls_register_event(struct lttng_event_enabler *event_enabler, void *filter) { + struct lttng_event_container *container = event_enabler->container; struct lttng_kernel_event ev; int ret; wrapper_vmalloc_sync_mappings(); - if (!chan->sc_table) { + if (!container->sc_table) { /* create syscall table mapping syscall to events */ - chan->sc_table = kzalloc(sizeof(struct lttng_event *) + container->sc_table = kzalloc(sizeof(struct hlist_head) * ARRAY_SIZE(sc_table), GFP_KERNEL); - if (!chan->sc_table) + if (!container->sc_table) return -ENOMEM; } - if (!chan->sc_exit_table) { + if (!container->sc_exit_table) { /* create syscall table mapping syscall to events */ - chan->sc_exit_table = kzalloc(sizeof(struct lttng_event *) + container->sc_exit_table = kzalloc(sizeof(struct hlist_head) * ARRAY_SIZE(sc_exit_table), GFP_KERNEL); - if (!chan->sc_exit_table) + if (!container->sc_exit_table) return -ENOMEM; } - #ifdef CONFIG_COMPAT - if (!chan->compat_sc_table) { + if (!container->compat_sc_table) { /* create syscall table mapping compat syscall to events */ - chan->compat_sc_table = kzalloc(sizeof(struct lttng_event *) + container->compat_sc_table = kzalloc(sizeof(struct hlist_head) * ARRAY_SIZE(compat_sc_table), GFP_KERNEL); - if (!chan->compat_sc_table) + if (!container->compat_sc_table) return -ENOMEM; } - if (!chan->compat_sc_exit_table) { + if (!container->compat_sc_exit_table) { /* create syscall table mapping compat syscall to events */ - chan->compat_sc_exit_table = kzalloc(sizeof(struct lttng_event *) + container->compat_sc_exit_table = kzalloc(sizeof(struct hlist_head) * ARRAY_SIZE(compat_sc_exit_table), GFP_KERNEL); - if (!chan->compat_sc_exit_table) + if (!container->compat_sc_exit_table) return -ENOMEM; } #endif - if (!chan->sc_unknown) { + + { const struct lttng_event_desc *desc = &__event_desc___syscall_entry_unknown; + struct lttng_event *event; memset(&ev, 0, sizeof(ev)); strncpy(ev.name, desc->name, LTTNG_KERNEL_SYM_NAME_LEN); @@ -861,18 +1220,22 @@ int lttng_syscalls_register_event(struct lttng_channel *chan, void *filter) 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); + event = _lttng_event_create(container, &ev, &event_enabler->key, filter, + desc, ev.instrumentation, + event_enabler->base.user_token); + if (IS_ERR(event)) { + if (PTR_ERR(event) != -EEXIST) + return PTR_ERR(event); + /* Skip if event is already found. */ + } else { + hlist_add_head(&event->u.syscall.node, &container->sc_unknown); } } - if (!chan->sc_compat_unknown) { + { const struct lttng_event_desc *desc = &__event_desc___compat_syscall_entry_unknown; + struct lttng_event *event; memset(&ev, 0, sizeof(ev)); strncpy(ev.name, desc->name, LTTNG_KERNEL_SYM_NAME_LEN); @@ -880,18 +1243,22 @@ int lttng_syscalls_register_event(struct lttng_channel *chan, void *filter) 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); + event = _lttng_event_create(container, &ev, &event_enabler->key, filter, + desc, ev.instrumentation, + event_enabler->base.user_token); + if (IS_ERR(event)) { + if (PTR_ERR(event) != -EEXIST) + return PTR_ERR(event); + /* Skip if event is already found. */ + } else { + hlist_add_head(&event->u.syscall.node, &container->sc_compat_unknown); } } - if (!chan->compat_sc_exit_unknown) { + { const struct lttng_event_desc *desc = &__event_desc___compat_syscall_exit_unknown; + struct lttng_event *event; memset(&ev, 0, sizeof(ev)); strncpy(ev.name, desc->name, LTTNG_KERNEL_SYM_NAME_LEN); @@ -899,18 +1266,22 @@ int lttng_syscalls_register_event(struct lttng_channel *chan, void *filter) 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); + event = _lttng_event_create(container, &ev, &event_enabler->key, + filter, desc, ev.instrumentation, + event_enabler->base.user_token); + if (IS_ERR(event)) { + if (PTR_ERR(event) != -EEXIST) + return PTR_ERR(event); + /* Skip if event is already found. */ + } else { + hlist_add_head(&event->u.syscall.node, &container->compat_sc_exit_unknown); } } - if (!chan->sc_exit_unknown) { + { const struct lttng_event_desc *desc = &__event_desc___syscall_exit_unknown; + struct lttng_event *event; memset(&ev, 0, sizeof(ev)); strncpy(ev.name, desc->name, LTTNG_KERNEL_SYM_NAME_LEN); @@ -918,63 +1289,67 @@ int lttng_syscalls_register_event(struct lttng_channel *chan, void *filter) 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); + event = _lttng_event_create(container, &ev, &event_enabler->key, filter, + desc, ev.instrumentation, + event_enabler->base.user_token); + if (IS_ERR(event)) { + if (PTR_ERR(event) != -EEXIST) + return PTR_ERR(event); + /* Skip if event is already found. */ + } else { + hlist_add_head(&event->u.syscall.node, &container->sc_exit_unknown); } } - ret = fill_event_table(sc_table, ARRAY_SIZE(sc_table), - chan->sc_table, chan, filter, SC_TYPE_ENTRY); + ret = lttng_create_syscall_event_if_missing(sc_table, ARRAY_SIZE(sc_table), + container->sc_table, event_enabler, 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); + ret = lttng_create_syscall_event_if_missing(sc_exit_table, ARRAY_SIZE(sc_exit_table), + container->sc_exit_table, event_enabler, 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, + ret = lttng_create_syscall_event_if_missing(compat_sc_table, ARRAY_SIZE(compat_sc_table), + container->compat_sc_table, event_enabler, 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, + ret = lttng_create_syscall_event_if_missing(compat_sc_exit_table, ARRAY_SIZE(compat_sc_exit_table), + container->compat_sc_exit_table, event_enabler, filter, SC_TYPE_COMPAT_EXIT); if (ret) return ret; #endif - if (!chan->sc_filter) { - chan->sc_filter = kzalloc(sizeof(struct lttng_syscall_filter), + if (!container->sc_filter) { + container->sc_filter = kzalloc(sizeof(struct lttng_syscall_filter), GFP_KERNEL); - if (!chan->sc_filter) + if (!container->sc_filter) return -ENOMEM; } - if (!chan->sys_enter_registered) { + if (!container->sys_enter_registered) { ret = lttng_wrapper_tracepoint_probe_register("sys_enter", - (void *) syscall_entry_event_probe, chan); + (void *) syscall_entry_event_probe, container); if (ret) return ret; - chan->sys_enter_registered = 1; + container->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 (!container->sys_exit_registered) { ret = lttng_wrapper_tracepoint_probe_register("sys_exit", - (void *) syscall_exit_event_probe, chan); + (void *) syscall_exit_event_probe, container); if (ret) { WARN_ON_ONCE(lttng_wrapper_tracepoint_probe_unregister("sys_enter", - (void *) syscall_entry_event_probe, chan)); + (void *) syscall_entry_event_probe, container)); return ret; } - chan->sys_exit_registered = 1; + container->sys_exit_registered = 1; } return ret; } @@ -982,7 +1357,9 @@ int lttng_syscalls_register_event(struct lttng_channel *chan, void *filter) /* * Should be called with sessions lock held. */ -int lttng_syscalls_register_event_notifier(struct lttng_event_notifier_enabler *event_notifier_enabler, void *filter) +int lttng_syscalls_register_event_notifier( + struct lttng_event_notifier_enabler *event_notifier_enabler, + void *filter) { struct lttng_event_notifier_group *group = event_notifier_enabler->group; unsigned int i; @@ -991,29 +1368,74 @@ int lttng_syscalls_register_event_notifier(struct lttng_event_notifier_enabler * wrapper_vmalloc_sync_mappings(); if (!group->event_notifier_syscall_dispatch) { - group->event_notifier_syscall_dispatch = kzalloc(sizeof(struct list_head) - * ARRAY_SIZE(sc_table), GFP_KERNEL); + group->event_notifier_syscall_dispatch = + kzalloc(sizeof(struct hlist_head) * ARRAY_SIZE(sc_table), + GFP_KERNEL); if (!group->event_notifier_syscall_dispatch) return -ENOMEM; /* Initialize all list_head */ for (i = 0; i < ARRAY_SIZE(sc_table); i++) - INIT_LIST_HEAD(&group->event_notifier_syscall_dispatch[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) * ARRAY_SIZE(sc_table), + GFP_KERNEL); + if (!group->event_notifier_exit_syscall_dispatch) + return -ENOMEM; + + /* Initialize all list_head */ + for (i = 0; i < ARRAY_SIZE(sc_table); 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 list_head) - * ARRAY_SIZE(compat_sc_table), GFP_KERNEL); + group->event_notifier_compat_syscall_dispatch = + kzalloc(sizeof(struct hlist_head) * ARRAY_SIZE(compat_sc_table), + GFP_KERNEL); if (!group->event_notifier_syscall_dispatch) return -ENOMEM; /* Initialize all list_head */ for (i = 0; i < ARRAY_SIZE(compat_sc_table); i++) - INIT_LIST_HEAD(&group->event_notifier_compat_syscall_dispatch[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) * ARRAY_SIZE(compat_sc_exit_table), + GFP_KERNEL); + if (!group->event_notifier_exit_syscall_dispatch) + return -ENOMEM; + + /* Initialize all list_head */ + for (i = 0; i < ARRAY_SIZE(compat_sc_exit_table); 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); @@ -1022,16 +1444,117 @@ int lttng_syscalls_register_event_notifier(struct lttng_event_notifier_enabler * 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_matching_event_notifiers(struct lttng_event_notifier_enabler *event_notifier_enabler, +static +int create_unknown_event_notifier( + struct lttng_event_notifier_enabler *event_notifier_enabler, + enum sc_type type) +{ + struct lttng_event_notifier *notifier; + const struct lttng_event_desc *desc; + struct lttng_event_notifier_group *group = event_notifier_enabler->group; + struct lttng_kernel_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_syscall_abi abi; + enum lttng_kernel_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_SYSCALL_ENTRY; + abi = LTTNG_KERNEL_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_SYSCALL_EXIT; + abi = LTTNG_KERNEL_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_SYSCALL_ENTRY; + abi = LTTNG_KERNEL_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_SYSCALL_EXIT; + abi = LTTNG_KERNEL_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->name); + lttng_hlist_for_each_entry(notifier, head, hlist) { + if (notifier->desc == desc && + notifier->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->name, + LTTNG_KERNEL_SYM_NAME_LEN - strlen(event_notifier_param.event.name) - 1); + + event_notifier_param.event.name[LTTNG_KERNEL_SYM_NAME_LEN - 1] = '\0'; + + event_notifier_param.event.instrumentation = LTTNG_KERNEL_SYSCALL; + event_notifier_param.event.u.syscall.abi = abi; + event_notifier_param.event.u.syscall.entryexit = entryexit; + + notifier = _lttng_event_notifier_create(desc, user_token, + error_counter_index, group, &event_notifier_param, NULL, + event_notifier_param.event.instrumentation); + if (IS_ERR(notifier)) { + printk(KERN_INFO "Unable to create unknown notifier %s\n", + desc->name); + ret = -ENOMEM; + goto end; + } + + hlist_add_head_rcu(¬ifier->u.syscall.node, unknown_dispatch_list); + +end: + return ret; +} + +static int create_matching_event_notifiers( + struct lttng_event_notifier_enabler *event_notifier_enabler, void *filter, const struct trace_syscall_entry *table, - size_t table_len, bool is_compat) + size_t table_len, enum sc_type type) { struct lttng_event_notifier_group *group = event_notifier_enabler->group; const struct lttng_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; @@ -1048,8 +1571,8 @@ static int create_matching_event_notifiers(struct lttng_event_notifier_enabler * continue; } - if (!lttng_desc_match_enabler(desc, - lttng_event_notifier_enabler_as_enabler(event_notifier_enabler))) + if (lttng_desc_match_enabler(desc, + lttng_event_notifier_enabler_as_enabler(event_notifier_enabler)) <= 0) continue; /* @@ -1066,14 +1589,32 @@ static int create_matching_event_notifiers(struct lttng_event_notifier_enabler * 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_SYSCALL_ENTRY; + event_notifier_param.event.u.syscall.abi = LTTNG_KERNEL_SYSCALL_ABI_NATIVE; + break; + case SC_TYPE_EXIT: + event_notifier_param.event.u.syscall.entryexit = LTTNG_KERNEL_SYSCALL_EXIT; + event_notifier_param.event.u.syscall.abi = LTTNG_KERNEL_SYSCALL_ABI_NATIVE; + break; + case SC_TYPE_COMPAT_ENTRY: + event_notifier_param.event.u.syscall.entryexit = LTTNG_KERNEL_SYSCALL_ENTRY; + event_notifier_param.event.u.syscall.abi = LTTNG_KERNEL_SYSCALL_ABI_COMPAT; + break; + case SC_TYPE_COMPAT_EXIT: + event_notifier_param.event.u.syscall.entryexit = LTTNG_KERNEL_SYSCALL_EXIT; + event_notifier_param.event.u.syscall.abi = LTTNG_KERNEL_SYSCALL_ABI_COMPAT; + break; + } strncat(event_notifier_param.event.name, desc->name, LTTNG_KERNEL_SYM_NAME_LEN - strlen(event_notifier_param.event.name) - 1); event_notifier_param.event.name[LTTNG_KERNEL_SYM_NAME_LEN - 1] = '\0'; event_notifier_param.event.instrumentation = LTTNG_KERNEL_SYSCALL; - event_notifier = _lttng_event_notifier_create(desc, user_token, group, - &event_notifier_param, filter, - event_notifier_param.event.instrumentation); + event_notifier = _lttng_event_notifier_create(desc, user_token, + error_counter_index, group, &event_notifier_param, + filter, event_notifier_param.event.instrumentation); if (IS_ERR(event_notifier)) { printk(KERN_INFO "Unable to create event_notifier %s\n", desc->name); @@ -1082,24 +1623,69 @@ static int create_matching_event_notifiers(struct lttng_event_notifier_enabler * } event_notifier->u.syscall.syscall_id = i; - event_notifier->u.syscall.is_compat = is_compat; } + end: return ret; - } -int lttng_syscals_create_matching_event_notifiers(struct lttng_event_notifier_enabler *event_notifier_enabler, void *filter) +int lttng_syscals_create_matching_event_notifiers( + struct lttng_event_notifier_enabler *event_notifier_enabler, + void *filter) { int ret; + struct lttng_enabler *base_enabler = + lttng_event_notifier_enabler_as_enabler(event_notifier_enabler); + enum lttng_kernel_syscall_entryexit entryexit = + base_enabler->event_param.u.syscall.entryexit; + + if (entryexit == LTTNG_KERNEL_SYSCALL_ENTRY || entryexit == LTTNG_KERNEL_SYSCALL_ENTRYEXIT) { + ret = create_matching_event_notifiers(event_notifier_enabler, + filter, sc_table, ARRAY_SIZE(sc_table), SC_TYPE_ENTRY); + if (ret) + goto end; - ret = create_matching_event_notifiers(event_notifier_enabler, filter, sc_table, - ARRAY_SIZE(sc_table), false); - if (ret) - goto end; + ret = create_matching_event_notifiers(event_notifier_enabler, + filter, compat_sc_table, ARRAY_SIZE(compat_sc_table), + 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_SYSCALL_EXIT || entryexit == LTTNG_KERNEL_SYSCALL_ENTRYEXIT) { + ret = create_matching_event_notifiers(event_notifier_enabler, + filter, sc_exit_table, ARRAY_SIZE(sc_exit_table), + 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, + filter, compat_sc_exit_table, ARRAY_SIZE(compat_sc_exit_table), + SC_TYPE_COMPAT_EXIT); + if (ret) + goto end; + + ret = create_unknown_event_notifier(event_notifier_enabler, + SC_TYPE_COMPAT_EXIT); + if (ret) + goto end; + } - ret = create_matching_event_notifiers(event_notifier_enabler, filter, compat_sc_table, - ARRAY_SIZE(compat_sc_table), true); end: return ret; } @@ -1107,7 +1693,8 @@ end: /* * Unregister the syscall event_notifier probes from the callsites. */ -int lttng_syscalls_unregister_event_notifier(struct lttng_event_notifier_group *event_notifier_group) +int lttng_syscalls_unregister_event_notifier_group( + struct lttng_event_notifier_group *event_notifier_group) { int ret; @@ -1123,46 +1710,55 @@ int lttng_syscalls_unregister_event_notifier(struct lttng_event_notifier_group * 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_event(struct lttng_channel *chan) +int lttng_syscalls_unregister_event_container(struct lttng_event_container *container) { int ret; - if (!chan->sc_table) + if (!container->sc_table) return 0; - if (chan->sys_enter_registered) { + if (container->sys_enter_registered) { ret = lttng_wrapper_tracepoint_probe_unregister("sys_enter", - (void *) syscall_entry_event_probe, chan); + (void *) syscall_entry_event_probe, container); if (ret) return ret; - chan->sys_enter_registered = 0; + container->sys_enter_registered = 0; } - if (chan->sys_exit_registered) { + if (container->sys_exit_registered) { ret = lttng_wrapper_tracepoint_probe_unregister("sys_exit", - (void *) syscall_exit_event_probe, chan); + (void *) syscall_exit_event_probe, container); if (ret) return ret; - chan->sys_exit_registered = 0; + container->sys_exit_registered = 0; } return 0; } -int lttng_syscalls_destroy_event(struct lttng_channel *chan) +int lttng_syscalls_destroy_event_container(struct lttng_event_container *container) { - kfree(chan->sc_table); - kfree(chan->sc_exit_table); + kfree(container->sc_table); + kfree(container->sc_exit_table); #ifdef CONFIG_COMPAT - kfree(chan->compat_sc_table); - kfree(chan->compat_sc_exit_table); + kfree(container->compat_sc_table); + kfree(container->compat_sc_exit_table); #endif - kfree(chan->sc_filter); + kfree(container->sc_filter); return 0; } @@ -1219,15 +1815,16 @@ uint32_t get_sc_tables_len(void) } 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; @@ -1237,7 +1834,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; @@ -1248,22 +1845,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; @@ -1276,9 +1873,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; @@ -1290,7 +1887,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; @@ -1311,35 +1908,84 @@ int lttng_syscall_filter_enable_event(struct lttng_channel *chan, } int lttng_syscall_filter_enable_event_notifier( - struct lttng_event_notifier *event_notifier) + struct lttng_event_notifier *notifier) { - struct lttng_event_notifier_group *group = event_notifier->group; - unsigned int syscall_id = event_notifier->u.syscall.syscall_id; - struct list_head *dispatch_list; + struct lttng_event_notifier_group *group = notifier->group; + unsigned int syscall_id = notifier->u.syscall.syscall_id; + struct hlist_head *dispatch_list; + int ret = 0; - if (event_notifier->u.syscall.is_compat) - dispatch_list = &group->event_notifier_compat_syscall_dispatch[syscall_id]; - else - dispatch_list = &group->event_notifier_syscall_dispatch[syscall_id]; + WARN_ON_ONCE(notifier->instrumentation != LTTNG_KERNEL_SYSCALL); - list_add_rcu(&event_notifier->u.syscall.node, dispatch_list); + ret = lttng_syscall_filter_enable(group->sc_filter, + notifier->desc->name, notifier->u.syscall.abi, + notifier->u.syscall.entryexit); + if (ret) { + goto end; + } - return 0; + switch (notifier->u.syscall.entryexit) { + case LTTNG_SYSCALL_ENTRY: + switch (notifier->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 (notifier->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; + } + break; + default: + ret = -EINVAL; + goto end; + } + + hlist_add_head_rcu(¬ifier->u.syscall.node, dispatch_list); + +end: + return ret ; } -int lttng_syscall_filter_disable_event(struct lttng_channel *chan, +int lttng_syscall_filter_enable_event( + struct lttng_event_container *container, struct lttng_event *event) { - struct lttng_syscall_filter *filter = chan->sc_filter; + WARN_ON_ONCE(event->instrumentation != LTTNG_KERNEL_SYSCALL); + + return lttng_syscall_filter_enable(container->sc_filter, + event->desc->name, event->u.syscall.abi, + event->u.syscall.entryexit); +} + +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; - 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; @@ -1352,9 +1998,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; @@ -1366,7 +2012,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; @@ -1388,12 +2034,31 @@ int lttng_syscall_filter_disable_event(struct lttng_channel *chan, } int lttng_syscall_filter_disable_event_notifier( - struct lttng_event_notifier *event_notifier) + struct lttng_event_notifier *notifier) { - list_del_rcu(&event_notifier->u.syscall.node); + struct lttng_event_notifier_group *group = notifier->group; + int ret; + + WARN_ON_ONCE(notifier->instrumentation != LTTNG_KERNEL_SYSCALL); + + ret = lttng_syscall_filter_disable(group->sc_filter, + notifier->desc->name, notifier->u.syscall.abi, + notifier->u.syscall.entryexit); + WARN_ON_ONCE(ret != 0); + + hlist_del_rcu(¬ifier->u.syscall.node); return 0; } +int lttng_syscall_filter_disable_event( + struct lttng_event_container *container, + struct lttng_event *event) +{ + return lttng_syscall_filter_disable(container->sc_filter, + event->desc->name, event->u.syscall.abi, + event->u.syscall.entryexit); +} + static const struct trace_syscall_entry *syscall_list_get_entry(loff_t *pos) { @@ -1508,7 +2173,7 @@ 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, +long lttng_event_container_syscall_mask(struct lttng_event_container *container, struct lttng_kernel_syscall_mask __user *usyscall_mask) { uint32_t len, sc_tables_len, bitmask_len; @@ -1528,13 +2193,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 = container->sc_filter; for (bit = 0; bit < ARRAY_SIZE(sc_table); bit++) { char state; - if (channel->sc_table) { - if (!READ_ONCE(channel->syscall_all) && filter) + if (container->sc_table) { + if (!(READ_ONCE(container->syscall_all_entry) + || READ_ONCE(container->syscall_all_exit)) && filter) state = test_bit(bit, filter->sc_entry) || test_bit(bit, filter->sc_exit); else @@ -1547,8 +2213,9 @@ 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) + if (container->compat_sc_table) { + if (!(READ_ONCE(container->syscall_all_entry) + || READ_ONCE(container->syscall_all_exit)) && filter) state = test_bit(bit - ARRAY_SIZE(sc_table), filter->sc_compat_entry) || test_bit(bit - ARRAY_SIZE(sc_table),