X-Git-Url: https://git.lttng.org/?a=blobdiff_plain;f=src%2Flttng-events.c;h=cd8efff18778808404a9a34aa35ba64860a2c17c;hb=ee7e9a186b9bf3815d6088e58d4bf816b27b9adf;hp=039b43e6ffb21f82c9dc864a5c89652aba200a93;hpb=0def91708e136463a7e19e322932844e596a02db;p=lttng-modules.git diff --git a/src/lttng-events.c b/src/lttng-events.c index 039b43e6..cd8efff1 100644 --- a/src/lttng-events.c +++ b/src/lttng-events.c @@ -73,9 +73,7 @@ static void _lttng_event_destroy(struct lttng_kernel_event_common *event); static void _lttng_channel_destroy(struct lttng_kernel_channel_buffer *chan); static int _lttng_event_unregister(struct lttng_kernel_event_common *event); static -int _lttng_event_metadata_statedump(struct lttng_kernel_session *session, - struct lttng_kernel_channel_buffer *chan, - struct lttng_kernel_event_recorder *event); +int _lttng_event_recorder_metadata_statedump(struct lttng_kernel_event_common *event); static int _lttng_session_metadata_statedump(struct lttng_kernel_session *session); static @@ -353,7 +351,7 @@ void lttng_session_destroy(struct lttng_kernel_session *session) struct lttng_kernel_channel_buffer_private *chan_priv, *tmpchan_priv; struct lttng_kernel_event_recorder_private *event_recorder_priv, *tmpevent_recorder_priv; struct lttng_metadata_stream *metadata_stream; - struct lttng_event_recorder_enabler *event_recorder_enabler, *tmp_event_recorder_enabler; + struct lttng_event_enabler_common *event_enabler, *tmp_event_enabler; int ret; mutex_lock(&sessions_mutex); @@ -362,7 +360,7 @@ void lttng_session_destroy(struct lttng_kernel_session *session) ret = lttng_syscalls_unregister_syscall_table(&chan_priv->parent.syscall_table); WARN_ON(ret); } - list_for_each_entry(event_recorder_priv, &session->priv->events, node) { + list_for_each_entry(event_recorder_priv, &session->priv->events, parent.node) { ret = _lttng_event_unregister(&event_recorder_priv->pub->parent); WARN_ON(ret); } @@ -371,10 +369,9 @@ void lttng_session_destroy(struct lttng_kernel_session *session) ret = lttng_syscalls_destroy_syscall_table(&chan_priv->parent.syscall_table); WARN_ON(ret); } - list_for_each_entry_safe(event_recorder_enabler, tmp_event_recorder_enabler, - &session->priv->enablers_head, node) - lttng_event_enabler_destroy(&event_recorder_enabler->parent); - list_for_each_entry_safe(event_recorder_priv, tmpevent_recorder_priv, &session->priv->events, node) + list_for_each_entry_safe(event_enabler, tmp_event_enabler, &session->priv->enablers_head, node) + lttng_event_enabler_destroy(event_enabler); + list_for_each_entry_safe(event_recorder_priv, tmpevent_recorder_priv, &session->priv->events, parent.node) _lttng_event_destroy(&event_recorder_priv->pub->parent); list_for_each_entry_safe(chan_priv, tmpchan_priv, &session->priv->chan, node) { BUG_ON(chan_priv->channel_type == METADATA_CHANNEL); @@ -400,7 +397,7 @@ void lttng_session_destroy(struct lttng_kernel_session *session) void lttng_event_notifier_group_destroy( struct lttng_event_notifier_group *event_notifier_group) { - struct lttng_event_notifier_enabler *event_notifier_enabler, *tmp_event_notifier_enabler; + struct lttng_event_enabler_common *event_enabler, *tmp_event_enabler; struct lttng_kernel_event_notifier_private *event_notifier_priv, *tmpevent_notifier_priv; int ret; @@ -413,7 +410,7 @@ void lttng_event_notifier_group_destroy( WARN_ON(ret); list_for_each_entry_safe(event_notifier_priv, tmpevent_notifier_priv, - &event_notifier_group->event_notifiers_head, node) { + &event_notifier_group->event_notifiers_head, parent.node) { ret = _lttng_event_unregister(&event_notifier_priv->pub->parent); WARN_ON(ret); } @@ -426,12 +423,12 @@ void lttng_event_notifier_group_destroy( ret = lttng_syscalls_destroy_syscall_table(&event_notifier_group->syscall_table); WARN_ON(ret); - list_for_each_entry_safe(event_notifier_enabler, tmp_event_notifier_enabler, + list_for_each_entry_safe(event_enabler, tmp_event_enabler, &event_notifier_group->enablers_head, node) - lttng_event_enabler_destroy(&event_notifier_enabler->parent); + lttng_event_enabler_destroy(event_enabler); list_for_each_entry_safe(event_notifier_priv, tmpevent_notifier_priv, - &event_notifier_group->event_notifiers_head, node) + &event_notifier_group->event_notifiers_head, parent.node) _lttng_event_destroy(&event_notifier_priv->pub->parent); if (event_notifier_group->error_counter) { @@ -567,7 +564,7 @@ int lttng_session_metadata_regenerate(struct lttng_kernel_session *session) chan_priv->metadata_dumped = 0; } - list_for_each_entry(event_recorder_priv, &session->priv->events, node) { + list_for_each_entry(event_recorder_priv, &session->priv->events, parent.node) { event_recorder_priv->metadata_dumped = 0; } @@ -867,21 +864,173 @@ void _lttng_metadata_channel_hangup(struct lttng_metadata_stream *stream) wake_up_interruptible(&stream->read_wait); } +static +struct lttng_kernel_event_common *lttng_kernel_event_alloc(struct lttng_event_enabler_common *event_enabler) +{ + struct lttng_kernel_abi_event *event_param = &event_enabler->event_param; + enum lttng_kernel_abi_instrumentation itype = event_param->instrumentation; + + switch (event_enabler->enabler_type) { + case LTTNG_EVENT_ENABLER_TYPE_RECORDER: + { + struct lttng_event_recorder_enabler *event_recorder_enabler = + container_of(event_enabler, struct lttng_event_recorder_enabler, parent); + struct lttng_kernel_event_recorder *event_recorder; + struct lttng_kernel_event_recorder_private *event_recorder_priv; + struct lttng_kernel_channel_buffer *chan = event_recorder_enabler->chan; + + event_recorder = kmem_cache_zalloc(event_recorder_cache, GFP_KERNEL); + if (!event_recorder) + return NULL; + event_recorder_priv = kmem_cache_zalloc(event_recorder_private_cache, GFP_KERNEL); + if (!event_recorder_priv) { + kmem_cache_free(event_recorder_private_cache, event_recorder); + return NULL; + } + event_recorder_priv->pub = event_recorder; + event_recorder_priv->parent.pub = &event_recorder->parent; + event_recorder->priv = event_recorder_priv; + event_recorder->parent.priv = &event_recorder_priv->parent; + + event_recorder->parent.type = LTTNG_KERNEL_EVENT_TYPE_RECORDER; + event_recorder->parent.run_filter = lttng_kernel_interpret_event_filter; + event_recorder->priv->parent.instrumentation = itype; + INIT_LIST_HEAD(&event_recorder->priv->parent.filter_bytecode_runtime_head); + INIT_LIST_HEAD(&event_recorder->priv->parent.enablers_ref_head); + + event_recorder->chan = chan; + event_recorder->priv->id = chan->priv->free_event_id++; + return &event_recorder->parent; + } + case LTTNG_EVENT_ENABLER_TYPE_NOTIFIER: + { + struct lttng_event_notifier_enabler *event_notifier_enabler = + container_of(event_enabler, struct lttng_event_notifier_enabler, parent); + struct lttng_kernel_event_notifier *event_notifier; + struct lttng_kernel_event_notifier_private *event_notifier_priv; + + event_notifier = kmem_cache_zalloc(event_notifier_cache, GFP_KERNEL); + if (!event_notifier) + return NULL; + event_notifier_priv = kmem_cache_zalloc(event_notifier_private_cache, GFP_KERNEL); + if (!event_notifier_priv) { + kmem_cache_free(event_notifier_private_cache, event_notifier); + return NULL; + } + event_notifier_priv->pub = event_notifier; + event_notifier_priv->parent.pub = &event_notifier->parent; + event_notifier->priv = event_notifier_priv; + event_notifier->parent.priv = &event_notifier_priv->parent; + + event_notifier->parent.type = LTTNG_KERNEL_EVENT_TYPE_NOTIFIER; + event_notifier->parent.run_filter = lttng_kernel_interpret_event_filter; + event_notifier->priv->parent.instrumentation = itype; + event_notifier->priv->parent.user_token = event_enabler->user_token; + INIT_LIST_HEAD(&event_notifier->priv->parent.filter_bytecode_runtime_head); + INIT_LIST_HEAD(&event_notifier->priv->parent.enablers_ref_head); + + event_notifier->priv->group = event_notifier_enabler->group; + event_notifier->priv->error_counter_index = event_notifier_enabler->error_counter_index; + event_notifier->priv->num_captures = 0; + event_notifier->notification_send = lttng_event_notifier_notification_send; + INIT_LIST_HEAD(&event_notifier->priv->capture_bytecode_runtime_head); + return &event_notifier->parent; + } + default: + return NULL; + } +} + +static +void lttng_kernel_event_free(struct lttng_kernel_event_common *event) +{ + switch (event->type) { + case LTTNG_KERNEL_EVENT_TYPE_RECORDER: + { + struct lttng_kernel_event_recorder *event_recorder = + container_of(event, struct lttng_kernel_event_recorder, parent); + + kmem_cache_free(event_recorder_private_cache, event_recorder->priv); + kmem_cache_free(event_recorder_cache, event_recorder); + break; + } + case LTTNG_KERNEL_EVENT_TYPE_NOTIFIER: + { + struct lttng_kernel_event_notifier *event_notifier = + container_of(event, struct lttng_kernel_event_notifier, parent); + + kmem_cache_free(event_notifier_private_cache, event_notifier->priv); + kmem_cache_free(event_notifier_cache, event_notifier); + break; + } + default: + WARN_ON_ONCE(1); + } +} + +static +int lttng_kernel_event_notifier_clear_error_counter(struct lttng_kernel_event_common *event) +{ + switch (event->type) { + case LTTNG_KERNEL_EVENT_TYPE_RECORDER: + return 0; + case LTTNG_KERNEL_EVENT_TYPE_NOTIFIER: + { + struct lttng_kernel_event_notifier *event_notifier = + container_of(event, struct lttng_kernel_event_notifier, parent); + struct lttng_counter *error_counter; + struct lttng_event_notifier_group *event_notifier_group = event_notifier->priv->group; + size_t dimension_index[1]; + int ret; + + /* + * Clear the error counter bucket. The sessiond keeps track of which + * bucket is currently in use. We trust it. The session lock + * synchronizes against concurrent creation of the error + * counter. + */ + error_counter = event_notifier_group->error_counter; + if (!error_counter) + return 0; + /* + * Check that the index is within the boundary of the counter. + */ + if (event_notifier->priv->error_counter_index >= event_notifier_group->error_counter_len) { + printk(KERN_INFO "LTTng: event_notifier: Error counter index out-of-bound: counter-len=%zu, index=%llu\n", + event_notifier_group->error_counter_len, event_notifier->priv->error_counter_index); + return -EINVAL; + } + + dimension_index[0] = event_notifier->priv->error_counter_index; + ret = error_counter->ops->counter_clear(error_counter->counter, dimension_index); + if (ret) { + printk(KERN_INFO "LTTng: event_notifier: Unable to clear error counter bucket %llu\n", + event_notifier->priv->error_counter_index); + return -EINVAL; + } + return 0; + } + default: + return -EINVAL; + } +} /* * Supports event creation while tracing session is active. * Needs to be called with sessions mutex held. */ +static struct lttng_kernel_event_recorder *_lttng_kernel_event_recorder_create(struct lttng_event_recorder_enabler *event_enabler, const struct lttng_kernel_event_desc *event_desc) { struct lttng_event_ht *events_ht = lttng_get_event_ht_from_enabler(&event_enabler->parent); + struct list_head *event_list_head = lttng_get_event_list_head_from_enabler(&event_enabler->parent); struct lttng_kernel_channel_buffer *chan = event_enabler->chan; struct lttng_kernel_abi_event *event_param = &event_enabler->parent.event_param; enum lttng_kernel_abi_instrumentation itype = event_param->instrumentation; - struct lttng_kernel_event_recorder *event_recorder; - struct lttng_kernel_event_recorder_private *event_recorder_priv; struct lttng_kernel_event_common_private *event_priv; + struct lttng_kernel_event_common *event; + struct lttng_kernel_event_recorder *event_recorder; const char *event_name; struct hlist_head *head; int ret; @@ -918,47 +1067,26 @@ struct lttng_kernel_event_recorder *_lttng_kernel_event_recorder_create(struct l head = utils_borrow_hash_table_bucket(events_ht->table, LTTNG_EVENT_HT_SIZE, event_name); lttng_hlist_for_each_entry(event_priv, head, hlist_node) { - event_recorder_priv = container_of(event_priv, struct lttng_kernel_event_recorder_private, parent); - - WARN_ON_ONCE(!event_priv->desc); - if (!strncmp(event_priv->desc->event_name, event_name, - LTTNG_KERNEL_ABI_SYM_NAME_LEN - 1) - && chan == event_recorder_priv->pub->chan) { + if (lttng_event_enabler_event_name_match_event(&event_enabler->parent, event_name, event_priv->pub)) { ret = -EEXIST; goto exist; } } - event_recorder = kmem_cache_zalloc(event_recorder_cache, GFP_KERNEL); - if (!event_recorder) { - ret = -ENOMEM; - goto cache_error; - } - event_recorder_priv = kmem_cache_zalloc(event_recorder_private_cache, GFP_KERNEL); - if (!event_recorder_priv) { + event = lttng_kernel_event_alloc(&event_enabler->parent); + if (!event) { ret = -ENOMEM; - goto cache_private_error; + goto alloc_error; } - event_recorder_priv->pub = event_recorder; - event_recorder_priv->parent.pub = &event_recorder->parent; - event_recorder->priv = event_recorder_priv; - event_recorder->parent.priv = &event_recorder_priv->parent; - event_recorder->parent.type = LTTNG_KERNEL_EVENT_TYPE_RECORDER; - - event_recorder->parent.run_filter = lttng_kernel_interpret_event_filter; - event_recorder->chan = chan; - event_recorder->priv->id = chan->priv->free_event_id++; - event_recorder->priv->parent.instrumentation = itype; - INIT_LIST_HEAD(&event_recorder->priv->parent.filter_bytecode_runtime_head); - INIT_LIST_HEAD(&event_recorder->priv->parent.enablers_ref_head); + event_recorder = container_of(event, struct lttng_kernel_event_recorder, parent); switch (itype) { case LTTNG_KERNEL_ABI_TRACEPOINT: /* Event will be enabled by enabler sync. */ - event_recorder->parent.enabled = 0; - event_recorder->priv->parent.registered = 0; - event_recorder->priv->parent.desc = lttng_event_desc_get(event_name); - if (!event_recorder->priv->parent.desc) { + event->enabled = 0; + event->priv->registered = 0; + event->priv->desc = lttng_event_desc_get(event_name); + if (!event->priv->desc) { ret = -ENOENT; goto register_error; } @@ -971,8 +1099,8 @@ struct lttng_kernel_event_recorder *_lttng_kernel_event_recorder_create(struct l * Needs to be explicitly enabled after creation, since * we may want to apply filters. */ - event_recorder->parent.enabled = 0; - event_recorder->priv->parent.registered = 1; + event->enabled = 0; + event->priv->registered = 1; /* * Populate lttng_event structure before event * registration. @@ -982,53 +1110,38 @@ struct lttng_kernel_event_recorder *_lttng_kernel_event_recorder_create(struct l event_param->u.kprobe.symbol_name, event_param->u.kprobe.offset, event_param->u.kprobe.addr, - &event_recorder->parent); + event); if (ret) { ret = -EINVAL; goto register_error; } - ret = try_module_get(event_recorder->priv->parent.desc->owner); + ret = try_module_get(event->priv->desc->owner); WARN_ON_ONCE(!ret); break; case LTTNG_KERNEL_ABI_KRETPROBE: { + struct lttng_kernel_event_common *event_return; struct lttng_kernel_event_recorder *event_recorder_return; - struct lttng_kernel_event_recorder_private *event_recorder_return_priv; /* kretprobe defines 2 events */ /* * Needs to be explicitly enabled after creation, since * we may want to apply filters. */ - event_recorder->parent.enabled = 0; - event_recorder->priv->parent.registered = 1; + event->enabled = 0; + event->priv->registered = 1; - event_recorder_return = kmem_cache_zalloc(event_recorder_cache, GFP_KERNEL); - if (!event_recorder_return) { - ret = -ENOMEM; - goto register_error; - } - event_recorder_return_priv = kmem_cache_zalloc(event_recorder_private_cache, GFP_KERNEL); - if (!event_recorder_return_priv) { - kmem_cache_free(event_recorder_cache, event_recorder_return); + event_return = lttng_kernel_event_alloc(&event_enabler->parent); + if (!event) { ret = -ENOMEM; - goto register_error; + goto alloc_error; } - event_recorder_return_priv->pub = event_recorder_return; - event_recorder_return_priv->parent.pub = &event_recorder_return->parent; - event_recorder_return->priv = event_recorder_return_priv; - event_recorder_return->parent.priv = &event_recorder_return_priv->parent; - event_recorder_return->parent.type = LTTNG_KERNEL_EVENT_TYPE_RECORDER; - - event_recorder_return->parent.run_filter = lttng_kernel_interpret_event_filter; - event_recorder_return->chan = chan; - event_recorder_return->priv->id = chan->priv->free_event_id++; - event_recorder_return->priv->parent.instrumentation = itype; - event_recorder_return->parent.enabled = 0; - event_recorder_return->priv->parent.registered = 1; - INIT_LIST_HEAD(&event_recorder_return->priv->parent.filter_bytecode_runtime_head); - INIT_LIST_HEAD(&event_recorder_return->priv->parent.enablers_ref_head); + event_recorder_return = container_of(event_return, struct lttng_kernel_event_recorder, parent); + + event_return->enabled = 0; + event_return->priv->registered = 1; + /* * Populate lttng_event structure before kretprobe registration. */ @@ -1037,29 +1150,26 @@ struct lttng_kernel_event_recorder *_lttng_kernel_event_recorder_create(struct l event_param->u.kretprobe.symbol_name, event_param->u.kretprobe.offset, event_param->u.kretprobe.addr, - &event_recorder->parent, &event_recorder_return->parent); + event, event_return); if (ret) { - kmem_cache_free(event_recorder_private_cache, event_recorder_return_priv); - kmem_cache_free(event_recorder_cache, event_recorder_return); + lttng_kernel_event_free(event_return); ret = -EINVAL; goto register_error; } /* Take 2 refs on the module: one per event. */ - ret = try_module_get(event_recorder->priv->parent.desc->owner); + ret = try_module_get(event->priv->desc->owner); WARN_ON_ONCE(!ret); - ret = try_module_get(event_recorder_return->priv->parent.desc->owner); + ret = try_module_get(event_return->priv->desc->owner); WARN_ON_ONCE(!ret); - ret = _lttng_event_metadata_statedump(chan->parent.session, chan, - event_recorder_return); + ret = _lttng_event_recorder_metadata_statedump(event_return); WARN_ON_ONCE(ret > 0); if (ret) { - kmem_cache_free(event_recorder_private_cache, event_recorder_return_priv); - kmem_cache_free(event_recorder_cache, event_recorder_return); - module_put(event_recorder_return->priv->parent.desc->owner); - module_put(event_recorder->priv->parent.desc->owner); + lttng_kernel_event_free(event_return); + module_put(event_return->priv->desc->owner); + module_put(event->priv->desc->owner); goto statedump_error; } - list_add(&event_recorder_return->priv->node, &chan->parent.session->priv->events); + list_add(&event_return->priv->node, event_list_head); break; } @@ -1068,18 +1178,18 @@ struct lttng_kernel_event_recorder *_lttng_kernel_event_recorder_create(struct l * Needs to be explicitly enabled after creation, since * we may want to apply filters. */ - event_recorder->parent.enabled = 0; - event_recorder->priv->parent.registered = 0; - event_recorder->priv->parent.desc = event_desc; + event->enabled = 0; + event->priv->registered = 0; + event->priv->desc = event_desc; switch (event_param->u.syscall.entryexit) { case LTTNG_KERNEL_ABI_SYSCALL_ENTRYEXIT: ret = -EINVAL; goto register_error; case LTTNG_KERNEL_ABI_SYSCALL_ENTRY: - event_recorder->priv->parent.u.syscall.entryexit = LTTNG_SYSCALL_ENTRY; + event->priv->u.syscall.entryexit = LTTNG_SYSCALL_ENTRY; break; case LTTNG_KERNEL_ABI_SYSCALL_EXIT: - event_recorder->priv->parent.u.syscall.entryexit = LTTNG_SYSCALL_EXIT; + event->priv->u.syscall.entryexit = LTTNG_SYSCALL_EXIT; break; } switch (event_param->u.syscall.abi) { @@ -1087,13 +1197,13 @@ struct lttng_kernel_event_recorder *_lttng_kernel_event_recorder_create(struct l ret = -EINVAL; goto register_error; case LTTNG_KERNEL_ABI_SYSCALL_ABI_NATIVE: - event_recorder->priv->parent.u.syscall.abi = LTTNG_SYSCALL_ABI_NATIVE; + event->priv->u.syscall.abi = LTTNG_SYSCALL_ABI_NATIVE; break; case LTTNG_KERNEL_ABI_SYSCALL_ABI_COMPAT: - event_recorder->priv->parent.u.syscall.abi = LTTNG_SYSCALL_ABI_COMPAT; + event->priv->u.syscall.abi = LTTNG_SYSCALL_ABI_COMPAT; break; } - if (!event_recorder->priv->parent.desc) { + if (!event->priv->desc) { ret = -EINVAL; goto register_error; } @@ -1104,8 +1214,8 @@ struct lttng_kernel_event_recorder *_lttng_kernel_event_recorder_create(struct l * Needs to be explicitly enabled after creation, since * we may want to apply filters. */ - event_recorder->parent.enabled = 0; - event_recorder->priv->parent.registered = 1; + event->enabled = 0; + event->priv->registered = 1; /* * Populate lttng_event structure before event @@ -1115,10 +1225,10 @@ struct lttng_kernel_event_recorder *_lttng_kernel_event_recorder_create(struct l ret = lttng_uprobes_register_event(event_param->name, event_param->u.uprobe.fd, - &event_recorder->parent); + event); if (ret) goto register_error; - ret = try_module_get(event_recorder->priv->parent.desc->owner); + ret = try_module_get(event->priv->desc->owner); WARN_ON_ONCE(!ret); break; @@ -1131,40 +1241,37 @@ struct lttng_kernel_event_recorder *_lttng_kernel_event_recorder_create(struct l ret = -EINVAL; goto register_error; } - ret = _lttng_event_metadata_statedump(chan->parent.session, chan, event_recorder); + ret = _lttng_event_recorder_metadata_statedump(event); WARN_ON_ONCE(ret > 0); if (ret) { goto statedump_error; } - hlist_add_head(&event_recorder->priv->parent.hlist_node, head); - list_add(&event_recorder->priv->node, &chan->parent.session->priv->events); + hlist_add_head(&event->priv->hlist_node, head); + list_add(&event->priv->node, event_list_head); return event_recorder; statedump_error: /* If a statedump error occurs, events will not be readable. */ register_error: - kmem_cache_free(event_recorder_private_cache, event_recorder_priv); -cache_private_error: - kmem_cache_free(event_recorder_cache, event_recorder); -cache_error: + lttng_kernel_event_free(event); +alloc_error: exist: type_error: full: return ERR_PTR(ret); } -struct lttng_kernel_event_notifier *_lttng_event_notifier_create(struct lttng_event_notifier_enabler *event_enabler, +static +struct lttng_kernel_event_notifier *_lttng_kernel_event_notifier_create(struct lttng_event_notifier_enabler *event_enabler, const struct lttng_kernel_event_desc *event_desc) { struct lttng_event_ht *events_ht = lttng_get_event_ht_from_enabler(&event_enabler->parent); - struct lttng_event_notifier_group *event_notifier_group = event_enabler->group; + struct list_head *event_list_head = lttng_get_event_list_head_from_enabler(&event_enabler->parent); struct lttng_kernel_abi_event *event_param = &event_enabler->parent.event_param; - uint64_t token = event_enabler->parent.user_token; enum lttng_kernel_abi_instrumentation itype = event_param->instrumentation; - struct lttng_kernel_event_notifier *event_notifier; - struct lttng_kernel_event_notifier_private *event_notifier_priv; struct lttng_kernel_event_common_private *event_priv; - struct lttng_counter *error_counter; + struct lttng_kernel_event_common *event; + struct lttng_kernel_event_notifier *event_notifier; const char *event_name; struct hlist_head *head; int ret; @@ -1196,52 +1303,26 @@ struct lttng_kernel_event_notifier *_lttng_event_notifier_create(struct lttng_ev head = utils_borrow_hash_table_bucket(events_ht->table, LTTNG_EVENT_HT_SIZE, event_name); lttng_hlist_for_each_entry(event_priv, head, hlist_node) { - event_notifier_priv = container_of(event_priv, struct lttng_kernel_event_notifier_private, parent); - - WARN_ON_ONCE(!event_priv->desc); - if (!strncmp(event_priv->desc->event_name, event_name, - LTTNG_KERNEL_ABI_SYM_NAME_LEN - 1) - && event_notifier_group == event_notifier_priv->group - && token == event_priv->user_token) { + if (lttng_event_enabler_event_name_match_event(&event_enabler->parent, event_name, event_priv->pub)) { ret = -EEXIST; goto exist; } } - event_notifier = kmem_cache_zalloc(event_notifier_cache, GFP_KERNEL); - if (!event_notifier) { + event = lttng_kernel_event_alloc(&event_enabler->parent); + if (!event) { ret = -ENOMEM; - goto cache_error; + goto alloc_error; } - event_notifier_priv = kmem_cache_zalloc(event_notifier_private_cache, GFP_KERNEL); - if (!event_notifier_priv) { - ret = -ENOMEM; - goto cache_private_error; - } - event_notifier_priv->pub = event_notifier; - event_notifier_priv->parent.pub = &event_notifier->parent; - event_notifier->priv = event_notifier_priv; - event_notifier->parent.priv = &event_notifier_priv->parent; - event_notifier->parent.type = LTTNG_KERNEL_EVENT_TYPE_NOTIFIER; - - event_notifier->priv->group = event_notifier_group; - event_notifier->priv->parent.user_token = event_enabler->parent.user_token; - event_notifier->priv->error_counter_index = event_enabler->error_counter_index; - event_notifier->priv->num_captures = 0; - event_notifier->priv->parent.instrumentation = itype; - event_notifier->notification_send = lttng_event_notifier_notification_send; - INIT_LIST_HEAD(&event_notifier->priv->parent.filter_bytecode_runtime_head); - INIT_LIST_HEAD(&event_notifier->priv->parent.enablers_ref_head); - INIT_LIST_HEAD(&event_notifier->priv->capture_bytecode_runtime_head); - event_notifier->parent.run_filter = lttng_kernel_interpret_event_filter; + event_notifier = container_of(event, struct lttng_kernel_event_notifier, parent); switch (itype) { case LTTNG_KERNEL_ABI_TRACEPOINT: /* Event will be enabled by enabler sync. */ - event_notifier->parent.enabled = 0; - event_notifier->priv->parent.registered = 0; - event_notifier->priv->parent.desc = lttng_event_desc_get(event_name); - if (!event_notifier->priv->parent.desc) { + event->enabled = 0; + event->priv->registered = 0; + event->priv->desc = lttng_event_desc_get(event_name); + if (!event->priv->desc) { ret = -ENOENT; goto register_error; } @@ -1254,8 +1335,8 @@ struct lttng_kernel_event_notifier *_lttng_event_notifier_create(struct lttng_ev * Needs to be explicitly enabled after creation, since * we may want to apply filters. */ - event_notifier->parent.enabled = 0; - event_notifier->priv->parent.registered = 1; + event->enabled = 0; + event->priv->registered = 1; /* * Populate lttng_event_notifier structure before event * registration. @@ -1265,12 +1346,12 @@ struct lttng_kernel_event_notifier *_lttng_event_notifier_create(struct lttng_ev event_param->u.kprobe.symbol_name, event_param->u.kprobe.offset, event_param->u.kprobe.addr, - &event_notifier->parent); + event); if (ret) { ret = -EINVAL; goto register_error; } - ret = try_module_get(event_notifier->priv->parent.desc->owner); + ret = try_module_get(event->priv->desc->owner); WARN_ON_ONCE(!ret); break; @@ -1279,18 +1360,18 @@ struct lttng_kernel_event_notifier *_lttng_event_notifier_create(struct lttng_ev * Needs to be explicitly enabled after creation, since * we may want to apply filters. */ - event_notifier->parent.enabled = 0; - event_notifier->priv->parent.registered = 0; - event_notifier->priv->parent.desc = event_desc; + event->enabled = 0; + event->priv->registered = 0; + event->priv->desc = event_desc; switch (event_param->u.syscall.entryexit) { case LTTNG_KERNEL_ABI_SYSCALL_ENTRYEXIT: ret = -EINVAL; goto register_error; case LTTNG_KERNEL_ABI_SYSCALL_ENTRY: - event_notifier->priv->parent.u.syscall.entryexit = LTTNG_SYSCALL_ENTRY; + event->priv->u.syscall.entryexit = LTTNG_SYSCALL_ENTRY; break; case LTTNG_KERNEL_ABI_SYSCALL_EXIT: - event_notifier->priv->parent.u.syscall.entryexit = LTTNG_SYSCALL_EXIT; + event->priv->u.syscall.entryexit = LTTNG_SYSCALL_EXIT; break; } switch (event_param->u.syscall.abi) { @@ -1298,14 +1379,14 @@ struct lttng_kernel_event_notifier *_lttng_event_notifier_create(struct lttng_ev ret = -EINVAL; goto register_error; case LTTNG_KERNEL_ABI_SYSCALL_ABI_NATIVE: - event_notifier->priv->parent.u.syscall.abi = LTTNG_SYSCALL_ABI_NATIVE; + event->priv->u.syscall.abi = LTTNG_SYSCALL_ABI_NATIVE; break; case LTTNG_KERNEL_ABI_SYSCALL_ABI_COMPAT: - event_notifier->priv->parent.u.syscall.abi = LTTNG_SYSCALL_ABI_COMPAT; + event->priv->u.syscall.abi = LTTNG_SYSCALL_ABI_COMPAT; break; } - if (!event_notifier->priv->parent.desc) { + if (!event->priv->desc) { ret = -EINVAL; goto register_error; } @@ -1316,8 +1397,8 @@ struct lttng_kernel_event_notifier *_lttng_event_notifier_create(struct lttng_ev * Needs to be explicitly enabled after creation, since * we may want to apply filters. */ - event_notifier->parent.enabled = 0; - event_notifier->priv->parent.registered = 1; + event->enabled = 0; + event->priv->registered = 1; /* * Populate lttng_event_notifier structure before @@ -1327,10 +1408,10 @@ struct lttng_kernel_event_notifier *_lttng_event_notifier_create(struct lttng_ev ret = lttng_uprobes_register_event(event_param->name, event_param->u.uprobe.fd, - &event_notifier->parent); + event); if (ret) goto register_error; - ret = try_module_get(event_notifier->priv->parent.desc->owner); + ret = try_module_get(event->priv->desc->owner); WARN_ON_ONCE(!ret); break; @@ -1346,50 +1427,66 @@ struct lttng_kernel_event_notifier *_lttng_event_notifier_create(struct lttng_ev goto register_error; } - list_add(&event_notifier->priv->node, &event_notifier_group->event_notifiers_head); - hlist_add_head(&event_notifier->priv->parent.hlist_node, head); - - /* - * Clear the error counter bucket. The sessiond keeps track of which - * bucket is currently in use. We trust it. The session lock - * synchronizes against concurrent creation of the error - * counter. - */ - error_counter = event_notifier_group->error_counter; - if (error_counter) { - size_t dimension_index[1]; - - /* - * Check that the index is within the boundary of the counter. - */ - if (event_notifier->priv->error_counter_index >= event_notifier_group->error_counter_len) { - printk(KERN_INFO "LTTng: event_notifier: Error counter index out-of-bound: counter-len=%zu, index=%llu\n", - event_notifier_group->error_counter_len, event_notifier->priv->error_counter_index); - ret = -EINVAL; - goto register_error; - } - - dimension_index[0] = event_notifier->priv->error_counter_index; - ret = error_counter->ops->counter_clear(error_counter->counter, dimension_index); - if (ret) { - printk(KERN_INFO "LTTng: event_notifier: Unable to clear error counter bucket %llu\n", - event_notifier->priv->error_counter_index); - goto register_error; - } - } + list_add(&event->priv->node, event_list_head); + hlist_add_head(&event->priv->hlist_node, head); + ret = lttng_kernel_event_notifier_clear_error_counter(event); + if (ret) + goto register_error; return event_notifier; register_error: - kmem_cache_free(event_notifier_private_cache, event_notifier_priv); -cache_private_error: - kmem_cache_free(event_notifier_cache, event_notifier); -cache_error: + lttng_kernel_event_free(event); +alloc_error: exist: type_error: return ERR_PTR(ret); } +struct lttng_kernel_event_common *_lttng_kernel_event_create(struct lttng_event_enabler_common *event_enabler, + const struct lttng_kernel_event_desc *event_desc) +{ + switch (event_enabler->enabler_type) { + case LTTNG_EVENT_ENABLER_TYPE_RECORDER: + { + struct lttng_event_recorder_enabler *event_recorder_enabler = + container_of(event_enabler, struct lttng_event_recorder_enabler, parent); + struct lttng_kernel_event_recorder *event_recorder; + + event_recorder = _lttng_kernel_event_recorder_create(event_recorder_enabler, event_desc); + if (!event_recorder) + return NULL; + return &event_recorder->parent; + } + case LTTNG_EVENT_ENABLER_TYPE_NOTIFIER: + { + struct lttng_event_notifier_enabler *event_notifier_enabler = + container_of(event_enabler, struct lttng_event_notifier_enabler, parent); + struct lttng_kernel_event_notifier *event_notifier; + + event_notifier = _lttng_kernel_event_notifier_create(event_notifier_enabler, event_desc); + if (!event_notifier) + return NULL; + return &event_notifier->parent; + } + default: + return NULL; + } +} + +struct lttng_kernel_event_common *lttng_kernel_event_create(struct lttng_event_enabler_common *event_enabler, + const struct lttng_kernel_event_desc *event_desc) +{ + struct lttng_kernel_event_common *event; + + mutex_lock(&sessions_mutex); + event = _lttng_kernel_event_create(event_enabler, event_desc); + mutex_unlock(&sessions_mutex); + return event; +} + + + int lttng_kernel_counter_read(struct lttng_counter *counter, const size_t *dim_indexes, int32_t cpu, int64_t *val, bool *overflow, bool *underflow) @@ -1412,28 +1509,6 @@ int lttng_kernel_counter_clear(struct lttng_counter *counter, return counter->ops->counter_clear(counter->counter, dim_indexes); } -struct lttng_kernel_event_recorder *lttng_kernel_event_recorder_create(struct lttng_event_recorder_enabler *event_enabler, - const struct lttng_kernel_event_desc *event_desc) -{ - struct lttng_kernel_event_recorder *event; - - mutex_lock(&sessions_mutex); - event = _lttng_kernel_event_recorder_create(event_enabler, event_desc); - mutex_unlock(&sessions_mutex); - return event; -} - -struct lttng_kernel_event_notifier *lttng_event_notifier_create(struct lttng_event_notifier_enabler *event_enabler, - const struct lttng_kernel_event_desc *event_desc) -{ - struct lttng_kernel_event_notifier *event_notifier; - - mutex_lock(&sessions_mutex); - event_notifier = _lttng_event_notifier_create(event_enabler, event_desc); - mutex_unlock(&sessions_mutex); - return event_notifier; -} - /* Only used for tracepoints for now. */ static void register_event(struct lttng_kernel_event_common *event) @@ -1599,7 +1674,7 @@ void _lttng_event_destroy(struct lttng_kernel_event_common *event) default: WARN_ON_ONCE(1); } - list_del(&event_recorder->priv->node); + list_del(&event_recorder->priv->parent.node); kmem_cache_free(event_recorder_private_cache, event_recorder->priv); kmem_cache_free(event_recorder_cache, event_recorder); break; @@ -1636,7 +1711,7 @@ void _lttng_event_destroy(struct lttng_kernel_event_common *event) default: WARN_ON_ONCE(1); } - list_del(&event_notifier->priv->node); + list_del(&event_notifier->priv->parent.node); kmem_cache_free(event_notifier_private_cache, event_notifier->priv); kmem_cache_free(event_notifier_cache, event_notifier); break; @@ -1921,7 +1996,8 @@ int lttng_match_enabler_name(const char *desc_name, return 1; } -int lttng_desc_match_enabler(const struct lttng_kernel_event_desc *desc, +static +int lttng_desc_match_enabler_check(const struct lttng_kernel_event_desc *desc, struct lttng_event_enabler_common *enabler) { const char *desc_name, *enabler_name; @@ -2010,153 +2086,197 @@ int lttng_desc_match_enabler(const struct lttng_kernel_event_desc *desc, } } -static -int lttng_event_enabler_match_event(struct lttng_event_recorder_enabler *event_enabler, - struct lttng_kernel_event_recorder *event_recorder) +bool lttng_desc_match_enabler(const struct lttng_kernel_event_desc *desc, + struct lttng_event_enabler_common *enabler) { - struct lttng_event_enabler_common *base_enabler = lttng_event_recorder_enabler_as_enabler( - event_enabler); + int ret; - if (base_enabler->event_param.instrumentation != event_recorder->priv->parent.instrumentation) - return 0; - if (lttng_desc_match_enabler(event_recorder->priv->parent.desc, base_enabler) - && event_recorder->chan == event_enabler->chan) - return 1; - else - return 0; + ret = lttng_desc_match_enabler_check(desc, enabler); + if (ret < 0) { + WARN_ON_ONCE(1); + return false; + } + return ret; } -static -int lttng_event_notifier_enabler_match_event_notifier(struct lttng_event_notifier_enabler *event_notifier_enabler, - struct lttng_kernel_event_notifier *event_notifier) +bool lttng_event_enabler_match_event(struct lttng_event_enabler_common *event_enabler, + struct lttng_kernel_event_common *event) { - struct lttng_event_enabler_common *base_enabler = lttng_event_notifier_enabler_as_enabler( - event_notifier_enabler); + if (event_enabler->event_param.instrumentation != event->priv->instrumentation) + return false; - if (base_enabler->event_param.instrumentation != event_notifier->priv->parent.instrumentation) - return 0; - if (lttng_desc_match_enabler(event_notifier->priv->parent.desc, base_enabler) - && event_notifier->priv->group == event_notifier_enabler->group - && event_notifier->priv->parent.user_token == event_notifier_enabler->parent.user_token) - return 1; - else - return 0; + switch (event_enabler->enabler_type) { + case LTTNG_EVENT_ENABLER_TYPE_RECORDER: + { + struct lttng_event_recorder_enabler *event_recorder_enabler = + container_of(event_enabler, struct lttng_event_recorder_enabler, parent); + struct lttng_kernel_event_recorder *event_recorder = + container_of(event, struct lttng_kernel_event_recorder, parent); + + if (lttng_desc_match_enabler(event->priv->desc, event_enabler) + && event_recorder->chan == event_recorder_enabler->chan) + return true; + else + return false; + } + case LTTNG_EVENT_ENABLER_TYPE_NOTIFIER: + { + struct lttng_event_notifier_enabler *event_notifier_enabler = + container_of(event_enabler, struct lttng_event_notifier_enabler, parent); + struct lttng_kernel_event_notifier *event_notifier = + container_of(event, struct lttng_kernel_event_notifier, parent); + + if (lttng_desc_match_enabler(event->priv->desc, event_enabler) + && event_notifier->priv->group == event_notifier_enabler->group + && event->priv->user_token == event_enabler->user_token) + return true; + else + return false; + } + default: + WARN_ON_ONCE(1); + return false; + } } -static -struct lttng_enabler_ref *lttng_enabler_ref( - struct list_head *enablers_ref_list, - struct lttng_event_enabler_common *enabler) +bool lttng_event_enabler_desc_match_event(struct lttng_event_enabler_common *event_enabler, + const struct lttng_kernel_event_desc *desc, + struct lttng_kernel_event_common *event) { - struct lttng_enabler_ref *enabler_ref; + if (event_enabler->event_param.instrumentation != event->priv->instrumentation) + return false; - list_for_each_entry(enabler_ref, enablers_ref_list, node) { - if (enabler_ref->ref == enabler) - return enabler_ref; + switch (event_enabler->enabler_type) { + case LTTNG_EVENT_ENABLER_TYPE_RECORDER: + { + struct lttng_event_recorder_enabler *event_recorder_enabler = + container_of(event_enabler, struct lttng_event_recorder_enabler, parent); + struct lttng_kernel_event_recorder *event_recorder = + container_of(event, struct lttng_kernel_event_recorder, parent); + + if (event->priv->desc == desc && event_recorder->chan == event_recorder_enabler->chan) + return true; + else + return false; + } + case LTTNG_EVENT_ENABLER_TYPE_NOTIFIER: + { + struct lttng_event_notifier_enabler *event_notifier_enabler = + container_of(event_enabler, struct lttng_event_notifier_enabler, parent); + struct lttng_kernel_event_notifier *event_notifier = + container_of(event, struct lttng_kernel_event_notifier, parent); + + if (event->priv->desc == desc + && event_notifier->priv->group == event_notifier_enabler->group + && event->priv->user_token == event_enabler->user_token) + return true; + else + return false; + } + default: + WARN_ON_ONCE(1); + return false; } - return NULL; } -static -void lttng_create_tracepoint_event_if_missing(struct lttng_event_recorder_enabler *event_enabler) +bool lttng_event_enabler_event_name_match_event(struct lttng_event_enabler_common *event_enabler, + const char *event_name, + struct lttng_kernel_event_common *event) { - struct lttng_event_ht *events_ht = lttng_get_event_ht_from_enabler(&event_enabler->parent); - struct lttng_kernel_probe_desc *probe_desc; - const struct lttng_kernel_event_desc *desc; - int i; - struct list_head *probe_list; + if (event_enabler->event_param.instrumentation != event->priv->instrumentation) + return false; - probe_list = lttng_get_probe_list_head(); - /* - * For each probe event, if we find that a probe event matches - * our enabler, create an associated lttng_event if not - * already present. - */ - list_for_each_entry(probe_desc, probe_list, head) { - for (i = 0; i < probe_desc->nr_events; i++) { - int found = 0; - struct hlist_head *head; - struct lttng_kernel_event_recorder_private *event_recorder_priv; - struct lttng_kernel_event_recorder *event_recorder; - struct lttng_kernel_event_common_private *event_priv; + switch (event_enabler->enabler_type) { + case LTTNG_EVENT_ENABLER_TYPE_RECORDER: + { + struct lttng_event_recorder_enabler *event_recorder_enabler = + container_of(event_enabler, struct lttng_event_recorder_enabler, parent); + struct lttng_kernel_event_recorder *event_recorder = + container_of(event, struct lttng_kernel_event_recorder, parent); - desc = probe_desc->event_desc[i]; - if (!lttng_desc_match_enabler(desc, - lttng_event_recorder_enabler_as_enabler(event_enabler))) - continue; + if (!strncmp(event->priv->desc->event_name, event_name, LTTNG_KERNEL_ABI_SYM_NAME_LEN - 1) + && event_recorder->chan == event_recorder_enabler->chan) + return true; + else + return false; + } + case LTTNG_EVENT_ENABLER_TYPE_NOTIFIER: + { + struct lttng_event_notifier_enabler *event_notifier_enabler = + container_of(event_enabler, struct lttng_event_notifier_enabler, parent); + struct lttng_kernel_event_notifier *event_notifier = + container_of(event, struct lttng_kernel_event_notifier, parent); - /* - * Check if already created. - */ - 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) { - event_recorder_priv = container_of(event_priv, struct lttng_kernel_event_recorder_private, parent); - if (event_priv->desc == desc - && event_recorder_priv->pub->chan == event_enabler->chan) - found = 1; - } - if (found) - continue; + if (!strncmp(event->priv->desc->event_name, event_name, LTTNG_KERNEL_ABI_SYM_NAME_LEN - 1) + && event_notifier->priv->group == event_notifier_enabler->group + && event->priv->user_token == event_enabler->user_token) + return true; + else + return false; + } + default: + WARN_ON_ONCE(1); + return false; + } +} - /* - * We need to create an event for this - * event probe. - */ - event_recorder = _lttng_kernel_event_recorder_create(event_enabler, desc); - if (!event_recorder) { - printk(KERN_INFO "LTTng: Unable to create event %s\n", - probe_desc->event_desc[i]->event_name); - } - } +static +struct lttng_enabler_ref *lttng_enabler_ref( + struct list_head *enablers_ref_list, + struct lttng_event_enabler_common *enabler) +{ + struct lttng_enabler_ref *enabler_ref; + + list_for_each_entry(enabler_ref, enablers_ref_list, node) { + if (enabler_ref->ref == enabler) + return enabler_ref; } + return NULL; } static -void lttng_create_tracepoint_event_notifier_if_missing(struct lttng_event_notifier_enabler *event_notifier_enabler) +void lttng_create_tracepoint_event_if_missing(struct lttng_event_enabler_common *event_enabler) { - struct lttng_event_ht *events_ht = lttng_get_event_ht_from_enabler(&event_notifier_enabler->parent); + struct lttng_event_ht *events_ht = lttng_get_event_ht_from_enabler(event_enabler); struct lttng_kernel_probe_desc *probe_desc; const struct lttng_kernel_event_desc *desc; - int i; struct list_head *probe_list; + int i; probe_list = lttng_get_probe_list_head(); /* * For each probe event, if we find that a probe event matches - * our enabler, create an associated lttng_event_notifier if not + * our enabler, create an associated lttng_event if not * already present. */ list_for_each_entry(probe_desc, probe_list, head) { for (i = 0; i < probe_desc->nr_events; i++) { int found = 0; struct hlist_head *head; - struct lttng_kernel_event_notifier *event_notifier; + struct lttng_kernel_event_common *event; struct lttng_kernel_event_common_private *event_priv; desc = probe_desc->event_desc[i]; - if (!lttng_desc_match_enabler(desc, - lttng_event_notifier_enabler_as_enabler(event_notifier_enabler))) + if (!lttng_desc_match_enabler(desc, event_enabler)) continue; /* * Check if already created. */ - head = utils_borrow_hash_table_bucket(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 == event_notifier_enabler->parent.user_token) + if (lttng_event_enabler_desc_match_event(event_enabler, desc, event_priv->pub)) found = 1; } if (found) continue; /* - * We need to create a event_notifier for this event probe. + * We need to create an event for this event probe. */ - event_notifier = _lttng_event_notifier_create(event_notifier_enabler, desc); - if (IS_ERR(event_notifier)) { - printk(KERN_INFO "Unable to create event_notifier %s\n", + event = _lttng_kernel_event_create(event_enabler, desc); + if (!event) { + printk(KERN_INFO "LTTng: Unable to create event %s\n", probe_desc->event_desc[i]->event_name); } } @@ -2173,20 +2293,19 @@ void lttng_create_syscall_event_if_missing(struct lttng_event_enabler_common *ev } /* - * Create struct lttng_kernel_event_recorder if it is missing and present in the list of - * tracepoint probes. + * Create event if it is missing and present in the list of tracepoint probes. * Should be called with sessions mutex held. */ static -void lttng_create_event_if_missing(struct lttng_event_recorder_enabler *event_enabler) +void lttng_create_event_if_missing(struct lttng_event_enabler_common *event_enabler) { - switch (event_enabler->parent.event_param.instrumentation) { + switch (event_enabler->event_param.instrumentation) { case LTTNG_KERNEL_ABI_TRACEPOINT: lttng_create_tracepoint_event_if_missing(event_enabler); break; case LTTNG_KERNEL_ABI_SYSCALL: - lttng_create_syscall_event_if_missing(&event_enabler->parent); + lttng_create_syscall_event_if_missing(event_enabler); break; default: @@ -2195,132 +2314,66 @@ void lttng_create_event_if_missing(struct lttng_event_recorder_enabler *event_en } } -/* - * Create events associated with an event_enabler (if not already present), - * and add backward reference from the event to the enabler. - * Should be called with sessions mutex held. - */ static -int lttng_event_enabler_ref_events(struct lttng_event_recorder_enabler *event_enabler) +void lttng_event_enabler_init_event_filter(struct lttng_event_enabler_common *event_enabler, + struct lttng_kernel_event_common *event) { - struct lttng_kernel_channel_buffer *chan = event_enabler->chan; - struct lttng_kernel_session *session = event_enabler->chan->parent.session; - struct lttng_event_enabler_common *base_enabler = lttng_event_recorder_enabler_as_enabler(event_enabler); - struct lttng_kernel_event_recorder_private *event_recorder_priv; - - if (base_enabler->event_param.instrumentation == LTTNG_KERNEL_ABI_SYSCALL && - base_enabler->event_param.u.syscall.abi == LTTNG_KERNEL_ABI_SYSCALL_ABI_ALL && - base_enabler->event_param.u.syscall.match == LTTNG_KERNEL_ABI_SYSCALL_MATCH_NAME && - !strcmp(base_enabler->event_param.name, "*")) { - int enabled = base_enabler->enabled; - enum lttng_kernel_abi_syscall_entryexit entryexit = base_enabler->event_param.u.syscall.entryexit; - - if (entryexit == LTTNG_KERNEL_ABI_SYSCALL_ENTRY || entryexit == LTTNG_KERNEL_ABI_SYSCALL_ENTRYEXIT) - WRITE_ONCE(chan->priv->parent.syscall_table.syscall_all_entry, enabled); - - if (entryexit == LTTNG_KERNEL_ABI_SYSCALL_EXIT || entryexit == LTTNG_KERNEL_ABI_SYSCALL_ENTRYEXIT) - WRITE_ONCE(chan->priv->parent.syscall_table.syscall_all_exit, enabled); - } - - /* First ensure that probe events are created for this enabler. */ - lttng_create_event_if_missing(event_enabler); - - /* For each event matching event_enabler in session event list. */ - list_for_each_entry(event_recorder_priv, &session->priv->events, node) { - struct lttng_kernel_event_recorder *event_recorder = event_recorder_priv->pub; - struct lttng_enabler_ref *enabler_ref; - - if (!lttng_event_enabler_match_event(event_enabler, event_recorder)) - continue; - enabler_ref = lttng_enabler_ref(&event_recorder_priv->parent.enablers_ref_head, - lttng_event_recorder_enabler_as_enabler(event_enabler)); - if (!enabler_ref) { - /* - * If no backward ref, create it. - * Add backward ref from event to event_enabler. - */ - enabler_ref = kzalloc(sizeof(*enabler_ref), GFP_KERNEL); - if (!enabler_ref) - return -ENOMEM; - enabler_ref->ref = lttng_event_recorder_enabler_as_enabler(event_enabler); - list_add(&enabler_ref->node, - &event_recorder_priv->parent.enablers_ref_head); - } - - /* - * Link filter bytecodes if not linked yet. - */ - lttng_enabler_link_bytecode(event_recorder_priv->parent.desc, - lttng_static_ctx, - &event_recorder_priv->parent.filter_bytecode_runtime_head, - <tng_event_recorder_enabler_as_enabler(event_enabler)->filter_bytecode_head); - } - return 0; + /* Link filter bytecodes if not linked yet. */ + lttng_enabler_link_bytecode(event->priv->desc, lttng_static_ctx, + &event->priv->filter_bytecode_runtime_head, &event_enabler->filter_bytecode_head); } -/* - * Create struct lttng_kernel_event_notifier if it is missing and present in the list of - * tracepoint probes. - * Should be called with sessions mutex held. - */ static -void lttng_create_event_notifier_if_missing(struct lttng_event_notifier_enabler *event_notifier_enabler) +void lttng_event_enabler_init_event_capture(struct lttng_event_enabler_common *event_enabler, + struct lttng_kernel_event_common *event) { - switch (event_notifier_enabler->parent.event_param.instrumentation) { - case LTTNG_KERNEL_ABI_TRACEPOINT: - lttng_create_tracepoint_event_notifier_if_missing(event_notifier_enabler); + switch (event_enabler->enabler_type) { + case LTTNG_EVENT_ENABLER_TYPE_RECORDER: break; + case LTTNG_EVENT_ENABLER_TYPE_NOTIFIER: + { + struct lttng_event_notifier_enabler *event_notifier_enabler = + container_of(event_enabler, struct lttng_event_notifier_enabler, parent); + struct lttng_kernel_event_notifier *event_notifier = + container_of(event, struct lttng_kernel_event_notifier, parent); - case LTTNG_KERNEL_ABI_SYSCALL: - lttng_create_syscall_event_if_missing(&event_notifier_enabler->parent); + /* Link capture bytecodes if not linked yet. */ + lttng_enabler_link_bytecode(event->priv->desc, + lttng_static_ctx, &event_notifier->priv->capture_bytecode_runtime_head, + &event_notifier_enabler->capture_bytecode_head); + event_notifier->priv->num_captures = event_notifier_enabler->num_captures; break; - + } default: WARN_ON_ONCE(1); - break; } } /* - * Create event_notifiers associated with a event_notifier enabler (if not already present). + * Create events associated with an event_enabler (if not already present), + * and add backward reference from the event to the enabler. + * Should be called with sessions mutex held. */ static -int lttng_event_notifier_enabler_ref_event_notifiers( - struct lttng_event_notifier_enabler *event_notifier_enabler) +int lttng_event_enabler_ref_events(struct lttng_event_enabler_common *event_enabler) { - struct lttng_event_notifier_group *event_notifier_group = event_notifier_enabler->group; - struct lttng_event_enabler_common *base_enabler = lttng_event_notifier_enabler_as_enabler(event_notifier_enabler); - struct lttng_kernel_event_notifier_private *event_notifier_priv; - - if (base_enabler->event_param.instrumentation == LTTNG_KERNEL_ABI_SYSCALL && - base_enabler->event_param.u.syscall.abi == LTTNG_KERNEL_ABI_SYSCALL_ABI_ALL && - base_enabler->event_param.u.syscall.match == LTTNG_KERNEL_ABI_SYSCALL_MATCH_NAME && - !strcmp(base_enabler->event_param.name, "*")) { - - int enabled = base_enabler->enabled; - enum lttng_kernel_abi_syscall_entryexit entryexit = base_enabler->event_param.u.syscall.entryexit; - - if (entryexit == LTTNG_KERNEL_ABI_SYSCALL_ENTRY || entryexit == LTTNG_KERNEL_ABI_SYSCALL_ENTRYEXIT) - WRITE_ONCE(event_notifier_group->syscall_table.syscall_all_entry, enabled); - - if (entryexit == LTTNG_KERNEL_ABI_SYSCALL_EXIT || entryexit == LTTNG_KERNEL_ABI_SYSCALL_ENTRYEXIT) - WRITE_ONCE(event_notifier_group->syscall_table.syscall_all_exit, enabled); + struct list_head *event_list_head = lttng_get_event_list_head_from_enabler(event_enabler); + struct lttng_kernel_event_common_private *event_priv; - } + lttng_syscall_table_set_wildcard_all(event_enabler); - /* First ensure that probe event_notifiers are created for this enabler. */ - lttng_create_event_notifier_if_missing(event_notifier_enabler); + /* First ensure that probe events are created for this enabler. */ + lttng_create_event_if_missing(event_enabler); - /* Link the created event_notifier with its associated enabler. */ - list_for_each_entry(event_notifier_priv, &event_notifier_group->event_notifiers_head, node) { - struct lttng_kernel_event_notifier *event_notifier = event_notifier_priv->pub; + /* Link the created event with its associated enabler. */ + list_for_each_entry(event_priv, event_list_head, node) { + struct lttng_kernel_event_common *event = event_priv->pub; struct lttng_enabler_ref *enabler_ref; - if (!lttng_event_notifier_enabler_match_event_notifier(event_notifier_enabler, event_notifier)) + if (!lttng_event_enabler_match_event(event_enabler, event)) continue; - enabler_ref = lttng_enabler_ref(&event_notifier_priv->parent.enablers_ref_head, - lttng_event_notifier_enabler_as_enabler(event_notifier_enabler)); + enabler_ref = lttng_enabler_ref(&event_priv->enablers_ref_head, event_enabler); if (!enabler_ref) { /* * If no backward ref, create it. @@ -2330,25 +2383,12 @@ int lttng_event_notifier_enabler_ref_event_notifiers( if (!enabler_ref) return -ENOMEM; - enabler_ref->ref = lttng_event_notifier_enabler_as_enabler( - event_notifier_enabler); - list_add(&enabler_ref->node, - &event_notifier_priv->parent.enablers_ref_head); + enabler_ref->ref = event_enabler; + list_add(&enabler_ref->node, &event_priv->enablers_ref_head); } - /* - * Link filter bytecodes if not linked yet. - */ - lttng_enabler_link_bytecode(event_notifier_priv->parent.desc, - lttng_static_ctx, &event_notifier_priv->parent.filter_bytecode_runtime_head, - <tng_event_notifier_enabler_as_enabler(event_notifier_enabler)->filter_bytecode_head); - - /* Link capture bytecodes if not linked yet. */ - lttng_enabler_link_bytecode(event_notifier_priv->parent.desc, - lttng_static_ctx, &event_notifier_priv->capture_bytecode_runtime_head, - &event_notifier_enabler->capture_bytecode_head); - - event_notifier_priv->num_captures = event_notifier_enabler->num_captures; + lttng_event_enabler_init_event_filter(event_enabler, event); + lttng_event_enabler_init_event_capture(event_enabler, event); } return 0; } @@ -2370,11 +2410,10 @@ int lttng_fix_pending_events(void) static bool lttng_event_notifier_group_has_active_event_notifiers( struct lttng_event_notifier_group *event_notifier_group) { - struct lttng_event_notifier_enabler *event_notifier_enabler; + struct lttng_event_enabler_common *event_enabler; - list_for_each_entry(event_notifier_enabler, &event_notifier_group->enablers_head, - node) { - if (event_notifier_enabler->parent.enabled) + list_for_each_entry(event_enabler, &event_notifier_group->enablers_head, node) { + if (event_enabler->enabled) return true; } return false; @@ -2425,8 +2464,8 @@ void lttng_event_enabler_session_add(struct lttng_kernel_session *session, struct lttng_event_recorder_enabler *event_enabler) { mutex_lock(&sessions_mutex); - list_add(&event_enabler->node, &session->priv->enablers_head); - event_enabler->published = true; + list_add(&event_enabler->parent.node, &session->priv->enablers_head); + event_enabler->parent.published = true; lttng_session_lazy_sync_event_enablers(session); mutex_unlock(&sessions_mutex); } @@ -2522,15 +2561,16 @@ void lttng_enabler_destroy(struct lttng_event_enabler_common *enabler) void lttng_event_enabler_destroy(struct lttng_event_enabler_common *event_enabler) { + lttng_enabler_destroy(event_enabler); + if (event_enabler->published) + list_del(&event_enabler->node); + switch (event_enabler->enabler_type) { case LTTNG_EVENT_ENABLER_TYPE_RECORDER: { struct lttng_event_recorder_enabler *event_recorder_enabler = container_of(event_enabler, struct lttng_event_recorder_enabler, parent); - lttng_enabler_destroy(event_enabler); - if (event_recorder_enabler->published) - list_del(&event_recorder_enabler->node); kfree(event_recorder_enabler); break; } @@ -2539,9 +2579,6 @@ void lttng_event_enabler_destroy(struct lttng_event_enabler_common *event_enable struct lttng_event_notifier_enabler *event_notifier_enabler = container_of(event_enabler, struct lttng_event_notifier_enabler, parent); - lttng_enabler_destroy(event_enabler); - if (event_notifier_enabler->published) - list_del(&event_notifier_enabler->node); kfree(event_notifier_enabler); break; } @@ -2582,8 +2619,8 @@ void lttng_event_notifier_enabler_group_add(struct lttng_event_notifier_group *e struct lttng_event_notifier_enabler *event_notifier_enabler) { mutex_lock(&sessions_mutex); - list_add(&event_notifier_enabler->node, &event_notifier_enabler->group->enablers_head); - event_notifier_enabler->published = true; + list_add(&event_notifier_enabler->parent.node, &event_notifier_enabler->group->enablers_head); + event_notifier_enabler->parent.published = true; lttng_event_notifier_group_sync_enablers(event_notifier_enabler->group); mutex_unlock(&sessions_mutex); } @@ -2650,90 +2687,167 @@ end: return ret; } +static +void lttng_event_sync_filter_state(struct lttng_kernel_event_common *event) +{ + int has_enablers_without_filter_bytecode = 0, nr_filters = 0; + struct lttng_kernel_bytecode_runtime *runtime; + struct lttng_enabler_ref *enabler_ref; + + /* Check if has enablers without bytecode enabled */ + list_for_each_entry(enabler_ref, &event->priv->enablers_ref_head, node) { + if (enabler_ref->ref->enabled + && list_empty(&enabler_ref->ref->filter_bytecode_head)) { + has_enablers_without_filter_bytecode = 1; + break; + } + } + event->priv->has_enablers_without_filter_bytecode = has_enablers_without_filter_bytecode; + + /* Enable filters */ + list_for_each_entry(runtime, &event->priv->filter_bytecode_runtime_head, node) { + lttng_bytecode_sync_state(runtime); + nr_filters++; + } + WRITE_ONCE(event->eval_filter, !(has_enablers_without_filter_bytecode || !nr_filters)); +} + +static +void lttng_event_sync_capture_state(struct lttng_kernel_event_common *event) +{ + switch (event->type) { + case LTTNG_KERNEL_EVENT_TYPE_RECORDER: + break; + case LTTNG_KERNEL_EVENT_TYPE_NOTIFIER: + { + struct lttng_kernel_event_notifier *event_notifier = + container_of(event, struct lttng_kernel_event_notifier, parent); + struct lttng_kernel_bytecode_runtime *runtime; + int nr_captures = 0; + + /* Enable captures */ + list_for_each_entry(runtime, &event_notifier->priv->capture_bytecode_runtime_head, node) { + lttng_bytecode_sync_state(runtime); + nr_captures++; + } + WRITE_ONCE(event_notifier->eval_capture, !!nr_captures); + break; + } + default: + WARN_ON_ONCE(1); + } +} + +static +bool lttng_get_event_enabled_state(struct lttng_kernel_event_common *event) +{ + struct lttng_enabler_ref *enabler_ref; + bool enabled = false; + + switch (event->priv->instrumentation) { + case LTTNG_KERNEL_ABI_TRACEPOINT: + lttng_fallthrough; + case LTTNG_KERNEL_ABI_SYSCALL: + /* Enable events */ + list_for_each_entry(enabler_ref, &event->priv->enablers_ref_head, node) { + if (enabler_ref->ref->enabled) { + enabled = true; + break; + } + } + break; + default: + WARN_ON_ONCE(1); + return false; + } + + switch (event->type) { + case LTTNG_KERNEL_EVENT_TYPE_RECORDER: + { + struct lttng_kernel_event_recorder *event_recorder = + container_of(event, struct lttng_kernel_event_recorder, parent); + + /* + * Enabled state is based on union of enablers, with + * intersection of session and channel transient enable + * states. + */ + return enabled && event_recorder->chan->parent.session->priv->tstate && event_recorder->chan->priv->parent.tstate; + } + case LTTNG_KERNEL_EVENT_TYPE_NOTIFIER: + return enabled; + default: + WARN_ON_ONCE(1); + return false; + } +} + +static +bool lttng_event_is_lazy_sync(struct lttng_kernel_event_common *event) +{ + switch (event->priv->instrumentation) { + case LTTNG_KERNEL_ABI_TRACEPOINT: + lttng_fallthrough; + case LTTNG_KERNEL_ABI_SYSCALL: + return true; + + default: + /* Not handled with lazy sync. */ + return false; + } +} + /* - * lttng_session_sync_event_enablers should be called just before starting a - * session. * Should be called with sessions mutex held. */ static -void lttng_session_sync_event_enablers(struct lttng_kernel_session *session) +void lttng_sync_event_list(struct list_head *event_enabler_list, + struct list_head *event_list) { - struct lttng_event_recorder_enabler *event_enabler; - struct lttng_kernel_event_recorder_private *event_recorder_priv; + struct lttng_kernel_event_common_private *event_priv; + struct lttng_event_enabler_common *event_enabler; - list_for_each_entry(event_enabler, &session->priv->enablers_head, node) + list_for_each_entry(event_enabler, event_enabler_list, node) lttng_event_enabler_ref_events(event_enabler); + /* * For each event, if at least one of its enablers is enabled, * and its channel and session transient states are enabled, we * enable the event, else we disable it. */ - list_for_each_entry(event_recorder_priv, &session->priv->events, node) { - struct lttng_kernel_event_recorder *event_recorder = event_recorder_priv->pub; - struct lttng_enabler_ref *enabler_ref; - struct lttng_kernel_bytecode_runtime *runtime; - int enabled = 0, has_enablers_without_filter_bytecode = 0; - int nr_filters = 0; - - switch (event_recorder_priv->parent.instrumentation) { - case LTTNG_KERNEL_ABI_TRACEPOINT: - lttng_fallthrough; - case LTTNG_KERNEL_ABI_SYSCALL: - /* Enable events */ - list_for_each_entry(enabler_ref, - &event_recorder_priv->parent.enablers_ref_head, node) { - if (enabler_ref->ref->enabled) { - enabled = 1; - break; - } - } - break; + list_for_each_entry(event_priv, event_list, node) { + struct lttng_kernel_event_common *event = event_priv->pub; + bool enabled; - default: - /* Not handled with lazy sync. */ + if (!lttng_event_is_lazy_sync(event)) continue; - } - /* - * Enabled state is based on union of enablers, with - * intesection of session and channel transient enable - * states. - */ - enabled = enabled && session->priv->tstate && event_recorder->chan->priv->parent.tstate; - WRITE_ONCE(event_recorder->parent.enabled, enabled); + enabled = lttng_get_event_enabled_state(event); + WRITE_ONCE(event->enabled, enabled); /* - * Sync tracepoint registration with event enabled - * state. + * Sync tracepoint registration with event enabled state. */ if (enabled) { - register_event(&event_recorder->parent); + register_event(event); } else { - _lttng_event_unregister(&event_recorder->parent); - } - - /* Check if has enablers without bytecode enabled */ - list_for_each_entry(enabler_ref, - &event_recorder_priv->parent.enablers_ref_head, node) { - if (enabler_ref->ref->enabled - && list_empty(&enabler_ref->ref->filter_bytecode_head)) { - has_enablers_without_filter_bytecode = 1; - break; - } + _lttng_event_unregister(event); } - event_recorder_priv->parent.has_enablers_without_filter_bytecode = - has_enablers_without_filter_bytecode; - /* Enable filters */ - list_for_each_entry(runtime, - &event_recorder_priv->parent.filter_bytecode_runtime_head, node) { - lttng_bytecode_sync_state(runtime); - nr_filters++; - } - WRITE_ONCE(event_recorder_priv->parent.pub->eval_filter, - !(has_enablers_without_filter_bytecode || !nr_filters)); + lttng_event_sync_filter_state(event); + lttng_event_sync_capture_state(event); } } +/* + * lttng_session_sync_event_enablers should be called just before starting a + * session. + */ +static +void lttng_session_sync_event_enablers(struct lttng_kernel_session *session) +{ + lttng_sync_event_list(&session->priv->enablers_head, &session->priv->events); +} + /* * Apply enablers to session events, adding events to session if need * be. It is required after each modification applied to an active @@ -2753,84 +2867,7 @@ void lttng_session_lazy_sync_event_enablers(struct lttng_kernel_session *session static void lttng_event_notifier_group_sync_enablers(struct lttng_event_notifier_group *event_notifier_group) { - struct lttng_event_notifier_enabler *event_notifier_enabler; - struct lttng_kernel_event_notifier_private *event_notifier_priv; - - list_for_each_entry(event_notifier_enabler, &event_notifier_group->enablers_head, node) - lttng_event_notifier_enabler_ref_event_notifiers(event_notifier_enabler); - - /* - * For each event_notifier, if at least one of its enablers is enabled, - * we enable the event_notifier, else we disable it. - */ - list_for_each_entry(event_notifier_priv, &event_notifier_group->event_notifiers_head, node) { - struct lttng_kernel_event_notifier *event_notifier = event_notifier_priv->pub; - struct lttng_enabler_ref *enabler_ref; - struct lttng_kernel_bytecode_runtime *runtime; - int enabled = 0, has_enablers_without_filter_bytecode = 0; - int nr_filters = 0, nr_captures = 0; - - switch (event_notifier_priv->parent.instrumentation) { - case LTTNG_KERNEL_ABI_TRACEPOINT: - lttng_fallthrough; - case LTTNG_KERNEL_ABI_SYSCALL: - /* Enable event_notifiers */ - list_for_each_entry(enabler_ref, - &event_notifier_priv->parent.enablers_ref_head, node) { - if (enabler_ref->ref->enabled) { - enabled = 1; - break; - } - } - break; - - default: - /* Not handled with sync. */ - continue; - } - - WRITE_ONCE(event_notifier->parent.enabled, enabled); - /* - * Sync tracepoint registration with event_notifier enabled - * state. - */ - if (enabled) { - if (!event_notifier_priv->parent.registered) - register_event(&event_notifier->parent); - } else { - if (event_notifier_priv->parent.registered) - _lttng_event_unregister(&event_notifier->parent); - } - - /* Check if has enablers without bytecode enabled */ - list_for_each_entry(enabler_ref, - &event_notifier_priv->parent.enablers_ref_head, node) { - if (enabler_ref->ref->enabled - && list_empty(&enabler_ref->ref->filter_bytecode_head)) { - has_enablers_without_filter_bytecode = 1; - break; - } - } - event_notifier_priv->parent.has_enablers_without_filter_bytecode = - has_enablers_without_filter_bytecode; - - /* Enable filters */ - list_for_each_entry(runtime, - &event_notifier_priv->parent.filter_bytecode_runtime_head, node) { - lttng_bytecode_sync_state(runtime); - nr_filters++; - } - WRITE_ONCE(event_notifier_priv->parent.pub->eval_filter, - !(has_enablers_without_filter_bytecode || !nr_filters)); - - /* Enable captures */ - list_for_each_entry(runtime, - &event_notifier_priv->capture_bytecode_runtime_head, node) { - lttng_bytecode_sync_state(runtime); - nr_captures++; - } - WRITE_ONCE(event_notifier->eval_capture, !!nr_captures); - } + lttng_sync_event_list(&event_notifier_group->enablers_head, &event_notifier_group->event_notifiers_head); } static @@ -3625,12 +3662,19 @@ int _lttng_fields_metadata_statedump(struct lttng_kernel_session *session, * transaction. */ static -int _lttng_event_metadata_statedump(struct lttng_kernel_session *session, - struct lttng_kernel_channel_buffer *chan, - struct lttng_kernel_event_recorder *event_recorder) +int _lttng_event_recorder_metadata_statedump(struct lttng_kernel_event_common *event) { + struct lttng_kernel_event_recorder *event_recorder; + struct lttng_kernel_channel_buffer *chan; + struct lttng_kernel_session *session; int ret = 0; + if (event->type != LTTNG_KERNEL_EVENT_TYPE_RECORDER) + return 0; + event_recorder = container_of(event, struct lttng_kernel_event_recorder, parent); + chan = event_recorder->chan; + session = chan->parent.session; + if (event_recorder->priv->metadata_dumped || !LTTNG_READ_ONCE(session->active)) return 0; if (chan->priv->channel_type == METADATA_CHANNEL) @@ -4084,9 +4128,8 @@ skip_session: goto end; } - list_for_each_entry(event_recorder_priv, &session->priv->events, node) { - ret = _lttng_event_metadata_statedump(session, event_recorder_priv->pub->chan, - event_recorder_priv->pub); + list_for_each_entry(event_recorder_priv, &session->priv->events, parent.node) { + ret = _lttng_event_recorder_metadata_statedump(&event_recorder_priv->pub->parent); if (ret) goto end; }