X-Git-Url: https://git.lttng.org/?a=blobdiff_plain;f=src%2Flttng-syscalls.c;h=dfb00cbb7043d58ac780abb8cfc4662405d02aba;hb=e2d5dbc7d09c7aa4f7c391fcdd4dfc95ba1ed326;hp=3fce0914d2d6a392f955cb724915373e4a830abc;hpb=5f4c791e2ad2c814101ccdb500e65543f2792c41;p=lttng-modules.git diff --git a/src/lttng-syscalls.c b/src/lttng-syscalls.c index 3fce0914..dfb00cbb 100644 --- a/src/lttng-syscalls.c +++ b/src/lttng-syscalls.c @@ -293,9 +293,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; }; @@ -310,7 +309,6 @@ struct trace_syscall_entry { #define TRACE_SYSCALL_TABLE(_template, _name, _nr, _nrargs) \ [ _nr ] = { \ .event_func = __event_probe__syscall_entry_##_template, \ - .event_notifier_func = __event_notifier_probe__syscall_entry_##_template, \ .nrargs = (_nrargs), \ .fields = __event_fields___syscall_entry_##_template, \ .desc = &__event_desc___syscall_entry_##_name, \ @@ -326,7 +324,6 @@ static const struct trace_syscall_entry sc_table[] = { #define TRACE_SYSCALL_TABLE(_template, _name, _nr, _nrargs) \ [ _nr ] = { \ .event_func = __event_probe__compat_syscall_entry_##_template, \ - .event_notifier_func = __event_notifier_probe__compat_syscall_entry_##_template, \ .nrargs = (_nrargs), \ .fields = __event_fields___compat_syscall_entry_##_template, \ .desc = &__event_desc___compat_syscall_entry_##_name, \ @@ -349,7 +346,6 @@ const struct trace_syscall_entry compat_sc_table[] = { #define TRACE_SYSCALL_TABLE(_template, _name, _nr, _nrargs) \ [ _nr ] = { \ .event_func = __event_probe__syscall_exit_##_template, \ - .event_notifier_func = __event_notifier_probe__syscall_exit_##_template, \ .nrargs = (_nrargs), \ .fields = __event_fields___syscall_exit_##_template, \ .desc = &__event_desc___syscall_exit_##_name, \ @@ -365,7 +361,6 @@ static const struct trace_syscall_entry sc_exit_table[] = { #define TRACE_SYSCALL_TABLE(_template, _name, _nr, _nrargs) \ [ _nr ] = { \ .event_func = __event_probe__compat_syscall_exit_##_template, \ - .event_notifier_func = __event_notifier_probe__compat_syscall_exit_##_template, \ .nrargs = (_nrargs), \ .fields = __event_fields___compat_syscall_exit_##_template, \ .desc = &__event_desc___compat_syscall_exit_##_name, \ @@ -392,63 +387,31 @@ static void syscall_entry_event_unknown(struct hlist_head *unknown_action_list_h struct pt_regs *regs, long id) { unsigned long args[LTTNG_SYSCALL_NR_ARGS]; - struct lttng_event *event; + struct lttng_kernel_event_common_private *event_priv; lttng_syscall_get_arguments(current, regs, args); - lttng_hlist_for_each_entry_rcu(event, unknown_action_list_head, u.syscall.node) { + 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, id, args); + __event_probe__compat_syscall_entry_unknown(event_priv->pub, id, args); else - __event_probe__syscall_entry_unknown(event, id, args); - } -} - -static void syscall_entry_event_notifier_unknown( - struct hlist_head *unknown_dispatch_list_head, - struct pt_regs *regs, long id) -{ - unsigned long args[LTTNG_SYSCALL_NR_ARGS]; - 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); - 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); + __event_probe__syscall_entry_unknown(event_priv->pub, id, args); } } static __always_inline -void syscall_entry_call_func(struct hlist_head *action_list, +void syscall_entry_event_call_func(struct hlist_head *action_list, void *func, unsigned int nrargs, struct pt_regs *regs) { - struct lttng_event *event; + struct lttng_kernel_event_common_private *event_priv; switch (nrargs) { case 0: { void (*fptr)(void *__data) = func; - lttng_hlist_for_each_entry_rcu(event, action_list, u.syscall.node) - fptr(event); + lttng_hlist_for_each_entry_rcu(event_priv, action_list, u.syscall.node) + fptr(event_priv->pub); break; } case 1: @@ -457,8 +420,8 @@ void syscall_entry_call_func(struct hlist_head *action_list, 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]); + lttng_hlist_for_each_entry_rcu(event_priv, action_list, u.syscall.node) + fptr(event_priv->pub, args[0]); break; } case 2: @@ -469,8 +432,8 @@ void syscall_entry_call_func(struct hlist_head *action_list, 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]); + lttng_hlist_for_each_entry_rcu(event_priv, action_list, u.syscall.node) + fptr(event_priv->pub, args[0], args[1]); break; } case 3: @@ -482,8 +445,8 @@ void syscall_entry_call_func(struct hlist_head *action_list, 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]); + 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: @@ -496,8 +459,8 @@ void syscall_entry_call_func(struct hlist_head *action_list, 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]); + 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: @@ -511,8 +474,8 @@ void syscall_entry_call_func(struct hlist_head *action_list, 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]); + 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: @@ -527,8 +490,8 @@ void syscall_entry_call_func(struct hlist_head *action_list, 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], + 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; } @@ -537,106 +500,6 @@ void syscall_entry_call_func(struct hlist_head *action_list, } } -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; - - lttng_hlist_for_each_entry_rcu(notifier, dispatch_list, u.syscall.node) - fptr(notifier); - 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(notifier, dispatch_list, u.syscall.node) - fptr(notifier, 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(notifier, dispatch_list, u.syscall.node) - fptr(notifier, 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(notifier, dispatch_list, u.syscall.node) - fptr(notifier, 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(notifier, dispatch_list, u.syscall.node) - fptr(notifier, 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(notifier, dispatch_list, u.syscall.node) - fptr(notifier, 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(notifier, dispatch_list, u.syscall.node) - fptr(notifier, args[0], args[1], args[2], args[3], args[4], args[5]); - break; - } - default: - break; - } -} - void syscall_entry_event_probe(void *__data, struct pt_regs *regs, long id) { struct lttng_channel *chan = __data; @@ -686,7 +549,7 @@ void syscall_entry_event_probe(void *__data, struct pt_regs *regs, long id) if (unlikely(hlist_empty(action_list))) return; - syscall_entry_call_func(action_list, entry->event_func, entry->nrargs, regs); + syscall_entry_event_call_func(action_list, entry->event_func, entry->nrargs, regs); } void syscall_entry_event_notifier_probe(void *__data, struct pt_regs *regs, @@ -724,14 +587,14 @@ void syscall_entry_event_notifier_probe(void *__data, struct pt_regs *regs, } /* Check if the syscall id is out of bound. */ if (unlikely(id < 0 || id >= table_len)) { - syscall_entry_event_notifier_unknown(unknown_dispatch_list, + syscall_entry_event_unknown(unknown_dispatch_list, regs, id); return; } entry = &table[id]; - if (!entry->event_notifier_func) { - syscall_entry_event_notifier_unknown(unknown_dispatch_list, + if (!entry->event_func) { + syscall_entry_event_unknown(unknown_dispatch_list, regs, id); return; } @@ -744,40 +607,40 @@ void syscall_entry_event_notifier_probe(void *__data, struct pt_regs *regs, if (unlikely(hlist_empty(dispatch_list))) return; - syscall_entry_event_notifier_call_func(dispatch_list, - entry->event_notifier_func, entry->nrargs, regs); + syscall_entry_event_call_func(dispatch_list, + entry->event_func, entry->nrargs, regs); } static void syscall_exit_event_unknown(struct hlist_head *unknown_action_list_head, struct pt_regs *regs, long id, long ret) { unsigned long args[LTTNG_SYSCALL_NR_ARGS]; - struct lttng_event *event; + struct lttng_kernel_event_common_private *event_priv; lttng_syscall_get_arguments(current, regs, args); - lttng_hlist_for_each_entry_rcu(event, unknown_action_list_head, u.syscall.node) { + 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, id, ret, + __event_probe__compat_syscall_exit_unknown(event_priv->pub, id, ret, args); else - __event_probe__syscall_exit_unknown(event, id, ret, args); + __event_probe__syscall_exit_unknown(event_priv->pub, id, ret, args); } } static __always_inline -void syscall_exit_call_func(struct hlist_head *action_list, +void syscall_exit_event_call_func(struct hlist_head *action_list, void *func, unsigned int nrargs, struct pt_regs *regs, long ret) { - struct lttng_event *event; + struct lttng_kernel_event_common_private *event_priv; 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); + lttng_hlist_for_each_entry_rcu(event_priv, action_list, u.syscall.node) + fptr(event_priv->pub, ret); break; } case 1: @@ -788,8 +651,8 @@ void syscall_exit_call_func(struct hlist_head *action_list, 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]); + lttng_hlist_for_each_entry_rcu(event_priv, action_list, u.syscall.node) + fptr(event_priv->pub, ret, args[0]); break; } case 2: @@ -801,8 +664,8 @@ void syscall_exit_call_func(struct hlist_head *action_list, 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]); + 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: @@ -815,8 +678,8 @@ void syscall_exit_call_func(struct hlist_head *action_list, 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]); + 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: @@ -830,8 +693,8 @@ void syscall_exit_call_func(struct hlist_head *action_list, 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]); + 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: @@ -846,8 +709,8 @@ void syscall_exit_call_func(struct hlist_head *action_list, 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]); + 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: @@ -863,8 +726,8 @@ void syscall_exit_call_func(struct hlist_head *action_list, 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], + 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; } @@ -925,115 +788,10 @@ void syscall_exit_event_probe(void *__data, struct pt_regs *regs, long ret) if (unlikely(hlist_empty(action_list))) return; - syscall_exit_call_func(action_list, entry->event_func, entry->nrargs, + syscall_exit_event_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) = func; - - 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) = func; - unsigned long args[LTTNG_SYSCALL_NR_ARGS]; - - lttng_syscall_get_arguments(current, regs, args); - lttng_hlist_for_each_entry_rcu(notifier, dispatch_list, u.syscall.node) - fptr(notifier, 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(notifier, dispatch_list, u.syscall.node) - fptr(notifier, 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(notifier, dispatch_list, u.syscall.node) - fptr(notifier, 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(notifier, dispatch_list, u.syscall.node) - fptr(notifier, 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(notifier, dispatch_list, u.syscall.node) - fptr(notifier, 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(notifier, dispatch_list, u.syscall.node) - fptr(notifier, ret, args[0], args[1], args[2], args[3], args[4], args[5]); - break; - } - default: - break; - } -} - static void syscall_exit_event_notifier_probe(void *__data, struct pt_regs *regs, long ret) @@ -1073,14 +831,14 @@ void syscall_exit_event_notifier_probe(void *__data, struct pt_regs *regs, } /* Check if the syscall id is out of bound. */ if (unlikely(id < 0 || id >= table_len)) { - syscall_exit_event_notifier_unknown(unknown_dispatch_list, + syscall_exit_event_unknown(unknown_dispatch_list, regs, id, ret); return; } entry = &table[id]; - if (!entry->event_notifier_func) { - syscall_entry_event_notifier_unknown(unknown_dispatch_list, + if (!entry->event_func) { + syscall_entry_event_unknown(unknown_dispatch_list, regs, id); return; } @@ -1093,8 +851,8 @@ void syscall_exit_event_notifier_probe(void *__data, struct pt_regs *regs, if (unlikely(hlist_empty(dispatch_list))) return; - syscall_exit_event_notifier_call_func(dispatch_list, - entry->event_notifier_func, entry->nrargs, regs, ret); + syscall_exit_event_call_func(dispatch_list, + entry->event_func, entry->nrargs, regs, ret); } /* * noinline to diminish caller stack size. @@ -1103,7 +861,7 @@ void syscall_exit_event_notifier_probe(void *__data, struct pt_regs *regs, static 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) + enum sc_type type) { struct lttng_channel *chan = event_enabler->chan; struct lttng_session *session = chan->session; @@ -1111,9 +869,10 @@ int lttng_create_syscall_event_if_missing(const struct trace_syscall_entry *tabl /* 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; - struct lttng_event *event; + const struct lttng_kernel_event_desc *desc = table[i].desc; + struct lttng_kernel_abi_event ev; + struct lttng_kernel_event_recorder_private *event_recorder_priv; + struct lttng_kernel_event_recorder *event_recorder; struct hlist_head *head; bool found = false; @@ -1129,10 +888,10 @@ int lttng_create_syscall_event_if_missing(const struct trace_syscall_entry *tabl */ head = utils_borrow_hash_table_bucket( session->events_ht.table, LTTNG_EVENT_HT_SIZE, - desc->name); - lttng_hlist_for_each_entry(event, head, hlist) { - if (event->desc == desc - && event->chan == event_enabler->chan) + desc->event_name); + lttng_hlist_for_each_entry(event_recorder_priv, head, hlist) { + if (event_recorder_priv->parent.desc == desc + && event_recorder_priv->pub->chan == event_enabler->chan) found = true; } if (found) @@ -1142,38 +901,37 @@ int lttng_create_syscall_event_if_missing(const struct trace_syscall_entry *tabl 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; - event = _lttng_event_create(chan, &ev, filter, - desc, ev.instrumentation); - WARN_ON_ONCE(!event); - if (IS_ERR(event)) { + strncpy(ev.name, desc->event_name, LTTNG_KERNEL_ABI_SYM_NAME_LEN - 1); + ev.name[LTTNG_KERNEL_ABI_SYM_NAME_LEN - 1] = '\0'; + ev.instrumentation = LTTNG_KERNEL_ABI_SYSCALL; + event_recorder = _lttng_kernel_event_recorder_create(chan, &ev, desc, ev.instrumentation); + WARN_ON_ONCE(!event_recorder); + if (IS_ERR(event_recorder)) { /* * If something goes wrong in event registration * after the first one, we have no choice but to * leave the previous events in there, until * deleted by session teardown. */ - return PTR_ERR(event); + return PTR_ERR(event_recorder); } - hlist_add_head(&event->u.syscall.node, &chan_table[i]); + hlist_add_head(&event_recorder->priv->parent.u.syscall.node, &chan_table[i]); } return 0; } @@ -1181,24 +939,24 @@ int lttng_create_syscall_event_if_missing(const struct trace_syscall_entry *tabl /* * Should be called with sessions lock held. */ -int lttng_syscalls_register_event(struct lttng_event_enabler *event_enabler, void *filter) +int lttng_syscalls_register_event(struct lttng_event_enabler *event_enabler) { struct lttng_channel *chan = event_enabler->chan; - struct lttng_kernel_event ev; + struct lttng_kernel_abi_event ev; int ret; wrapper_vmalloc_sync_mappings(); if (!chan->sc_table) { /* create syscall table mapping syscall to events */ - chan->sc_table = kzalloc(sizeof(struct lttng_event *) + chan->sc_table = kzalloc(sizeof(struct lttng_kernel_event_recorder *) * 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 *) + chan->sc_exit_table = kzalloc(sizeof(struct lttng_kernel_event_recorder *) * ARRAY_SIZE(sc_exit_table), GFP_KERNEL); if (!chan->sc_exit_table) return -ENOMEM; @@ -1208,7 +966,7 @@ int lttng_syscalls_register_event(struct lttng_event_enabler *event_enabler, voi #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 *) + chan->compat_sc_table = kzalloc(sizeof(struct lttng_kernel_event_recorder *) * ARRAY_SIZE(compat_sc_table), GFP_KERNEL); if (!chan->compat_sc_table) return -ENOMEM; @@ -1216,110 +974,108 @@ int lttng_syscalls_register_event(struct lttng_event_enabler *event_enabler, voi if (!chan->compat_sc_exit_table) { /* create syscall table mapping compat syscall to events */ - chan->compat_sc_exit_table = kzalloc(sizeof(struct lttng_event *) + chan->compat_sc_exit_table = kzalloc(sizeof(struct lttng_kernel_event_recorder *) * ARRAY_SIZE(compat_sc_exit_table), GFP_KERNEL); if (!chan->compat_sc_exit_table) return -ENOMEM; } #endif if (hlist_empty(&chan->sc_unknown)) { - const struct lttng_event_desc *desc = + const struct lttng_kernel_event_desc *desc = &__event_desc___syscall_entry_unknown; - struct lttng_event *event; + struct lttng_kernel_event_recorder *event_recorder; memset(&ev, 0, sizeof(ev)); - strncpy(ev.name, desc->name, LTTNG_KERNEL_SYM_NAME_LEN); - ev.name[LTTNG_KERNEL_SYM_NAME_LEN - 1] = '\0'; - ev.instrumentation = LTTNG_KERNEL_SYSCALL; - ev.u.syscall.entryexit = LTTNG_KERNEL_SYSCALL_ENTRY; - ev.u.syscall.abi = LTTNG_KERNEL_SYSCALL_ABI_NATIVE; - event = _lttng_event_create(chan, &ev, filter, desc, + strncpy(ev.name, desc->event_name, LTTNG_KERNEL_ABI_SYM_NAME_LEN); + ev.name[LTTNG_KERNEL_ABI_SYM_NAME_LEN - 1] = '\0'; + ev.instrumentation = LTTNG_KERNEL_ABI_SYSCALL; + ev.u.syscall.entryexit = LTTNG_KERNEL_ABI_SYSCALL_ENTRY; + ev.u.syscall.abi = LTTNG_KERNEL_ABI_SYSCALL_ABI_NATIVE; + event_recorder = _lttng_kernel_event_recorder_create(chan, &ev, desc, ev.instrumentation); - WARN_ON_ONCE(!event); - if (IS_ERR(event)) { - return PTR_ERR(event); + WARN_ON_ONCE(!event_recorder); + if (IS_ERR(event_recorder)) { + return PTR_ERR(event_recorder); } - hlist_add_head(&event->u.syscall.node, &chan->sc_unknown); + hlist_add_head(&event_recorder->priv->parent.u.syscall.node, &chan->sc_unknown); } if (hlist_empty(&chan->sc_compat_unknown)) { - const struct lttng_event_desc *desc = + const struct lttng_kernel_event_desc *desc = &__event_desc___compat_syscall_entry_unknown; - struct lttng_event *event; + struct lttng_kernel_event_recorder *event_recorder; memset(&ev, 0, sizeof(ev)); - strncpy(ev.name, desc->name, LTTNG_KERNEL_SYM_NAME_LEN); - ev.name[LTTNG_KERNEL_SYM_NAME_LEN - 1] = '\0'; - ev.instrumentation = LTTNG_KERNEL_SYSCALL; - ev.u.syscall.entryexit = LTTNG_KERNEL_SYSCALL_ENTRY; - ev.u.syscall.abi = LTTNG_KERNEL_SYSCALL_ABI_COMPAT; - event = _lttng_event_create(chan, &ev, filter, desc, + strncpy(ev.name, desc->event_name, LTTNG_KERNEL_ABI_SYM_NAME_LEN); + ev.name[LTTNG_KERNEL_ABI_SYM_NAME_LEN - 1] = '\0'; + ev.instrumentation = LTTNG_KERNEL_ABI_SYSCALL; + ev.u.syscall.entryexit = LTTNG_KERNEL_ABI_SYSCALL_ENTRY; + ev.u.syscall.abi = LTTNG_KERNEL_ABI_SYSCALL_ABI_COMPAT; + event_recorder = _lttng_kernel_event_recorder_create(chan, &ev, desc, ev.instrumentation); - WARN_ON_ONCE(!event); - if (IS_ERR(event)) { - return PTR_ERR(event); + WARN_ON_ONCE(!event_recorder); + if (IS_ERR(event_recorder)) { + return PTR_ERR(event_recorder); } - hlist_add_head(&event->u.syscall.node, &chan->sc_compat_unknown); + hlist_add_head(&event_recorder->priv->parent.u.syscall.node, &chan->sc_compat_unknown); } if (hlist_empty(&chan->compat_sc_exit_unknown)) { - const struct lttng_event_desc *desc = + const struct lttng_kernel_event_desc *desc = &__event_desc___compat_syscall_exit_unknown; - struct lttng_event *event; + struct lttng_kernel_event_recorder *event_recorder; memset(&ev, 0, sizeof(ev)); - strncpy(ev.name, desc->name, LTTNG_KERNEL_SYM_NAME_LEN); - ev.name[LTTNG_KERNEL_SYM_NAME_LEN - 1] = '\0'; - ev.instrumentation = LTTNG_KERNEL_SYSCALL; - ev.u.syscall.entryexit = LTTNG_KERNEL_SYSCALL_EXIT; - ev.u.syscall.abi = LTTNG_KERNEL_SYSCALL_ABI_COMPAT; - event = _lttng_event_create(chan, &ev, filter, desc, + strncpy(ev.name, desc->event_name, LTTNG_KERNEL_ABI_SYM_NAME_LEN); + ev.name[LTTNG_KERNEL_ABI_SYM_NAME_LEN - 1] = '\0'; + ev.instrumentation = LTTNG_KERNEL_ABI_SYSCALL; + ev.u.syscall.entryexit = LTTNG_KERNEL_ABI_SYSCALL_EXIT; + ev.u.syscall.abi = LTTNG_KERNEL_ABI_SYSCALL_ABI_COMPAT; + event_recorder = _lttng_kernel_event_recorder_create(chan, &ev, desc, ev.instrumentation); - WARN_ON_ONCE(!event); - if (IS_ERR(event)) { - return PTR_ERR(event); + WARN_ON_ONCE(!event_recorder); + if (IS_ERR(event_recorder)) { + return PTR_ERR(event_recorder); } - hlist_add_head(&event->u.syscall.node, &chan->compat_sc_exit_unknown); + hlist_add_head(&event_recorder->priv->parent.u.syscall.node, &chan->compat_sc_exit_unknown); } if (hlist_empty(&chan->sc_exit_unknown)) { - const struct lttng_event_desc *desc = + const struct lttng_kernel_event_desc *desc = &__event_desc___syscall_exit_unknown; - struct lttng_event *event; + struct lttng_kernel_event_recorder *event_recorder; memset(&ev, 0, sizeof(ev)); - strncpy(ev.name, desc->name, LTTNG_KERNEL_SYM_NAME_LEN); - ev.name[LTTNG_KERNEL_SYM_NAME_LEN - 1] = '\0'; - ev.instrumentation = LTTNG_KERNEL_SYSCALL; - ev.u.syscall.entryexit = LTTNG_KERNEL_SYSCALL_EXIT; - ev.u.syscall.abi = LTTNG_KERNEL_SYSCALL_ABI_NATIVE; - event = _lttng_event_create(chan, &ev, filter, desc, + strncpy(ev.name, desc->event_name, LTTNG_KERNEL_ABI_SYM_NAME_LEN); + ev.name[LTTNG_KERNEL_ABI_SYM_NAME_LEN - 1] = '\0'; + ev.instrumentation = LTTNG_KERNEL_ABI_SYSCALL; + ev.u.syscall.entryexit = LTTNG_KERNEL_ABI_SYSCALL_EXIT; + ev.u.syscall.abi = LTTNG_KERNEL_ABI_SYSCALL_ABI_NATIVE; + event_recorder = _lttng_kernel_event_recorder_create(chan, &ev, desc, ev.instrumentation); - WARN_ON_ONCE(!event); - if (IS_ERR(event)) { - return PTR_ERR(event); + WARN_ON_ONCE(!event_recorder); + if (IS_ERR(event_recorder)) { + return PTR_ERR(event_recorder); } - hlist_add_head(&event->u.syscall.node, &chan->sc_exit_unknown); + hlist_add_head(&event_recorder->priv->parent.u.syscall.node, &chan->sc_exit_unknown); } ret = lttng_create_syscall_event_if_missing(sc_table, ARRAY_SIZE(sc_table), - chan->sc_table, event_enabler, filter, SC_TYPE_ENTRY); + chan->sc_table, event_enabler, SC_TYPE_ENTRY); if (ret) return ret; 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); + chan->sc_exit_table, event_enabler, SC_TYPE_EXIT); if (ret) return ret; #ifdef CONFIG_COMPAT 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); + chan->compat_sc_table, event_enabler, SC_TYPE_COMPAT_ENTRY); if (ret) return ret; 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); + chan->compat_sc_exit_table, event_enabler, SC_TYPE_COMPAT_EXIT); if (ret) return ret; #endif @@ -1359,8 +1115,7 @@ int lttng_syscalls_register_event(struct lttng_event_enabler *event_enabler, voi * Should be called with sessions lock held. */ int lttng_syscalls_register_event_notifier( - struct lttng_event_notifier_enabler *event_notifier_enabler, - void *filter) + struct lttng_event_notifier_enabler *event_notifier_enabler) { struct lttng_event_notifier_group *group = event_notifier_enabler->group; unsigned int i; @@ -1464,10 +1219,11 @@ 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_kernel_event_notifier_private *event_notifier_priv; + struct lttng_kernel_event_notifier *event_notifier; + const struct lttng_kernel_event_desc *desc; struct lttng_event_notifier_group *group = event_notifier_enabler->group; - struct lttng_kernel_event_notifier event_notifier_param; + struct lttng_kernel_abi_event_notifier event_notifier_param; uint64_t user_token = event_notifier_enabler->base.user_token; uint64_t error_counter_index = event_notifier_enabler->error_counter_index; struct lttng_enabler *base_enabler = lttng_event_notifier_enabler_as_enabler( @@ -1475,34 +1231,34 @@ int create_unknown_event_notifier( struct hlist_head *unknown_dispatch_list; int ret = 0; bool found = false; - enum lttng_kernel_syscall_abi abi; - enum lttng_kernel_syscall_entryexit entryexit; + enum lttng_kernel_abi_syscall_abi abi; + enum lttng_kernel_abi_syscall_entryexit entryexit; struct hlist_head *head; switch (type) { case SC_TYPE_ENTRY: desc = &__event_desc___syscall_entry_unknown; unknown_dispatch_list = &group->event_notifier_unknown_syscall_dispatch; - entryexit = LTTNG_KERNEL_SYSCALL_ENTRY; - abi = LTTNG_KERNEL_SYSCALL_ABI_NATIVE; + entryexit = LTTNG_KERNEL_ABI_SYSCALL_ENTRY; + abi = LTTNG_KERNEL_ABI_SYSCALL_ABI_NATIVE; break; case SC_TYPE_EXIT: desc = &__event_desc___syscall_exit_unknown; unknown_dispatch_list = &group->event_notifier_exit_unknown_syscall_dispatch; - entryexit = LTTNG_KERNEL_SYSCALL_EXIT; - abi = LTTNG_KERNEL_SYSCALL_ABI_NATIVE; + entryexit = LTTNG_KERNEL_ABI_SYSCALL_EXIT; + abi = LTTNG_KERNEL_ABI_SYSCALL_ABI_NATIVE; break; case SC_TYPE_COMPAT_ENTRY: desc = &__event_desc___compat_syscall_entry_unknown; unknown_dispatch_list = &group->event_notifier_compat_unknown_syscall_dispatch; - entryexit = LTTNG_KERNEL_SYSCALL_ENTRY; - abi = LTTNG_KERNEL_SYSCALL_ABI_COMPAT; + entryexit = LTTNG_KERNEL_ABI_SYSCALL_ENTRY; + abi = LTTNG_KERNEL_ABI_SYSCALL_ABI_COMPAT; break; case SC_TYPE_COMPAT_EXIT: desc = &__event_desc___compat_syscall_exit_unknown; unknown_dispatch_list = &group->event_notifier_exit_compat_unknown_syscall_dispatch; - entryexit = LTTNG_KERNEL_SYSCALL_EXIT; - abi = LTTNG_KERNEL_SYSCALL_ABI_COMPAT; + entryexit = LTTNG_KERNEL_ABI_SYSCALL_EXIT; + abi = LTTNG_KERNEL_ABI_SYSCALL_ABI_COMPAT; break; default: BUG_ON(1); @@ -1512,36 +1268,36 @@ 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_hlist_for_each_entry(notifier, head, hlist) { - if (notifier->desc == desc && - notifier->user_token == base_enabler->user_token) + LTTNG_EVENT_NOTIFIER_HT_SIZE, desc->event_name); + lttng_hlist_for_each_entry(event_notifier_priv, head, hlist) { + if (event_notifier_priv->parent.desc == desc && + event_notifier_priv->parent.user_token == base_enabler->user_token) found = true; } if (found) goto end; memset(&event_notifier_param, 0, sizeof(event_notifier_param)); - strncat(event_notifier_param.event.name, desc->name, - LTTNG_KERNEL_SYM_NAME_LEN - strlen(event_notifier_param.event.name) - 1); + 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_SYM_NAME_LEN - 1] = '\0'; + event_notifier_param.event.name[LTTNG_KERNEL_ABI_SYM_NAME_LEN - 1] = '\0'; - event_notifier_param.event.instrumentation = LTTNG_KERNEL_SYSCALL; + event_notifier_param.event.instrumentation = LTTNG_KERNEL_ABI_SYSCALL; event_notifier_param.event.u.syscall.abi = abi; event_notifier_param.event.u.syscall.entryexit = entryexit; - notifier = _lttng_event_notifier_create(desc, user_token, - error_counter_index, group, &event_notifier_param, NULL, + event_notifier = _lttng_event_notifier_create(desc, user_token, + error_counter_index, group, &event_notifier_param, event_notifier_param.event.instrumentation); - if (IS_ERR(notifier)) { + if (IS_ERR(event_notifier)) { printk(KERN_INFO "Unable to create unknown notifier %s\n", - desc->name); + desc->event_name); ret = -ENOMEM; goto end; } - hlist_add_head_rcu(¬ifier->u.syscall.node, unknown_dispatch_list); + hlist_add_head_rcu(&event_notifier->priv->parent.u.syscall.node, unknown_dispatch_list); end: return ret; @@ -1549,11 +1305,11 @@ end: static int create_matching_event_notifiers( struct lttng_event_notifier_enabler *event_notifier_enabler, - void *filter, const struct trace_syscall_entry *table, + const struct trace_syscall_entry *table, size_t table_len, enum sc_type type) { struct lttng_event_notifier_group *group = event_notifier_enabler->group; - const struct lttng_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; @@ -1561,8 +1317,9 @@ static int create_matching_event_notifiers( /* iterate over all syscall and create event_notifier that match */ for (i = 0; i < table_len; i++) { - struct lttng_event_notifier *event_notifier; - struct lttng_kernel_event_notifier event_notifier_param; + struct lttng_kernel_event_notifier_private *event_notifier_priv; + struct lttng_kernel_event_notifier *event_notifier; + struct lttng_kernel_abi_event_notifier event_notifier_param; struct hlist_head *head; int found = 0; @@ -1580,10 +1337,10 @@ 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_hlist_for_each_entry(event_notifier, head, hlist) { - if (event_notifier->desc == desc - && event_notifier->user_token == event_notifier_enabler->base.user_token) + LTTNG_EVENT_NOTIFIER_HT_SIZE, desc->event_name); + lttng_hlist_for_each_entry(event_notifier_priv, head, hlist) { + if (event_notifier_priv->parent.desc == desc + && event_notifier_priv->parent.user_token == event_notifier_enabler->base.user_token) found = 1; } if (found) @@ -1592,38 +1349,38 @@ static int create_matching_event_notifiers( 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; + 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_SYSCALL_EXIT; - event_notifier_param.event.u.syscall.abi = LTTNG_KERNEL_SYSCALL_ABI_NATIVE; + 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_SYSCALL_ENTRY; - event_notifier_param.event.u.syscall.abi = LTTNG_KERNEL_SYSCALL_ABI_COMPAT; + 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_SYSCALL_EXIT; - event_notifier_param.event.u.syscall.abi = LTTNG_KERNEL_SYSCALL_ABI_COMPAT; + 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->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; + strncat(event_notifier_param.event.name, desc->event_name, + LTTNG_KERNEL_ABI_SYM_NAME_LEN - strlen(event_notifier_param.event.name) - 1); + event_notifier_param.event.name[LTTNG_KERNEL_ABI_SYM_NAME_LEN - 1] = '\0'; + event_notifier_param.event.instrumentation = LTTNG_KERNEL_ABI_SYSCALL; event_notifier = _lttng_event_notifier_create(desc, user_token, error_counter_index, group, &event_notifier_param, - filter, event_notifier_param.event.instrumentation); + 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; } - event_notifier->u.syscall.syscall_id = i; + event_notifier->priv->parent.u.syscall.syscall_id = i; } end: @@ -1631,24 +1388,23 @@ end: } -int lttng_syscals_create_matching_event_notifiers( - struct lttng_event_notifier_enabler *event_notifier_enabler, - void *filter) +int lttng_syscalls_create_matching_event_notifiers( + struct lttng_event_notifier_enabler *event_notifier_enabler) { int ret; struct lttng_enabler *base_enabler = lttng_event_notifier_enabler_as_enabler(event_notifier_enabler); - enum lttng_kernel_syscall_entryexit entryexit = + enum lttng_kernel_abi_syscall_entryexit entryexit = base_enabler->event_param.u.syscall.entryexit; - if (entryexit == LTTNG_KERNEL_SYSCALL_ENTRY || entryexit == LTTNG_KERNEL_SYSCALL_ENTRYEXIT) { + if (entryexit == LTTNG_KERNEL_ABI_SYSCALL_ENTRY || entryexit == LTTNG_KERNEL_ABI_SYSCALL_ENTRYEXIT) { ret = create_matching_event_notifiers(event_notifier_enabler, - filter, sc_table, ARRAY_SIZE(sc_table), SC_TYPE_ENTRY); + sc_table, ARRAY_SIZE(sc_table), SC_TYPE_ENTRY); if (ret) goto end; ret = create_matching_event_notifiers(event_notifier_enabler, - filter, compat_sc_table, ARRAY_SIZE(compat_sc_table), + compat_sc_table, ARRAY_SIZE(compat_sc_table), SC_TYPE_COMPAT_ENTRY); if (ret) goto end; @@ -1664,9 +1420,9 @@ int lttng_syscals_create_matching_event_notifiers( goto end; } - if (entryexit == LTTNG_KERNEL_SYSCALL_EXIT || entryexit == LTTNG_KERNEL_SYSCALL_ENTRYEXIT) { + if (entryexit == LTTNG_KERNEL_ABI_SYSCALL_EXIT || entryexit == LTTNG_KERNEL_ABI_SYSCALL_ENTRYEXIT) { ret = create_matching_event_notifiers(event_notifier_enabler, - filter, sc_exit_table, ARRAY_SIZE(sc_exit_table), + sc_exit_table, ARRAY_SIZE(sc_exit_table), SC_TYPE_EXIT); if (ret) goto end; @@ -1677,7 +1433,7 @@ int lttng_syscals_create_matching_event_notifiers( goto end; ret = create_matching_event_notifiers(event_notifier_enabler, - filter, compat_sc_exit_table, ARRAY_SIZE(compat_sc_exit_table), + compat_sc_exit_table, ARRAY_SIZE(compat_sc_exit_table), SC_TYPE_COMPAT_EXIT); if (ret) goto end; @@ -1777,7 +1533,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; @@ -1800,7 +1556,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; @@ -1910,25 +1666,26 @@ int lttng_syscall_filter_enable( } int lttng_syscall_filter_enable_event_notifier( - struct lttng_event_notifier *notifier) + struct lttng_kernel_event_notifier *event_notifier) { - struct lttng_event_notifier_group *group = notifier->group; - unsigned int syscall_id = notifier->u.syscall.syscall_id; + struct lttng_event_notifier_group *group = event_notifier->priv->group; + unsigned int syscall_id = event_notifier->priv->parent.u.syscall.syscall_id; struct hlist_head *dispatch_list; int ret = 0; - WARN_ON_ONCE(notifier->instrumentation != LTTNG_KERNEL_SYSCALL); + WARN_ON_ONCE(event_notifier->priv->parent.instrumentation != LTTNG_KERNEL_ABI_SYSCALL); ret = lttng_syscall_filter_enable(group->sc_filter, - notifier->desc->name, notifier->u.syscall.abi, - notifier->u.syscall.entryexit); + event_notifier->priv->parent.desc->event_name, + event_notifier->priv->parent.u.syscall.abi, + event_notifier->priv->parent.u.syscall.entryexit); if (ret) { goto end; } - switch (notifier->u.syscall.entryexit) { + switch (event_notifier->priv->parent.u.syscall.entryexit) { case LTTNG_SYSCALL_ENTRY: - switch (notifier->u.syscall.abi) { + switch (event_notifier->priv->parent.u.syscall.abi) { case LTTNG_SYSCALL_ABI_NATIVE: dispatch_list = &group->event_notifier_syscall_dispatch[syscall_id]; break; @@ -1941,7 +1698,7 @@ int lttng_syscall_filter_enable_event_notifier( } break; case LTTNG_SYSCALL_EXIT: - switch (notifier->u.syscall.abi) { + switch (event_notifier->priv->parent.u.syscall.abi) { case LTTNG_SYSCALL_ABI_NATIVE: dispatch_list = &group->event_notifier_exit_syscall_dispatch[syscall_id]; break; @@ -1958,7 +1715,7 @@ int lttng_syscall_filter_enable_event_notifier( goto end; } - hlist_add_head_rcu(¬ifier->u.syscall.node, dispatch_list); + hlist_add_head_rcu(&event_notifier->priv->parent.u.syscall.node, dispatch_list); end: return ret ; @@ -1966,13 +1723,14 @@ end: int lttng_syscall_filter_enable_event( struct lttng_channel *channel, - struct lttng_event *event) + struct lttng_kernel_event_recorder *event_recorder) { - WARN_ON_ONCE(event->instrumentation != LTTNG_KERNEL_SYSCALL); + WARN_ON_ONCE(event_recorder->priv->parent.instrumentation != LTTNG_KERNEL_ABI_SYSCALL); return lttng_syscall_filter_enable(channel->sc_filter, - event->desc->name, event->u.syscall.abi, - event->u.syscall.entryexit); + event_recorder->priv->parent.desc->event_name, + event_recorder->priv->parent.u.syscall.abi, + event_recorder->priv->parent.u.syscall.entryexit); } static @@ -2036,29 +1794,31 @@ int lttng_syscall_filter_disable( } int lttng_syscall_filter_disable_event_notifier( - struct lttng_event_notifier *notifier) + struct lttng_kernel_event_notifier *event_notifier) { - struct lttng_event_notifier_group *group = notifier->group; + struct lttng_event_notifier_group *group = event_notifier->priv->group; int ret; - WARN_ON_ONCE(notifier->instrumentation != LTTNG_KERNEL_SYSCALL); + WARN_ON_ONCE(event_notifier->priv->parent.instrumentation != LTTNG_KERNEL_ABI_SYSCALL); ret = lttng_syscall_filter_disable(group->sc_filter, - notifier->desc->name, notifier->u.syscall.abi, - notifier->u.syscall.entryexit); + event_notifier->priv->parent.desc->event_name, + event_notifier->priv->parent.u.syscall.abi, + event_notifier->priv->parent.u.syscall.entryexit); WARN_ON_ONCE(ret != 0); - hlist_del_rcu(¬ifier->u.syscall.node); + hlist_del_rcu(&event_notifier->priv->parent.u.syscall.node); return 0; } int lttng_syscall_filter_disable_event( struct lttng_channel *channel, - struct lttng_event *event) + struct lttng_kernel_event_recorder *event_recorder) { return lttng_syscall_filter_disable(channel->sc_filter, - event->desc->name, event->u.syscall.abi, - event->u.syscall.entryexit); + event_recorder->priv->parent.desc->event_name, + event_recorder->priv->parent.u.syscall.abi, + event_recorder->priv->parent.u.syscall.entryexit); } static @@ -2140,10 +1900,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); @@ -2176,7 +1936,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, - struct lttng_kernel_syscall_mask __user *usyscall_mask) + struct lttng_kernel_abi_syscall_mask __user *usyscall_mask) { uint32_t len, sc_tables_len, bitmask_len; int ret = 0, bit;