X-Git-Url: https://git.lttng.org/?a=blobdiff_plain;f=src%2Flttng-syscalls.c;h=de4dbacefc5c23e7331081696585e4a278b82a7c;hb=873a97436b75e272560fc164813971c8b5461eaa;hp=7fa6d7e517299924ac98d792c1ea7a760e8b9c9f;hpb=19bef247a29761d0f9ecca993e7088b46456f199;p=lttng-modules.git diff --git a/src/lttng-syscalls.c b/src/lttng-syscalls.c index 7fa6d7e5..de4dbace 100644 --- a/src/lttng-syscalls.c +++ b/src/lttng-syscalls.c @@ -536,9 +536,8 @@ int lttng_create_syscall_event_if_missing(const struct trace_syscall_entry *tabl struct hlist_head *chan_table, struct lttng_event_recorder_enabler *syscall_event_enabler, enum sc_type type) { - struct lttng_kernel_syscall_table *syscall_table = get_syscall_table_from_enabler(&syscall_event_enabler->parent); + struct lttng_event_ht *events_ht = lttng_get_event_ht_from_enabler(&syscall_event_enabler->parent); struct lttng_kernel_channel_buffer *chan = syscall_event_enabler->chan; - struct lttng_kernel_session *session = chan->parent.session; unsigned int i; /* Allocate events for each syscall matching enabler, insert into table */ @@ -546,7 +545,7 @@ int lttng_create_syscall_event_if_missing(const struct trace_syscall_entry *tabl const struct lttng_kernel_event_desc *desc = table[i].desc; struct lttng_event_recorder_enabler *event_enabler; struct lttng_kernel_abi_event ev; - struct lttng_kernel_event_recorder *event_recorder; + struct lttng_kernel_event_common *event; struct lttng_kernel_event_common_private *event_priv; struct hlist_head *head; bool found = false; @@ -555,18 +554,15 @@ int lttng_create_syscall_event_if_missing(const struct trace_syscall_entry *tabl /* Unknown syscall */ continue; } - if (lttng_desc_match_enabler(desc, - lttng_event_recorder_enabler_as_enabler(syscall_event_enabler)) <= 0) + if (!lttng_desc_match_enabler(desc, + lttng_event_recorder_enabler_as_enabler(syscall_event_enabler))) continue; /* * Check if already created. */ - head = utils_borrow_hash_table_bucket( - session->priv->events_ht.table, LTTNG_EVENT_HT_SIZE, - desc->event_name); + head = utils_borrow_hash_table_bucket(events_ht->table, LTTNG_EVENT_HT_SIZE, desc->event_name); lttng_hlist_for_each_entry(event_priv, head, hlist_node) { - if (event_priv->desc == desc - && get_syscall_table_from_event(event_priv->pub) == syscall_table) + if (lttng_event_enabler_desc_match_event(&syscall_event_enabler->parent, desc, event_priv->pub)) found = true; } if (found) @@ -599,19 +595,19 @@ int lttng_create_syscall_event_if_missing(const struct trace_syscall_entry *tabl if (!event_enabler) { return -ENOMEM; } - event_recorder = _lttng_kernel_event_recorder_create(event_enabler, desc); - WARN_ON_ONCE(!event_recorder); + event = _lttng_kernel_event_create(&event_enabler->parent, desc); + WARN_ON_ONCE(!event); lttng_event_enabler_destroy(&event_enabler->parent); - if (IS_ERR(event_recorder)) { + 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(event_recorder); + return PTR_ERR(event); } - hlist_add_head(&event_recorder->priv->parent.u.syscall.node, &chan_table[i]); + hlist_add_head(&event->priv->u.syscall.node, &chan_table[i]); } return 0; } @@ -633,7 +629,7 @@ int lttng_syscalls_populate_events(struct lttng_event_enabler_common *syscall_ev if (hlist_empty(&syscall_table->unknown_syscall_dispatch)) { const struct lttng_kernel_event_desc *desc = &__event_desc___syscall_entry_unknown; - struct lttng_kernel_event_recorder *event_recorder; + struct lttng_kernel_event_common *event; struct lttng_event_recorder_enabler *event_enabler; memset(&ev, 0, sizeof(ev)); @@ -646,19 +642,19 @@ int lttng_syscalls_populate_events(struct lttng_event_enabler_common *syscall_ev if (!event_enabler) { return -ENOMEM; } - event_recorder = _lttng_kernel_event_recorder_create(event_enabler, desc); + event = _lttng_kernel_event_create(&event_enabler->parent, desc); lttng_event_enabler_destroy(&event_enabler->parent); - WARN_ON_ONCE(!event_recorder); - if (IS_ERR(event_recorder)) { - return PTR_ERR(event_recorder); + WARN_ON_ONCE(!event); + if (IS_ERR(event)) { + return PTR_ERR(event); } - hlist_add_head(&event_recorder->priv->parent.u.syscall.node, &syscall_table->unknown_syscall_dispatch); + hlist_add_head(&event->priv->u.syscall.node, &syscall_table->unknown_syscall_dispatch); } if (hlist_empty(&syscall_table->compat_unknown_syscall_dispatch)) { const struct lttng_kernel_event_desc *desc = &__event_desc___compat_syscall_entry_unknown; - struct lttng_kernel_event_recorder *event_recorder; + struct lttng_kernel_event_common *event; struct lttng_event_recorder_enabler *event_enabler; memset(&ev, 0, sizeof(ev)); @@ -671,19 +667,19 @@ int lttng_syscalls_populate_events(struct lttng_event_enabler_common *syscall_ev if (!event_enabler) { return -ENOMEM; } - event_recorder = _lttng_kernel_event_recorder_create(event_enabler, desc); - WARN_ON_ONCE(!event_recorder); + event = _lttng_kernel_event_create(&event_enabler->parent, desc); + WARN_ON_ONCE(!event); lttng_event_enabler_destroy(&event_enabler->parent); - if (IS_ERR(event_recorder)) { - return PTR_ERR(event_recorder); + if (IS_ERR(event)) { + return PTR_ERR(event); } - hlist_add_head(&event_recorder->priv->parent.u.syscall.node, &syscall_table->compat_unknown_syscall_dispatch); + hlist_add_head(&event->priv->u.syscall.node, &syscall_table->compat_unknown_syscall_dispatch); } if (hlist_empty(&syscall_table->compat_unknown_syscall_exit_dispatch)) { const struct lttng_kernel_event_desc *desc = &__event_desc___compat_syscall_exit_unknown; - struct lttng_kernel_event_recorder *event_recorder; + struct lttng_kernel_event_common *event; struct lttng_event_recorder_enabler *event_enabler; memset(&ev, 0, sizeof(ev)); @@ -696,19 +692,19 @@ int lttng_syscalls_populate_events(struct lttng_event_enabler_common *syscall_ev if (!event_enabler) { return -ENOMEM; } - event_recorder = _lttng_kernel_event_recorder_create(event_enabler, desc); - WARN_ON_ONCE(!event_recorder); + event = _lttng_kernel_event_create(&event_enabler->parent, desc); + WARN_ON_ONCE(!event); lttng_event_enabler_destroy(&event_enabler->parent); - if (IS_ERR(event_recorder)) { - return PTR_ERR(event_recorder); + if (IS_ERR(event)) { + return PTR_ERR(event); } - hlist_add_head(&event_recorder->priv->parent.u.syscall.node, &syscall_table->compat_unknown_syscall_exit_dispatch); + hlist_add_head(&event->priv->u.syscall.node, &syscall_table->compat_unknown_syscall_exit_dispatch); } if (hlist_empty(&syscall_table->unknown_syscall_exit_dispatch)) { const struct lttng_kernel_event_desc *desc = &__event_desc___syscall_exit_unknown; - struct lttng_kernel_event_recorder *event_recorder; + struct lttng_kernel_event_common *event; struct lttng_event_recorder_enabler *event_enabler; memset(&ev, 0, sizeof(ev)); @@ -721,13 +717,13 @@ int lttng_syscalls_populate_events(struct lttng_event_enabler_common *syscall_ev if (!event_enabler) { return -ENOMEM; } - event_recorder = _lttng_kernel_event_recorder_create(event_enabler, desc); - WARN_ON_ONCE(!event_recorder); + event = _lttng_kernel_event_create(&event_enabler->parent, desc); + WARN_ON_ONCE(!event); lttng_event_enabler_destroy(&event_enabler->parent); - if (IS_ERR(event_recorder)) { - return PTR_ERR(event_recorder); + if (IS_ERR(event)) { + return PTR_ERR(event); } - hlist_add_head(&event_recorder->priv->parent.u.syscall.node, &syscall_table->unknown_syscall_exit_dispatch); + hlist_add_head(&event->priv->u.syscall.node, &syscall_table->unknown_syscall_exit_dispatch); } ret = lttng_create_syscall_event_if_missing(sc_table.table, sc_table.len, @@ -755,7 +751,7 @@ int lttng_syscalls_populate_events(struct lttng_event_enabler_common *syscall_ev /* * Should be called with sessions lock held. */ -int lttng_syscalls_register_event(struct lttng_event_enabler_common *syscall_event_enabler) +int lttng_event_enabler_create_syscall_events_if_missing(struct lttng_event_enabler_common *syscall_event_enabler) { struct lttng_kernel_syscall_table *syscall_table = get_syscall_table_from_enabler(syscall_event_enabler); int ret; @@ -800,8 +796,6 @@ int lttng_syscalls_register_event(struct lttng_event_enabler_common *syscall_eve if (ret) return ret; - wrapper_vmalloc_sync_mappings(); - if (!syscall_table->sys_enter_registered) { ret = lttng_wrapper_tracepoint_probe_register("sys_enter", (void *) syscall_entry_event_probe, syscall_table); @@ -832,8 +826,9 @@ int create_unknown_event_notifier( struct lttng_event_notifier_enabler *event_notifier_enabler, enum sc_type type) { + struct lttng_event_ht *events_ht = lttng_get_event_ht_from_enabler(&event_notifier_enabler->parent); struct lttng_kernel_event_common_private *event_priv; - struct lttng_kernel_event_notifier *event_notifier; + struct lttng_kernel_event_common *event; const struct lttng_kernel_event_desc *desc; struct lttng_event_notifier_group *group = event_notifier_enabler->group; struct lttng_kernel_syscall_table *syscall_table = &group->syscall_table; @@ -881,11 +876,9 @@ int create_unknown_event_notifier( /* * Check if already created. */ - head = utils_borrow_hash_table_bucket(group->events_ht.table, - LTTNG_EVENT_HT_SIZE, desc->event_name); + head = utils_borrow_hash_table_bucket(events_ht->table, LTTNG_EVENT_HT_SIZE, desc->event_name); lttng_hlist_for_each_entry(event_priv, head, hlist_node) { - if (event_priv->desc == desc && - event_priv->user_token == base_enabler->user_token) + if (lttng_event_enabler_desc_match_event(base_enabler, desc, event_priv->pub)) found = true; } if (found) @@ -906,16 +899,16 @@ int create_unknown_event_notifier( event_notifier_enabler = lttng_event_notifier_enabler_create(LTTNG_ENABLER_FORMAT_NAME, &event_notifier_param, group); WARN_ON_ONCE(!event_notifier_enabler); - event_notifier = _lttng_event_notifier_create(event_notifier_enabler, desc); + event = _lttng_kernel_event_create(&event_notifier_enabler->parent, desc); lttng_event_enabler_destroy(&event_notifier_enabler->parent); - if (IS_ERR(event_notifier)) { + if (IS_ERR(event)) { printk(KERN_INFO "Unable to create unknown notifier %s\n", desc->event_name); ret = -ENOMEM; goto end; } - hlist_add_head_rcu(&event_notifier->priv->parent.u.syscall.node, unknown_dispatch_list); + hlist_add_head_rcu(&event->priv->u.syscall.node, unknown_dispatch_list); end: return ret; @@ -926,6 +919,7 @@ static int create_matching_event_notifiers( const struct trace_syscall_entry *table, size_t table_len, enum sc_type type) { + struct lttng_event_ht *events_ht = lttng_get_event_ht_from_enabler(&syscall_event_notifier_enabler->parent); struct lttng_event_notifier_group *group = syscall_event_notifier_enabler->group; const struct lttng_kernel_event_desc *desc; uint64_t user_token = syscall_event_notifier_enabler->parent.user_token; @@ -937,7 +931,7 @@ static int create_matching_event_notifiers( for (i = 0; i < table_len; i++) { struct lttng_event_notifier_enabler *event_notifier_enabler; struct lttng_kernel_event_common_private *event_priv; - struct lttng_kernel_event_notifier *event_notifier; + struct lttng_kernel_event_common *event; struct lttng_kernel_abi_event_notifier event_notifier_param; struct hlist_head *head; int found = 0; @@ -955,11 +949,9 @@ static int create_matching_event_notifiers( /* * Check if already created. */ - head = utils_borrow_hash_table_bucket(group->events_ht.table, - LTTNG_EVENT_HT_SIZE, desc->event_name); + head = utils_borrow_hash_table_bucket(events_ht->table, LTTNG_EVENT_HT_SIZE, desc->event_name); lttng_hlist_for_each_entry(event_priv, head, hlist_node) { - if (event_priv->desc == desc - && event_priv->user_token == syscall_event_notifier_enabler->parent.user_token) + if (lttng_event_enabler_desc_match_event(&syscall_event_notifier_enabler->parent, desc, event_priv->pub)) found = 1; } if (found) @@ -994,16 +986,16 @@ static int create_matching_event_notifiers( event_notifier_enabler = lttng_event_notifier_enabler_create(LTTNG_ENABLER_FORMAT_NAME, &event_notifier_param, group); WARN_ON_ONCE(!event_notifier_enabler); - event_notifier = _lttng_event_notifier_create(event_notifier_enabler, desc); + event = _lttng_kernel_event_create(&event_notifier_enabler->parent, desc); lttng_event_enabler_destroy(&event_notifier_enabler->parent); - if (IS_ERR(event_notifier)) { + if (IS_ERR(event)) { printk(KERN_INFO "Unable to create event_notifier %s\n", desc->event_name); ret = -ENOMEM; goto end; } - event_notifier->priv->parent.u.syscall.syscall_id = i; + event->priv->u.syscall.syscall_id = i; } end: @@ -1403,6 +1395,29 @@ int lttng_syscall_filter_disable_event(struct lttng_kernel_event_common *event) return 0; } +void lttng_syscall_table_set_wildcard_all(struct lttng_event_enabler_common *event_enabler) +{ + struct lttng_kernel_syscall_table *syscall_table = get_syscall_table_from_enabler(event_enabler); + enum lttng_kernel_abi_syscall_entryexit entryexit; + int enabled = event_enabler->enabled; + + if (event_enabler->event_param.instrumentation != LTTNG_KERNEL_ABI_SYSCALL) + return; + if (event_enabler->event_param.u.syscall.abi != LTTNG_KERNEL_ABI_SYSCALL_ABI_ALL) + return; + if (event_enabler->event_param.u.syscall.match != LTTNG_KERNEL_ABI_SYSCALL_MATCH_NAME) + return; + if (strcmp(event_enabler->event_param.name, "*")) + return; + + entryexit = event_enabler->event_param.u.syscall.entryexit; + if (entryexit == LTTNG_KERNEL_ABI_SYSCALL_ENTRY || entryexit == LTTNG_KERNEL_ABI_SYSCALL_ENTRYEXIT) + WRITE_ONCE(syscall_table->syscall_all_entry, enabled); + + if (entryexit == LTTNG_KERNEL_ABI_SYSCALL_EXIT || entryexit == LTTNG_KERNEL_ABI_SYSCALL_ENTRYEXIT) + WRITE_ONCE(syscall_table->syscall_all_exit, enabled); +} + static const struct trace_syscall_entry *syscall_list_get_entry(loff_t *pos) {