X-Git-Url: https://git.lttng.org/?a=blobdiff_plain;f=src%2Flttng-syscalls.c;h=de84a18be2f41c1e6731e5868ab1c8fe5260933a;hb=437d5aa59380583ce1cd14d394a53b398be1275d;hp=1465083556c4ca94657deb621cdb95f58b297962;hpb=8a8ac9a87ae1ddffad34d96a66be224e8c8d89e4;p=lttng-modules.git diff --git a/src/lttng-syscalls.c b/src/lttng-syscalls.c index 14650835..de84a18b 100644 --- a/src/lttng-syscalls.c +++ b/src/lttng-syscalls.c @@ -91,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 @@ -294,8 +294,8 @@ typedef __kernel_old_time_t time_t; struct trace_syscall_entry { void *event_func; void *event_notifier_func; - const struct lttng_event_desc *desc; - const struct lttng_event_field *fields; + const struct lttng_kernel_event_desc *desc; + const struct lttng_kernel_event_field **fields; unsigned int nrargs; }; @@ -388,16 +388,19 @@ struct lttng_syscall_filter { DECLARE_BITMAP(sc_compat_exit, NR_compat_syscalls); }; -static void syscall_entry_event_unknown(struct lttng_event *event, +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( @@ -433,15 +436,19 @@ static void syscall_exit_event_notifier_unknown( } 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; - fptr(data); + lttng_hlist_for_each_entry_rcu(event, action_list, u.syscall.node) + fptr(event); break; } case 1: @@ -450,7 +457,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(event, action_list, u.syscall.node) + fptr(event, args[0]); break; } case 2: @@ -461,7 +469,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(event, action_list, u.syscall.node) + fptr(event, args[0], args[1]); break; } case 3: @@ -473,7 +482,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(event, action_list, u.syscall.node) + fptr(event, args[0], args[1], args[2]); break; } case 4: @@ -486,7 +496,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(event, action_list, u.syscall.node) + fptr(event, args[0], args[1], args[2], args[3]); break; } case 5: @@ -500,7 +511,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(event, action_list, u.syscall.node) + fptr(event, args[0], args[1], args[2], args[3], args[4]); break; } case 6: @@ -515,8 +527,9 @@ 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(event, action_list, u.syscall.node) + fptr(event, args[0], args[1], args[2], + args[3], args[4], args[5]); break; } default: @@ -627,7 +640,7 @@ void syscall_entry_event_notifier_call_func(struct hlist_head *dispatch_list, 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 hlist_head *action_list, *unknown_action_list; const struct trace_syscall_entry *table, *entry; size_t table_len; @@ -635,40 +648,45 @@ void syscall_entry_event_probe(void *__data, struct pt_regs *regs, long id) struct lttng_syscall_filter *filter = chan->sc_filter; if (id < 0 || id >= NR_compat_syscalls - || (!READ_ONCE(chan->syscall_all) && !test_bit(id, filter->sc_compat_entry))) { + || (!READ_ONCE(chan->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 = &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))) { + || (!READ_ONCE(chan->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 = &chan->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->event_func); - syscall_entry_call_func(entry->event_func, entry->nrargs, event, regs); + + if (unlikely(in_compat_syscall())) { + action_list = &chan->compat_sc_table[id]; + } else { + action_list = &chan->sc_table[id]; + } + if (unlikely(hlist_empty(action_list))) + return; + + syscall_entry_call_func(action_list, entry->event_func, entry->nrargs, regs); } void syscall_entry_event_notifier_probe(void *__data, struct pt_regs *regs, @@ -730,83 +748,48 @@ void syscall_entry_event_notifier_probe(void *__data, struct pt_regs *regs, entry->event_notifier_func, entry->nrargs, regs); } -static void syscall_exit_event_unknown(struct lttng_event *event, +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); + } } -void syscall_exit_event_probe(void *__data, struct pt_regs *regs, long ret) +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_channel *chan = __data; - struct lttng_event *event, *unknown_event; - const struct trace_syscall_entry *table, *entry; - size_t table_len; - long id; - - id = syscall_get_nr(current, regs); - if (unlikely(in_compat_syscall())) { - struct lttng_syscall_filter *filter = chan->sc_filter; - - if (id < 0 || id >= NR_compat_syscalls - || (!READ_ONCE(chan->syscall_all) && !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; - } 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_exit))) { - /* System call filtered out. */ - return; - } - table = sc_exit_table; - table_len = ARRAY_SIZE(sc_exit_table); - unknown_event = chan->sc_exit_unknown; - } - if (unlikely(id < 0 || id >= table_len)) { - syscall_exit_event_unknown(unknown_event, 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); - return; - } - entry = &table[id]; - WARN_ON_ONCE(!entry->event_func); + struct lttng_event *event; - switch (entry->nrargs) { + 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, action_list, u.syscall.node) + fptr(event, 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, action_list, u.syscall.node) + fptr(event, ret, args[0]); break; } case 2: @@ -814,11 +797,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, action_list, u.syscall.node) + fptr(event, ret, args[0], args[1]); break; } case 3: @@ -827,11 +811,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, action_list, u.syscall.node) + fptr(event, ret, args[0], args[1], args[2]); break; } case 4: @@ -841,11 +826,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, action_list, u.syscall.node) + fptr(event, ret, args[0], args[1], args[2], args[3]); break; } case 5: @@ -856,11 +842,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, action_list, u.syscall.node) + fptr(event, ret, args[0], args[1], args[2], args[3], args[4]); break; } case 6: @@ -872,12 +859,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, action_list, u.syscall.node) + fptr(event, ret, args[0], args[1], args[2], + args[3], args[4], args[5]); break; } default: @@ -885,6 +873,62 @@ void syscall_exit_event_probe(void *__data, struct pt_regs *regs, long ret) } } +void syscall_exit_event_probe(void *__data, struct pt_regs *regs, long ret) +{ + struct lttng_channel *chan = __data; + struct hlist_head *action_list, *unknown_action_list; + const struct trace_syscall_entry *table, *entry; + size_t table_len; + long id; + + id = syscall_get_nr(current, regs); + + if (unlikely(in_compat_syscall())) { + struct lttng_syscall_filter *filter = chan->sc_filter; + + if (id < 0 || id >= NR_compat_syscalls + || (!READ_ONCE(chan->syscall_all_exit) && !test_bit(id, filter->sc_compat_exit))) { + /* System call filtered out. */ + return; + } + table = compat_sc_exit_table; + table_len = ARRAY_SIZE(compat_sc_exit_table); + unknown_action_list = &chan->compat_sc_exit_unknown; + } else { + struct lttng_syscall_filter *filter = chan->sc_filter; + + if (id < 0 || id >= NR_syscalls + || (!READ_ONCE(chan->syscall_all_exit) && !test_bit(id, filter->sc_exit))) { + /* System call filtered out. */ + return; + } + table = sc_exit_table; + table_len = ARRAY_SIZE(sc_exit_table); + unknown_action_list = &chan->sc_exit_unknown; + } + if (unlikely(id < 0 || id >= table_len)) { + syscall_exit_event_unknown(unknown_action_list, regs, id, ret); + return; + } + + entry = &table[id]; + if (!entry->event_func) { + syscall_exit_event_unknown(unknown_action_list, regs, id, ret); + return; + } + + if (unlikely(in_compat_syscall())) { + action_list = &chan->compat_sc_exit_table[id]; + } else { + action_list = &chan->sc_exit_table[id]; + } + if (unlikely(hlist_empty(action_list))) + return; + + syscall_exit_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) @@ -1057,28 +1101,44 @@ void syscall_exit_event_notifier_probe(void *__data, struct pt_regs *regs, * 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 *chan_table, struct lttng_event_enabler *event_enabler, void *filter, enum sc_type type) { - const struct lttng_event_desc *desc; + struct lttng_channel *chan = event_enabler->chan; + struct lttng_session *session = chan->session; unsigned int i; - /* Allocate events for each syscall, insert into table */ + /* Allocate events for each syscall matching enabler, insert into table */ for (i = 0; i < table_len; i++) { + const struct lttng_kernel_event_desc *desc = table[i].desc; struct lttng_kernel_event ev; - desc = table[i].desc; + struct lttng_event *event; + struct hlist_head *head; + bool found = false; if (!desc) { /* Unknown syscall */ continue; } + if (lttng_desc_match_enabler(desc, + lttng_event_enabler_as_enabler(event_enabler)) <= 0) + continue; /* - * Skip those already populated by previous failed - * register for this channel. + * Check if already created. */ - if (chan_table[i]) + head = utils_borrow_hash_table_bucket( + session->events_ht.table, LTTNG_EVENT_HT_SIZE, + desc->event_name); + lttng_hlist_for_each_entry(event, head, hlist) { + if (event->desc == desc + && event->chan == event_enabler->chan) + found = true; + } + if (found) continue; + + /* We need to create an event for this syscall/enabler. */ memset(&ev, 0, sizeof(ev)); switch (type) { case SC_TYPE_ENTRY: @@ -1098,21 +1158,22 @@ int fill_event_table(const struct trace_syscall_entry *table, size_t table_len, ev.u.syscall.abi = LTTNG_KERNEL_SYSCALL_ABI_COMPAT; break; } - strncpy(ev.name, desc->name, LTTNG_KERNEL_SYM_NAME_LEN - 1); + strncpy(ev.name, desc->event_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(chan, &ev, filter, + desc, ev.instrumentation); + WARN_ON_ONCE(!event); + 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, &chan_table[i]); } return 0; } @@ -1120,8 +1181,9 @@ 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_channel *chan = event_enabler->chan; struct lttng_kernel_event ev; int ret; @@ -1160,98 +1222,103 @@ int lttng_syscalls_register_event(struct lttng_channel *chan, void *filter) return -ENOMEM; } #endif - if (!chan->sc_unknown) { - const struct lttng_event_desc *desc = + if (hlist_empty(&chan->sc_unknown)) { + const struct lttng_kernel_event_desc *desc = &__event_desc___syscall_entry_unknown; + struct lttng_event *event; memset(&ev, 0, sizeof(ev)); - strncpy(ev.name, desc->name, LTTNG_KERNEL_SYM_NAME_LEN); + strncpy(ev.name, desc->event_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); + event = _lttng_event_create(chan, &ev, filter, desc, + ev.instrumentation); + WARN_ON_ONCE(!event); + if (IS_ERR(event)) { + return PTR_ERR(event); } + hlist_add_head(&event->u.syscall.node, &chan->sc_unknown); } - if (!chan->sc_compat_unknown) { - const struct lttng_event_desc *desc = + if (hlist_empty(&chan->sc_compat_unknown)) { + const struct lttng_kernel_event_desc *desc = &__event_desc___compat_syscall_entry_unknown; + struct lttng_event *event; memset(&ev, 0, sizeof(ev)); - strncpy(ev.name, desc->name, LTTNG_KERNEL_SYM_NAME_LEN); + strncpy(ev.name, desc->event_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); + event = _lttng_event_create(chan, &ev, filter, desc, + ev.instrumentation); + WARN_ON_ONCE(!event); + if (IS_ERR(event)) { + return PTR_ERR(event); } + hlist_add_head(&event->u.syscall.node, &chan->sc_compat_unknown); } - if (!chan->compat_sc_exit_unknown) { - const struct lttng_event_desc *desc = + if (hlist_empty(&chan->compat_sc_exit_unknown)) { + const struct lttng_kernel_event_desc *desc = &__event_desc___compat_syscall_exit_unknown; + struct lttng_event *event; memset(&ev, 0, sizeof(ev)); - strncpy(ev.name, desc->name, LTTNG_KERNEL_SYM_NAME_LEN); + strncpy(ev.name, desc->event_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); + event = _lttng_event_create(chan, &ev, filter, desc, + ev.instrumentation); + WARN_ON_ONCE(!event); + if (IS_ERR(event)) { + return PTR_ERR(event); } + hlist_add_head(&event->u.syscall.node, &chan->compat_sc_exit_unknown); } - if (!chan->sc_exit_unknown) { - const struct lttng_event_desc *desc = + if (hlist_empty(&chan->sc_exit_unknown)) { + const struct lttng_kernel_event_desc *desc = &__event_desc___syscall_exit_unknown; + struct lttng_event *event; memset(&ev, 0, sizeof(ev)); - strncpy(ev.name, desc->name, LTTNG_KERNEL_SYM_NAME_LEN); + strncpy(ev.name, desc->event_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); + event = _lttng_event_create(chan, &ev, filter, desc, + ev.instrumentation); + WARN_ON_ONCE(!event); + if (IS_ERR(event)) { + return PTR_ERR(event); } + hlist_add_head(&event->u.syscall.node, &chan->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), + chan->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), + chan->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), + chan->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), + chan->compat_sc_exit_table, event_enabler, filter, SC_TYPE_COMPAT_EXIT); if (ret) return ret; @@ -1398,10 +1465,11 @@ int create_unknown_event_notifier( enum sc_type type) { struct lttng_event_notifier *notifier; - const struct lttng_event_desc *desc; + const struct lttng_kernel_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; @@ -1444,7 +1512,7 @@ int create_unknown_event_notifier( * Check if already created. */ head = utils_borrow_hash_table_bucket(group->event_notifiers_ht.table, - LTTNG_EVENT_NOTIFIER_HT_SIZE, desc->name); + LTTNG_EVENT_NOTIFIER_HT_SIZE, desc->event_name); lttng_hlist_for_each_entry(notifier, head, hlist) { if (notifier->desc == desc && notifier->user_token == base_enabler->user_token) @@ -1454,7 +1522,7 @@ int create_unknown_event_notifier( goto end; memset(&event_notifier_param, 0, sizeof(event_notifier_param)); - strncat(event_notifier_param.event.name, desc->name, + strncat(event_notifier_param.event.name, desc->event_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'; @@ -1464,11 +1532,11 @@ int create_unknown_event_notifier( event_notifier_param.event.u.syscall.entryexit = entryexit; notifier = _lttng_event_notifier_create(desc, user_token, - group, &event_notifier_param, NULL, + 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); + desc->event_name); ret = -ENOMEM; goto end; } @@ -1485,8 +1553,9 @@ static int create_matching_event_notifiers( size_t table_len, enum sc_type type) { struct lttng_event_notifier_group *group = event_notifier_enabler->group; - const struct lttng_event_desc *desc; + const struct lttng_kernel_event_desc *desc; uint64_t user_token = event_notifier_enabler->base.user_token; + uint64_t error_counter_index = event_notifier_enabler->error_counter_index; unsigned int i; int ret = 0; @@ -1511,7 +1580,7 @@ static int create_matching_event_notifiers( * Check if already created. */ head = utils_borrow_hash_table_bucket(group->event_notifiers_ht.table, - LTTNG_EVENT_NOTIFIER_HT_SIZE, desc->name); + LTTNG_EVENT_NOTIFIER_HT_SIZE, desc->event_name); lttng_hlist_for_each_entry(event_notifier, head, hlist) { if (event_notifier->desc == desc && event_notifier->user_token == event_notifier_enabler->base.user_token) @@ -1539,17 +1608,17 @@ static int create_matching_event_notifiers( event_notifier_param.event.u.syscall.abi = LTTNG_KERNEL_SYSCALL_ABI_COMPAT; break; } - strncat(event_notifier_param.event.name, desc->name, + strncat(event_notifier_param.event.name, desc->event_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); + desc->event_name); ret = -ENOMEM; goto end; } @@ -1626,7 +1695,7 @@ end: /* * Unregister the syscall event_notifier probes from the callsites. */ -int lttng_syscalls_unregister_event_notifier( +int lttng_syscalls_unregister_event_notifier_group( struct lttng_event_notifier_group *event_notifier_group) { int ret; @@ -1660,7 +1729,7 @@ int lttng_syscalls_unregister_event_notifier( return 0; } -int lttng_syscalls_unregister_event(struct lttng_channel *chan) +int lttng_syscalls_unregister_channel(struct lttng_channel *chan) { int ret; @@ -1708,7 +1777,7 @@ int get_syscall_nr(const char *syscall_name) entry = &sc_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; @@ -1731,7 +1800,7 @@ int get_compat_syscall_nr(const char *syscall_name) entry = &compat_sc_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; @@ -1851,7 +1920,7 @@ int lttng_syscall_filter_enable_event_notifier( WARN_ON_ONCE(notifier->instrumentation != LTTNG_KERNEL_SYSCALL); ret = lttng_syscall_filter_enable(group->sc_filter, - notifier->desc->name, notifier->u.syscall.abi, + notifier->desc->event_name, notifier->u.syscall.abi, notifier->u.syscall.entryexit); if (ret) { goto end; @@ -1866,6 +1935,9 @@ int lttng_syscall_filter_enable_event_notifier( 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: @@ -1876,8 +1948,14 @@ int lttng_syscall_filter_enable_event_notifier( 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); @@ -1893,7 +1971,7 @@ int lttng_syscall_filter_enable_event( WARN_ON_ONCE(event->instrumentation != LTTNG_KERNEL_SYSCALL); return lttng_syscall_filter_enable(channel->sc_filter, - event->desc->name, event->u.syscall.abi, + event->desc->event_name, event->u.syscall.abi, event->u.syscall.entryexit); } @@ -1966,7 +2044,7 @@ int lttng_syscall_filter_disable_event_notifier( WARN_ON_ONCE(notifier->instrumentation != LTTNG_KERNEL_SYSCALL); ret = lttng_syscall_filter_disable(group->sc_filter, - notifier->desc->name, notifier->u.syscall.abi, + notifier->desc->event_name, notifier->u.syscall.abi, notifier->u.syscall.entryexit); WARN_ON_ONCE(ret != 0); @@ -1979,7 +2057,7 @@ int lttng_syscall_filter_disable_event( struct lttng_event *event) { return lttng_syscall_filter_disable(channel->sc_filter, - event->desc->name, event->u.syscall.abi, + event->desc->event_name, event->u.syscall.abi, event->u.syscall.entryexit); } @@ -2062,10 +2140,10 @@ int syscall_list_show(struct seq_file *m, void *p) return 0; if (table == sc_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)]; + name = &entry->desc->event_name[strlen(COMPAT_SYSCALL_ENTRY_STR)]; } seq_printf(m, "syscall { index = %lu; name = %s; bitness = %u; };\n", index, name, bitness); @@ -2123,7 +2201,8 @@ long lttng_channel_syscall_mask(struct lttng_channel *channel, char state; if (channel->sc_table) { - if (!READ_ONCE(channel->syscall_all) && filter) + if (!(READ_ONCE(channel->syscall_all_entry) + || READ_ONCE(channel->syscall_all_exit)) && filter) state = test_bit(bit, filter->sc_entry) || test_bit(bit, filter->sc_exit); else @@ -2137,7 +2216,8 @@ long lttng_channel_syscall_mask(struct lttng_channel *channel, char state; if (channel->compat_sc_table) { - if (!READ_ONCE(channel->syscall_all) && filter) + if (!(READ_ONCE(channel->syscall_all_entry) + || READ_ONCE(channel->syscall_all_exit)) && filter) state = test_bit(bit - ARRAY_SIZE(sc_table), filter->sc_compat_entry) || test_bit(bit - ARRAY_SIZE(sc_table),