X-Git-Url: https://git.lttng.org/?p=lttng-modules.git;a=blobdiff_plain;f=src%2Flttng-events.c;h=d5f8314c5fbbe59ea9834b37809de658971032c0;hp=3b9b907beb85196b36301cbb6df6456ab195b23b;hb=17806c46f59eba37b32bde6543bd5017d154b42d;hpb=8b97fd420ec915f0264e20e4a0f2d1b7924adfda diff --git a/src/lttng-events.c b/src/lttng-events.c index 3b9b907b..d5f8314c 100644 --- a/src/lttng-events.c +++ b/src/lttng-events.c @@ -24,11 +24,11 @@ #include #include #include -#include #include #include #include +#include #include #include /* for wrapper_vmalloc_sync_mappings() */ #include @@ -37,10 +37,14 @@ #include #include #include +#include +#include #include +#include #include #include #include +#include #include #include #include @@ -48,54 +52,63 @@ #define METADATA_CACHE_DEFAULT_SIZE 4096 static LIST_HEAD(sessions); +static LIST_HEAD(event_notifier_groups); static LIST_HEAD(lttng_transport_list); +static LIST_HEAD(lttng_counter_transport_list); /* * Protect the sessions and metadata caches. */ static DEFINE_MUTEX(sessions_mutex); -static struct kmem_cache *event_cache; - -static void lttng_session_lazy_sync_enablers(struct lttng_session *session); -static void lttng_session_sync_enablers(struct lttng_session *session); -static void lttng_enabler_destroy(struct lttng_enabler *enabler); - -static void _lttng_event_destroy(struct lttng_event *event); -static void _lttng_channel_destroy(struct lttng_channel *chan); -static int _lttng_event_unregister(struct lttng_event *event); +static struct kmem_cache *event_recorder_cache; +static struct kmem_cache *event_recorder_private_cache; +static struct kmem_cache *event_notifier_cache; +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_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_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_session *session, - struct lttng_channel *chan, - struct lttng_event *event); +int _lttng_event_metadata_statedump(struct lttng_kernel_session *session, + struct lttng_kernel_channel_buffer *chan, + struct lttng_kernel_event_recorder *event); static -int _lttng_session_metadata_statedump(struct lttng_session *session); +int _lttng_session_metadata_statedump(struct lttng_kernel_session *session); static void _lttng_metadata_channel_hangup(struct lttng_metadata_stream *stream); static -int _lttng_type_statedump(struct lttng_session *session, - const struct lttng_type *type, +int _lttng_type_statedump(struct lttng_kernel_session *session, + const struct lttng_kernel_type_common *type, + enum lttng_kernel_string_encoding parent_encoding, size_t nesting); static -int _lttng_field_statedump(struct lttng_session *session, - const struct lttng_event_field *field, - size_t nesting); +int _lttng_field_statedump(struct lttng_kernel_session *session, + const struct lttng_kernel_event_field *field, + size_t nesting, const char **prev_field_name_p); void synchronize_trace(void) { -#if (LINUX_VERSION_CODE >= 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(); #endif -#if (LINUX_VERSION_CODE >= KERNEL_VERSION(3,4,0)) +#if (LTTNG_LINUX_VERSION_CODE >= LTTNG_KERNEL_VERSION(3,4,0)) #ifdef CONFIG_PREEMPT_RT_FULL synchronize_rcu(); #endif -#else /* (LINUX_VERSION_CODE >= KERNEL_VERSION(3,4,0)) */ +#else /* (LTTNG_LINUX_VERSION_CODE >= LTTNG_KERNEL_VERSION(3,4,0)) */ #ifdef CONFIG_PREEMPT_RT synchronize_rcu(); #endif -#endif /* (LINUX_VERSION_CODE >= KERNEL_VERSION(3,4,0)) */ +#endif /* (LTTNG_LINUX_VERSION_CODE >= LTTNG_KERNEL_VERSION(3,4,0)) */ } void lttng_lock_sessions(void) @@ -108,69 +121,99 @@ void lttng_unlock_sessions(void) mutex_unlock(&sessions_mutex); } +static struct lttng_transport *lttng_transport_find(const char *name) +{ + struct lttng_transport *transport; + + list_for_each_entry(transport, <tng_transport_list, node) { + if (!strcmp(transport->name, name)) + return transport; + } + return NULL; +} + /* * Called with sessions lock held. */ int lttng_session_active(void) { - struct lttng_session *iter; + struct lttng_kernel_session_private *iter; list_for_each_entry(iter, &sessions, list) { - if (iter->active) + if (iter->pub->active) return 1; } return 0; } -struct lttng_session *lttng_session_create(void) +struct lttng_kernel_session *lttng_session_create(void) { - struct lttng_session *session; + struct lttng_kernel_session *session; + struct lttng_kernel_session_private *session_priv; struct lttng_metadata_cache *metadata_cache; int i; mutex_lock(&sessions_mutex); - session = lttng_kvzalloc(sizeof(struct lttng_session), GFP_KERNEL); + session = lttng_kvzalloc(sizeof(*session), GFP_KERNEL); if (!session) goto err; - INIT_LIST_HEAD(&session->chan); - INIT_LIST_HEAD(&session->events); - lttng_guid_gen(&session->uuid); + session_priv = lttng_kvzalloc(sizeof(*session_priv), GFP_KERNEL); + if (!session_priv) + goto err_free_session; + session->priv = session_priv; + session_priv->pub = session; + + INIT_LIST_HEAD(&session_priv->chan); + INIT_LIST_HEAD(&session_priv->events); + lttng_guid_gen(&session_priv->uuid); metadata_cache = kzalloc(sizeof(struct lttng_metadata_cache), GFP_KERNEL); if (!metadata_cache) - goto err_free_session; + goto err_free_session_private; metadata_cache->data = vzalloc(METADATA_CACHE_DEFAULT_SIZE); if (!metadata_cache->data) goto err_free_cache; metadata_cache->cache_alloc = METADATA_CACHE_DEFAULT_SIZE; kref_init(&metadata_cache->refcount); mutex_init(&metadata_cache->lock); - session->metadata_cache = metadata_cache; + session_priv->metadata_cache = metadata_cache; INIT_LIST_HEAD(&metadata_cache->metadata_stream); - memcpy(&metadata_cache->uuid, &session->uuid, + memcpy(&metadata_cache->uuid, &session_priv->uuid, sizeof(metadata_cache->uuid)); - INIT_LIST_HEAD(&session->enablers_head); + INIT_LIST_HEAD(&session_priv->enablers_head); for (i = 0; i < LTTNG_EVENT_HT_SIZE; i++) - INIT_HLIST_HEAD(&session->events_ht.table[i]); - list_add(&session->list, &sessions); - session->pid_tracker.session = session; - session->pid_tracker.tracker_type = TRACKER_PID; - session->vpid_tracker.session = session; - session->vpid_tracker.tracker_type = TRACKER_VPID; - session->uid_tracker.session = session; - session->uid_tracker.tracker_type = TRACKER_UID; - session->vuid_tracker.session = session; - session->vuid_tracker.tracker_type = TRACKER_VUID; - session->gid_tracker.session = session; - session->gid_tracker.tracker_type = TRACKER_GID; - session->vgid_tracker.session = session; - session->vgid_tracker.tracker_type = TRACKER_VGID; + INIT_HLIST_HEAD(&session_priv->events_ht.table[i]); + list_add(&session_priv->list, &sessions); + + if (lttng_id_tracker_init(&session->pid_tracker, session, TRACKER_PID)) + goto tracker_alloc_error; + if (lttng_id_tracker_init(&session->vpid_tracker, session, TRACKER_VPID)) + goto tracker_alloc_error; + if (lttng_id_tracker_init(&session->uid_tracker, session, TRACKER_UID)) + goto tracker_alloc_error; + if (lttng_id_tracker_init(&session->vuid_tracker, session, TRACKER_VUID)) + goto tracker_alloc_error; + if (lttng_id_tracker_init(&session->gid_tracker, session, TRACKER_GID)) + goto tracker_alloc_error; + if (lttng_id_tracker_init(&session->vgid_tracker, session, TRACKER_VGID)) + goto tracker_alloc_error; + mutex_unlock(&sessions_mutex); + return session; +tracker_alloc_error: + lttng_id_tracker_fini(&session->pid_tracker); + lttng_id_tracker_fini(&session->vpid_tracker); + lttng_id_tracker_fini(&session->uid_tracker); + lttng_id_tracker_fini(&session->vuid_tracker); + lttng_id_tracker_fini(&session->gid_tracker); + lttng_id_tracker_fini(&session->vgid_tracker); err_free_cache: kfree(metadata_cache); +err_free_session_private: + lttng_kvfree(session_priv); err_free_session: lttng_kvfree(session); err: @@ -178,6 +221,126 @@ err: return NULL; } +static +struct lttng_counter_transport *lttng_counter_transport_find(const char *name) +{ + struct lttng_counter_transport *transport; + + list_for_each_entry(transport, <tng_counter_transport_list, node) { + if (!strcmp(transport->name, name)) + return transport; + } + return NULL; +} + +struct lttng_counter *lttng_kernel_counter_create( + const char *counter_transport_name, + size_t number_dimensions, const size_t *dimensions_sizes) +{ + struct lttng_counter *counter = NULL; + struct lttng_counter_transport *counter_transport = NULL; + + counter_transport = lttng_counter_transport_find(counter_transport_name); + if (!counter_transport) { + printk(KERN_WARNING "LTTng: counter transport %s not found.\n", + counter_transport_name); + goto notransport; + } + if (!try_module_get(counter_transport->owner)) { + printk(KERN_WARNING "LTTng: Can't lock counter transport module.\n"); + goto notransport; + } + + counter = lttng_kvzalloc(sizeof(struct lttng_counter), GFP_KERNEL); + if (!counter) + goto nomem; + + /* Create event notifier error counter. */ + counter->ops = &counter_transport->ops; + counter->transport = counter_transport; + + counter->counter = counter->ops->counter_create( + number_dimensions, dimensions_sizes, 0); + if (!counter->counter) { + goto create_error; + } + + return counter; + +create_error: + lttng_kvfree(counter); +nomem: + if (counter_transport) + module_put(counter_transport->owner); +notransport: + return NULL; +} + +struct lttng_event_notifier_group *lttng_event_notifier_group_create(void) +{ + struct lttng_transport *transport = NULL; + struct lttng_event_notifier_group *event_notifier_group; + const char *transport_name = "relay-event-notifier"; + size_t subbuf_size = 4096; //TODO + size_t num_subbuf = 16; //TODO + unsigned int switch_timer_interval = 0; + unsigned int read_timer_interval = 0; + int i; + + mutex_lock(&sessions_mutex); + + transport = lttng_transport_find(transport_name); + if (!transport) { + printk(KERN_WARNING "LTTng: transport %s not found\n", + transport_name); + goto notransport; + } + if (!try_module_get(transport->owner)) { + printk(KERN_WARNING "LTTng: Can't lock transport %s module.\n", + transport_name); + goto notransport; + } + + event_notifier_group = lttng_kvzalloc(sizeof(struct lttng_event_notifier_group), + GFP_KERNEL); + if (!event_notifier_group) + goto nomem; + + /* + * Initialize the ring buffer used to store event notifier + * notifications. + */ + event_notifier_group->ops = &transport->ops; + event_notifier_group->chan = transport->ops.priv->channel_create( + transport_name, event_notifier_group, NULL, + subbuf_size, num_subbuf, switch_timer_interval, + read_timer_interval); + if (!event_notifier_group->chan) + goto create_error; + + event_notifier_group->transport = transport; + + 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]); + + list_add(&event_notifier_group->node, &event_notifier_groups); + + mutex_unlock(&sessions_mutex); + + return event_notifier_group; + +create_error: + lttng_kvfree(event_notifier_group); +nomem: + if (transport) + module_put(transport->owner); +notransport: + mutex_unlock(&sessions_mutex); + return NULL; +} + void metadata_cache_destroy(struct kref *kref) { struct lttng_metadata_cache *cache = @@ -186,49 +349,110 @@ void metadata_cache_destroy(struct kref *kref) kfree(cache); } -void lttng_session_destroy(struct lttng_session *session) +void lttng_session_destroy(struct lttng_kernel_session *session) { - struct lttng_channel *chan, *tmpchan; - struct lttng_event *event, *tmpevent; + 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_enabler *enabler, *tmpenabler; + 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->chan, list) { - ret = lttng_syscalls_unregister(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, &session->events, list) { - ret = _lttng_event_unregister(event); + list_for_each_entry(event_recorder_priv, &session->priv->events, node) { + 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_safe(enabler, tmpenabler, - &session->enablers_head, node) - lttng_enabler_destroy(enabler); - list_for_each_entry_safe(event, tmpevent, &session->events, list) - _lttng_event_destroy(event); - list_for_each_entry_safe(chan, tmpchan, &session->chan, list) { - BUG_ON(chan->channel_type == METADATA_CHANNEL); - _lttng_channel_destroy(chan); - } - list_for_each_entry(metadata_stream, &session->metadata_cache->metadata_stream, list) + 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_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) + _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); + _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) _lttng_metadata_channel_hangup(metadata_stream); - lttng_id_tracker_destroy(&session->pid_tracker, false); - lttng_id_tracker_destroy(&session->vpid_tracker, false); - lttng_id_tracker_destroy(&session->uid_tracker, false); - lttng_id_tracker_destroy(&session->vuid_tracker, false); - lttng_id_tracker_destroy(&session->gid_tracker, false); - lttng_id_tracker_destroy(&session->vgid_tracker, false); - kref_put(&session->metadata_cache->refcount, metadata_cache_destroy); - list_del(&session->list); + mutex_unlock(&session->priv->metadata_cache->lock); + lttng_id_tracker_fini(&session->pid_tracker); + lttng_id_tracker_fini(&session->vpid_tracker); + lttng_id_tracker_fini(&session->uid_tracker); + lttng_id_tracker_fini(&session->vuid_tracker); + lttng_id_tracker_fini(&session->gid_tracker); + lttng_id_tracker_fini(&session->vgid_tracker); + kref_put(&session->priv->metadata_cache->refcount, metadata_cache_destroy); + list_del(&session->priv->list); mutex_unlock(&sessions_mutex); + lttng_kvfree(session->priv); lttng_kvfree(session); } -int lttng_session_statedump(struct lttng_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_kernel_event_notifier_private *event_notifier_priv, *tmpevent_notifier_priv; + int ret; + + if (!event_notifier_group) + return; + + mutex_lock(&sessions_mutex); + + 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, + &event_notifier_group->event_notifiers_head, node) { + ret = _lttng_event_notifier_unregister(event_notifier_priv->pub); + WARN_ON(ret); + } + + /* Wait for in-flight event notifier to complete */ + synchronize_trace(); + + irq_work_sync(&event_notifier_group->wakeup_pending); + + 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_enabler_destroy(&event_notifier_enabler->parent); + + list_for_each_entry_safe(event_notifier_priv, tmpevent_notifier_priv, + &event_notifier_group->event_notifiers_head, node) + _lttng_event_destroy(&event_notifier_priv->pub->parent); + + if (event_notifier_group->error_counter) { + struct lttng_counter *error_counter = event_notifier_group->error_counter; + + error_counter->ops->counter_destroy(error_counter->counter); + module_put(error_counter->transport->owner); + lttng_kvfree(error_counter); + event_notifier_group->error_counter = NULL; + } + + event_notifier_group->ops->priv->channel_destroy(event_notifier_group->chan); + module_put(event_notifier_group->transport->owner); + list_del(&event_notifier_group->node); + + mutex_unlock(&sessions_mutex); + lttng_kvfree(event_notifier_group); +} + +int lttng_session_statedump(struct lttng_kernel_session *session) { int ret; @@ -238,10 +462,10 @@ int lttng_session_statedump(struct lttng_session *session) return ret; } -int lttng_session_enable(struct lttng_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) { @@ -250,32 +474,32 @@ int lttng_session_enable(struct lttng_session *session) } /* Set transient enabler state to "enabled" */ - session->tstate = 1; + session->priv->tstate = 1; /* We need to sync enablers with session before activation. */ - lttng_session_sync_enablers(session); + lttng_session_sync_event_enablers(session); /* * Snapshot the number of events per channel to know the type of header * we need to use. */ - list_for_each_entry(chan, &session->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->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); - WRITE_ONCE(session->been_active, 1); + WRITE_ONCE(session->priv->been_active, 1); ret = _lttng_session_metadata_statedump(session); if (ret) { WRITE_ONCE(session->active, 0); @@ -289,10 +513,10 @@ end: return ret; } -int lttng_session_disable(struct lttng_session *session) +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) { @@ -302,25 +526,25 @@ int lttng_session_disable(struct lttng_session *session) WRITE_ONCE(session->active, 0); /* Set transient enabler state to "disabled" */ - session->tstate = 0; - lttng_session_sync_enablers(session); + session->priv->tstate = 0; + lttng_session_sync_event_enablers(session); /* Set each stream's quiescent state. */ - list_for_each_entry(chan, &session->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); return ret; } -int lttng_session_metadata_regenerate(struct lttng_session *session) +int lttng_session_metadata_regenerate(struct lttng_kernel_session *session) { int ret = 0; - struct lttng_channel *chan; - struct lttng_event *event; - struct lttng_metadata_cache *cache = session->metadata_cache; + 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; mutex_lock(&sessions_mutex); @@ -333,19 +557,19 @@ int lttng_session_metadata_regenerate(struct lttng_session *session) memset(cache->data, 0, cache->cache_alloc); cache->metadata_written = 0; cache->version++; - list_for_each_entry(stream, &session->metadata_cache->metadata_stream, list) { + list_for_each_entry(stream, &session->priv->metadata_cache->metadata_stream, list) { stream->metadata_out = 0; stream->metadata_in = 0; } mutex_unlock(&cache->lock); - session->metadata_dumped = 0; - list_for_each_entry(chan, &session->chan, list) { - chan->metadata_dumped = 0; + session->priv->metadata_dumped = 0; + list_for_each_entry(chan_priv, &session->priv->chan, node) { + chan_priv->metadata_dumped = 0; } - list_for_each_entry(event, &session->events, list) { - event->metadata_dumped = 0; + list_for_each_entry(event_recorder_priv, &session->priv->events, node) { + event_recorder_priv->metadata_dumped = 0; } ret = _lttng_session_metadata_statedump(session); @@ -355,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; } @@ -369,8 +606,8 @@ int lttng_channel_enable(struct lttng_channel *channel) goto end; } /* Set transient enabler state to "enabled" */ - channel->tstate = 1; - lttng_session_sync_enablers(channel->session); + channel->priv->tstate = 1; + lttng_session_sync_event_enablers(channel->session); /* Set atomically the state to "enabled" */ WRITE_ONCE(channel->enabled, 1); end: @@ -378,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; } @@ -394,40 +631,68 @@ 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; - lttng_session_sync_enablers(channel->session); + channel->priv->tstate = 0; + lttng_session_sync_event_enablers(channel->session); end: mutex_unlock(&sessions_mutex); return ret; } -int lttng_event_enable(struct lttng_event *event) +int lttng_event_enable(struct lttng_kernel_event_common *event) { int ret = 0; mutex_lock(&sessions_mutex); - if (event->chan->channel_type == METADATA_CHANNEL) { - ret = -EPERM; - goto end; + 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); + + if (event_recorder->chan->priv->channel_type == METADATA_CHANNEL) { + ret = -EPERM; + goto end; + } + break; + } + case LTTNG_KERNEL_EVENT_TYPE_NOTIFIER: + switch (event->priv->instrumentation) { + case LTTNG_KERNEL_ABI_KRETPROBE: + ret = -EINVAL; + goto end; + default: + break; + } + break; + default: + break; } + if (event->enabled) { ret = -EEXIST; goto end; } - switch (event->instrumentation) { - case LTTNG_KERNEL_TRACEPOINT: - case LTTNG_KERNEL_SYSCALL: + switch (event->priv->instrumentation) { + case LTTNG_KERNEL_ABI_TRACEPOINT: + lttng_fallthrough; + case LTTNG_KERNEL_ABI_SYSCALL: ret = -EINVAL; break; - case LTTNG_KERNEL_KPROBE: - case LTTNG_KERNEL_UPROBE: - case LTTNG_KERNEL_NOOP: + + case LTTNG_KERNEL_ABI_KPROBE: + lttng_fallthrough; + case LTTNG_KERNEL_ABI_UPROBE: WRITE_ONCE(event->enabled, 1); break; - case LTTNG_KERNEL_KRETPROBE: + + case LTTNG_KERNEL_ABI_KRETPROBE: ret = lttng_kretprobes_event_enable_state(event, 1); break; - case LTTNG_KERNEL_FUNCTION: /* Fall-through. */ + + case LTTNG_KERNEL_ABI_FUNCTION: + lttng_fallthrough; + case LTTNG_KERNEL_ABI_NOOP: + lttng_fallthrough; default: WARN_ON_ONCE(1); ret = -EINVAL; @@ -437,33 +702,61 @@ end: return ret; } -int lttng_event_disable(struct lttng_event *event) +int lttng_event_disable(struct lttng_kernel_event_common *event) { int ret = 0; mutex_lock(&sessions_mutex); - if (event->chan->channel_type == METADATA_CHANNEL) { - ret = -EPERM; - goto end; + 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); + + if (event_recorder->chan->priv->channel_type == METADATA_CHANNEL) { + ret = -EPERM; + goto end; + } + break; + } + case LTTNG_KERNEL_EVENT_TYPE_NOTIFIER: + switch (event->priv->instrumentation) { + case LTTNG_KERNEL_ABI_KRETPROBE: + ret = -EINVAL; + goto end; + default: + break; + } + break; + default: + break; } + if (!event->enabled) { ret = -EEXIST; goto end; } - switch (event->instrumentation) { - case LTTNG_KERNEL_TRACEPOINT: - case LTTNG_KERNEL_SYSCALL: + switch (event->priv->instrumentation) { + case LTTNG_KERNEL_ABI_TRACEPOINT: + lttng_fallthrough; + case LTTNG_KERNEL_ABI_SYSCALL: ret = -EINVAL; break; - case LTTNG_KERNEL_KPROBE: - case LTTNG_KERNEL_UPROBE: - case LTTNG_KERNEL_NOOP: + + case LTTNG_KERNEL_ABI_KPROBE: + lttng_fallthrough; + case LTTNG_KERNEL_ABI_UPROBE: WRITE_ONCE(event->enabled, 0); break; - case LTTNG_KERNEL_KRETPROBE: + + case LTTNG_KERNEL_ABI_KRETPROBE: ret = lttng_kretprobes_event_enable_state(event, 0); break; - case LTTNG_KERNEL_FUNCTION: /* Fall-through. */ + + case LTTNG_KERNEL_ABI_FUNCTION: + lttng_fallthrough; + case LTTNG_KERNEL_ABI_NOOP: + lttng_fallthrough; default: WARN_ON_ONCE(1); ret = -EINVAL; @@ -473,18 +766,7 @@ end: return ret; } -static struct lttng_transport *lttng_transport_find(const char *name) -{ - struct lttng_transport *transport; - - list_for_each_entry(transport, <tng_transport_list, node) { - if (!strcmp(transport->name, name)) - return transport; - } - return NULL; -} - -struct lttng_channel *lttng_channel_create(struct lttng_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, @@ -492,47 +774,56 @@ struct lttng_channel *lttng_channel_create(struct lttng_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); - if (session->been_active && channel_type != METADATA_CHANNEL) + if (session->priv->been_active && channel_type != METADATA_CHANNEL) goto active; /* Refuse to add channel to active session */ transport = lttng_transport_find(transport_name); if (!transport) { - printk(KERN_WARNING "LTTng transport %s not found\n", + printk(KERN_WARNING "LTTng: transport %s not found\n", transport_name); goto notransport; } if (!try_module_get(transport->owner)) { - printk(KERN_WARNING "LTT : Can't lock transport module.\n"); + 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->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.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->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) @@ -549,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->channel_destroy(chan->chan); - module_put(chan->transport->owner); - list_del(&chan->list); - lttng_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); @@ -576,132 +868,166 @@ void _lttng_metadata_channel_hangup(struct lttng_metadata_stream *stream) wake_up_interruptible(&stream->read_wait); } + /* * Supports event creation while tracing session is active. * Needs to be called with sessions mutex held. */ -struct lttng_event *_lttng_event_create(struct lttng_channel *chan, - struct lttng_kernel_event *event_param, - void *filter, - const struct lttng_event_desc *event_desc, - enum lttng_kernel_instrumentation itype) -{ - struct lttng_session *session = chan->session; - struct lttng_event *event; +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_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; - size_t name_len; - uint32_t hash; int ret; - if (chan->free_event_id == -1U) { + if (chan->priv->free_event_id == -1U) { ret = -EMFILE; goto full; } switch (itype) { - case LTTNG_KERNEL_TRACEPOINT: - event_name = event_desc->name; - break; - case LTTNG_KERNEL_KPROBE: - case LTTNG_KERNEL_UPROBE: - case LTTNG_KERNEL_KRETPROBE: - case LTTNG_KERNEL_NOOP: - case LTTNG_KERNEL_SYSCALL: + case LTTNG_KERNEL_ABI_TRACEPOINT: + event_name = event_desc->event_name; + break; + + 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_FUNCTION: /* Fall-through. */ + + case LTTNG_KERNEL_ABI_FUNCTION: + lttng_fallthrough; + case LTTNG_KERNEL_ABI_NOOP: + lttng_fallthrough; default: WARN_ON_ONCE(1); ret = -EINVAL; goto type_error; } - name_len = strlen(event_name); - hash = jhash(event_name, name_len, 0); - head = &session->events_ht.table[hash & (LTTNG_EVENT_HT_SIZE - 1)]; - lttng_hlist_for_each_entry(event, head, hlist) { - WARN_ON_ONCE(!event->desc); - if (!strncmp(event->desc->name, event_name, - LTTNG_KERNEL_SYM_NAME_LEN - 1) - && chan == event->chan) { + + head = utils_borrow_hash_table_bucket(session->priv->events_ht.table, + LTTNG_EVENT_HT_SIZE, event_name); + lttng_hlist_for_each_entry(event_recorder_priv, head, hlist) { + WARN_ON_ONCE(!event_recorder_priv->parent.desc); + if (!strncmp(event_recorder_priv->parent.desc->event_name, event_name, + LTTNG_KERNEL_ABI_SYM_NAME_LEN - 1) + && chan == event_recorder_priv->pub->chan) { ret = -EEXIST; goto exist; } } - event = kmem_cache_zalloc(event_cache, GFP_KERNEL); - if (!event) { + event_recorder = kmem_cache_zalloc(event_recorder_cache, GFP_KERNEL); + if (!event_recorder) { ret = -ENOMEM; goto cache_error; } - event->chan = chan; - event->filter = filter; - event->id = chan->free_event_id++; - event->instrumentation = itype; - event->evtype = LTTNG_TYPE_EVENT; - INIT_LIST_HEAD(&event->bytecode_runtime_head); - INIT_LIST_HEAD(&event->enablers_ref_head); + event_recorder_priv = kmem_cache_zalloc(event_recorder_private_cache, GFP_KERNEL); + if (!event_recorder_priv) { + ret = -ENOMEM; + goto cache_private_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); switch (itype) { - case LTTNG_KERNEL_TRACEPOINT: + case LTTNG_KERNEL_ABI_TRACEPOINT: /* Event will be enabled by enabler sync. */ - event->enabled = 0; - event->registered = 0; - event->desc = lttng_event_get(event_name); - if (!event->desc) { + 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) { ret = -ENOENT; goto register_error; } /* Populate lttng_event structure before event registration. */ smp_wmb(); break; - case LTTNG_KERNEL_KPROBE: + + case LTTNG_KERNEL_ABI_KPROBE: /* * Needs to be explicitly enabled after creation, since * we may want to apply filters. */ - event->enabled = 0; - event->registered = 1; + event_recorder->parent.enabled = 0; + event_recorder->priv->parent.registered = 1; /* * Populate lttng_event structure before event * registration. */ smp_wmb(); - ret = lttng_kprobes_register(event_name, + ret = lttng_kprobes_register_event(event_name, event_param->u.kprobe.symbol_name, event_param->u.kprobe.offset, event_param->u.kprobe.addr, - event); + event_recorder); if (ret) { ret = -EINVAL; goto register_error; } - ret = try_module_get(event->desc->owner); + ret = try_module_get(event_recorder->priv->parent.desc->owner); WARN_ON_ONCE(!ret); break; - case LTTNG_KERNEL_KRETPROBE: + + case LTTNG_KERNEL_ABI_KRETPROBE: { - struct lttng_event *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->enabled = 0; - event->registered = 1; - event_return = - kmem_cache_zalloc(event_cache, GFP_KERNEL); - if (!event_return) { + event_recorder->parent.enabled = 0; + event_recorder->priv->parent.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); ret = -ENOMEM; goto register_error; } - event_return->chan = chan; - event_return->filter = filter; - event_return->id = chan->free_event_id++; - event_return->enabled = 0; - event_return->registered = 1; - event_return->instrumentation = itype; + 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); /* * Populate lttng_event structure before kretprobe registration. */ @@ -710,50 +1036,75 @@ struct lttng_event *_lttng_event_create(struct lttng_channel *chan, event_param->u.kretprobe.symbol_name, event_param->u.kretprobe.offset, event_param->u.kretprobe.addr, - event, event_return); + event_recorder, event_recorder_return); if (ret) { - kmem_cache_free(event_cache, event_return); + kmem_cache_free(event_recorder_private_cache, event_recorder_return_priv); + kmem_cache_free(event_recorder_cache, event_recorder_return); ret = -EINVAL; goto register_error; } /* Take 2 refs on the module: one per event. */ - ret = try_module_get(event->desc->owner); + ret = try_module_get(event_recorder->priv->parent.desc->owner); WARN_ON_ONCE(!ret); - ret = try_module_get(event->desc->owner); + ret = try_module_get(event_recorder_return->priv->parent.desc->owner); WARN_ON_ONCE(!ret); - ret = _lttng_event_metadata_statedump(chan->session, chan, - event_return); + ret = _lttng_event_metadata_statedump(chan->parent.session, chan, + event_recorder_return); WARN_ON_ONCE(ret > 0); if (ret) { - kmem_cache_free(event_cache, event_return); - module_put(event->desc->owner); - module_put(event->desc->owner); + 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); goto statedump_error; } - list_add(&event_return->list, &chan->session->events); + list_add(&event_recorder_return->priv->node, &chan->parent.session->priv->events); break; } - case LTTNG_KERNEL_NOOP: - case LTTNG_KERNEL_SYSCALL: + + case LTTNG_KERNEL_ABI_SYSCALL: /* * Needs to be explicitly enabled after creation, since * we may want to apply filters. */ - event->enabled = 0; - event->registered = 0; - event->desc = event_desc; - if (!event->desc) { + event_recorder->parent.enabled = 0; + event_recorder->priv->parent.registered = 0; + event_recorder->priv->parent.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; + break; + case LTTNG_KERNEL_ABI_SYSCALL_EXIT: + event_recorder->priv->parent.u.syscall.entryexit = LTTNG_SYSCALL_EXIT; + break; + } + switch (event_param->u.syscall.abi) { + case LTTNG_KERNEL_ABI_SYSCALL_ABI_ALL: + ret = -EINVAL; + goto register_error; + case LTTNG_KERNEL_ABI_SYSCALL_ABI_NATIVE: + event_recorder->priv->parent.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; + break; + } + if (!event_recorder->priv->parent.desc) { ret = -EINVAL; goto register_error; } break; - case LTTNG_KERNEL_UPROBE: + + case LTTNG_KERNEL_ABI_UPROBE: /* * Needs to be explicitly enabled after creation, since * we may want to apply filters. */ - event->enabled = 0; - event->registered = 1; + event_recorder->parent.enabled = 0; + event_recorder->priv->parent.registered = 1; /* * Populate lttng_event structure before event @@ -761,33 +1112,39 @@ struct lttng_event *_lttng_event_create(struct lttng_channel *chan, */ smp_wmb(); - ret = lttng_uprobes_register(event_param->name, + ret = lttng_uprobes_register_event(event_param->name, event_param->u.uprobe.fd, - event); + &event_recorder->parent); if (ret) goto register_error; - ret = try_module_get(event->desc->owner); + ret = try_module_get(event_recorder->priv->parent.desc->owner); WARN_ON_ONCE(!ret); break; - case LTTNG_KERNEL_FUNCTION: /* 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); + 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->hlist, head); - list_add(&event->list, &chan->session->events); - return event; + hlist_add_head(&event_recorder->priv->hlist, head); + list_add(&event_recorder->priv->node, &chan->parent.session->priv->events); + return event_recorder; statedump_error: /* If a statedump error occurs, events will not be readable. */ register_error: - kmem_cache_free(event_cache, event); + kmem_cache_free(event_recorder_private_cache, event_recorder_priv); +cache_private_error: + kmem_cache_free(event_recorder_cache, event_recorder); cache_error: exist: type_error: @@ -795,137 +1152,570 @@ full: return ERR_PTR(ret); } -struct lttng_event *lttng_event_create(struct lttng_channel *chan, - struct lttng_kernel_event *event_param, - void *filter, - const struct lttng_event_desc *event_desc, - enum lttng_kernel_instrumentation itype) -{ - struct lttng_event *event; - - mutex_lock(&sessions_mutex); - event = _lttng_event_create(chan, event_param, filter, event_desc, - itype); - mutex_unlock(&sessions_mutex); - return event; -} - -/* Only used for tracepoints for now. */ -static -void register_event(struct lttng_event *event) +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) { - const struct lttng_event_desc *desc; - int ret = -EINVAL; + struct lttng_kernel_event_notifier *event_notifier; + struct lttng_kernel_event_notifier_private *event_notifier_priv; + struct lttng_counter *error_counter; + const char *event_name; + struct hlist_head *head; + int ret; - if (event->registered) - return; + switch (itype) { + case LTTNG_KERNEL_ABI_TRACEPOINT: + event_name = event_desc->event_name; + break; - desc = event->desc; - switch (event->instrumentation) { - case LTTNG_KERNEL_TRACEPOINT: - ret = lttng_wrapper_tracepoint_probe_register(desc->kname, - desc->probe_callback, - event); - break; - case LTTNG_KERNEL_SYSCALL: - ret = lttng_syscall_filter_enable(event->chan, - desc->name); - break; - case LTTNG_KERNEL_KPROBE: - case LTTNG_KERNEL_UPROBE: - case LTTNG_KERNEL_KRETPROBE: - case LTTNG_KERNEL_NOOP: - ret = 0; + 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_FUNCTION: /* 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; + goto type_error; } - if (!ret) - event->registered = 1; -} -/* - * Only used internally at session destruction. - */ -int _lttng_event_unregister(struct lttng_event *event) -{ - const struct lttng_event_desc *desc; - int ret = -EINVAL; + head = utils_borrow_hash_table_bucket(event_notifier_group->event_notifiers_ht.table, + LTTNG_EVENT_NOTIFIER_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, + LTTNG_KERNEL_ABI_SYM_NAME_LEN - 1) + && event_notifier_group == event_notifier_priv->group + && token == event_notifier_priv->parent.user_token) { + ret = -EEXIST; + goto exist; + } + } - if (!event->registered) - return 0; + event_notifier = kmem_cache_zalloc(event_notifier_cache, GFP_KERNEL); + if (!event_notifier) { + ret = -ENOMEM; + goto cache_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 = token; + event_notifier->priv->error_counter_index = 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; - desc = event->desc; - switch (event->instrumentation) { - case LTTNG_KERNEL_TRACEPOINT: - ret = lttng_wrapper_tracepoint_probe_unregister(event->desc->kname, - event->desc->probe_callback, - event); - break; - case LTTNG_KERNEL_KPROBE: - lttng_kprobes_unregister(event); - ret = 0; - break; - case LTTNG_KERNEL_KRETPROBE: - lttng_kretprobes_unregister(event); - ret = 0; - break; - case LTTNG_KERNEL_SYSCALL: - ret = lttng_syscall_filter_disable(event->chan, - desc->name); - break; - case LTTNG_KERNEL_NOOP: - ret = 0; - break; - case LTTNG_KERNEL_UPROBE: - lttng_uprobes_unregister(event); - ret = 0; + 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) { + ret = -ENOENT; + goto register_error; + } + /* Populate lttng_event_notifier structure before event registration. */ + smp_wmb(); break; - case LTTNG_KERNEL_FUNCTION: /* Fall-through */ - default: - WARN_ON_ONCE(1); - } - if (!ret) - event->registered = 0; - return ret; -} -/* - * Only used internally at session destruction. - */ -static -void _lttng_event_destroy(struct lttng_event *event) + case LTTNG_KERNEL_ABI_KPROBE: + /* + * 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; + /* + * Populate lttng_event_notifier structure before event + * registration. + */ + smp_wmb(); + ret = lttng_kprobes_register_event_notifier( + event_notifier_param->event.u.kprobe.symbol_name, + event_notifier_param->event.u.kprobe.offset, + event_notifier_param->event.u.kprobe.addr, + event_notifier); + if (ret) { + ret = -EINVAL; + goto register_error; + } + ret = try_module_get(event_notifier->priv->parent.desc->owner); + WARN_ON_ONCE(!ret); + break; + + case LTTNG_KERNEL_ABI_SYSCALL: + /* + * 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; + switch (event_notifier_param->event.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; + break; + case LTTNG_KERNEL_ABI_SYSCALL_EXIT: + event_notifier->priv->parent.u.syscall.entryexit = LTTNG_SYSCALL_EXIT; + break; + } + switch (event_notifier_param->event.u.syscall.abi) { + case LTTNG_KERNEL_ABI_SYSCALL_ABI_ALL: + ret = -EINVAL; + goto register_error; + case LTTNG_KERNEL_ABI_SYSCALL_ABI_NATIVE: + event_notifier->priv->parent.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; + break; + } + + if (!event_notifier->priv->parent.desc) { + ret = -EINVAL; + goto register_error; + } + break; + + case LTTNG_KERNEL_ABI_UPROBE: + /* + * 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; + + /* + * Populate lttng_event_notifier structure before + * event_notifier registration. + */ + smp_wmb(); + + ret = lttng_uprobes_register_event(event_notifier_param->event.name, + event_notifier_param->event.u.uprobe.fd, + &event_notifier->parent); + if (ret) + goto register_error; + ret = try_module_get(event_notifier->priv->parent.desc->owner); + WARN_ON_ONCE(!ret); + 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); + ret = -EINVAL; + goto register_error; + } + + list_add(&event_notifier->priv->node, &event_notifier_group->event_notifiers_head); + hlist_add_head(&event_notifier->priv->hlist, 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; + } + } + + 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: +exist: +type_error: + return ERR_PTR(ret); +} + +int lttng_kernel_counter_read(struct lttng_counter *counter, + const size_t *dim_indexes, int32_t cpu, + int64_t *val, bool *overflow, bool *underflow) +{ + return counter->ops->counter_read(counter->counter, dim_indexes, + cpu, val, overflow, underflow); +} + +int lttng_kernel_counter_aggregate(struct lttng_counter *counter, + const size_t *dim_indexes, int64_t *val, + bool *overflow, bool *underflow) +{ + return counter->ops->counter_aggregate(counter->counter, dim_indexes, + val, overflow, underflow); +} + +int lttng_kernel_counter_clear(struct lttng_counter *counter, + const size_t *dim_indexes) { - switch (event->instrumentation) { - case LTTNG_KERNEL_TRACEPOINT: - lttng_event_put(event->desc); + 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( + 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 *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); + 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) +{ + const struct lttng_kernel_event_desc *desc; + int ret = -EINVAL; + + if (event_recorder->priv->parent.registered) + return; + + desc = event_recorder->priv->parent.desc; + switch (event_recorder->priv->parent.instrumentation) { + case LTTNG_KERNEL_ABI_TRACEPOINT: + ret = lttng_wrapper_tracepoint_probe_register(desc->event_kname, + desc->tp_class->probe_callback, + &event_recorder->parent); break; - case LTTNG_KERNEL_KPROBE: - module_put(event->desc->owner); - lttng_kprobes_destroy_private(event); + + case LTTNG_KERNEL_ABI_SYSCALL: + ret = lttng_syscall_filter_enable_event(&event_recorder->parent); break; - case LTTNG_KERNEL_KRETPROBE: - module_put(event->desc->owner); - lttng_kretprobes_destroy_private(event); + + 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_NOOP: - case LTTNG_KERNEL_SYSCALL: + + case LTTNG_KERNEL_ABI_FUNCTION: + lttng_fallthrough; + case LTTNG_KERNEL_ABI_NOOP: + lttng_fallthrough; + default: + WARN_ON_ONCE(1); + } + if (!ret) + event_recorder->priv->parent.registered = 1; +} + +/* + * Only used internally at session destruction. + */ +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; + int ret = -EINVAL; + + if (!event_priv->registered) + return 0; + + desc = event_priv->desc; + switch (event_priv->instrumentation) { + 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); break; - case LTTNG_KERNEL_UPROBE: - module_put(event->desc->owner); - lttng_uprobes_destroy_private(event); + + case LTTNG_KERNEL_ABI_KPROBE: + lttng_kprobes_unregister_event(event_recorder); + ret = 0; + break; + + case LTTNG_KERNEL_ABI_KRETPROBE: + lttng_kretprobes_unregister(event_recorder); + ret = 0; break; - case LTTNG_KERNEL_FUNCTION: /* Fall-through */ + + case LTTNG_KERNEL_ABI_SYSCALL: + ret = lttng_syscall_filter_disable_event(&event_recorder->parent); + break; + + case LTTNG_KERNEL_ABI_NOOP: + ret = 0; + break; + + case LTTNG_KERNEL_ABI_UPROBE: + lttng_uprobes_unregister_event(&event_recorder->parent); + ret = 0; + break; + + case LTTNG_KERNEL_ABI_FUNCTION: + lttng_fallthrough; + default: + WARN_ON_ONCE(1); + } + if (!ret) + event_priv->registered = 0; + 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); } - list_del(&event->list); - lttng_destroy_context(event->ctx); - kmem_cache_free(event_cache, event); + if (!ret) + event_notifier->priv->parent.registered = 1; } -struct lttng_id_tracker *get_tracker(struct lttng_session *session, +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_notifier(event_notifier); + 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. + */ +static +void _lttng_event_destroy(struct lttng_kernel_event_common *event) +{ + struct lttng_kernel_event_common_private *event_priv = event->priv; + struct lttng_enabler_ref *enabler_ref, *tmp_enabler_ref; + + lttng_free_event_filter_runtime(event); + /* Free event enabler refs */ + list_for_each_entry_safe(enabler_ref, tmp_enabler_ref, + &event_priv->enablers_ref_head, node) + kfree(enabler_ref); + + 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); + + switch (event_priv->instrumentation) { + case LTTNG_KERNEL_ABI_TRACEPOINT: + lttng_event_desc_put(event_priv->desc); + break; + + case LTTNG_KERNEL_ABI_KPROBE: + module_put(event_priv->desc->owner); + lttng_kprobes_destroy_event_private(event_recorder); + break; + + case LTTNG_KERNEL_ABI_KRETPROBE: + module_put(event_priv->desc->owner); + lttng_kretprobes_destroy_private(event_recorder); + break; + + case LTTNG_KERNEL_ABI_SYSCALL: + break; + + case LTTNG_KERNEL_ABI_UPROBE: + module_put(event_priv->desc->owner); + lttng_uprobes_destroy_event_private(&event_recorder->parent); + break; + + case LTTNG_KERNEL_ABI_FUNCTION: + lttng_fallthrough; + case LTTNG_KERNEL_ABI_NOOP: + lttng_fallthrough; + default: + WARN_ON_ONCE(1); + } + list_del(&event_recorder->priv->node); + 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); + + switch (event_notifier->priv->parent.instrumentation) { + case LTTNG_KERNEL_ABI_TRACEPOINT: + lttng_event_desc_put(event_notifier->priv->parent.desc); + break; + + case LTTNG_KERNEL_ABI_KPROBE: + module_put(event_notifier->priv->parent.desc->owner); + lttng_kprobes_destroy_event_notifier_private(event_notifier); + break; + + case LTTNG_KERNEL_ABI_SYSCALL: + break; + + case LTTNG_KERNEL_ABI_UPROBE: + module_put(event_notifier->priv->parent.desc->owner); + lttng_uprobes_destroy_event_private(&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); + } + list_del(&event_notifier->priv->node); + kmem_cache_free(event_notifier_private_cache, event_notifier->priv); + kmem_cache_free(event_notifier_cache, event_notifier); + break; + } + default: + WARN_ON_ONCE(1); + } +} + +struct lttng_kernel_id_tracker *get_tracker(struct lttng_kernel_session *session, enum tracker_type tracker_type) { switch (tracker_type) { @@ -947,10 +1737,10 @@ struct lttng_id_tracker *get_tracker(struct lttng_session *session, } } -int lttng_session_track_id(struct lttng_session *session, +int lttng_session_track_id(struct lttng_kernel_session *session, enum tracker_type tracker_type, int id) { - struct lttng_id_tracker *tracker; + struct lttng_kernel_id_tracker *tracker; int ret; tracker = get_tracker(session, tracker_type); @@ -970,10 +1760,10 @@ int lttng_session_track_id(struct lttng_session *session, return ret; } -int lttng_session_untrack_id(struct lttng_session *session, +int lttng_session_untrack_id(struct lttng_kernel_session *session, enum tracker_type tracker_type, int id) { - struct lttng_id_tracker *tracker; + struct lttng_kernel_id_tracker *tracker; int ret; tracker = get_tracker(session, tracker_type); @@ -995,8 +1785,8 @@ int lttng_session_untrack_id(struct lttng_session *session, static void *id_list_start(struct seq_file *m, loff_t *pos) { - struct lttng_id_tracker *id_tracker = m->private; - struct lttng_id_tracker_rcu *id_tracker_p = id_tracker->p; + struct lttng_kernel_id_tracker *id_tracker = m->private; + struct lttng_kernel_id_tracker_rcu *id_tracker_p = id_tracker->p; struct lttng_id_hash_node *e; int iter = 0, i; @@ -1025,8 +1815,8 @@ void *id_list_start(struct seq_file *m, loff_t *pos) static void *id_list_next(struct seq_file *m, void *p, loff_t *ppos) { - struct lttng_id_tracker *id_tracker = m->private; - struct lttng_id_tracker_rcu *id_tracker_p = id_tracker->p; + struct lttng_kernel_id_tracker *id_tracker = m->private; + struct lttng_kernel_id_tracker_rcu *id_tracker_p = id_tracker->p; struct lttng_id_hash_node *e; int iter = 0, i; @@ -1060,8 +1850,8 @@ void id_list_stop(struct seq_file *m, void *p) static int id_list_show(struct seq_file *m, void *p) { - struct lttng_id_tracker *id_tracker = m->private; - struct lttng_id_tracker_rcu *id_tracker_p = id_tracker->p; + struct lttng_kernel_id_tracker *id_tracker = m->private; + struct lttng_kernel_id_tracker_rcu *id_tracker_p = id_tracker->p; int id; if (p == id_tracker_p) { @@ -1072,7 +1862,7 @@ int id_list_show(struct seq_file *m, void *p) id = lttng_id_tracker_get_node_id(e); } - switch (id_tracker->tracker_type) { + switch (id_tracker->priv->tracker_type) { case TRACKER_PID: seq_printf(m, "process { pid = %d; };\n", id); break; @@ -1115,13 +1905,13 @@ static int lttng_tracker_ids_list_release(struct inode *inode, struct file *file) { struct seq_file *m = file->private_data; - struct lttng_id_tracker *id_tracker = m->private; + struct lttng_kernel_id_tracker *id_tracker = m->private; int ret; WARN_ON_ONCE(!id_tracker); ret = seq_release(inode, file); if (!ret) - fput(id_tracker->session->file); + fput(id_tracker->priv->session->priv->file); return ret; } @@ -1133,7 +1923,7 @@ const struct file_operations lttng_tracker_ids_list_fops = { .release = lttng_tracker_ids_list_release, }; -int lttng_session_list_tracker_ids(struct lttng_session *session, +int lttng_session_list_tracker_ids(struct lttng_kernel_session *session, enum tracker_type tracker_type) { struct file *tracker_ids_list_file; @@ -1153,7 +1943,7 @@ int lttng_session_list_tracker_ids(struct lttng_session *session, ret = PTR_ERR(tracker_ids_list_file); goto file_error; } - if (!atomic_long_add_unless(&session->file->f_count, 1, LONG_MAX)) { + if (!atomic_long_add_unless(&session->priv->file->f_count, 1, LONG_MAX)) { ret = -EOVERFLOW; goto refcount_error; } @@ -1169,7 +1959,7 @@ int lttng_session_list_tracker_ids(struct lttng_session *session, return file_fd; open_error: - atomic_long_dec(&session->file->f_count); + atomic_long_dec(&session->priv->file->f_count); refcount_error: fput(tracker_ids_list_file); file_error: @@ -1200,67 +1990,136 @@ int lttng_match_enabler_name(const char *desc_name, return 1; } -static -int lttng_desc_match_enabler(const struct lttng_event_desc *desc, - struct lttng_enabler *enabler) +int lttng_desc_match_enabler(const struct lttng_kernel_event_desc *desc, + struct lttng_event_enabler_common *enabler) { const char *desc_name, *enabler_name; + bool compat = false, entry = false; enabler_name = enabler->event_param.name; switch (enabler->event_param.instrumentation) { - case LTTNG_KERNEL_TRACEPOINT: - desc_name = desc->name; + case LTTNG_KERNEL_ABI_TRACEPOINT: + desc_name = desc->event_name; + switch (enabler->format_type) { + case LTTNG_ENABLER_FORMAT_STAR_GLOB: + return lttng_match_enabler_star_glob(desc_name, enabler_name); + case LTTNG_ENABLER_FORMAT_NAME: + return lttng_match_enabler_name(desc_name, enabler_name); + default: + return -EINVAL; + } break; - case LTTNG_KERNEL_SYSCALL: - desc_name = desc->name; - if (!strncmp(desc_name, "compat_", strlen("compat_"))) + + case LTTNG_KERNEL_ABI_SYSCALL: + desc_name = desc->event_name; + if (!strncmp(desc_name, "compat_", strlen("compat_"))) { desc_name += strlen("compat_"); + compat = true; + } if (!strncmp(desc_name, "syscall_exit_", strlen("syscall_exit_"))) { desc_name += strlen("syscall_exit_"); } else if (!strncmp(desc_name, "syscall_entry_", strlen("syscall_entry_"))) { desc_name += strlen("syscall_entry_"); + entry = true; } else { WARN_ON_ONCE(1); return -EINVAL; } + switch (enabler->event_param.u.syscall.entryexit) { + case LTTNG_KERNEL_ABI_SYSCALL_ENTRYEXIT: + break; + case LTTNG_KERNEL_ABI_SYSCALL_ENTRY: + if (!entry) + return 0; + break; + case LTTNG_KERNEL_ABI_SYSCALL_EXIT: + if (entry) + return 0; + break; + default: + return -EINVAL; + } + switch (enabler->event_param.u.syscall.abi) { + case LTTNG_KERNEL_ABI_SYSCALL_ABI_ALL: + break; + case LTTNG_KERNEL_ABI_SYSCALL_ABI_NATIVE: + if (compat) + return 0; + break; + case LTTNG_KERNEL_ABI_SYSCALL_ABI_COMPAT: + if (!compat) + return 0; + break; + default: + return -EINVAL; + } + switch (enabler->event_param.u.syscall.match) { + case LTTNG_KERNEL_ABI_SYSCALL_MATCH_NAME: + switch (enabler->format_type) { + case LTTNG_ENABLER_FORMAT_STAR_GLOB: + return lttng_match_enabler_star_glob(desc_name, enabler_name); + case LTTNG_ENABLER_FORMAT_NAME: + return lttng_match_enabler_name(desc_name, enabler_name); + default: + return -EINVAL; + } + break; + case LTTNG_KERNEL_ABI_SYSCALL_MATCH_NR: + return -EINVAL; /* Not implemented. */ + default: + return -EINVAL; + } break; + default: WARN_ON_ONCE(1); return -EINVAL; } - switch (enabler->type) { - case LTTNG_ENABLER_STAR_GLOB: - return lttng_match_enabler_star_glob(desc_name, enabler_name); - case LTTNG_ENABLER_NAME: - return lttng_match_enabler_name(desc_name, enabler_name); - default: - return -EINVAL; - } } static -int lttng_event_match_enabler(struct lttng_event *event, - struct lttng_enabler *enabler) +int lttng_event_enabler_match_event(struct lttng_event_recorder_enabler *event_enabler, + struct lttng_kernel_event_recorder *event_recorder) +{ + 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) + 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; +} + +static +int lttng_event_notifier_enabler_match_event_notifier(struct lttng_event_notifier_enabler *event_notifier_enabler, + struct lttng_kernel_event_notifier *event_notifier) { - if (enabler->event_param.instrumentation != event->instrumentation) + 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->desc, enabler) - && event->chan == enabler->chan) + 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; } static -struct lttng_enabler_ref *lttng_event_enabler_ref(struct lttng_event *event, - struct lttng_enabler *enabler) +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, - &event->enablers_ref_head, node) { + list_for_each_entry(enabler_ref, enablers_ref_list, node) { if (enabler_ref->ref == enabler) return enabler_ref; } @@ -1268,11 +2127,11 @@ struct lttng_enabler_ref *lttng_event_enabler_ref(struct lttng_event *event, } static -void lttng_create_tracepoint_if_missing(struct lttng_enabler *enabler) +void lttng_create_tracepoint_event_if_missing(struct lttng_event_recorder_enabler *event_enabler) { - struct lttng_session *session = enabler->chan->session; - struct lttng_probe_desc *probe_desc; - const struct lttng_event_desc *desc; + 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; struct list_head *probe_list; @@ -1286,69 +2145,221 @@ void lttng_create_tracepoint_if_missing(struct lttng_enabler *enabler) for (i = 0; i < probe_desc->nr_events; i++) { int found = 0; struct hlist_head *head; - const char *event_name; - size_t name_len; - uint32_t hash; - struct lttng_event *event; + struct lttng_kernel_event_recorder_private *event_recorder_private; + struct lttng_kernel_event_recorder *event_recorder; + + desc = probe_desc->event_desc[i]; + if (!lttng_desc_match_enabler(desc, + lttng_event_recorder_enabler_as_enabler(event_enabler))) + continue; + + /* + * Check if already created. + */ + head = utils_borrow_hash_table_bucket( + session->priv->events_ht.table, LTTNG_EVENT_HT_SIZE, + desc->event_name); + lttng_hlist_for_each_entry(event_recorder_private, head, hlist) { + if (event_recorder_private->parent.desc == desc + && event_recorder_private->pub->chan == event_enabler->chan) + found = 1; + } + if (found) + continue; + + /* + * 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 +void lttng_create_tracepoint_event_notifier_if_missing(struct lttng_event_notifier_enabler *event_notifier_enabler) +{ + struct lttng_event_notifier_group *event_notifier_group = event_notifier_enabler->group; + struct lttng_kernel_probe_desc *probe_desc; + const struct lttng_kernel_event_desc *desc; + int i; + struct list_head *probe_list; + + 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 + * 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_private *event_notifier_priv; + struct lttng_kernel_event_notifier *event_notifier; + + desc = probe_desc->event_desc[i]; + if (!lttng_desc_match_enabler(desc, + lttng_event_notifier_enabler_as_enabler(event_notifier_enabler))) + continue; + + /* + * 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); + 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) + found = 1; + } + if (found) + continue; + + /* + * 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); + if (IS_ERR(event_notifier)) { + printk(KERN_INFO "Unable to create event_notifier %s\n", + probe_desc->event_desc[i]->event_name); + } + } + } +} + +static +void lttng_create_syscall_event_if_missing(struct lttng_event_recorder_enabler *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); + WARN_ON_ONCE(ret); +} + +/* + * Create struct lttng_kernel_event_recorder 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) +{ + switch (event_enabler->parent.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); + break; + + default: + WARN_ON_ONCE(1); + break; + } +} + +/* + * 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) +{ + 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); + } - desc = probe_desc->event_desc[i]; - if (!lttng_desc_match_enabler(desc, enabler)) - continue; - event_name = desc->name; - name_len = strlen(event_name); + /* First ensure that probe events are created for this enabler. */ + lttng_create_event_if_missing(event_enabler); - /* - * Check if already created. - */ - hash = jhash(event_name, name_len, 0); - head = &session->events_ht.table[hash & (LTTNG_EVENT_HT_SIZE - 1)]; - lttng_hlist_for_each_entry(event, head, hlist) { - if (event->desc == desc - && event->chan == enabler->chan) - found = 1; - } - if (found) - continue; + /* 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) { /* - * We need to create an event for this - * event probe. + * If no backward ref, create it. + * Add backward ref from event to event_enabler. */ - event = _lttng_event_create(enabler->chan, - NULL, NULL, desc, - LTTNG_KERNEL_TRACEPOINT); - if (!event) { - printk(KERN_INFO "Unable to create event %s\n", - probe_desc->event_desc[i]->name); - } + 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); } - } -} - -static -void lttng_create_syscall_if_missing(struct lttng_enabler *enabler) -{ - int ret; - ret = lttng_syscalls_register(enabler->chan, NULL); - WARN_ON_ONCE(ret); + /* + * 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; } /* - * Create struct lttng_event if it is missing and present in the list of + * 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_if_missing(struct lttng_enabler *enabler) +void lttng_create_event_notifier_if_missing(struct lttng_event_notifier_enabler *event_notifier_enabler) { - switch (enabler->event_param.instrumentation) { - case LTTNG_KERNEL_TRACEPOINT: - lttng_create_tracepoint_if_missing(enabler); + switch (event_notifier_enabler->parent.event_param.instrumentation) { + case LTTNG_KERNEL_ABI_TRACEPOINT: + lttng_create_tracepoint_event_notifier_if_missing(event_notifier_enabler); break; - case LTTNG_KERNEL_SYSCALL: - lttng_create_syscall_if_missing(enabler); + + case LTTNG_KERNEL_ABI_SYSCALL: + lttng_create_syscall_event_notifier_if_missing(event_notifier_enabler); break; + default: WARN_ON_ONCE(1); break; @@ -1356,45 +2367,73 @@ void lttng_create_event_if_missing(struct lttng_enabler *enabler) } /* - * Create events associated with an enabler (if not already present), - * and add backward reference from the event to the enabler. - * Should be called with sessions mutex held. + * Create event_notifiers associated with a event_notifier enabler (if not already present). */ static -int lttng_enabler_ref_events(struct lttng_enabler *enabler) +int lttng_event_notifier_enabler_ref_event_notifiers( + struct lttng_event_notifier_enabler *event_notifier_enabler) { - struct lttng_session *session = enabler->chan->session; - struct lttng_event *event; + 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; - /* First ensure that probe events are created for this enabler. */ - lttng_create_event_if_missing(enabler); + 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; - /* For each event matching enabler in session event list. */ - list_for_each_entry(event, &session->events, list) { + 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); + + } + + /* First ensure that probe event_notifiers are created for this enabler. */ + lttng_create_event_notifier_if_missing(event_notifier_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; struct lttng_enabler_ref *enabler_ref; - if (!lttng_event_match_enabler(event, enabler)) + if (!lttng_event_notifier_enabler_match_event_notifier(event_notifier_enabler, event_notifier)) continue; - enabler_ref = lttng_event_enabler_ref(event, enabler); + + enabler_ref = lttng_enabler_ref(&event_notifier_priv->parent.enablers_ref_head, + lttng_event_notifier_enabler_as_enabler(event_notifier_enabler)); if (!enabler_ref) { /* * If no backward ref, create it. - * Add backward ref from event to enabler. + * Add backward ref from event_notifier to enabler. */ enabler_ref = kzalloc(sizeof(*enabler_ref), GFP_KERNEL); if (!enabler_ref) return -ENOMEM; - enabler_ref->ref = enabler; + + enabler_ref->ref = lttng_event_notifier_enabler_as_enabler( + event_notifier_enabler); list_add(&enabler_ref->node, - &event->enablers_ref_head); + &event_notifier_priv->parent.enablers_ref_head); } /* * Link filter bytecodes if not linked yet. */ - lttng_enabler_event_link_bytecode(event, enabler); + 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); - /* TODO: merge event context. */ + event_notifier_priv->num_captures = event_notifier_enabler->num_captures; } return 0; } @@ -1406,66 +2445,107 @@ int lttng_enabler_ref_events(struct lttng_enabler *enabler) */ int lttng_fix_pending_events(void) { - struct lttng_session *session; + struct lttng_kernel_session_private *session_priv; - list_for_each_entry(session, &sessions, list) - lttng_session_lazy_sync_enablers(session); + list_for_each_entry(session_priv, &sessions, list) + lttng_session_lazy_sync_event_enablers(session_priv->pub); return 0; } -struct lttng_enabler *lttng_enabler_create(enum lttng_enabler_type type, - struct lttng_kernel_event *event_param, - struct lttng_channel *chan) +static bool lttng_event_notifier_group_has_active_event_notifiers( + struct lttng_event_notifier_group *event_notifier_group) { - struct lttng_enabler *enabler; + struct lttng_event_notifier_enabler *event_notifier_enabler; - enabler = kzalloc(sizeof(*enabler), GFP_KERNEL); - if (!enabler) + list_for_each_entry(event_notifier_enabler, &event_notifier_group->enablers_head, + node) { + if (event_notifier_enabler->parent.enabled) + return true; + } + return false; +} + +bool lttng_event_notifier_active(void) +{ + struct lttng_event_notifier_group *event_notifier_group; + + list_for_each_entry(event_notifier_group, &event_notifier_groups, node) { + if (lttng_event_notifier_group_has_active_event_notifiers(event_notifier_group)) + return true; + } + return false; +} + +int lttng_fix_pending_event_notifiers(void) +{ + struct lttng_event_notifier_group *event_notifier_group; + + list_for_each_entry(event_notifier_group, &event_notifier_groups, node) + lttng_event_notifier_group_sync_enablers(event_notifier_group); + return 0; +} + +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_kernel_channel_buffer *chan) +{ + struct lttng_event_recorder_enabler *event_enabler; + + event_enabler = kzalloc(sizeof(*event_enabler), GFP_KERNEL); + if (!event_enabler) return NULL; - enabler->type = type; - INIT_LIST_HEAD(&enabler->filter_bytecode_head); - memcpy(&enabler->event_param, event_param, - sizeof(enabler->event_param)); - enabler->chan = chan; + 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 */ - enabler->enabled = 0; - enabler->evtype = LTTNG_TYPE_ENABLER; + 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(&enabler->node, &enabler->chan->session->enablers_head); - lttng_session_lazy_sync_enablers(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 enabler; } -int lttng_enabler_enable(struct lttng_enabler *enabler) +int lttng_event_enabler_enable(struct lttng_event_enabler_common *event_enabler) { mutex_lock(&sessions_mutex); - enabler->enabled = 1; - lttng_session_lazy_sync_enablers(enabler->chan->session); + event_enabler->enabled = 1; + lttng_event_enabler_sync(event_enabler); mutex_unlock(&sessions_mutex); return 0; } -int lttng_enabler_disable(struct lttng_enabler *enabler) +int lttng_event_enabler_disable(struct lttng_event_enabler_common *event_enabler) { mutex_lock(&sessions_mutex); - enabler->enabled = 0; - lttng_session_lazy_sync_enablers(enabler->chan->session); + event_enabler->enabled = 0; + lttng_event_enabler_sync(event_enabler); mutex_unlock(&sessions_mutex); return 0; } -int lttng_enabler_attach_bytecode(struct lttng_enabler *enabler, - struct lttng_kernel_filter_bytecode __user *bytecode) +static +int lttng_enabler_attach_filter_bytecode(struct lttng_event_enabler_common *enabler, + struct lttng_kernel_abi_filter_bytecode __user *bytecode) { - struct lttng_filter_bytecode_node *bytecode_node; + struct lttng_kernel_bytecode_node *bytecode_node; uint32_t bytecode_len; int ret; ret = get_user(bytecode_len, &bytecode->len); if (ret) return ret; - bytecode_node = kzalloc(sizeof(*bytecode_node) + bytecode_len, + bytecode_node = lttng_kvzalloc(sizeof(*bytecode_node) + bytecode_len, GFP_KERNEL); if (!bytecode_node) return -ENOMEM; @@ -1473,89 +2553,223 @@ int lttng_enabler_attach_bytecode(struct lttng_enabler *enabler, sizeof(*bytecode) + bytecode_len); if (ret) goto error_free; + + bytecode_node->type = LTTNG_KERNEL_BYTECODE_TYPE_FILTER; bytecode_node->enabler = enabler; /* Enforce length based on allocated size */ bytecode_node->bc.len = bytecode_len; list_add_tail(&bytecode_node->node, &enabler->filter_bytecode_head); - lttng_session_lazy_sync_enablers(enabler->chan->session); + return 0; error_free: - kfree(bytecode_node); + lttng_kvfree(bytecode_node); return ret; } -int lttng_event_add_callsite(struct lttng_event *event, - struct lttng_kernel_event_callsite __user *callsite) +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(event_enabler, bytecode); + if (ret) + goto error; + lttng_event_enabler_sync(event_enabler); + return 0; - switch (event->instrumentation) { - case LTTNG_KERNEL_UPROBE: - return lttng_uprobes_add_callsite(event, callsite); - default: - return -EINVAL; - } +error: + return ret; } -int lttng_enabler_attach_context(struct lttng_enabler *enabler, - struct lttng_kernel_context *context_param) +int lttng_event_add_callsite(struct lttng_kernel_event_common *event, + struct lttng_kernel_abi_event_callsite __user *callsite) { - return -ENOSYS; + + switch (event->priv->instrumentation) { + case LTTNG_KERNEL_ABI_UPROBE: + return lttng_uprobes_event_add_callsite(event, callsite); + default: + return -EINVAL; + } } static -void lttng_enabler_destroy(struct lttng_enabler *enabler) +void lttng_enabler_destroy(struct lttng_event_enabler_common *enabler) { - struct lttng_filter_bytecode_node *filter_node, *tmp_filter_node; + struct lttng_kernel_bytecode_node *filter_node, *tmp_filter_node; /* Destroy filter bytecode */ list_for_each_entry_safe(filter_node, tmp_filter_node, &enabler->filter_bytecode_head, node) { - kfree(filter_node); + lttng_kvfree(filter_node); + } +} + +void lttng_event_enabler_destroy(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_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_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( + 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_event_notifier_enabler *event_notifier_enabler; + + event_notifier_enabler = kzalloc(sizeof(*event_notifier_enabler), GFP_KERNEL); + if (!event_notifier_enabler) + return NULL; + + 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->parent.event_param, &event_notifier_param->event, + sizeof(event_notifier_enabler->parent.event_param)); + + 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); + list_add(&event_notifier_enabler->node, &event_notifier_enabler->group->enablers_head); + lttng_event_notifier_group_sync_enablers(event_notifier_enabler->group); + + mutex_unlock(&sessions_mutex); + + return event_notifier_enabler; +} + +int lttng_event_notifier_enabler_enable( + struct lttng_event_notifier_enabler *event_notifier_enabler) +{ + mutex_lock(&sessions_mutex); + lttng_event_notifier_enabler_as_enabler(event_notifier_enabler)->enabled = 1; + lttng_event_notifier_group_sync_enablers(event_notifier_enabler->group); + mutex_unlock(&sessions_mutex); + return 0; +} + +int lttng_event_notifier_enabler_disable( + struct lttng_event_notifier_enabler *event_notifier_enabler) +{ + mutex_lock(&sessions_mutex); + lttng_event_notifier_enabler_as_enabler(event_notifier_enabler)->enabled = 0; + lttng_event_notifier_group_sync_enablers(event_notifier_enabler->group); + mutex_unlock(&sessions_mutex); + return 0; +} + +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_event_enabler_common *enabler = + lttng_event_notifier_enabler_as_enabler(event_notifier_enabler); + uint32_t bytecode_len; + int ret; + + ret = get_user(bytecode_len, &bytecode->len); + if (ret) + return ret; + + bytecode_node = lttng_kvzalloc(sizeof(*bytecode_node) + bytecode_len, + GFP_KERNEL); + if (!bytecode_node) + return -ENOMEM; + + ret = copy_from_user(&bytecode_node->bc, bytecode, + sizeof(*bytecode) + bytecode_len); + if (ret) + goto error_free; + + bytecode_node->type = LTTNG_KERNEL_BYTECODE_TYPE_CAPTURE; + bytecode_node->enabler = enabler; + + /* Enforce length based on allocated size */ + bytecode_node->bc.len = bytecode_len; + list_add_tail(&bytecode_node->node, &event_notifier_enabler->capture_bytecode_head); + + event_notifier_enabler->num_captures++; - /* Destroy contexts */ - lttng_destroy_context(enabler->ctx); + lttng_event_notifier_group_sync_enablers(event_notifier_enabler->group); + goto end; - list_del(&enabler->node); - kfree(enabler); +error_free: + lttng_kvfree(bytecode_node); +end: + return ret; } /* - * lttng_session_sync_enablers should be called just before starting a + * 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_enablers(struct lttng_session *session) +void lttng_session_sync_event_enablers(struct lttng_kernel_session *session) { - struct lttng_enabler *enabler; - struct lttng_event *event; + struct lttng_event_recorder_enabler *event_enabler; + struct lttng_kernel_event_recorder_private *event_recorder_priv; - list_for_each_entry(enabler, &session->enablers_head, node) - lttng_enabler_ref_events(enabler); + list_for_each_entry(event_enabler, &session->priv->enablers_head, 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, &session->events, 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; - struct lttng_bytecode_runtime *runtime; - int enabled = 0, has_enablers_without_bytecode = 0; - - switch (event->instrumentation) { - case LTTNG_KERNEL_TRACEPOINT: - case LTTNG_KERNEL_SYSCALL: + 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->enablers_ref_head, node) { + &event_recorder_priv->parent.enablers_ref_head, node) { if (enabler_ref->ref->enabled) { enabled = 1; break; } } break; + default: /* Not handled with lazy sync. */ continue; @@ -1565,35 +2779,39 @@ void lttng_session_sync_enablers(struct lttng_session *session) * intesection of session and channel transient enable * states. */ - enabled = enabled && session->tstate && event->chan->tstate; + enabled = enabled && session->priv->tstate && event_recorder->chan->priv->parent.tstate; - WRITE_ONCE(event->enabled, enabled); + WRITE_ONCE(event_recorder->parent.enabled, enabled); /* * Sync tracepoint registration with event enabled * state. */ if (enabled) { - register_event(event); + register_event_recorder(event_recorder); } else { - _lttng_event_unregister(event); + _lttng_event_recorder_unregister(event_recorder); } /* Check if has enablers without bytecode enabled */ list_for_each_entry(enabler_ref, - &event->enablers_ref_head, node) { + &event_recorder_priv->parent.enablers_ref_head, node) { if (enabler_ref->ref->enabled && list_empty(&enabler_ref->ref->filter_bytecode_head)) { - has_enablers_without_bytecode = 1; + has_enablers_without_filter_bytecode = 1; break; } } - event->has_enablers_without_bytecode = - has_enablers_without_bytecode; + event_recorder_priv->parent.has_enablers_without_filter_bytecode = + has_enablers_without_filter_bytecode; /* Enable filters */ list_for_each_entry(runtime, - &event->bytecode_runtime_head, node) - lttng_filter_sync_state(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)); } } @@ -1605,12 +2823,118 @@ void lttng_session_sync_enablers(struct lttng_session *session) * Should be called with sessions mutex held. */ static -void lttng_session_lazy_sync_enablers(struct lttng_session *session) +void lttng_session_lazy_sync_event_enablers(struct lttng_kernel_session *session) { /* We can skip if session is not active */ if (!session->active) return; - lttng_session_sync_enablers(session); + lttng_session_sync_event_enablers(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_notifier(event_notifier); + } else { + if (event_notifier_priv->parent.registered) + _lttng_event_notifier_unregister(event_notifier); + } + + /* 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); + } +} + +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); + } } /* @@ -1626,9 +2950,9 @@ void lttng_session_lazy_sync_enablers(struct lttng_session *session) * 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 lib_ring_buffer_ctx ctx; + struct lttng_kernel_ring_buffer_ctx ctx; int ret = 0; size_t len, reserve_len; @@ -1655,14 +2979,14 @@ int lttng_metadata_output_channel(struct lttng_metadata_stream *stream, if (!len) goto end; reserve_len = min_t(size_t, - stream->transport->ops.packet_avail_size(chan), + stream->transport->ops.priv->packet_avail_size(chan), len); - lib_ring_buffer_ctx_init(&ctx, chan, NULL, reserve_len, - sizeof(char), -1); + lib_ring_buffer_ctx_init(&ctx, chan, reserve_len, + sizeof(char), NULL); /* * If reservation failed, return an error to the caller. */ - ret = stream->transport->ops.event_reserve(&ctx, 0); + ret = stream->transport->ops.event_reserve(&ctx); if (ret != 0) { printk(KERN_WARNING "LTTng: Metadata event reservation failed\n"); stream->coherent = false; @@ -1670,10 +2994,10 @@ 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 || stream->metadata_cache->producing != 0) + if (reserve_len < len) stream->coherent = false; else stream->coherent = true; @@ -1687,20 +3011,23 @@ end: } static -void lttng_metadata_begin(struct lttng_session *session) +void lttng_metadata_begin(struct lttng_kernel_session *session) { - mutex_lock(&session->metadata_cache->lock); - session->metadata_cache->producing++; - mutex_unlock(&session->metadata_cache->lock); + if (atomic_inc_return(&session->priv->metadata_cache->producing) == 1) + mutex_lock(&session->priv->metadata_cache->lock); } static -void lttng_metadata_end(struct lttng_session *session) +void lttng_metadata_end(struct lttng_kernel_session *session) { - mutex_lock(&session->metadata_cache->lock); - WARN_ON_ONCE(!session->metadata_cache->producing); - session->metadata_cache->producing--; - mutex_unlock(&session->metadata_cache->lock); + WARN_ON_ONCE(!atomic_read(&session->priv->metadata_cache->producing)); + if (atomic_dec_return(&session->priv->metadata_cache->producing) == 0) { + struct lttng_metadata_stream *stream; + + list_for_each_entry(stream, &session->priv->metadata_cache->metadata_stream, list) + wake_up_interruptible(&stream->read_wait); + mutex_unlock(&session->priv->metadata_cache->lock); + } } /* @@ -1711,15 +3038,14 @@ void lttng_metadata_end(struct lttng_session *session) * The content of the printf is printed as a single atomic metadata * transaction. */ -int lttng_metadata_printf(struct lttng_session *session, +int lttng_metadata_printf(struct lttng_kernel_session *session, const char *fmt, ...) { char *str; size_t len; va_list ap; - struct lttng_metadata_stream *stream; - WARN_ON_ONCE(!READ_ONCE(session->active)); + WARN_ON_ONCE(!LTTNG_READ_ONCE(session->active)); va_start(ap, fmt); str = kvasprintf(GFP_KERNEL, fmt, ap); @@ -1728,51 +3054,43 @@ int lttng_metadata_printf(struct lttng_session *session, return -ENOMEM; len = strlen(str); - mutex_lock(&session->metadata_cache->lock); - session->metadata_cache->producing++; - if (session->metadata_cache->metadata_written + len > - session->metadata_cache->cache_alloc) { + WARN_ON_ONCE(!atomic_read(&session->priv->metadata_cache->producing)); + if (session->priv->metadata_cache->metadata_written + len > + session->priv->metadata_cache->cache_alloc) { char *tmp_cache_realloc; unsigned int tmp_cache_alloc_size; tmp_cache_alloc_size = max_t(unsigned int, - session->metadata_cache->cache_alloc + len, - session->metadata_cache->cache_alloc << 1); + session->priv->metadata_cache->cache_alloc + len, + session->priv->metadata_cache->cache_alloc << 1); tmp_cache_realloc = vzalloc(tmp_cache_alloc_size); if (!tmp_cache_realloc) goto err; - if (session->metadata_cache->data) { + if (session->priv->metadata_cache->data) { memcpy(tmp_cache_realloc, - session->metadata_cache->data, - session->metadata_cache->cache_alloc); - vfree(session->metadata_cache->data); + session->priv->metadata_cache->data, + session->priv->metadata_cache->cache_alloc); + vfree(session->priv->metadata_cache->data); } - session->metadata_cache->cache_alloc = tmp_cache_alloc_size; - session->metadata_cache->data = tmp_cache_realloc; + session->priv->metadata_cache->cache_alloc = tmp_cache_alloc_size; + session->priv->metadata_cache->data = tmp_cache_realloc; } - memcpy(session->metadata_cache->data + - session->metadata_cache->metadata_written, + memcpy(session->priv->metadata_cache->data + + session->priv->metadata_cache->metadata_written, str, len); - session->metadata_cache->metadata_written += len; - session->metadata_cache->producing--; - mutex_unlock(&session->metadata_cache->lock); + session->priv->metadata_cache->metadata_written += len; kfree(str); - list_for_each_entry(stream, &session->metadata_cache->metadata_stream, list) - wake_up_interruptible(&stream->read_wait); - return 0; err: - session->metadata_cache->producing--; - mutex_unlock(&session->metadata_cache->lock); kfree(str); return -ENOMEM; } static -int print_tabs(struct lttng_session *session, size_t nesting) +int print_tabs(struct lttng_kernel_session *session, size_t nesting) { size_t i; @@ -1788,39 +3106,39 @@ int print_tabs(struct lttng_session *session, size_t nesting) } static -int lttng_field_name_statedump(struct lttng_session *session, - const struct lttng_event_field *field, +int lttng_field_name_statedump(struct lttng_kernel_session *session, + const struct lttng_kernel_event_field *field, size_t nesting) { return lttng_metadata_printf(session, " _%s;\n", field->name); } static -int _lttng_integer_type_statedump(struct lttng_session *session, - const struct lttng_type *type, +int _lttng_integer_type_statedump(struct lttng_kernel_session *session, + const struct lttng_kernel_type_integer *type, + enum lttng_kernel_string_encoding parent_encoding, size_t nesting) { int ret; - WARN_ON_ONCE(type->atype != atype_integer); ret = print_tabs(session, nesting); if (ret) return ret; ret = lttng_metadata_printf(session, "integer { size = %u; align = %u; signed = %u; encoding = %s; base = %u;%s }", - type->u.integer.size, - type->u.integer.alignment, - type->u.integer.signedness, - (type->u.integer.encoding == lttng_encode_none) + type->size, + type->alignment, + type->signedness, + (parent_encoding == lttng_kernel_string_encoding_none) ? "none" - : (type->u.integer.encoding == lttng_encode_UTF8) + : (parent_encoding == lttng_kernel_string_encoding_UTF8) ? "UTF8" : "ASCII", - type->u.integer.base, + type->base, #if __BYTE_ORDER == __BIG_ENDIAN - type->u.integer.reverse_byte_order ? " byte_order = le;" : "" + type->reverse_byte_order ? " byte_order = le;" : "" #else - type->u.integer.reverse_byte_order ? " byte_order = be;" : "" + type->reverse_byte_order ? " byte_order = be;" : "" #endif ); return ret; @@ -1830,16 +3148,15 @@ int _lttng_integer_type_statedump(struct lttng_session *session, * Must be called with sessions_mutex held. */ static -int _lttng_struct_type_statedump(struct lttng_session *session, - const struct lttng_type *type, +int _lttng_struct_type_statedump(struct lttng_kernel_session *session, + const struct lttng_kernel_type_struct *type, size_t nesting) { + const char *prev_field_name = NULL; int ret; uint32_t i, nr_fields; unsigned int alignment; - WARN_ON_ONCE(type->atype != atype_struct_nestable); - ret = print_tabs(session, nesting); if (ret) return ret; @@ -1847,19 +3164,19 @@ int _lttng_struct_type_statedump(struct lttng_session *session, "struct {\n"); if (ret) return ret; - nr_fields = type->u.struct_nestable.nr_fields; + nr_fields = type->nr_fields; for (i = 0; i < nr_fields; i++) { - const struct lttng_event_field *iter_field; + const struct lttng_kernel_event_field *iter_field; - iter_field = &type->u.struct_nestable.fields[i]; - ret = _lttng_field_statedump(session, iter_field, nesting + 1); + iter_field = type->fields[i]; + ret = _lttng_field_statedump(session, iter_field, nesting + 1, &prev_field_name); if (ret) return ret; } ret = print_tabs(session, nesting); if (ret) return ret; - alignment = type->u.struct_nestable.alignment; + alignment = type->alignment; if (alignment) { ret = lttng_metadata_printf(session, "} align(%u)", @@ -1875,14 +3192,14 @@ int _lttng_struct_type_statedump(struct lttng_session *session, * Must be called with sessions_mutex held. */ static -int _lttng_struct_field_statedump(struct lttng_session *session, - const struct lttng_event_field *field, +int _lttng_struct_field_statedump(struct lttng_kernel_session *session, + const struct lttng_kernel_event_field *field, size_t nesting) { int ret; ret = _lttng_struct_type_statedump(session, - &field->type, nesting); + lttng_kernel_get_type_struct(field->type), nesting); if (ret) return ret; return lttng_field_name_statedump(session, field, nesting); @@ -1892,33 +3209,39 @@ int _lttng_struct_field_statedump(struct lttng_session *session, * Must be called with sessions_mutex held. */ static -int _lttng_variant_type_statedump(struct lttng_session *session, - const struct lttng_type *type, - size_t nesting) +int _lttng_variant_type_statedump(struct lttng_kernel_session *session, + const struct lttng_kernel_type_variant *type, + size_t nesting, + const char *prev_field_name) { + const char *tag_name; int ret; uint32_t i, nr_choices; - WARN_ON_ONCE(type->atype != atype_variant_nestable); + tag_name = type->tag_name; + if (!tag_name) + tag_name = prev_field_name; + if (!tag_name) + return -EINVAL; /* * CTF 1.8 does not allow expressing nonzero variant alignment in a nestable way. */ - if (type->u.variant_nestable.alignment != 0) + if (type->alignment != 0) return -EINVAL; ret = print_tabs(session, nesting); if (ret) return ret; ret = lttng_metadata_printf(session, "variant <_%s> {\n", - type->u.variant_nestable.tag_name); + tag_name); if (ret) return ret; - nr_choices = type->u.variant_nestable.nr_choices; + nr_choices = type->nr_choices; for (i = 0; i < nr_choices; i++) { - const struct lttng_event_field *iter_field; + const struct lttng_kernel_event_field *iter_field; - iter_field = &type->u.variant_nestable.choices[i]; - ret = _lttng_field_statedump(session, iter_field, nesting + 1); + iter_field = type->choices[i]; + ret = _lttng_field_statedump(session, iter_field, nesting + 1, NULL); if (ret) return ret; } @@ -1934,14 +3257,16 @@ int _lttng_variant_type_statedump(struct lttng_session *session, * Must be called with sessions_mutex held. */ static -int _lttng_variant_field_statedump(struct lttng_session *session, - const struct lttng_event_field *field, - size_t nesting) +int _lttng_variant_field_statedump(struct lttng_kernel_session *session, + const struct lttng_kernel_event_field *field, + size_t nesting, + const char *prev_field_name) { int ret; ret = _lttng_variant_type_statedump(session, - &field->type, nesting); + lttng_kernel_get_type_variant(field->type), nesting, + prev_field_name); if (ret) return ret; return lttng_field_name_statedump(session, field, nesting); @@ -1951,22 +3276,24 @@ int _lttng_variant_field_statedump(struct lttng_session *session, * Must be called with sessions_mutex held. */ static -int _lttng_array_field_statedump(struct lttng_session *session, - const struct lttng_event_field *field, +int _lttng_array_field_statedump(struct lttng_kernel_session *session, + const struct lttng_kernel_event_field *field, size_t nesting) { int ret; - const struct lttng_type *elem_type; + const struct lttng_kernel_type_array *array_type; + const struct lttng_kernel_type_common *elem_type; - WARN_ON_ONCE(field->type.atype != atype_array_nestable); + array_type = lttng_kernel_get_type_array(field->type); + WARN_ON_ONCE(!array_type); - if (field->type.u.array_nestable.alignment) { + if (array_type->alignment) { ret = print_tabs(session, nesting); if (ret) return ret; ret = lttng_metadata_printf(session, "struct { } align(%u) _%s_padding;\n", - field->type.u.array_nestable.alignment * CHAR_BIT, + array_type->alignment * CHAR_BIT, field->name); if (ret) return ret; @@ -1975,12 +3302,13 @@ int _lttng_array_field_statedump(struct lttng_session *session, * Nested compound types: Only array of structures and variants are * currently supported. */ - elem_type = field->type.u.array_nestable.elem_type; - switch (elem_type->atype) { - case atype_integer: - case atype_struct_nestable: - case atype_variant_nestable: - ret = _lttng_type_statedump(session, elem_type, nesting); + elem_type = array_type->elem_type; + switch (elem_type->type) { + case lttng_kernel_type_integer: + case lttng_kernel_type_struct: + case lttng_kernel_type_variant: + ret = _lttng_type_statedump(session, elem_type, + array_type->encoding, nesting); if (ret) return ret; break; @@ -1991,7 +3319,7 @@ int _lttng_array_field_statedump(struct lttng_session *session, ret = lttng_metadata_printf(session, " _%s[%u];\n", field->name, - field->type.u.array_nestable.length); + array_type->length); return ret; } @@ -1999,25 +3327,32 @@ int _lttng_array_field_statedump(struct lttng_session *session, * Must be called with sessions_mutex held. */ static -int _lttng_sequence_field_statedump(struct lttng_session *session, - const struct lttng_event_field *field, - size_t nesting) +int _lttng_sequence_field_statedump(struct lttng_kernel_session *session, + const struct lttng_kernel_event_field *field, + size_t nesting, + const char *prev_field_name) { int ret; const char *length_name; - const struct lttng_type *elem_type; + const struct lttng_kernel_type_sequence *sequence_type; + const struct lttng_kernel_type_common *elem_type; - WARN_ON_ONCE(field->type.atype != atype_sequence_nestable); + sequence_type = lttng_kernel_get_type_sequence(field->type); + WARN_ON_ONCE(!sequence_type); - length_name = field->type.u.sequence_nestable.length_name; + length_name = sequence_type->length_name; + if (!length_name) + length_name = prev_field_name; + if (!length_name) + return -EINVAL; - if (field->type.u.sequence_nestable.alignment) { + if (sequence_type->alignment) { ret = print_tabs(session, nesting); if (ret) return ret; ret = lttng_metadata_printf(session, "struct { } align(%u) _%s_padding;\n", - field->type.u.sequence_nestable.alignment * CHAR_BIT, + sequence_type->alignment * CHAR_BIT, field->name); if (ret) return ret; @@ -2027,12 +3362,13 @@ int _lttng_sequence_field_statedump(struct lttng_session *session, * Nested compound types: Only array of structures and variants are * currently supported. */ - elem_type = field->type.u.sequence_nestable.elem_type; - switch (elem_type->atype) { - case atype_integer: - case atype_struct_nestable: - case atype_variant_nestable: - ret = _lttng_type_statedump(session, elem_type, nesting); + elem_type = sequence_type->elem_type; + switch (elem_type->type) { + case lttng_kernel_type_integer: + case lttng_kernel_type_struct: + case lttng_kernel_type_variant: + ret = _lttng_type_statedump(session, elem_type, + sequence_type->encoding, nesting); if (ret) return ret; break; @@ -2043,7 +3379,7 @@ int _lttng_sequence_field_statedump(struct lttng_session *session, ret = lttng_metadata_printf(session, " _%s[ _%s ];\n", field->name, - field->type.u.sequence_nestable.length_name); + length_name); return ret; } @@ -2051,21 +3387,21 @@ int _lttng_sequence_field_statedump(struct lttng_session *session, * Must be called with sessions_mutex held. */ static -int _lttng_enum_type_statedump(struct lttng_session *session, - const struct lttng_type *type, +int _lttng_enum_type_statedump(struct lttng_kernel_session *session, + const struct lttng_kernel_type_enum *type, size_t nesting) { - const struct lttng_enum_desc *enum_desc; - const struct lttng_type *container_type; + const struct lttng_kernel_enum_desc *enum_desc; + const struct lttng_kernel_type_common *container_type; int ret; unsigned int i, nr_entries; - container_type = type->u.enum_nestable.container_type; - if (container_type->atype != atype_integer) { + container_type = type->container_type; + if (container_type->type != lttng_kernel_type_integer) { ret = -EINVAL; goto end; } - enum_desc = type->u.enum_nestable.desc; + enum_desc = type->desc; nr_entries = enum_desc->nr_entries; ret = print_tabs(session, nesting); @@ -2074,7 +3410,8 @@ int _lttng_enum_type_statedump(struct lttng_session *session, ret = lttng_metadata_printf(session, "enum : "); if (ret) goto end; - ret = _lttng_integer_type_statedump(session, container_type, 0); + ret = _lttng_integer_type_statedump(session, lttng_kernel_get_type_integer(container_type), + lttng_kernel_string_encoding_none, 0); if (ret) goto end; ret = lttng_metadata_printf(session, " {\n"); @@ -2082,7 +3419,7 @@ int _lttng_enum_type_statedump(struct lttng_session *session, goto end; /* Dump all entries */ for (i = 0; i < nr_entries; i++) { - const struct lttng_enum_entry *entry = &enum_desc->entries[i]; + const struct lttng_kernel_enum_entry *entry = enum_desc->entries[i]; int j, len; ret = print_tabs(session, nesting + 1); @@ -2167,59 +3504,64 @@ end: * Must be called with sessions_mutex held. */ static -int _lttng_enum_field_statedump(struct lttng_session *session, - const struct lttng_event_field *field, +int _lttng_enum_field_statedump(struct lttng_kernel_session *session, + const struct lttng_kernel_event_field *field, size_t nesting) { int ret; + const struct lttng_kernel_type_enum *enum_type; - ret = _lttng_enum_type_statedump(session, &field->type, nesting); + enum_type = lttng_kernel_get_type_enum(field->type); + WARN_ON_ONCE(!enum_type); + ret = _lttng_enum_type_statedump(session, enum_type, nesting); if (ret) return ret; return lttng_field_name_statedump(session, field, nesting); } static -int _lttng_integer_field_statedump(struct lttng_session *session, - const struct lttng_event_field *field, +int _lttng_integer_field_statedump(struct lttng_kernel_session *session, + const struct lttng_kernel_event_field *field, size_t nesting) { int ret; - ret = _lttng_integer_type_statedump(session, &field->type, nesting); + ret = _lttng_integer_type_statedump(session, lttng_kernel_get_type_integer(field->type), + lttng_kernel_string_encoding_none, nesting); if (ret) return ret; return lttng_field_name_statedump(session, field, nesting); } static -int _lttng_string_type_statedump(struct lttng_session *session, - const struct lttng_type *type, +int _lttng_string_type_statedump(struct lttng_kernel_session *session, + const struct lttng_kernel_type_string *type, size_t nesting) { int ret; - WARN_ON_ONCE(type->atype != atype_string); /* Default encoding is UTF8 */ ret = print_tabs(session, nesting); if (ret) return ret; ret = lttng_metadata_printf(session, "string%s", - type->u.string.encoding == lttng_encode_ASCII ? + type->encoding == lttng_kernel_string_encoding_ASCII ? " { encoding = ASCII; }" : ""); return ret; } static -int _lttng_string_field_statedump(struct lttng_session *session, - const struct lttng_event_field *field, +int _lttng_string_field_statedump(struct lttng_kernel_session *session, + const struct lttng_kernel_event_field *field, size_t nesting) { + const struct lttng_kernel_type_string *string_type; int ret; - WARN_ON_ONCE(field->type.atype != atype_string); - ret = _lttng_string_type_statedump(session, &field->type, nesting); + string_type = lttng_kernel_get_type_string(field->type); + WARN_ON_ONCE(!string_type); + ret = _lttng_string_type_statedump(session, string_type, nesting); if (ret) return ret; return lttng_field_name_statedump(session, field, nesting); @@ -2229,32 +3571,43 @@ int _lttng_string_field_statedump(struct lttng_session *session, * Must be called with sessions_mutex held. */ static -int _lttng_type_statedump(struct lttng_session *session, - const struct lttng_type *type, +int _lttng_type_statedump(struct lttng_kernel_session *session, + const struct lttng_kernel_type_common *type, + enum lttng_kernel_string_encoding parent_encoding, size_t nesting) { int ret = 0; - switch (type->atype) { - case atype_integer: - ret = _lttng_integer_type_statedump(session, type, nesting); + switch (type->type) { + case lttng_kernel_type_integer: + ret = _lttng_integer_type_statedump(session, + lttng_kernel_get_type_integer(type), + parent_encoding, nesting); break; - case atype_enum_nestable: - ret = _lttng_enum_type_statedump(session, type, nesting); + case lttng_kernel_type_enum: + ret = _lttng_enum_type_statedump(session, + lttng_kernel_get_type_enum(type), + nesting); break; - case atype_string: - ret = _lttng_string_type_statedump(session, type, nesting); + case lttng_kernel_type_string: + ret = _lttng_string_type_statedump(session, + lttng_kernel_get_type_string(type), + nesting); break; - case atype_struct_nestable: - ret = _lttng_struct_type_statedump(session, type, nesting); + case lttng_kernel_type_struct: + ret = _lttng_struct_type_statedump(session, + lttng_kernel_get_type_struct(type), + nesting); break; - case atype_variant_nestable: - ret = _lttng_variant_type_statedump(session, type, nesting); + case lttng_kernel_type_variant: + ret = _lttng_variant_type_statedump(session, + lttng_kernel_get_type_variant(type), + nesting, NULL); break; /* Nested arrays and sequences are not supported yet. */ - case atype_array_nestable: - case atype_sequence_nestable: + case lttng_kernel_type_array: + case lttng_kernel_type_sequence: default: WARN_ON_ONCE(1); return -EINVAL; @@ -2266,55 +3619,62 @@ int _lttng_type_statedump(struct lttng_session *session, * Must be called with sessions_mutex held. */ static -int _lttng_field_statedump(struct lttng_session *session, - const struct lttng_event_field *field, - size_t nesting) +int _lttng_field_statedump(struct lttng_kernel_session *session, + const struct lttng_kernel_event_field *field, + size_t nesting, + const char **prev_field_name_p) { + const char *prev_field_name = NULL; int ret = 0; - switch (field->type.atype) { - case atype_integer: + if (prev_field_name_p) + prev_field_name = *prev_field_name_p; + switch (field->type->type) { + case lttng_kernel_type_integer: ret = _lttng_integer_field_statedump(session, field, nesting); break; - case atype_enum_nestable: + case lttng_kernel_type_enum: ret = _lttng_enum_field_statedump(session, field, nesting); break; - case atype_string: + case lttng_kernel_type_string: ret = _lttng_string_field_statedump(session, field, nesting); break; - case atype_struct_nestable: + case lttng_kernel_type_struct: ret = _lttng_struct_field_statedump(session, field, nesting); break; - case atype_array_nestable: + case lttng_kernel_type_array: ret = _lttng_array_field_statedump(session, field, nesting); break; - case atype_sequence_nestable: - ret = _lttng_sequence_field_statedump(session, field, nesting); + case lttng_kernel_type_sequence: + ret = _lttng_sequence_field_statedump(session, field, nesting, prev_field_name); break; - case atype_variant_nestable: - ret = _lttng_variant_field_statedump(session, field, nesting); + case lttng_kernel_type_variant: + ret = _lttng_variant_field_statedump(session, field, nesting, prev_field_name); break; default: WARN_ON_ONCE(1); return -EINVAL; } + if (prev_field_name_p) + *prev_field_name_p = field->name; return ret; } static -int _lttng_context_metadata_statedump(struct lttng_session *session, - struct lttng_ctx *ctx) +int _lttng_context_metadata_statedump(struct lttng_kernel_session *session, + struct lttng_kernel_ctx *ctx) { + const char *prev_field_name = NULL; int ret = 0; int i; if (!ctx) return 0; for (i = 0; i < ctx->nr_fields; i++) { - const struct lttng_ctx_field *field = &ctx->fields[i]; + const struct lttng_kernel_ctx_field *field = &ctx->fields[i]; - ret = _lttng_field_statedump(session, &field->event_field, 2); + ret = _lttng_field_statedump(session, field->event_field, 2, &prev_field_name); if (ret) return ret; } @@ -2322,17 +3682,18 @@ int _lttng_context_metadata_statedump(struct lttng_session *session, } static -int _lttng_fields_metadata_statedump(struct lttng_session *session, - struct lttng_event *event) +int _lttng_fields_metadata_statedump(struct lttng_kernel_session *session, + struct lttng_kernel_event_recorder *event_recorder) { - const struct lttng_event_desc *desc = event->desc; + const char *prev_field_name = NULL; + const struct lttng_kernel_event_desc *desc = event_recorder->priv->parent.desc; int ret = 0; int i; - for (i = 0; i < desc->nr_fields; i++) { - const struct lttng_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); + ret = _lttng_field_statedump(session, field, 2, &prev_field_name); if (ret) return ret; } @@ -2345,15 +3706,15 @@ int _lttng_fields_metadata_statedump(struct lttng_session *session, * transaction. */ static -int _lttng_event_metadata_statedump(struct lttng_session *session, - struct lttng_channel *chan, - struct lttng_event *event) +int _lttng_event_metadata_statedump(struct lttng_kernel_session *session, + struct lttng_kernel_channel_buffer *chan, + struct lttng_kernel_event_recorder *event_recorder) { int ret = 0; - if (event->metadata_dumped || !READ_ONCE(session->active)) + 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); @@ -2363,27 +3724,11 @@ int _lttng_event_metadata_statedump(struct lttng_session *session, " name = \"%s\";\n" " id = %u;\n" " stream_id = %u;\n", - event->desc->name, - event->id, - event->chan->id); - if (ret) - goto end; - - if (event->ctx) { - ret = lttng_metadata_printf(session, - " context := struct {\n"); - if (ret) - goto end; - } - ret = _lttng_context_metadata_statedump(session, event->ctx); + event_recorder->priv->parent.desc->event_name, + event_recorder->priv->id, + event_recorder->chan->priv->id); if (ret) goto end; - if (event->ctx) { - ret = lttng_metadata_printf(session, - " };\n"); - if (ret) - goto end; - } ret = lttng_metadata_printf(session, " fields := struct {\n" @@ -2391,7 +3736,7 @@ int _lttng_event_metadata_statedump(struct lttng_session *session, if (ret) goto end; - ret = _lttng_fields_metadata_statedump(session, event); + ret = _lttng_fields_metadata_statedump(session, event_recorder); if (ret) goto end; @@ -2405,7 +3750,7 @@ int _lttng_event_metadata_statedump(struct lttng_session *session, if (ret) goto end; - event->metadata_dumped = 1; + event_recorder->priv->metadata_dumped = 1; end: lttng_metadata_end(session); return ret; @@ -2418,41 +3763,41 @@ end: * transaction. */ static -int _lttng_channel_metadata_statedump(struct lttng_session *session, - struct lttng_channel *chan) +int _lttng_channel_metadata_statedump(struct lttng_kernel_session *session, + struct lttng_kernel_channel_buffer *chan) { int ret = 0; - if (chan->metadata_dumped || !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) @@ -2462,7 +3807,7 @@ int _lttng_channel_metadata_statedump(struct lttng_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; @@ -2472,7 +3817,7 @@ end: * Must be called with sessions_mutex held. */ static -int _lttng_stream_packet_context_declare(struct lttng_session *session) +int _lttng_stream_packet_context_declare(struct lttng_kernel_session *session) { return lttng_metadata_printf(session, "struct packet_context {\n" @@ -2499,7 +3844,7 @@ int _lttng_stream_packet_context_declare(struct lttng_session *session) * Must be called with sessions_mutex held. */ static -int _lttng_event_header_declare(struct lttng_session *session) +int _lttng_event_header_declare(struct lttng_kernel_session *session) { return lttng_metadata_printf(session, "struct event_header_compact {\n" @@ -2582,7 +3927,7 @@ int64_t measure_clock_offset(void) } static -int print_escaped_ctf_string(struct lttng_session *session, const char *string) +int print_escaped_ctf_string(struct lttng_kernel_session *session, const char *string) { int ret = 0; size_t i; @@ -2601,7 +3946,7 @@ int print_escaped_ctf_string(struct lttng_session *session, const char *string) if (ret) goto error; /* We still print the current char */ - /* Fallthrough */ + lttng_fallthrough; default: ret = lttng_metadata_printf(session, "%c", cur); break; @@ -2617,7 +3962,7 @@ error: } static -int print_metadata_escaped_field(struct lttng_session *session, const char *field, +int print_metadata_escaped_field(struct lttng_kernel_session *session, const char *field, const char *field_value) { int ret; @@ -2641,21 +3986,21 @@ error: * Must be called with sessions_mutex held. */ static -int _lttng_session_metadata_statedump(struct lttng_session *session) +int _lttng_session_metadata_statedump(struct lttng_kernel_session *session) { - unsigned char *uuid_c = session->uuid.b; + 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_event *event; + struct lttng_kernel_channel_buffer_private *chan_priv; + struct lttng_kernel_event_recorder_private *event_recorder_priv; int ret = 0; - if (!READ_ONCE(session->active)) + if (!LTTNG_READ_ONCE(session->active)) return 0; lttng_metadata_begin(session); - if (session->metadata_dumped) + if (session->priv->metadata_dumped) goto skip_session; snprintf(uuid_s, sizeof(uuid_s), @@ -2727,11 +4072,11 @@ int _lttng_session_metadata_statedump(struct lttng_session *session) if (ret) goto end; - ret = print_metadata_escaped_field(session, "trace_name", session->name); + ret = print_metadata_escaped_field(session, "trace_name", session->priv->name); if (ret) goto end; ret = print_metadata_escaped_field(session, "trace_creation_datetime", - session->creation_time); + session->priv->creation_time); if (ret) goto end; @@ -2814,18 +4159,19 @@ int _lttng_session_metadata_statedump(struct lttng_session *session) goto end; skip_session: - list_for_each_entry(chan, &session->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; } - list_for_each_entry(event, &session->events, list) { - ret = _lttng_event_metadata_statedump(session, event->chan, event); + 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); if (ret) goto end; } - session->metadata_dumped = 1; + session->priv->metadata_dumped = 1; end: lttng_metadata_end(session); return ret; @@ -2870,7 +4216,30 @@ void lttng_transport_unregister(struct lttng_transport *transport) } EXPORT_SYMBOL_GPL(lttng_transport_unregister); -#if (LINUX_VERSION_CODE >= KERNEL_VERSION(4,10,0)) +void lttng_counter_transport_register(struct lttng_counter_transport *transport) +{ + /* + * Make sure no page fault can be triggered by the module about to be + * registered. We deal with this here so we don't have to call + * vmalloc_sync_mappings() in each module's init. + */ + wrapper_vmalloc_sync_mappings(); + + mutex_lock(&sessions_mutex); + list_add_tail(&transport->node, <tng_counter_transport_list); + mutex_unlock(&sessions_mutex); +} +EXPORT_SYMBOL_GPL(lttng_counter_transport_register); + +void lttng_counter_transport_unregister(struct lttng_counter_transport *transport) +{ + mutex_lock(&sessions_mutex); + list_del(&transport->node); + mutex_unlock(&sessions_mutex); +} +EXPORT_SYMBOL_GPL(lttng_counter_transport_unregister); + +#if (LTTNG_LINUX_VERSION_CODE >= LTTNG_KERNEL_VERSION(4,10,0)) enum cpuhp_state lttng_hp_prepare; enum cpuhp_state lttng_hp_online; @@ -2986,7 +4355,7 @@ static void __exit lttng_exit_cpu_hotplug(void) cpuhp_remove_multi_state(lttng_hp_prepare); } -#else /* #if (LINUX_VERSION_CODE >= KERNEL_VERSION(4,10,0)) */ +#else /* #if (LTTNG_LINUX_VERSION_CODE >= LTTNG_KERNEL_VERSION(4,10,0)) */ static int lttng_init_cpu_hotplug(void) { return 0; @@ -2994,8 +4363,7 @@ static int lttng_init_cpu_hotplug(void) static void lttng_exit_cpu_hotplug(void) { } -#endif /* #else #if (LINUX_VERSION_CODE >= KERNEL_VERSION(4,10,0)) */ - +#endif /* #else #if (LTTNG_LINUX_VERSION_CODE >= LTTNG_KERNEL_VERSION(4,10,0)) */ static int __init lttng_events_init(void) { @@ -3019,10 +4387,25 @@ static int __init lttng_events_init(void) ret = lttng_tracepoint_init(); if (ret) goto error_tp; - event_cache = KMEM_CACHE(lttng_event, 0); - if (!event_cache) { + event_recorder_cache = KMEM_CACHE(lttng_kernel_event_recorder, 0); + if (!event_recorder_cache) { + ret = -ENOMEM; + goto error_kmem_event_recorder; + } + event_recorder_private_cache = KMEM_CACHE(lttng_kernel_event_recorder_private, 0); + if (!event_recorder_private_cache) { + ret = -ENOMEM; + goto error_kmem_event_recorder_private; + } + event_notifier_cache = KMEM_CACHE(lttng_kernel_event_notifier, 0); + if (!event_notifier_cache) { + ret = -ENOMEM; + goto error_kmem_event_notifier; + } + event_notifier_private_cache = KMEM_CACHE(lttng_kernel_event_notifier_private, 0); + if (!event_notifier_private_cache) { ret = -ENOMEM; - goto error_kmem; + goto error_kmem_event_notifier_private; } ret = lttng_abi_init(); if (ret) @@ -3049,6 +4432,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: @@ -3056,8 +4442,14 @@ error_hotplug: error_logger: lttng_abi_exit(); error_abi: - kmem_cache_destroy(event_cache); -error_kmem: + kmem_cache_destroy(event_notifier_private_cache); +error_kmem_event_notifier_private: + kmem_cache_destroy(event_notifier_cache); +error_kmem_event_notifier: + kmem_cache_destroy(event_recorder_private_cache); +error_kmem_event_recorder_private: + kmem_cache_destroy(event_recorder_cache); +error_kmem_event_recorder: lttng_tracepoint_exit(); error_tp: lttng_context_exit(); @@ -3084,14 +4476,17 @@ module_init(lttng_events_init); static void __exit lttng_events_exit(void) { - struct lttng_session *session, *tmpsession; + struct lttng_kernel_session_private *session_priv, *tmpsession_priv; lttng_exit_cpu_hotplug(); lttng_logger_exit(); lttng_abi_exit(); - list_for_each_entry_safe(session, tmpsession, &sessions, list) - lttng_session_destroy(session); - kmem_cache_destroy(event_cache); + list_for_each_entry_safe(session_priv, tmpsession_priv, &sessions, list) + lttng_session_destroy(session_priv->pub); + kmem_cache_destroy(event_recorder_cache); + kmem_cache_destroy(event_recorder_private_cache); + kmem_cache_destroy(event_notifier_cache); + kmem_cache_destroy(event_notifier_private_cache); lttng_tracepoint_exit(); lttng_context_exit(); printk(KERN_NOTICE "LTTng: Unloaded modules v%s.%s.%s%s (%s)%s%s\n",