X-Git-Url: http://git.lttng.org/?a=blobdiff_plain;f=src%2Flttng-events.c;h=314fb3ecb02b397f47d51e164dc4166aef259e70;hb=b813aed7b6e763db83caa3ba24468bc21c514b23;hp=af20bfccd117473051a26f8b6e66629c4b13d6f0;hpb=f73c5a4351807e11db1f69606cbeee3fabf847e6;p=lttng-modules.git diff --git a/src/lttng-events.c b/src/lttng-events.c index af20bfcc..314fb3ec 100644 --- a/src/lttng-events.c +++ b/src/lttng-events.c @@ -28,6 +28,7 @@ #include #include +#include #include #include /* for wrapper_vmalloc_sync_mappings() */ #include @@ -48,6 +49,13 @@ #include #include +#if (LTTNG_LINUX_VERSION_CODE >= LTTNG_KERNEL_VERSION(5,16,0) \ + || LTTNG_RHEL_KERNEL_RANGE(5,14,0,162,0,0, 5,15,0,0,0,0)) +#include +#else +#include +#endif + #define METADATA_CACHE_DEFAULT_SIZE 4096 static LIST_HEAD(sessions); @@ -71,8 +79,8 @@ static void lttng_event_notifier_group_sync_enablers(struct lttng_event_notifier 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_recorder *event); -static int _lttng_event_notifier_unregister(struct lttng_kernel_event_notifier *event_notifier); +static void _lttng_event_unregister(struct lttng_kernel_event_recorder *event); +static void _lttng_event_notifier_unregister(struct lttng_kernel_event_notifier *event_notifier); static int _lttng_event_metadata_statedump(struct lttng_kernel_session *session, struct lttng_kernel_channel_buffer *chan, @@ -93,7 +101,8 @@ int _lttng_field_statedump(struct lttng_kernel_session *session, void synchronize_trace(void) { -#if (LTTNG_LINUX_VERSION_CODE >= LTTNG_KERNEL_VERSION(5,1,0)) +#if (LTTNG_LINUX_VERSION_CODE >= LTTNG_KERNEL_VERSION(5,1,0) || \ + LTTNG_RHEL_KERNEL_RANGE(4,18,0,193,0,0, 4,19,0,0,0,0)) synchronize_rcu(); #else synchronize_sched(); @@ -362,10 +371,8 @@ void lttng_session_destroy(struct lttng_kernel_session *session) ret = lttng_syscalls_unregister_channel(chan_priv->pub); WARN_ON(ret); } - list_for_each_entry(event_recorder_priv, &session->priv->events, node) { - ret = _lttng_event_unregister(event_recorder_priv->pub); - WARN_ON(ret); - } + list_for_each_entry(event_recorder_priv, &session->priv->events, node) + _lttng_event_unregister(event_recorder_priv->pub); synchronize_trace(); /* Wait for in-flight events to complete */ list_for_each_entry(chan_priv, &session->priv->chan, node) { ret = lttng_syscalls_destroy_event(chan_priv->pub); @@ -413,10 +420,8 @@ 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) { - ret = _lttng_event_notifier_unregister(event_notifier_priv->pub); - WARN_ON(ret); - } + &event_notifier_group->event_notifiers_head, node) + _lttng_event_notifier_unregister(event_notifier_priv->pub); /* Wait for in-flight event notifier to complete */ synchronize_trace(); @@ -658,12 +663,14 @@ int lttng_event_enable(struct lttng_kernel_event_common *event) goto end; } switch (event->priv->instrumentation) { - case LTTNG_KERNEL_ABI_TRACEPOINT: /* Fall-through */ + case LTTNG_KERNEL_ABI_TRACEPOINT: + lttng_fallthrough; case LTTNG_KERNEL_ABI_SYSCALL: ret = -EINVAL; break; - case LTTNG_KERNEL_ABI_KPROBE: /* Fall-through */ + case LTTNG_KERNEL_ABI_KPROBE: + lttng_fallthrough; case LTTNG_KERNEL_ABI_UPROBE: WRITE_ONCE(event->enabled, 1); break; @@ -672,8 +679,10 @@ int lttng_event_enable(struct lttng_kernel_event_common *event) ret = lttng_kretprobes_event_enable_state(event, 1); break; - case LTTNG_KERNEL_ABI_FUNCTION: /* Fall-through */ - case LTTNG_KERNEL_ABI_NOOP: /* Fall-through */ + case LTTNG_KERNEL_ABI_FUNCTION: + lttng_fallthrough; + case LTTNG_KERNEL_ABI_NOOP: + lttng_fallthrough; default: WARN_ON_ONCE(1); ret = -EINVAL; @@ -718,12 +727,14 @@ int lttng_event_disable(struct lttng_kernel_event_common *event) goto end; } switch (event->priv->instrumentation) { - case LTTNG_KERNEL_ABI_TRACEPOINT: /* Fall-through */ + case LTTNG_KERNEL_ABI_TRACEPOINT: + lttng_fallthrough; case LTTNG_KERNEL_ABI_SYSCALL: ret = -EINVAL; break; - case LTTNG_KERNEL_ABI_KPROBE: /* Fall-through */ + case LTTNG_KERNEL_ABI_KPROBE: + lttng_fallthrough; case LTTNG_KERNEL_ABI_UPROBE: WRITE_ONCE(event->enabled, 0); break; @@ -732,8 +743,10 @@ int lttng_event_disable(struct lttng_kernel_event_common *event) ret = lttng_kretprobes_event_enable_state(event, 0); break; - case LTTNG_KERNEL_ABI_FUNCTION: /* Fall-through */ - case LTTNG_KERNEL_ABI_NOOP: /* Fall-through */ + case LTTNG_KERNEL_ABI_FUNCTION: + lttng_fallthrough; + case LTTNG_KERNEL_ABI_NOOP: + lttng_fallthrough; default: WARN_ON_ONCE(1); ret = -EINVAL; @@ -872,15 +885,20 @@ struct lttng_kernel_event_recorder *_lttng_kernel_event_recorder_create(struct l event_name = event_desc->event_name; break; - case LTTNG_KERNEL_ABI_KPROBE: /* Fall-through */ - case LTTNG_KERNEL_ABI_UPROBE: /* Fall-through */ - case LTTNG_KERNEL_ABI_KRETPROBE: /* Fall-through */ + case LTTNG_KERNEL_ABI_KPROBE: + lttng_fallthrough; + case LTTNG_KERNEL_ABI_UPROBE: + lttng_fallthrough; + case LTTNG_KERNEL_ABI_KRETPROBE: + lttng_fallthrough; case LTTNG_KERNEL_ABI_SYSCALL: event_name = event_param->name; break; - case LTTNG_KERNEL_ABI_FUNCTION: /* Fall-through */ - case LTTNG_KERNEL_ABI_NOOP: /* Fall-through */ + case LTTNG_KERNEL_ABI_FUNCTION: + lttng_fallthrough; + case LTTNG_KERNEL_ABI_NOOP: + lttng_fallthrough; default: WARN_ON_ONCE(1); ret = -EINVAL; @@ -1092,8 +1110,10 @@ struct lttng_kernel_event_recorder *_lttng_kernel_event_recorder_create(struct l WARN_ON_ONCE(!ret); break; - case LTTNG_KERNEL_ABI_FUNCTION: /* Fall-through */ - case LTTNG_KERNEL_ABI_NOOP: /* Fall-through */ + case LTTNG_KERNEL_ABI_FUNCTION: + lttng_fallthrough; + case LTTNG_KERNEL_ABI_NOOP: + lttng_fallthrough; default: WARN_ON_ONCE(1); ret = -EINVAL; @@ -1140,15 +1160,20 @@ struct lttng_kernel_event_notifier *_lttng_event_notifier_create( event_name = event_desc->event_name; break; - case LTTNG_KERNEL_ABI_KPROBE: /* Fall-through */ - case LTTNG_KERNEL_ABI_UPROBE: /* Fall-through */ + case LTTNG_KERNEL_ABI_KPROBE: + lttng_fallthrough; + case LTTNG_KERNEL_ABI_UPROBE: + lttng_fallthrough; case LTTNG_KERNEL_ABI_SYSCALL: event_name = event_notifier_param->event.name; break; - case LTTNG_KERNEL_ABI_KRETPROBE: /* Fall-through */ - case LTTNG_KERNEL_ABI_FUNCTION: /* Fall-through */ - case LTTNG_KERNEL_ABI_NOOP: /* Fall-through */ + 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); ret = -EINVAL; @@ -1295,9 +1320,12 @@ struct lttng_kernel_event_notifier *_lttng_event_notifier_create( WARN_ON_ONCE(!ret); break; - case LTTNG_KERNEL_ABI_KRETPROBE: /* Fall-through */ - case LTTNG_KERNEL_ABI_FUNCTION: /* Fall-through */ - case LTTNG_KERNEL_ABI_NOOP: /* Fall-through */ + 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); ret = -EINVAL; @@ -1407,8 +1435,7 @@ void register_event(struct lttng_kernel_event_recorder *event_recorder) const struct lttng_kernel_event_desc *desc; int ret = -EINVAL; - if (event_recorder->priv->parent.registered) - return; + WARN_ON_ONCE(event_recorder->priv->parent.registered); desc = event_recorder->priv->parent.desc; switch (event_recorder->priv->parent.instrumentation) { @@ -1422,14 +1449,18 @@ void register_event(struct lttng_kernel_event_recorder *event_recorder) ret = lttng_syscall_filter_enable_event(event_recorder->chan, event_recorder); break; - case LTTNG_KERNEL_ABI_KPROBE: /* Fall-through */ - case LTTNG_KERNEL_ABI_UPROBE: /* Fall-through */ + 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_FUNCTION: /* Fall-through */ - case LTTNG_KERNEL_ABI_NOOP: /* Fall-through */ + case LTTNG_KERNEL_ABI_FUNCTION: + lttng_fallthrough; + case LTTNG_KERNEL_ABI_NOOP: + lttng_fallthrough; default: WARN_ON_ONCE(1); } @@ -1440,14 +1471,14 @@ void register_event(struct lttng_kernel_event_recorder *event_recorder) /* * Only used internally at session destruction. */ -int _lttng_event_unregister(struct lttng_kernel_event_recorder *event_recorder) +static +void unregister_event(struct lttng_kernel_event_recorder *event_recorder) { struct lttng_kernel_event_common_private *event_priv = &event_recorder->priv->parent; const struct lttng_kernel_event_desc *desc; int ret = -EINVAL; - if (!event_priv->registered) - return 0; + WARN_ON_ONCE(!event_priv->registered); desc = event_priv->desc; switch (event_priv->instrumentation) { @@ -1480,13 +1511,21 @@ int _lttng_event_unregister(struct lttng_kernel_event_recorder *event_recorder) ret = 0; break; - case LTTNG_KERNEL_ABI_FUNCTION: /* Fall-through */ + case LTTNG_KERNEL_ABI_FUNCTION: + lttng_fallthrough; default: WARN_ON_ONCE(1); } + WARN_ON_ONCE(ret); if (!ret) event_priv->registered = 0; - return ret; +} + +static +void _lttng_event_unregister(struct lttng_kernel_event_recorder *event_recorder) +{ + if (event_recorder->priv->parent.registered) + unregister_event(event_recorder); } /* Only used for tracepoints for now. */ @@ -1496,8 +1535,7 @@ 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; + WARN_ON_ONCE(event_notifier->priv->parent.registered); desc = event_notifier->priv->parent.desc; switch (event_notifier->priv->parent.instrumentation) { @@ -1511,14 +1549,18 @@ void register_event_notifier(struct lttng_kernel_event_notifier *event_notifier) ret = lttng_syscall_filter_enable_event_notifier(event_notifier); break; - case LTTNG_KERNEL_ABI_KPROBE: /* Fall-through */ + case LTTNG_KERNEL_ABI_KPROBE: + lttng_fallthrough; case LTTNG_KERNEL_ABI_UPROBE: ret = 0; break; - case LTTNG_KERNEL_ABI_KRETPROBE: /* Fall-through */ - case LTTNG_KERNEL_ABI_FUNCTION: /* Fall-through */ - case LTTNG_KERNEL_ABI_NOOP: /* Fall-through */ + 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); } @@ -1527,14 +1569,12 @@ void register_event_notifier(struct lttng_kernel_event_notifier *event_notifier) } static -int _lttng_event_notifier_unregister( - struct lttng_kernel_event_notifier *event_notifier) +int unregister_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 0; + WARN_ON_ONCE(!event_notifier->priv->parent.registered); desc = event_notifier->priv->parent.desc; switch (event_notifier->priv->parent.instrumentation) { @@ -1558,9 +1598,12 @@ int _lttng_event_notifier_unregister( ret = lttng_syscall_filter_disable_event_notifier(event_notifier); break; - case LTTNG_KERNEL_ABI_KRETPROBE: /* Fall-through */ - case LTTNG_KERNEL_ABI_FUNCTION: /* Fall-through */ - case LTTNG_KERNEL_ABI_NOOP: /* Fall-through */ + 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); } @@ -1569,6 +1612,13 @@ int _lttng_event_notifier_unregister( return ret; } +static +void _lttng_event_notifier_unregister(struct lttng_kernel_event_notifier *event_notifier) +{ + if (event_notifier->priv->parent.registered) + unregister_event_notifier(event_notifier); +} + /* * Only used internally at session destruction. */ @@ -1613,8 +1663,10 @@ void _lttng_event_destroy(struct lttng_kernel_event_common *event) lttng_uprobes_destroy_event_private(event_recorder); break; - case LTTNG_KERNEL_ABI_FUNCTION: /* Fall-through */ - case LTTNG_KERNEL_ABI_NOOP: /* Fall-through */ + case LTTNG_KERNEL_ABI_FUNCTION: + lttng_fallthrough; + case LTTNG_KERNEL_ABI_NOOP: + lttng_fallthrough; default: WARN_ON_ONCE(1); } @@ -1646,9 +1698,12 @@ void _lttng_event_destroy(struct lttng_kernel_event_common *event) lttng_uprobes_destroy_event_notifier_private(event_notifier); break; - case LTTNG_KERNEL_ABI_KRETPROBE: /* Fall-through */ - case LTTNG_KERNEL_ABI_FUNCTION: /* Fall-through */ - case LTTNG_KERNEL_ABI_NOOP: /* Fall-through */ + 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); } @@ -1662,6 +1717,7 @@ void _lttng_event_destroy(struct lttng_kernel_event_common *event) } } +static struct lttng_kernel_id_tracker *get_tracker(struct lttng_kernel_session *session, enum tracker_type tracker_type) { @@ -2712,7 +2768,8 @@ void lttng_session_sync_event_enablers(struct lttng_kernel_session *session) int nr_filters = 0; switch (event_recorder_priv->parent.instrumentation) { - case LTTNG_KERNEL_ABI_TRACEPOINT: /* Fall-through */ + case LTTNG_KERNEL_ABI_TRACEPOINT: + lttng_fallthrough; case LTTNG_KERNEL_ABI_SYSCALL: /* Enable events */ list_for_each_entry(enabler_ref, @@ -2741,9 +2798,11 @@ void lttng_session_sync_event_enablers(struct lttng_kernel_session *session) * state. */ if (enabled) { - register_event(event_recorder); + if (!event_recorder_priv->parent.registered) + register_event(event_recorder); } else { - _lttng_event_unregister(event_recorder); + if (event_recorder_priv->parent.registered) + _lttng_event_unregister(event_recorder); } /* Check if has enablers without bytecode enabled */ @@ -2806,7 +2865,8 @@ void lttng_event_notifier_group_sync_enablers(struct lttng_event_notifier_group int nr_filters = 0, nr_captures = 0; switch (event_notifier_priv->parent.instrumentation) { - case LTTNG_KERNEL_ABI_TRACEPOINT: /* Fall-through */ + case LTTNG_KERNEL_ABI_TRACEPOINT: + lttng_fallthrough; case LTTNG_KERNEL_ABI_SYSCALL: /* Enable event_notifiers */ list_for_each_entry(enabler_ref, @@ -2833,7 +2893,7 @@ void lttng_event_notifier_group_sync_enablers(struct lttng_event_notifier_group register_event_notifier(event_notifier); } else { if (event_notifier_priv->parent.registered) - _lttng_event_notifier_unregister(event_notifier); + unregister_event_notifier(event_notifier); } /* Check if has enablers without bytecode enabled */ @@ -2968,6 +3028,7 @@ void lttng_metadata_end(struct lttng_kernel_session *session) * The content of the printf is printed as a single atomic metadata * transaction. */ +static int lttng_metadata_printf(struct lttng_kernel_session *session, const char *fmt, ...) { @@ -3876,7 +3937,7 @@ int print_escaped_ctf_string(struct lttng_kernel_session *session, const char *s if (ret) goto error; /* We still print the current char */ - /* Fallthrough */ + lttng_fallthrough; default: ret = lttng_metadata_printf(session, "%c", cur); break;