X-Git-Url: https://git.lttng.org/?a=blobdiff_plain;f=src%2Flttng-events.c;h=78ee916f0258283b2f92b29f932d4508af6c05b2;hb=1bbb5b2dfb4634c1ed19d006a538101fd69a30de;hp=bc5a56cc2a103d6a6a06273362428c6d5d05bd41;hpb=eb6b47dbeeb508c56dd965209c1179be15b6d27c;p=lttng-modules.git diff --git a/src/lttng-events.c b/src/lttng-events.c index bc5a56cc..78ee916f 100644 --- a/src/lttng-events.c +++ b/src/lttng-events.c @@ -71,8 +71,7 @@ static void lttng_event_enabler_sync(struct lttng_event_enabler_common *event_en 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_recorder_unregister(struct lttng_kernel_event_recorder *event); -static int _lttng_event_notifier_unregister(struct lttng_kernel_event_notifier *event_notifier); +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, @@ -322,8 +321,8 @@ struct lttng_event_notifier_group *lttng_event_notifier_group_create(void) INIT_LIST_HEAD(&event_notifier_group->enablers_head); INIT_LIST_HEAD(&event_notifier_group->event_notifiers_head); - for (i = 0; i < LTTNG_EVENT_NOTIFIER_HT_SIZE; i++) - INIT_HLIST_HEAD(&event_notifier_group->event_notifiers_ht.table[i]); + for (i = 0; i < LTTNG_EVENT_HT_SIZE; i++) + INIT_HLIST_HEAD(&event_notifier_group->events_ht.table[i]); list_add(&event_notifier_group->node, &event_notifier_groups); @@ -364,7 +363,7 @@ void lttng_session_destroy(struct lttng_kernel_session *session) WARN_ON(ret); } list_for_each_entry(event_recorder_priv, &session->priv->events, node) { - ret = _lttng_event_recorder_unregister(event_recorder_priv->pub); + ret = _lttng_event_unregister(&event_recorder_priv->pub->parent); WARN_ON(ret); } synchronize_trace(); /* Wait for in-flight events to complete */ @@ -415,7 +414,7 @@ void lttng_event_notifier_group_destroy( list_for_each_entry_safe(event_notifier_priv, tmpevent_notifier_priv, &event_notifier_group->event_notifiers_head, node) { - ret = _lttng_event_notifier_unregister(event_notifier_priv->pub); + ret = _lttng_event_unregister(&event_notifier_priv->pub->parent); WARN_ON(ret); } @@ -1152,13 +1151,13 @@ full: return ERR_PTR(ret); } -struct lttng_kernel_event_notifier *_lttng_event_notifier_create( - const struct lttng_kernel_event_desc *event_desc, - uint64_t token, uint64_t error_counter_index, - struct lttng_event_notifier_group *event_notifier_group, - struct lttng_kernel_abi_event_notifier *event_notifier_param, - enum lttng_kernel_abi_instrumentation itype) +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_event_notifier_group *event_notifier_group = event_enabler->group; + 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_counter *error_counter; @@ -1176,7 +1175,7 @@ struct lttng_kernel_event_notifier *_lttng_event_notifier_create( case LTTNG_KERNEL_ABI_UPROBE: lttng_fallthrough; case LTTNG_KERNEL_ABI_SYSCALL: - event_name = event_notifier_param->event.name; + event_name = event_param->name; break; case LTTNG_KERNEL_ABI_KRETPROBE: @@ -1191,8 +1190,8 @@ struct lttng_kernel_event_notifier *_lttng_event_notifier_create( goto type_error; } - head = utils_borrow_hash_table_bucket(event_notifier_group->event_notifiers_ht.table, - LTTNG_EVENT_NOTIFIER_HT_SIZE, event_name); + head = utils_borrow_hash_table_bucket(event_notifier_group->events_ht.table, + LTTNG_EVENT_HT_SIZE, event_name); lttng_hlist_for_each_entry(event_notifier_priv, head, hlist) { WARN_ON_ONCE(!event_notifier_priv->parent.desc); if (!strncmp(event_notifier_priv->parent.desc->event_name, event_name, @@ -1221,8 +1220,8 @@ struct lttng_kernel_event_notifier *_lttng_event_notifier_create( event_notifier->parent.type = LTTNG_KERNEL_EVENT_TYPE_NOTIFIER; event_notifier->priv->group = event_notifier_group; - event_notifier->priv->parent.user_token = token; - event_notifier->priv->error_counter_index = error_counter_index; + 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; @@ -1257,10 +1256,10 @@ struct lttng_kernel_event_notifier *_lttng_event_notifier_create( * registration. */ smp_wmb(); - ret = lttng_kprobes_register_event(event_notifier_param->event.u.kprobe.symbol_name, - event_notifier_param->event.u.kprobe.symbol_name, - event_notifier_param->event.u.kprobe.offset, - event_notifier_param->event.u.kprobe.addr, + ret = lttng_kprobes_register_event(event_param->u.kprobe.symbol_name, + event_param->u.kprobe.symbol_name, + event_param->u.kprobe.offset, + event_param->u.kprobe.addr, &event_notifier->parent); if (ret) { ret = -EINVAL; @@ -1278,7 +1277,7 @@ struct lttng_kernel_event_notifier *_lttng_event_notifier_create( event_notifier->parent.enabled = 0; event_notifier->priv->parent.registered = 0; event_notifier->priv->parent.desc = event_desc; - switch (event_notifier_param->event.u.syscall.entryexit) { + switch (event_param->u.syscall.entryexit) { case LTTNG_KERNEL_ABI_SYSCALL_ENTRYEXIT: ret = -EINVAL; goto register_error; @@ -1289,7 +1288,7 @@ struct lttng_kernel_event_notifier *_lttng_event_notifier_create( event_notifier->priv->parent.u.syscall.entryexit = LTTNG_SYSCALL_EXIT; break; } - switch (event_notifier_param->event.u.syscall.abi) { + switch (event_param->u.syscall.abi) { case LTTNG_KERNEL_ABI_SYSCALL_ABI_ALL: ret = -EINVAL; goto register_error; @@ -1321,8 +1320,8 @@ struct lttng_kernel_event_notifier *_lttng_event_notifier_create( */ smp_wmb(); - ret = lttng_uprobes_register_event(event_notifier_param->event.name, - event_notifier_param->event.u.uprobe.fd, + ret = lttng_uprobes_register_event(event_param->name, + event_param->u.uprobe.fd, &event_notifier->parent); if (ret) goto register_error; @@ -1419,53 +1418,56 @@ struct lttng_kernel_event_recorder *lttng_kernel_event_recorder_create(struct lt return event; } -struct lttng_kernel_event_notifier *lttng_event_notifier_create( - const struct lttng_kernel_event_desc *event_desc, - uint64_t id, uint64_t error_counter_index, - struct lttng_event_notifier_group *event_notifier_group, - struct lttng_kernel_abi_event_notifier *event_notifier_param, - enum lttng_kernel_abi_instrumentation itype) +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_desc, id, - error_counter_index, event_notifier_group, - event_notifier_param, itype); + 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_recorder(struct lttng_kernel_event_recorder *event_recorder) +void register_event(struct lttng_kernel_event_common *event) { const struct lttng_kernel_event_desc *desc; int ret = -EINVAL; - if (event_recorder->priv->parent.registered) + if (event->priv->registered) return; - desc = event_recorder->priv->parent.desc; - switch (event_recorder->priv->parent.instrumentation) { + desc = event->priv->desc; + switch (event->priv->instrumentation) { case LTTNG_KERNEL_ABI_TRACEPOINT: ret = lttng_wrapper_tracepoint_probe_register(desc->event_kname, desc->tp_class->probe_callback, - &event_recorder->parent); + event); break; case LTTNG_KERNEL_ABI_SYSCALL: - ret = lttng_syscall_filter_enable_event(&event_recorder->parent); + ret = lttng_syscall_filter_enable_event(event); break; case LTTNG_KERNEL_ABI_KPROBE: lttng_fallthrough; case LTTNG_KERNEL_ABI_UPROBE: - lttng_fallthrough; - case LTTNG_KERNEL_ABI_KRETPROBE: ret = 0; break; + case LTTNG_KERNEL_ABI_KRETPROBE: + switch (event->type) { + case LTTNG_KERNEL_EVENT_TYPE_RECORDER: + ret = 0; + break; + case LTTNG_KERNEL_EVENT_TYPE_NOTIFIER: + WARN_ON_ONCE(1); + break; + } + break; + case LTTNG_KERNEL_ABI_FUNCTION: lttng_fallthrough; case LTTNG_KERNEL_ABI_NOOP: @@ -1474,15 +1476,12 @@ void register_event_recorder(struct lttng_kernel_event_recorder *event_recorder) WARN_ON_ONCE(1); } if (!ret) - event_recorder->priv->parent.registered = 1; + event->priv->registered = 1; } -/* - * Only used internally at session destruction. - */ -int _lttng_event_recorder_unregister(struct lttng_kernel_event_recorder *event_recorder) +int _lttng_event_unregister(struct lttng_kernel_event_common *event) { - struct lttng_kernel_event_common_private *event_priv = &event_recorder->priv->parent; + struct lttng_kernel_event_common_private *event_priv = event->priv; const struct lttng_kernel_event_desc *desc; int ret = -EINVAL; @@ -1494,29 +1493,43 @@ int _lttng_event_recorder_unregister(struct lttng_kernel_event_recorder *event_r case LTTNG_KERNEL_ABI_TRACEPOINT: ret = lttng_wrapper_tracepoint_probe_unregister(event_priv->desc->event_kname, event_priv->desc->tp_class->probe_callback, - &event_recorder->parent); + event); break; case LTTNG_KERNEL_ABI_KPROBE: - lttng_kprobes_unregister_event(&event_recorder->parent); + lttng_kprobes_unregister_event(event); ret = 0; break; case LTTNG_KERNEL_ABI_KRETPROBE: - lttng_kretprobes_unregister(&event_recorder->parent); - ret = 0; + switch (event->type) { + case LTTNG_KERNEL_EVENT_TYPE_RECORDER: + lttng_kretprobes_unregister(event); + ret = 0; + break; + case LTTNG_KERNEL_EVENT_TYPE_NOTIFIER: + WARN_ON_ONCE(1); + break; + } break; case LTTNG_KERNEL_ABI_SYSCALL: - ret = lttng_syscall_filter_disable_event(&event_recorder->parent); + ret = lttng_syscall_filter_disable_event(event); break; case LTTNG_KERNEL_ABI_NOOP: - ret = 0; + switch (event->type) { + case LTTNG_KERNEL_EVENT_TYPE_RECORDER: + ret = 0; + break; + case LTTNG_KERNEL_EVENT_TYPE_NOTIFIER: + WARN_ON_ONCE(1); + break; + } break; case LTTNG_KERNEL_ABI_UPROBE: - lttng_uprobes_unregister_event(&event_recorder->parent); + lttng_uprobes_unregister_event(event); ret = 0; break; @@ -1530,93 +1543,6 @@ int _lttng_event_recorder_unregister(struct lttng_kernel_event_recorder *event_r return ret; } -/* Only used for tracepoints for now. */ -static -void register_event_notifier(struct lttng_kernel_event_notifier *event_notifier) -{ - const struct lttng_kernel_event_desc *desc; - int ret = -EINVAL; - - if (event_notifier->priv->parent.registered) - return; - - desc = event_notifier->priv->parent.desc; - switch (event_notifier->priv->parent.instrumentation) { - case LTTNG_KERNEL_ABI_TRACEPOINT: - ret = lttng_wrapper_tracepoint_probe_register(desc->event_kname, - desc->tp_class->probe_callback, - &event_notifier->parent); - break; - - case LTTNG_KERNEL_ABI_SYSCALL: - ret = lttng_syscall_filter_enable_event(&event_notifier->parent); - break; - - case LTTNG_KERNEL_ABI_KPROBE: - lttng_fallthrough; - case LTTNG_KERNEL_ABI_UPROBE: - ret = 0; - break; - - case LTTNG_KERNEL_ABI_KRETPROBE: - lttng_fallthrough; - case LTTNG_KERNEL_ABI_FUNCTION: - lttng_fallthrough; - case LTTNG_KERNEL_ABI_NOOP: - lttng_fallthrough; - default: - WARN_ON_ONCE(1); - } - if (!ret) - event_notifier->priv->parent.registered = 1; -} - -static -int _lttng_event_notifier_unregister( - struct lttng_kernel_event_notifier *event_notifier) -{ - const struct lttng_kernel_event_desc *desc; - int ret = -EINVAL; - - if (!event_notifier->priv->parent.registered) - return 0; - - desc = event_notifier->priv->parent.desc; - switch (event_notifier->priv->parent.instrumentation) { - case LTTNG_KERNEL_ABI_TRACEPOINT: - ret = lttng_wrapper_tracepoint_probe_unregister(event_notifier->priv->parent.desc->event_kname, - event_notifier->priv->parent.desc->tp_class->probe_callback, - &event_notifier->parent); - break; - - case LTTNG_KERNEL_ABI_KPROBE: - lttng_kprobes_unregister_event(&event_notifier->parent); - ret = 0; - break; - - case LTTNG_KERNEL_ABI_UPROBE: - lttng_uprobes_unregister_event(&event_notifier->parent); - ret = 0; - break; - - case LTTNG_KERNEL_ABI_SYSCALL: - ret = lttng_syscall_filter_disable_event(&event_notifier->parent); - break; - - case LTTNG_KERNEL_ABI_KRETPROBE: - lttng_fallthrough; - case LTTNG_KERNEL_ABI_FUNCTION: - lttng_fallthrough; - case LTTNG_KERNEL_ABI_NOOP: - lttng_fallthrough; - default: - WARN_ON_ONCE(1); - } - if (!ret) - event_notifier->priv->parent.registered = 0; - return ret; -} - /* * Only used internally at session destruction. */ @@ -2211,8 +2137,8 @@ void lttng_create_tracepoint_event_notifier_if_missing(struct lttng_event_notifi * Check if already created. */ head = utils_borrow_hash_table_bucket( - event_notifier_group->event_notifiers_ht.table, - LTTNG_EVENT_NOTIFIER_HT_SIZE, desc->event_name); + event_notifier_group->events_ht.table, + LTTNG_EVENT_HT_SIZE, desc->event_name); lttng_hlist_for_each_entry(event_notifier_priv, head, hlist) { if (event_notifier_priv->parent.desc == desc && event_notifier_priv->parent.user_token == event_notifier_enabler->parent.user_token) @@ -2224,11 +2150,7 @@ void lttng_create_tracepoint_event_notifier_if_missing(struct lttng_event_notifi /* * We need to create a event_notifier for this event probe. */ - event_notifier = _lttng_event_notifier_create(desc, - event_notifier_enabler->parent.user_token, - event_notifier_enabler->error_counter_index, - event_notifier_group, NULL, - LTTNG_KERNEL_ABI_TRACEPOINT); + 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", probe_desc->event_desc[i]->event_name); @@ -2238,22 +2160,11 @@ void lttng_create_tracepoint_event_notifier_if_missing(struct lttng_event_notifi } static -void lttng_create_syscall_event_if_missing(struct lttng_event_recorder_enabler *event_enabler) +void lttng_create_syscall_event_if_missing(struct lttng_event_enabler_common *event_enabler) { int ret; - ret = lttng_syscalls_register_event(&event_enabler->parent); - WARN_ON_ONCE(ret); -} - -static -void lttng_create_syscall_event_notifier_if_missing(struct lttng_event_notifier_enabler *event_notifier_enabler) -{ - int ret; - - ret = lttng_syscalls_register_event(&event_notifier_enabler->parent); - WARN_ON_ONCE(ret); - ret = lttng_syscalls_create_matching_event_notifiers(event_notifier_enabler); + ret = lttng_syscalls_register_event(event_enabler); WARN_ON_ONCE(ret); } @@ -2271,7 +2182,7 @@ void lttng_create_event_if_missing(struct lttng_event_recorder_enabler *event_en break; case LTTNG_KERNEL_ABI_SYSCALL: - lttng_create_syscall_event_if_missing(event_enabler); + lttng_create_syscall_event_if_missing(&event_enabler->parent); break; default: @@ -2357,7 +2268,7 @@ void lttng_create_event_notifier_if_missing(struct lttng_event_notifier_enabler break; case LTTNG_KERNEL_ABI_SYSCALL: - lttng_create_syscall_event_notifier_if_missing(event_notifier_enabler); + lttng_create_syscall_event_if_missing(&event_notifier_enabler->parent); break; default: @@ -2624,8 +2535,9 @@ 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); - list_del(&event_notifier_enabler->node); lttng_enabler_destroy(event_enabler); + if (event_notifier_enabler->published) + list_del(&event_notifier_enabler->node); kfree(event_notifier_enabler); break; } @@ -2635,9 +2547,9 @@ void lttng_event_enabler_destroy(struct lttng_event_enabler_common *event_enable } struct lttng_event_notifier_enabler *lttng_event_notifier_enabler_create( - struct lttng_event_notifier_group *event_notifier_group, enum lttng_enabler_format_type format_type, - struct lttng_kernel_abi_event_notifier *event_notifier_param) + struct lttng_kernel_abi_event_notifier *event_notifier_param, + struct lttng_event_notifier_group *event_notifier_group) { struct lttng_event_notifier_enabler *event_notifier_enabler; @@ -2659,14 +2571,17 @@ struct lttng_event_notifier_enabler *lttng_event_notifier_enabler_create( event_notifier_enabler->parent.enabled = 0; event_notifier_enabler->parent.user_token = event_notifier_param->event.token; event_notifier_enabler->group = event_notifier_group; + return event_notifier_enabler; +} +void lttng_event_notifier_enabler_group_add(struct lttng_event_notifier_group *event_notifier_group, + 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; lttng_event_notifier_group_sync_enablers(event_notifier_enabler->group); - mutex_unlock(&sessions_mutex); - - return event_notifier_enabler; } int lttng_event_notifier_enabler_enable( @@ -2787,9 +2702,9 @@ void lttng_session_sync_event_enablers(struct lttng_kernel_session *session) * state. */ if (enabled) { - register_event_recorder(event_recorder); + register_event(&event_recorder->parent); } else { - _lttng_event_recorder_unregister(event_recorder); + _lttng_event_unregister(&event_recorder->parent); } /* Check if has enablers without bytecode enabled */ @@ -2877,10 +2792,10 @@ void lttng_event_notifier_group_sync_enablers(struct lttng_event_notifier_group */ if (enabled) { if (!event_notifier_priv->parent.registered) - register_event_notifier(event_notifier); + register_event(&event_notifier->parent); } else { if (event_notifier_priv->parent.registered) - _lttng_event_notifier_unregister(event_notifier); + _lttng_event_unregister(&event_notifier->parent); } /* Check if has enablers without bytecode enabled */