X-Git-Url: https://git.lttng.org/?a=blobdiff_plain;f=src%2Flttng-syscalls.c;h=6f95fe9378fd13fbb930bcb06e8d40a4c0190cb8;hb=7633c7736aefbf2ac3c308021d7aa2bb3229ae94;hp=2c40ae1cbcb03a37c89b5256186306b8bd9cb633;hpb=9b4791f7d6585fb152c68e609e925152664940e9;p=lttng-modules.git diff --git a/src/lttng-syscalls.c b/src/lttng-syscalls.c index 2c40ae1c..6f95fe93 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; }; @@ -1111,8 +1111,8 @@ 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; + const struct lttng_kernel_event_desc *desc = table[i].desc; + struct lttng_kernel_abi_event ev; struct lttng_event *event; struct hlist_head *head; bool found = false; @@ -1129,7 +1129,7 @@ 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); + desc->event_name); lttng_hlist_for_each_entry(event, head, hlist) { if (event->desc == desc && event->chan == event_enabler->chan) @@ -1142,25 +1142,25 @@ 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; + 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 = _lttng_event_create(chan, &ev, filter, desc, ev.instrumentation); WARN_ON_ONCE(!event); @@ -1184,7 +1184,7 @@ int lttng_create_syscall_event_if_missing(const struct trace_syscall_entry *tabl 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; + struct lttng_kernel_abi_event ev; int ret; wrapper_vmalloc_sync_mappings(); @@ -1223,16 +1223,16 @@ int lttng_syscalls_register_event(struct lttng_event_enabler *event_enabler, voi } #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; 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; + 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 = _lttng_event_create(chan, &ev, filter, desc, ev.instrumentation); WARN_ON_ONCE(!event); @@ -1243,16 +1243,16 @@ int lttng_syscalls_register_event(struct lttng_event_enabler *event_enabler, voi } 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; 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; + 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 = _lttng_event_create(chan, &ev, filter, desc, ev.instrumentation); WARN_ON_ONCE(!event); @@ -1263,16 +1263,16 @@ int lttng_syscalls_register_event(struct lttng_event_enabler *event_enabler, voi } 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; 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; + 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 = _lttng_event_create(chan, &ev, filter, desc, ev.instrumentation); WARN_ON_ONCE(!event); @@ -1283,16 +1283,16 @@ int lttng_syscalls_register_event(struct lttng_event_enabler *event_enabler, voi } 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; 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; + 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 = _lttng_event_create(chan, &ev, filter, desc, ev.instrumentation); WARN_ON_ONCE(!event); @@ -1465,9 +1465,9 @@ 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; + 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 +1475,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,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) @@ -1522,12 +1522,12 @@ int create_unknown_event_notifier( 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; @@ -1536,7 +1536,7 @@ int create_unknown_event_notifier( 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; } @@ -1553,7 +1553,7 @@ 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; @@ -1562,7 +1562,7 @@ 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_abi_event_notifier event_notifier_param; struct hlist_head *head; int found = 0; @@ -1580,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) @@ -1592,33 +1592,33 @@ 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); if (IS_ERR(event_notifier)) { printk(KERN_INFO "Unable to create event_notifier %s\n", - desc->name); + desc->event_name); ret = -ENOMEM; goto end; } @@ -1638,10 +1638,10 @@ int lttng_syscals_create_matching_event_notifiers( 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); if (ret) @@ -1664,7 +1664,7 @@ 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_TYPE_EXIT); @@ -1777,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; @@ -1800,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; @@ -1917,10 +1917,10 @@ int lttng_syscall_filter_enable_event_notifier( struct hlist_head *dispatch_list; int ret = 0; - WARN_ON_ONCE(notifier->instrumentation != LTTNG_KERNEL_SYSCALL); + WARN_ON_ONCE(notifier->instrumentation != LTTNG_KERNEL_ABI_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; @@ -1935,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: @@ -1945,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); @@ -1959,10 +1968,10 @@ int lttng_syscall_filter_enable_event( struct lttng_channel *channel, struct lttng_event *event) { - WARN_ON_ONCE(event->instrumentation != LTTNG_KERNEL_SYSCALL); + WARN_ON_ONCE(event->instrumentation != LTTNG_KERNEL_ABI_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); } @@ -2032,10 +2041,10 @@ int lttng_syscall_filter_disable_event_notifier( struct lttng_event_notifier_group *group = notifier->group; int ret; - WARN_ON_ONCE(notifier->instrumentation != LTTNG_KERNEL_SYSCALL); + WARN_ON_ONCE(notifier->instrumentation != LTTNG_KERNEL_ABI_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); @@ -2048,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); } @@ -2131,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); @@ -2167,7 +2176,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;