X-Git-Url: https://git.lttng.org/?a=blobdiff_plain;f=src%2Flttng-events.c;h=6907b5a0f347d069ee8f5472b661b51eae0512f4;hb=3c6beb8d0a658c617b2808abec04008edf9e3094;hp=2c007ad4d339fe2570b088c95a11920291aae603;hpb=8c0393c3679b2f047a723b23e012188b064797d4;p=lttng-modules.git diff --git a/src/lttng-events.c b/src/lttng-events.c index 2c007ad4..6907b5a0 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 @@ -65,17 +66,16 @@ static struct kmem_cache *event_notifier_private_cache; static void lttng_session_lazy_sync_event_enablers(struct lttng_kernel_session *session); static void lttng_session_sync_event_enablers(struct lttng_kernel_session *session); -static void lttng_event_enabler_destroy(struct lttng_event_enabler *event_enabler); -static void lttng_event_notifier_enabler_destroy(struct lttng_event_notifier_enabler *event_notifier_enabler); static void lttng_event_notifier_group_sync_enablers(struct lttng_event_notifier_group *event_notifier_group); +static void lttng_event_enabler_sync(struct lttng_event_enabler_common *event_enabler); static void _lttng_event_destroy(struct lttng_kernel_event_common *event); -static void _lttng_channel_destroy(struct lttng_channel *chan); -static int _lttng_event_unregister(struct lttng_kernel_event_recorder *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_metadata_statedump(struct lttng_kernel_session *session, - struct lttng_channel *chan, + struct lttng_kernel_channel_buffer *chan, struct lttng_kernel_event_recorder *event); static int _lttng_session_metadata_statedump(struct lttng_kernel_session *session); @@ -93,7 +93,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(); @@ -350,35 +351,35 @@ void metadata_cache_destroy(struct kref *kref) void lttng_session_destroy(struct lttng_kernel_session *session) { - struct lttng_channel *chan, *tmpchan; + 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_enabler *event_enabler, *tmp_event_enabler; + struct lttng_event_recorder_enabler *event_recorder_enabler, *tmp_event_recorder_enabler; int ret; mutex_lock(&sessions_mutex); WRITE_ONCE(session->active, 0); - list_for_each_entry(chan, &session->priv->chan, list) { - ret = lttng_syscalls_unregister_channel(chan); + list_for_each_entry(chan_priv, &session->priv->chan, node) { + 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) { - ret = _lttng_event_unregister(event_recorder_priv->pub); + ret = _lttng_event_recorder_unregister(event_recorder_priv->pub); WARN_ON(ret); } synchronize_trace(); /* Wait for in-flight events to complete */ - list_for_each_entry(chan, &session->priv->chan, list) { - ret = lttng_syscalls_destroy_event(chan); + list_for_each_entry(chan_priv, &session->priv->chan, node) { + ret = lttng_syscalls_destroy_syscall_table(&chan_priv->parent.syscall_table); WARN_ON(ret); } - list_for_each_entry_safe(event_enabler, tmp_event_enabler, + list_for_each_entry_safe(event_recorder_enabler, tmp_event_recorder_enabler, &session->priv->enablers_head, node) - lttng_event_enabler_destroy(event_enabler); + lttng_event_enabler_destroy(&event_recorder_enabler->parent); list_for_each_entry_safe(event_recorder_priv, tmpevent_recorder_priv, &session->priv->events, node) _lttng_event_destroy(&event_recorder_priv->pub->parent); - list_for_each_entry_safe(chan, tmpchan, &session->priv->chan, list) { - BUG_ON(chan->channel_type == METADATA_CHANNEL); - _lttng_channel_destroy(chan); + list_for_each_entry_safe(chan_priv, tmpchan_priv, &session->priv->chan, node) { + BUG_ON(chan_priv->channel_type == METADATA_CHANNEL); + _lttng_channel_destroy(chan_priv->pub); } mutex_lock(&session->priv->metadata_cache->lock); list_for_each_entry(metadata_stream, &session->priv->metadata_cache->metadata_stream, list) @@ -409,7 +410,7 @@ void lttng_event_notifier_group_destroy( mutex_lock(&sessions_mutex); - ret = lttng_syscalls_unregister_event_notifier_group(event_notifier_group); + ret = lttng_syscalls_unregister_syscall_table(&event_notifier_group->syscall_table); WARN_ON(ret); list_for_each_entry_safe(event_notifier_priv, tmpevent_notifier_priv, @@ -423,11 +424,12 @@ void lttng_event_notifier_group_destroy( irq_work_sync(&event_notifier_group->wakeup_pending); - kfree(event_notifier_group->sc_filter); + 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, &event_notifier_group->enablers_head, node) - lttng_event_notifier_enabler_destroy(event_notifier_enabler); + lttng_event_enabler_destroy(&event_notifier_enabler->parent); list_for_each_entry_safe(event_notifier_priv, tmpevent_notifier_priv, &event_notifier_group->event_notifiers_head, node) @@ -463,7 +465,7 @@ int lttng_session_statedump(struct lttng_kernel_session *session) int lttng_session_enable(struct lttng_kernel_session *session) { int ret = 0; - struct lttng_channel *chan; + struct lttng_kernel_channel_buffer_private *chan_priv; mutex_lock(&sessions_mutex); if (session->active) { @@ -481,19 +483,19 @@ int lttng_session_enable(struct lttng_kernel_session *session) * Snapshot the number of events per channel to know the type of header * we need to use. */ - list_for_each_entry(chan, &session->priv->chan, list) { - if (chan->header_type) - continue; /* don't change it if session stop/restart */ - if (chan->free_event_id < 31) - chan->header_type = 1; /* compact */ + list_for_each_entry(chan_priv, &session->priv->chan, node) { + if (chan_priv->header_type) + continue; /* don't change it if session stop/restart */ + if (chan_priv->free_event_id < 31) + chan_priv->header_type = 1; /* compact */ else - chan->header_type = 2; /* large */ + chan_priv->header_type = 2; /* large */ } /* Clear each stream's quiescent state. */ - list_for_each_entry(chan, &session->priv->chan, list) { - if (chan->channel_type != METADATA_CHANNEL) - lib_ring_buffer_clear_quiescent_channel(chan->chan); + list_for_each_entry(chan_priv, &session->priv->chan, node) { + if (chan_priv->channel_type != METADATA_CHANNEL) + lib_ring_buffer_clear_quiescent_channel(chan_priv->rb_chan); } WRITE_ONCE(session->active, 1); @@ -514,7 +516,7 @@ end: int lttng_session_disable(struct lttng_kernel_session *session) { int ret = 0; - struct lttng_channel *chan; + struct lttng_kernel_channel_buffer_private *chan_priv; mutex_lock(&sessions_mutex); if (!session->active) { @@ -528,9 +530,9 @@ int lttng_session_disable(struct lttng_kernel_session *session) lttng_session_sync_event_enablers(session); /* Set each stream's quiescent state. */ - list_for_each_entry(chan, &session->priv->chan, list) { - if (chan->channel_type != METADATA_CHANNEL) - lib_ring_buffer_set_quiescent_channel(chan->chan); + list_for_each_entry(chan_priv, &session->priv->chan, node) { + if (chan_priv->channel_type != METADATA_CHANNEL) + lib_ring_buffer_set_quiescent_channel(chan_priv->rb_chan); } end: mutex_unlock(&sessions_mutex); @@ -540,7 +542,7 @@ end: int lttng_session_metadata_regenerate(struct lttng_kernel_session *session) { int ret = 0; - struct lttng_channel *chan; + struct lttng_kernel_channel_buffer_private *chan_priv; struct lttng_kernel_event_recorder_private *event_recorder_priv; struct lttng_metadata_cache *cache = session->priv->metadata_cache; struct lttng_metadata_stream *stream; @@ -562,8 +564,8 @@ int lttng_session_metadata_regenerate(struct lttng_kernel_session *session) mutex_unlock(&cache->lock); session->priv->metadata_dumped = 0; - list_for_each_entry(chan, &session->priv->chan, list) { - chan->metadata_dumped = 0; + list_for_each_entry(chan_priv, &session->priv->chan, node) { + chan_priv->metadata_dumped = 0; } list_for_each_entry(event_recorder_priv, &session->priv->events, node) { @@ -577,12 +579,25 @@ end: return ret; } -int lttng_channel_enable(struct lttng_channel *channel) +static +bool is_channel_buffer_metadata(struct lttng_kernel_channel_common *channel) +{ + struct lttng_kernel_channel_buffer *chan_buf; + + if (channel->type != LTTNG_KERNEL_CHANNEL_TYPE_BUFFER) + return false; + chan_buf = container_of(channel, struct lttng_kernel_channel_buffer, parent); + if (chan_buf->priv->channel_type == METADATA_CHANNEL) + return true; + return false; +} + +int lttng_channel_enable(struct lttng_kernel_channel_common *channel) { int ret = 0; mutex_lock(&sessions_mutex); - if (channel->channel_type == METADATA_CHANNEL) { + if (is_channel_buffer_metadata(channel)) { ret = -EPERM; goto end; } @@ -591,7 +606,7 @@ int lttng_channel_enable(struct lttng_channel *channel) goto end; } /* Set transient enabler state to "enabled" */ - channel->tstate = 1; + channel->priv->tstate = 1; lttng_session_sync_event_enablers(channel->session); /* Set atomically the state to "enabled" */ WRITE_ONCE(channel->enabled, 1); @@ -600,12 +615,12 @@ end: return ret; } -int lttng_channel_disable(struct lttng_channel *channel) +int lttng_channel_disable(struct lttng_kernel_channel_common *channel) { int ret = 0; mutex_lock(&sessions_mutex); - if (channel->channel_type == METADATA_CHANNEL) { + if (is_channel_buffer_metadata(channel)) { ret = -EPERM; goto end; } @@ -616,7 +631,7 @@ int lttng_channel_disable(struct lttng_channel *channel) /* Set atomically the state to "disabled" */ WRITE_ONCE(channel->enabled, 0); /* Set transient enabler state to "enabled" */ - channel->tstate = 0; + channel->priv->tstate = 0; lttng_session_sync_event_enablers(channel->session); end: mutex_unlock(&sessions_mutex); @@ -634,7 +649,7 @@ int lttng_event_enable(struct lttng_kernel_event_common *event) struct lttng_kernel_event_recorder *event_recorder = container_of(event, struct lttng_kernel_event_recorder, parent); - if (event_recorder->chan->channel_type == METADATA_CHANNEL) { + if (event_recorder->chan->priv->channel_type == METADATA_CHANNEL) { ret = -EPERM; goto end; } @@ -658,12 +673,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 +689,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; @@ -694,7 +713,7 @@ int lttng_event_disable(struct lttng_kernel_event_common *event) struct lttng_kernel_event_recorder *event_recorder = container_of(event, struct lttng_kernel_event_recorder, parent); - if (event_recorder->chan->channel_type == METADATA_CHANNEL) { + if (event_recorder->chan->priv->channel_type == METADATA_CHANNEL) { ret = -EPERM; goto end; } @@ -718,12 +737,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 +753,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; @@ -743,7 +766,7 @@ end: return ret; } -struct lttng_channel *lttng_channel_create(struct lttng_kernel_session *session, +struct lttng_kernel_channel_buffer *lttng_channel_buffer_create(struct lttng_kernel_session *session, const char *transport_name, void *buf_addr, size_t subbuf_size, size_t num_subbuf, @@ -751,7 +774,8 @@ struct lttng_channel *lttng_channel_create(struct lttng_kernel_session *session, unsigned int read_timer_interval, enum channel_type channel_type) { - struct lttng_channel *chan; + struct lttng_kernel_channel_buffer *chan; + struct lttng_kernel_channel_buffer_private *chan_priv; struct lttng_transport *transport = NULL; mutex_lock(&sessions_mutex); @@ -767,31 +791,39 @@ struct lttng_channel *lttng_channel_create(struct lttng_kernel_session *session, printk(KERN_WARNING "LTTng: Can't lock transport module.\n"); goto notransport; } - chan = kzalloc(sizeof(struct lttng_channel), GFP_KERNEL); + chan = kzalloc(sizeof(struct lttng_kernel_channel_buffer), GFP_KERNEL); if (!chan) goto nomem; - chan->session = session; - chan->id = session->priv->free_chan_id++; + chan_priv = kzalloc(sizeof(struct lttng_kernel_channel_buffer_private), GFP_KERNEL); + if (!chan_priv) + goto nomem_priv; + chan->priv = chan_priv; + chan_priv->pub = chan; + chan->parent.type = LTTNG_KERNEL_CHANNEL_TYPE_BUFFER; + chan->parent.session = session; + chan->priv->id = session->priv->free_chan_id++; chan->ops = &transport->ops; /* * Note: the channel creation op already writes into the packet * headers. Therefore the "chan" information used as input * should be already accessible. */ - chan->chan = transport->ops.priv->channel_create(transport_name, + chan->priv->rb_chan = transport->ops.priv->channel_create(transport_name, chan, buf_addr, subbuf_size, num_subbuf, switch_timer_interval, read_timer_interval); - if (!chan->chan) + if (!chan->priv->rb_chan) goto create_error; - chan->tstate = 1; - chan->enabled = 1; - chan->transport = transport; - chan->channel_type = channel_type; - list_add(&chan->list, &session->priv->chan); + chan->priv->parent.tstate = 1; + chan->parent.enabled = 1; + chan->priv->transport = transport; + chan->priv->channel_type = channel_type; + list_add(&chan->priv->node, &session->priv->chan); mutex_unlock(&sessions_mutex); return chan; create_error: + kfree(chan_priv); +nomem_priv: kfree(chan); nomem: if (transport) @@ -808,18 +840,19 @@ active: * Needs to be called with sessions mutex held. */ static -void _lttng_channel_destroy(struct lttng_channel *chan) +void _lttng_channel_destroy(struct lttng_kernel_channel_buffer *chan) { - chan->ops->priv->channel_destroy(chan->chan); - module_put(chan->transport->owner); - list_del(&chan->list); - lttng_kernel_destroy_context(chan->ctx); + chan->ops->priv->channel_destroy(chan->priv->rb_chan); + module_put(chan->priv->transport->owner); + list_del(&chan->priv->node); + lttng_kernel_destroy_context(chan->priv->ctx); + kfree(chan->priv); kfree(chan); } -void lttng_metadata_channel_destroy(struct lttng_channel *chan) +void lttng_metadata_channel_destroy(struct lttng_kernel_channel_buffer *chan) { - BUG_ON(chan->channel_type != METADATA_CHANNEL); + BUG_ON(chan->priv->channel_type != METADATA_CHANNEL); /* Protect the metadata cache with the sessions_mutex. */ mutex_lock(&sessions_mutex); @@ -840,19 +873,20 @@ void _lttng_metadata_channel_hangup(struct lttng_metadata_stream *stream) * Supports event creation while tracing session is active. * Needs to be called with sessions mutex held. */ -struct lttng_kernel_event_recorder *_lttng_kernel_event_recorder_create(struct lttng_channel *chan, - struct lttng_kernel_abi_event *event_param, - const struct lttng_kernel_event_desc *event_desc, - enum lttng_kernel_abi_instrumentation itype) +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_session *session = chan->session; + 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_session *session = chan->parent.session; struct lttng_kernel_event_recorder *event_recorder; struct lttng_kernel_event_recorder_private *event_recorder_priv; const char *event_name; struct hlist_head *head; int ret; - if (chan->free_event_id == -1U) { + if (chan->priv->free_event_id == -1U) { ret = -EMFILE; goto full; } @@ -862,15 +896,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; @@ -907,7 +946,7 @@ struct lttng_kernel_event_recorder *_lttng_kernel_event_recorder_create(struct l event_recorder->parent.run_filter = lttng_kernel_interpret_event_filter; event_recorder->chan = chan; - event_recorder->priv->id = chan->free_event_id++; + 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); @@ -983,7 +1022,7 @@ struct lttng_kernel_event_recorder *_lttng_kernel_event_recorder_create(struct l event_recorder_return->parent.run_filter = lttng_kernel_interpret_event_filter; event_recorder_return->chan = chan; - event_recorder_return->priv->id = chan->free_event_id++; + 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; @@ -1009,7 +1048,7 @@ struct lttng_kernel_event_recorder *_lttng_kernel_event_recorder_create(struct l WARN_ON_ONCE(!ret); ret = try_module_get(event_recorder_return->priv->parent.desc->owner); WARN_ON_ONCE(!ret); - ret = _lttng_event_metadata_statedump(chan->session, chan, + ret = _lttng_event_metadata_statedump(chan->parent.session, chan, event_recorder_return); WARN_ON_ONCE(ret > 0); if (ret) { @@ -1019,7 +1058,7 @@ struct lttng_kernel_event_recorder *_lttng_kernel_event_recorder_create(struct l module_put(event_recorder->priv->parent.desc->owner); goto statedump_error; } - list_add(&event_recorder_return->priv->node, &chan->session->priv->events); + list_add(&event_recorder_return->priv->node, &chan->parent.session->priv->events); break; } @@ -1082,20 +1121,22 @@ 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; goto register_error; } - ret = _lttng_event_metadata_statedump(chan->session, chan, event_recorder); + ret = _lttng_event_metadata_statedump(chan->parent.session, chan, event_recorder); WARN_ON_ONCE(ret > 0); if (ret) { goto statedump_error; } hlist_add_head(&event_recorder->priv->hlist, head); - list_add(&event_recorder->priv->node, &chan->session->priv->events); + list_add(&event_recorder->priv->node, &chan->parent.session->priv->events); return event_recorder; statedump_error: @@ -1130,15 +1171,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; @@ -1285,9 +1331,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; @@ -1360,15 +1409,13 @@ 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_channel *chan, - struct lttng_kernel_abi_event *event_param, - const struct lttng_kernel_event_desc *event_desc, - enum lttng_kernel_abi_instrumentation itype) +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(chan, event_param, event_desc, itype); + event = _lttng_kernel_event_recorder_create(event_enabler, event_desc); mutex_unlock(&sessions_mutex); return event; } @@ -1392,7 +1439,7 @@ struct lttng_kernel_event_notifier *lttng_event_notifier_create( /* Only used for tracepoints for now. */ static -void register_event(struct lttng_kernel_event_recorder *event_recorder) +void register_event_recorder(struct lttng_kernel_event_recorder *event_recorder) { const struct lttng_kernel_event_desc *desc; int ret = -EINVAL; @@ -1404,22 +1451,26 @@ void register_event(struct lttng_kernel_event_recorder *event_recorder) switch (event_recorder->priv->parent.instrumentation) { case LTTNG_KERNEL_ABI_TRACEPOINT: ret = lttng_wrapper_tracepoint_probe_register(desc->event_kname, - desc->probe_callback, - event_recorder); + desc->tp_class->probe_callback, + &event_recorder->parent); break; case LTTNG_KERNEL_ABI_SYSCALL: - ret = lttng_syscall_filter_enable_event(event_recorder->chan, event_recorder); + ret = lttng_syscall_filter_enable_event_recorder(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); } @@ -1430,7 +1481,7 @@ 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) +int _lttng_event_recorder_unregister(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; @@ -1443,8 +1494,8 @@ int _lttng_event_unregister(struct lttng_kernel_event_recorder *event_recorder) switch (event_priv->instrumentation) { case LTTNG_KERNEL_ABI_TRACEPOINT: ret = lttng_wrapper_tracepoint_probe_unregister(event_priv->desc->event_kname, - event_priv->desc->probe_callback, - event_recorder); + event_priv->desc->tp_class->probe_callback, + &event_recorder->parent); break; case LTTNG_KERNEL_ABI_KPROBE: @@ -1458,7 +1509,7 @@ int _lttng_event_unregister(struct lttng_kernel_event_recorder *event_recorder) break; case LTTNG_KERNEL_ABI_SYSCALL: - ret = lttng_syscall_filter_disable_event(event_recorder->chan, event_recorder); + ret = lttng_syscall_filter_disable_event_recorder(event_recorder); break; case LTTNG_KERNEL_ABI_NOOP: @@ -1470,7 +1521,8 @@ 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); } @@ -1493,22 +1545,26 @@ void register_event_notifier(struct lttng_kernel_event_notifier *event_notifier) switch (event_notifier->priv->parent.instrumentation) { case LTTNG_KERNEL_ABI_TRACEPOINT: ret = lttng_wrapper_tracepoint_probe_register(desc->event_kname, - desc->probe_callback, - event_notifier); + desc->tp_class->probe_callback, + &event_notifier->parent); break; case LTTNG_KERNEL_ABI_SYSCALL: 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); } @@ -1530,8 +1586,8 @@ int _lttng_event_notifier_unregister( 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->probe_callback, - event_notifier); + event_notifier->priv->parent.desc->tp_class->probe_callback, + &event_notifier->parent); break; case LTTNG_KERNEL_ABI_KPROBE: @@ -1548,9 +1604,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); } @@ -1603,8 +1662,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); } @@ -1636,9 +1697,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); } @@ -1928,7 +1992,7 @@ int lttng_match_enabler_name(const char *desc_name, } int lttng_desc_match_enabler(const struct lttng_kernel_event_desc *desc, - struct lttng_enabler *enabler) + struct lttng_event_enabler_common *enabler) { const char *desc_name, *enabler_name; bool compat = false, entry = false; @@ -2017,10 +2081,10 @@ int lttng_desc_match_enabler(const struct lttng_kernel_event_desc *desc, } static -int lttng_event_enabler_match_event(struct lttng_event_enabler *event_enabler, +int lttng_event_enabler_match_event(struct lttng_event_recorder_enabler *event_enabler, struct lttng_kernel_event_recorder *event_recorder) { - struct lttng_enabler *base_enabler = lttng_event_enabler_as_enabler( + struct lttng_event_enabler_common *base_enabler = lttng_event_recorder_enabler_as_enabler( event_enabler); if (base_enabler->event_param.instrumentation != event_recorder->priv->parent.instrumentation) @@ -2036,14 +2100,14 @@ static int lttng_event_notifier_enabler_match_event_notifier(struct lttng_event_notifier_enabler *event_notifier_enabler, struct lttng_kernel_event_notifier *event_notifier) { - struct lttng_enabler *base_enabler = lttng_event_notifier_enabler_as_enabler( + struct lttng_event_enabler_common *base_enabler = lttng_event_notifier_enabler_as_enabler( event_notifier_enabler); 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->base.user_token) + && event_notifier->priv->parent.user_token == event_notifier_enabler->parent.user_token) return 1; else return 0; @@ -2052,7 +2116,7 @@ int lttng_event_notifier_enabler_match_event_notifier(struct lttng_event_notifie static struct lttng_enabler_ref *lttng_enabler_ref( struct list_head *enablers_ref_list, - struct lttng_enabler *enabler) + struct lttng_event_enabler_common *enabler) { struct lttng_enabler_ref *enabler_ref; @@ -2064,9 +2128,9 @@ struct lttng_enabler_ref *lttng_enabler_ref( } static -void lttng_create_tracepoint_event_if_missing(struct lttng_event_enabler *event_enabler) +void lttng_create_tracepoint_event_if_missing(struct lttng_event_recorder_enabler *event_enabler) { - struct lttng_kernel_session *session = event_enabler->chan->session; + struct lttng_kernel_session *session = event_enabler->chan->parent.session; struct lttng_kernel_probe_desc *probe_desc; const struct lttng_kernel_event_desc *desc; int i; @@ -2087,7 +2151,7 @@ void lttng_create_tracepoint_event_if_missing(struct lttng_event_enabler *event_ desc = probe_desc->event_desc[i]; if (!lttng_desc_match_enabler(desc, - lttng_event_enabler_as_enabler(event_enabler))) + lttng_event_recorder_enabler_as_enabler(event_enabler))) continue; /* @@ -2108,8 +2172,7 @@ void lttng_create_tracepoint_event_if_missing(struct lttng_event_enabler *event_ * We need to create an event for this * event probe. */ - event_recorder = _lttng_kernel_event_recorder_create(event_enabler->chan, - NULL, desc, LTTNG_KERNEL_ABI_TRACEPOINT); + 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); @@ -2153,7 +2216,7 @@ void lttng_create_tracepoint_event_notifier_if_missing(struct lttng_event_notifi LTTNG_EVENT_NOTIFIER_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->base.user_token) + && event_notifier_priv->parent.user_token == event_notifier_enabler->parent.user_token) found = 1; } if (found) @@ -2163,7 +2226,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->base.user_token, + event_notifier_enabler->parent.user_token, event_notifier_enabler->error_counter_index, event_notifier_group, NULL, LTTNG_KERNEL_ABI_TRACEPOINT); @@ -2176,11 +2239,11 @@ void lttng_create_tracepoint_event_notifier_if_missing(struct lttng_event_notifi } static -void lttng_create_syscall_event_if_missing(struct lttng_event_enabler *event_enabler) +void lttng_create_syscall_event_if_missing(struct lttng_event_recorder_enabler *event_enabler) { int ret; - ret = lttng_syscalls_register_event(event_enabler); + ret = lttng_syscalls_register_event_recorder(event_enabler); WARN_ON_ONCE(ret); } @@ -2201,9 +2264,9 @@ void lttng_create_syscall_event_notifier_if_missing(struct lttng_event_notifier_ * Should be called with sessions mutex held. */ static -void lttng_create_event_if_missing(struct lttng_event_enabler *event_enabler) +void lttng_create_event_if_missing(struct lttng_event_recorder_enabler *event_enabler) { - switch (event_enabler->base.event_param.instrumentation) { + switch (event_enabler->parent.event_param.instrumentation) { case LTTNG_KERNEL_ABI_TRACEPOINT: lttng_create_tracepoint_event_if_missing(event_enabler); break; @@ -2224,11 +2287,11 @@ void lttng_create_event_if_missing(struct lttng_event_enabler *event_enabler) * Should be called with sessions mutex held. */ static -int lttng_event_enabler_ref_events(struct lttng_event_enabler *event_enabler) +int lttng_event_enabler_ref_events(struct lttng_event_recorder_enabler *event_enabler) { - struct lttng_channel *chan = event_enabler->chan; - struct lttng_kernel_session *session = event_enabler->chan->session; - struct lttng_enabler *base_enabler = lttng_event_enabler_as_enabler(event_enabler); + 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 && @@ -2239,10 +2302,10 @@ int lttng_event_enabler_ref_events(struct lttng_event_enabler *event_enabler) 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->syscall_all_entry, enabled); + 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->syscall_all_exit, enabled); + WRITE_ONCE(chan->priv->parent.syscall_table.syscall_all_exit, enabled); } /* First ensure that probe events are created for this enabler. */ @@ -2256,7 +2319,7 @@ int lttng_event_enabler_ref_events(struct lttng_event_enabler *event_enabler) 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_enabler_as_enabler(event_enabler)); + lttng_event_recorder_enabler_as_enabler(event_enabler)); if (!enabler_ref) { /* * If no backward ref, create it. @@ -2265,7 +2328,7 @@ int lttng_event_enabler_ref_events(struct lttng_event_enabler *event_enabler) enabler_ref = kzalloc(sizeof(*enabler_ref), GFP_KERNEL); if (!enabler_ref) return -ENOMEM; - enabler_ref->ref = lttng_event_enabler_as_enabler(event_enabler); + enabler_ref->ref = lttng_event_recorder_enabler_as_enabler(event_enabler); list_add(&enabler_ref->node, &event_recorder_priv->parent.enablers_ref_head); } @@ -2276,7 +2339,7 @@ int lttng_event_enabler_ref_events(struct lttng_event_enabler *event_enabler) lttng_enabler_link_bytecode(event_recorder_priv->parent.desc, lttng_static_ctx, &event_recorder_priv->parent.filter_bytecode_runtime_head, - <tng_event_enabler_as_enabler(event_enabler)->filter_bytecode_head); + <tng_event_recorder_enabler_as_enabler(event_enabler)->filter_bytecode_head); } return 0; } @@ -2289,7 +2352,7 @@ int lttng_event_enabler_ref_events(struct lttng_event_enabler *event_enabler) static void lttng_create_event_notifier_if_missing(struct lttng_event_notifier_enabler *event_notifier_enabler) { - switch (event_notifier_enabler->base.event_param.instrumentation) { + switch (event_notifier_enabler->parent.event_param.instrumentation) { case LTTNG_KERNEL_ABI_TRACEPOINT: lttng_create_tracepoint_event_notifier_if_missing(event_notifier_enabler); break; @@ -2312,7 +2375,7 @@ int lttng_event_notifier_enabler_ref_event_notifiers( struct lttng_event_notifier_enabler *event_notifier_enabler) { struct lttng_event_notifier_group *event_notifier_group = event_notifier_enabler->group; - struct lttng_enabler *base_enabler = lttng_event_notifier_enabler_as_enabler(event_notifier_enabler); + 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 && @@ -2324,10 +2387,10 @@ int lttng_event_notifier_enabler_ref_event_notifiers( 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_all_entry, enabled); + 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_all_exit, enabled); + WRITE_ONCE(event_notifier_group->syscall_table.syscall_all_exit, enabled); } @@ -2397,7 +2460,7 @@ static bool lttng_event_notifier_group_has_active_event_notifiers( list_for_each_entry(event_notifier_enabler, &event_notifier_group->enablers_head, node) { - if (event_notifier_enabler->base.enabled) + if (event_notifier_enabler->parent.enabled) return true; } return false; @@ -2423,50 +2486,57 @@ int lttng_fix_pending_event_notifiers(void) return 0; } -struct lttng_event_enabler *lttng_event_enabler_create( +struct lttng_event_recorder_enabler *lttng_event_recorder_enabler_create( enum lttng_enabler_format_type format_type, struct lttng_kernel_abi_event *event_param, - struct lttng_channel *chan) + struct lttng_kernel_channel_buffer *chan) { - struct lttng_event_enabler *event_enabler; + struct lttng_event_recorder_enabler *event_enabler; event_enabler = kzalloc(sizeof(*event_enabler), GFP_KERNEL); if (!event_enabler) return NULL; - event_enabler->base.format_type = format_type; - INIT_LIST_HEAD(&event_enabler->base.filter_bytecode_head); - memcpy(&event_enabler->base.event_param, event_param, - sizeof(event_enabler->base.event_param)); + event_enabler->parent.enabler_type = LTTNG_EVENT_ENABLER_TYPE_RECORDER; + event_enabler->parent.format_type = format_type; + INIT_LIST_HEAD(&event_enabler->parent.filter_bytecode_head); + memcpy(&event_enabler->parent.event_param, event_param, + sizeof(event_enabler->parent.event_param)); event_enabler->chan = chan; /* ctx left NULL */ - event_enabler->base.enabled = 0; + event_enabler->parent.enabled = 0; + return event_enabler; +} + +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, &event_enabler->chan->session->priv->enablers_head); - lttng_session_lazy_sync_event_enablers(event_enabler->chan->session); + list_add(&event_enabler->node, &session->priv->enablers_head); + event_enabler->published = true; + lttng_session_lazy_sync_event_enablers(session); mutex_unlock(&sessions_mutex); - return event_enabler; } -int lttng_event_enabler_enable(struct lttng_event_enabler *event_enabler) +int lttng_event_enabler_enable(struct lttng_event_enabler_common *event_enabler) { mutex_lock(&sessions_mutex); - lttng_event_enabler_as_enabler(event_enabler)->enabled = 1; - lttng_session_lazy_sync_event_enablers(event_enabler->chan->session); + event_enabler->enabled = 1; + lttng_event_enabler_sync(event_enabler); mutex_unlock(&sessions_mutex); return 0; } -int lttng_event_enabler_disable(struct lttng_event_enabler *event_enabler) +int lttng_event_enabler_disable(struct lttng_event_enabler_common *event_enabler) { mutex_lock(&sessions_mutex); - lttng_event_enabler_as_enabler(event_enabler)->enabled = 0; - lttng_session_lazy_sync_event_enablers(event_enabler->chan->session); + event_enabler->enabled = 0; + lttng_event_enabler_sync(event_enabler); mutex_unlock(&sessions_mutex); return 0; } static -int lttng_enabler_attach_filter_bytecode(struct lttng_enabler *enabler, +int lttng_enabler_attach_filter_bytecode(struct lttng_event_enabler_common *enabler, struct lttng_kernel_abi_filter_bytecode __user *bytecode) { struct lttng_kernel_bytecode_node *bytecode_node; @@ -2498,16 +2568,14 @@ error_free: return ret; } -int lttng_event_enabler_attach_filter_bytecode(struct lttng_event_enabler *event_enabler, +int lttng_event_enabler_attach_filter_bytecode(struct lttng_event_enabler_common *event_enabler, struct lttng_kernel_abi_filter_bytecode __user *bytecode) { int ret; - ret = lttng_enabler_attach_filter_bytecode( - lttng_event_enabler_as_enabler(event_enabler), bytecode); + ret = lttng_enabler_attach_filter_bytecode(event_enabler, bytecode); if (ret) goto error; - - lttng_session_lazy_sync_event_enablers(event_enabler->chan->session); + lttng_event_enabler_sync(event_enabler); return 0; error: @@ -2527,7 +2595,7 @@ int lttng_event_add_callsite(struct lttng_kernel_event_common *event, } static -void lttng_enabler_destroy(struct lttng_enabler *enabler) +void lttng_enabler_destroy(struct lttng_event_enabler_common *enabler) { struct lttng_kernel_bytecode_node *filter_node, *tmp_filter_node; @@ -2538,13 +2606,33 @@ void lttng_enabler_destroy(struct lttng_enabler *enabler) } } -static -void lttng_event_enabler_destroy(struct lttng_event_enabler *event_enabler) +void lttng_event_enabler_destroy(struct lttng_event_enabler_common *event_enabler) { - lttng_enabler_destroy(lttng_event_enabler_as_enabler(event_enabler)); + 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; + } + case LTTNG_EVENT_ENABLER_TYPE_NOTIFIER: + { + struct lttng_event_notifier_enabler *event_notifier_enabler = + container_of(event_enabler, struct lttng_event_notifier_enabler, parent); - list_del(&event_enabler->node); - kfree(event_enabler); + list_del(&event_notifier_enabler->node); + lttng_enabler_destroy(event_enabler); + kfree(event_notifier_enabler); + break; + } + default: + WARN_ON_ONCE(1); + } } struct lttng_event_notifier_enabler *lttng_event_notifier_enabler_create( @@ -2558,18 +2646,19 @@ struct lttng_event_notifier_enabler *lttng_event_notifier_enabler_create( if (!event_notifier_enabler) return NULL; - event_notifier_enabler->base.format_type = format_type; - INIT_LIST_HEAD(&event_notifier_enabler->base.filter_bytecode_head); + event_notifier_enabler->parent.enabler_type = LTTNG_EVENT_ENABLER_TYPE_NOTIFIER; + event_notifier_enabler->parent.format_type = format_type; + INIT_LIST_HEAD(&event_notifier_enabler->parent.filter_bytecode_head); INIT_LIST_HEAD(&event_notifier_enabler->capture_bytecode_head); event_notifier_enabler->error_counter_index = event_notifier_param->error_counter_index; event_notifier_enabler->num_captures = 0; - memcpy(&event_notifier_enabler->base.event_param, &event_notifier_param->event, - sizeof(event_notifier_enabler->base.event_param)); + memcpy(&event_notifier_enabler->parent.event_param, &event_notifier_param->event, + sizeof(event_notifier_enabler->parent.event_param)); - event_notifier_enabler->base.enabled = 0; - event_notifier_enabler->base.user_token = event_notifier_param->event.token; + event_notifier_enabler->parent.enabled = 0; + event_notifier_enabler->parent.user_token = event_notifier_param->event.token; event_notifier_enabler->group = event_notifier_group; mutex_lock(&sessions_mutex); @@ -2601,31 +2690,12 @@ int lttng_event_notifier_enabler_disable( return 0; } -int lttng_event_notifier_enabler_attach_filter_bytecode( - struct lttng_event_notifier_enabler *event_notifier_enabler, - struct lttng_kernel_abi_filter_bytecode __user *bytecode) -{ - int ret; - - ret = lttng_enabler_attach_filter_bytecode( - lttng_event_notifier_enabler_as_enabler(event_notifier_enabler), - bytecode); - if (ret) - goto error; - - lttng_event_notifier_group_sync_enablers(event_notifier_enabler->group); - return 0; - -error: - return ret; -} - int lttng_event_notifier_enabler_attach_capture_bytecode( struct lttng_event_notifier_enabler *event_notifier_enabler, struct lttng_kernel_abi_capture_bytecode __user *bytecode) { struct lttng_kernel_bytecode_node *bytecode_node; - struct lttng_enabler *enabler = + struct lttng_event_enabler_common *enabler = lttng_event_notifier_enabler_as_enabler(event_notifier_enabler); uint32_t bytecode_len; int ret; @@ -2662,20 +2732,6 @@ end: return ret; } -static -void lttng_event_notifier_enabler_destroy( - struct lttng_event_notifier_enabler *event_notifier_enabler) -{ - if (!event_notifier_enabler) { - return; - } - - list_del(&event_notifier_enabler->node); - - lttng_enabler_destroy(lttng_event_notifier_enabler_as_enabler(event_notifier_enabler)); - kfree(event_notifier_enabler); -} - /* * lttng_session_sync_event_enablers should be called just before starting a * session. @@ -2684,7 +2740,7 @@ void lttng_event_notifier_enabler_destroy( static void lttng_session_sync_event_enablers(struct lttng_kernel_session *session) { - struct lttng_event_enabler *event_enabler; + struct lttng_event_recorder_enabler *event_enabler; struct lttng_kernel_event_recorder_private *event_recorder_priv; list_for_each_entry(event_enabler, &session->priv->enablers_head, node) @@ -2702,7 +2758,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, @@ -2723,7 +2780,7 @@ void lttng_session_sync_event_enablers(struct lttng_kernel_session *session) * intesection of session and channel transient enable * states. */ - enabled = enabled && session->priv->tstate && event_recorder->chan->tstate; + enabled = enabled && session->priv->tstate && event_recorder->chan->priv->parent.tstate; WRITE_ONCE(event_recorder->parent.enabled, enabled); /* @@ -2731,9 +2788,9 @@ void lttng_session_sync_event_enablers(struct lttng_kernel_session *session) * state. */ if (enabled) { - register_event(event_recorder); + register_event_recorder(event_recorder); } else { - _lttng_event_unregister(event_recorder); + _lttng_event_recorder_unregister(event_recorder); } /* Check if has enablers without bytecode enabled */ @@ -2796,7 +2853,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, @@ -2857,6 +2915,29 @@ void lttng_event_notifier_group_sync_enablers(struct lttng_event_notifier_group } } +static +void lttng_event_enabler_sync(struct lttng_event_enabler_common *event_enabler) +{ + 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_session_lazy_sync_event_enablers(event_recorder_enabler->chan->parent.session); + 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); + lttng_event_notifier_group_sync_enablers(event_notifier_enabler->group); + break; + } + default: + WARN_ON_ONCE(1); + } +} + /* * Serialize at most one packet worth of metadata into a metadata * channel. @@ -2870,7 +2951,7 @@ void lttng_event_notifier_group_sync_enablers(struct lttng_event_notifier_group * was written and a negative value on error. */ int lttng_metadata_output_channel(struct lttng_metadata_stream *stream, - struct channel *chan, bool *coherent) + struct lttng_kernel_ring_buffer_channel *chan, bool *coherent) { struct lttng_kernel_ring_buffer_ctx ctx; int ret = 0; @@ -2914,7 +2995,7 @@ int lttng_metadata_output_channel(struct lttng_metadata_stream *stream, } stream->transport->ops.event_write(&ctx, stream->metadata_cache->data + stream->metadata_in, - reserve_len); + reserve_len, 1); stream->transport->ops.event_commit(&ctx); stream->metadata_in += reserve_len; if (reserve_len < len) @@ -3610,8 +3691,8 @@ int _lttng_fields_metadata_statedump(struct lttng_kernel_session *session, int ret = 0; int i; - for (i = 0; i < desc->nr_fields; i++) { - const struct lttng_kernel_event_field *field = desc->fields[i]; + for (i = 0; i < desc->tp_class->nr_fields; i++) { + const struct lttng_kernel_event_field *field = desc->tp_class->fields[i]; ret = _lttng_field_statedump(session, field, 2, &prev_field_name); if (ret) @@ -3627,14 +3708,14 @@ int _lttng_fields_metadata_statedump(struct lttng_kernel_session *session, */ static int _lttng_event_metadata_statedump(struct lttng_kernel_session *session, - struct lttng_channel *chan, + struct lttng_kernel_channel_buffer *chan, struct lttng_kernel_event_recorder *event_recorder) { int ret = 0; if (event_recorder->priv->metadata_dumped || !LTTNG_READ_ONCE(session->active)) return 0; - if (chan->channel_type == METADATA_CHANNEL) + if (chan->priv->channel_type == METADATA_CHANNEL) return 0; lttng_metadata_begin(session); @@ -3646,7 +3727,7 @@ int _lttng_event_metadata_statedump(struct lttng_kernel_session *session, " stream_id = %u;\n", event_recorder->priv->parent.desc->event_name, event_recorder->priv->id, - event_recorder->chan->id); + event_recorder->chan->priv->id); if (ret) goto end; @@ -3684,40 +3765,40 @@ end: */ static int _lttng_channel_metadata_statedump(struct lttng_kernel_session *session, - struct lttng_channel *chan) + struct lttng_kernel_channel_buffer *chan) { int ret = 0; - if (chan->metadata_dumped || !LTTNG_READ_ONCE(session->active)) + if (chan->priv->metadata_dumped || !LTTNG_READ_ONCE(session->active)) return 0; - if (chan->channel_type == METADATA_CHANNEL) + if (chan->priv->channel_type == METADATA_CHANNEL) return 0; lttng_metadata_begin(session); - WARN_ON_ONCE(!chan->header_type); + WARN_ON_ONCE(!chan->priv->header_type); ret = lttng_metadata_printf(session, "stream {\n" " id = %u;\n" " event.header := %s;\n" " packet.context := struct packet_context;\n", - chan->id, - chan->header_type == 1 ? "struct event_header_compact" : + chan->priv->id, + chan->priv->header_type == 1 ? "struct event_header_compact" : "struct event_header_large"); if (ret) goto end; - if (chan->ctx) { + if (chan->priv->ctx) { ret = lttng_metadata_printf(session, " event.context := struct {\n"); if (ret) goto end; } - ret = _lttng_context_metadata_statedump(session, chan->ctx); + ret = _lttng_context_metadata_statedump(session, chan->priv->ctx); if (ret) goto end; - if (chan->ctx) { + if (chan->priv->ctx) { ret = lttng_metadata_printf(session, " };\n"); if (ret) @@ -3727,7 +3808,7 @@ int _lttng_channel_metadata_statedump(struct lttng_kernel_session *session, ret = lttng_metadata_printf(session, "};\n\n"); - chan->metadata_dumped = 1; + chan->priv->metadata_dumped = 1; end: lttng_metadata_end(session); return ret; @@ -3866,7 +3947,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; @@ -3911,7 +3992,7 @@ int _lttng_session_metadata_statedump(struct lttng_kernel_session *session) unsigned char *uuid_c = session->priv->uuid.b; unsigned char uuid_s[37], clock_uuid_s[BOOT_ID_LEN]; const char *product_uuid; - struct lttng_channel *chan; + struct lttng_kernel_channel_buffer_private *chan_priv; struct lttng_kernel_event_recorder_private *event_recorder_priv; int ret = 0; @@ -4079,8 +4160,8 @@ int _lttng_session_metadata_statedump(struct lttng_kernel_session *session) goto end; skip_session: - list_for_each_entry(chan, &session->priv->chan, list) { - ret = _lttng_channel_metadata_statedump(session, chan); + list_for_each_entry(chan_priv, &session->priv->chan, node) { + ret = _lttng_channel_metadata_statedump(session, chan_priv->pub); if (ret) goto end; } @@ -4285,7 +4366,6 @@ static void lttng_exit_cpu_hotplug(void) } #endif /* #else #if (LTTNG_LINUX_VERSION_CODE >= LTTNG_KERNEL_VERSION(4,10,0)) */ - static int __init lttng_events_init(void) { int ret; @@ -4353,6 +4433,9 @@ static int __init lttng_events_init(void) #else ""); #endif +#ifdef CONFIG_LTTNG_EXPERIMENTAL_BITWISE_ENUM + printk(KERN_NOTICE "LTTng: Experimental bitwise enum enabled.\n"); +#endif /* CONFIG_LTTNG_EXPERIMENTAL_BITWISE_ENUM */ return 0; error_hotplug: