X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=liblttng-ust%2Flttng-events.c;h=113a2aeddb59f287182741dfe4f32b87e3344042;hb=refs%2Fheads%2Fsow-2020-0002-rev2;hp=f6db6e8a351d495e3e9cd2626e14fece8c21af49;hpb=53569322d40ed45abe0368ddb08eb4a2738afc37;p=deliverable%2Flttng-ust.git diff --git a/liblttng-ust/lttng-events.c b/liblttng-ust/lttng-events.c index f6db6e8a..113a2aed 100644 --- a/liblttng-ust/lttng-events.c +++ b/liblttng-ust/lttng-events.c @@ -1,44 +1,33 @@ /* - * lttng-events.c - * - * Holds LTTng per-session event registry. + * SPDX-License-Identifier: LGPL-2.1-only * * Copyright (C) 2010-2012 Mathieu Desnoyers * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; only - * version 2.1 of the License. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + * Holds LTTng per-session event registry. */ -#define _GNU_SOURCE +#define _LGPL_SOURCE #include -#include -#include -#include +#include #include +#include +#include #include #include #include #include #include #include +#include +#include +#include #include -#include "clock.h" -#include +#include #include +#include +#include #include -#include #include #include @@ -47,6 +36,7 @@ #include #include #include +#include #include #include #include "error.h" @@ -54,12 +44,18 @@ #include "lttng-ust-uuid.h" #include "tracepoint-internal.h" +#include "string-utils.h" +#include "lttng-bytecode.h" #include "lttng-tracer.h" #include "lttng-tracer-core.h" #include "lttng-ust-statedump.h" +#include "context-internal.h" +#include "ust-events-internal.h" #include "wait.h" #include "../libringbuffer/shm.h" +#include "../libcounter/counter.h" #include "jhash.h" +#include /* * All operations within this file are called by the communication @@ -67,6 +63,7 @@ */ static CDS_LIST_HEAD(sessions); +static CDS_LIST_HEAD(event_notifier_groups); struct cds_list_head *_lttng_get_sessions(void) { @@ -74,15 +71,48 @@ struct cds_list_head *_lttng_get_sessions(void) } static void _lttng_event_destroy(struct lttng_event *event); +static void _lttng_event_notifier_destroy( + struct lttng_event_notifier *event_notifier); static void _lttng_enum_destroy(struct lttng_enum *_enum); static -void lttng_session_lazy_sync_enablers(struct lttng_session *session); +void lttng_session_lazy_sync_event_enablers(struct lttng_session *session); +static +void lttng_session_sync_event_enablers(struct lttng_session *session); static -void lttng_session_sync_enablers(struct lttng_session *session); +void lttng_event_notifier_group_sync_enablers( + struct lttng_event_notifier_group *event_notifier_group); static void lttng_enabler_destroy(struct lttng_enabler *enabler); +/* + * @buf must hold at least LTTNG_UST_SYM_NAME_LEN bytes. + */ +static +int lttng_split_provider_event_name(const char *full_name, + char *buf, const char **event_name, + const char **provider_name) +{ + char *saveptr; + + if (strlen(full_name) >= LTTNG_UST_SYM_NAME_LEN) + return -1; + strcpy(buf, full_name); + *provider_name = strtok_r(buf, ":", &saveptr); /* Stops at ':' or '\0'. */ + if (!provider_name) + return -1; + *event_name = strtok_r(NULL, ":", &saveptr); /* Stops at ':' or '\0'. */ + if (!event_name) + return -1; + /* + * Ensure we don't have leftover characters. Stops at '\0'. It validates + * that neither the provider nor event name contain ':'. + */ + if (strtok_r(NULL, "", &saveptr)) + return -1; + return 0; +} + /* * Called with ust lock held. */ @@ -127,11 +157,6 @@ int lttng_loglevel_match(int loglevel, } } -void synchronize_trace(void) -{ - synchronize_rcu(); -} - struct lttng_session *lttng_session_create(void) { struct lttng_session *session; @@ -140,7 +165,7 @@ struct lttng_session *lttng_session_create(void) session = zmalloc(sizeof(struct lttng_session)); if (!session) return NULL; - if (lttng_session_context_init(&session->ctx)) { + if (lttng_context_init_all(&session->ctx)) { free(session); return NULL; } @@ -148,14 +173,111 @@ struct lttng_session *lttng_session_create(void) CDS_INIT_LIST_HEAD(&session->events_head); CDS_INIT_LIST_HEAD(&session->enums_head); CDS_INIT_LIST_HEAD(&session->enablers_head); + CDS_INIT_LIST_HEAD(&session->counters); + for (i = 0; i < LTTNG_UST_EVENT_HT_SIZE; i++) + CDS_INIT_HLIST_HEAD(&session->events_name_ht.table[i]); for (i = 0; i < LTTNG_UST_EVENT_HT_SIZE; i++) - CDS_INIT_HLIST_HEAD(&session->events_ht.table[i]); - for (i = 0; i < LTTNG_UST_ENUM_HT_SIZE; i++) CDS_INIT_HLIST_HEAD(&session->enums_ht.table[i]); cds_list_add(&session->node, &sessions); return session; } +struct lttng_counter *lttng_ust_counter_create( + const char *counter_transport_name, + size_t number_dimensions, + const size_t *max_nr_elem, + int64_t global_sum_step, + bool coalesce_hits) +{ + struct lttng_counter_transport *counter_transport = NULL; + struct lttng_counter *counter = NULL; + + counter_transport = lttng_counter_transport_find(counter_transport_name); + if (!counter_transport) + goto notransport; + counter = zmalloc(sizeof(struct lttng_counter)); + if (!counter) + goto nomem; + + counter->ops = &counter_transport->ops; + counter->transport = counter_transport; + + counter->counter = counter->ops->counter_create( + number_dimensions, max_nr_elem, global_sum_step, + -1, 0, NULL, false); + if (!counter->counter) { + goto create_error; + } + counter->parent.coalesce_hits = coalesce_hits; + + return counter; + +create_error: + free(counter); +nomem: +notransport: + return NULL; +} + +static +void lttng_ust_counter_destroy(struct lttng_counter *counter) +{ + counter->ops->counter_destroy(counter->counter); + free(counter); +} + +struct lttng_counter *lttng_session_create_counter( + struct lttng_session *session, + const char *counter_transport_name, + size_t number_dimensions, const size_t *dimensions_sizes, + int64_t global_sum_step, bool coalesce_hits) +{ + struct lttng_counter *counter; + struct lttng_event_container *container; + + counter = lttng_ust_counter_create(counter_transport_name, + number_dimensions, dimensions_sizes, global_sum_step, + coalesce_hits); + if (!counter) { + goto counter_error; + } + container = lttng_counter_get_event_container(counter); + container->type = LTTNG_EVENT_CONTAINER_COUNTER; + + container->session = session; + cds_list_add(&counter->node, &session->counters); + + return counter; + +counter_error: + return NULL; +} + +struct lttng_event_notifier_group *lttng_event_notifier_group_create(void) +{ + struct lttng_event_notifier_group *event_notifier_group; + int i; + + event_notifier_group = zmalloc(sizeof(struct lttng_event_notifier_group)); + if (!event_notifier_group) + return NULL; + + /* Add all contexts. */ + if (lttng_context_init_all(&event_notifier_group->ctx)) { + free(event_notifier_group); + return NULL; + } + + CDS_INIT_LIST_HEAD(&event_notifier_group->enablers_head); + CDS_INIT_LIST_HEAD(&event_notifier_group->event_notifiers_head); + for (i = 0; i < LTTNG_UST_EVENT_NOTIFIER_HT_SIZE; i++) + CDS_INIT_HLIST_HEAD(&event_notifier_group->event_notifiers_ht.table[i]); + + cds_list_add(&event_notifier_group->node, &event_notifier_groups); + + return event_notifier_group; +} + /* * Only used internally at session destruction. */ @@ -184,7 +306,7 @@ void register_event(struct lttng_event *event) assert(event->registered == 0); desc = event->desc; - ret = __tracepoint_probe_register(desc->name, + ret = __tracepoint_probe_register_queue_release(desc->name, desc->probe_callback, event, desc->signature); WARN_ON_ONCE(ret); @@ -192,6 +314,21 @@ void register_event(struct lttng_event *event) event->registered = 1; } +static +void register_event_notifier(struct lttng_event_notifier *event_notifier) +{ + int ret; + const struct lttng_event_desc *desc; + + assert(event_notifier->registered == 0); + desc = event_notifier->desc; + ret = __tracepoint_probe_register_queue_release(desc->name, + desc->u.ext.event_notifier_callback, event_notifier, desc->signature); + WARN_ON_ONCE(ret); + if (!ret) + event_notifier->registered = 1; +} + static void unregister_event(struct lttng_event *event) { @@ -200,7 +337,7 @@ void unregister_event(struct lttng_event *event) assert(event->registered == 1); desc = event->desc; - ret = __tracepoint_probe_unregister(desc->name, + ret = __tracepoint_probe_unregister_queue_release(desc->name, desc->probe_callback, event); WARN_ON_ONCE(ret); @@ -208,6 +345,21 @@ void unregister_event(struct lttng_event *event) event->registered = 0; } +static +void unregister_event_notifier(struct lttng_event_notifier *event_notifier) +{ + int ret; + const struct lttng_event_desc *desc; + + assert(event_notifier->registered == 1); + desc = event_notifier->desc; + ret = __tracepoint_probe_unregister_queue_release(desc->name, + desc->u.ext.event_notifier_callback, event_notifier); + WARN_ON_ONCE(ret); + if (!ret) + event_notifier->registered = 0; +} + /* * Only used internally at session destruction. */ @@ -218,21 +370,32 @@ void _lttng_event_unregister(struct lttng_event *event) unregister_event(event); } +/* + * Only used internally at session destruction. + */ +static +void _lttng_event_notifier_unregister(struct lttng_event_notifier *event_notifier) +{ + if (event_notifier->registered) + unregister_event_notifier(event_notifier); +} + void lttng_session_destroy(struct lttng_session *session) { struct lttng_channel *chan, *tmpchan; struct lttng_event *event, *tmpevent; struct lttng_enum *_enum, *tmp_enum; - struct lttng_enabler *enabler, *tmpenabler; + struct lttng_event_enabler *event_enabler, *event_tmpenabler; CMM_ACCESS_ONCE(session->active) = 0; cds_list_for_each_entry(event, &session->events_head, node) { _lttng_event_unregister(event); } - synchronize_trace(); /* Wait for in-flight events to complete */ - cds_list_for_each_entry_safe(enabler, tmpenabler, + lttng_ust_synchronize_trace(); /* Wait for in-flight events to complete */ + __tracepoint_probe_prune_release_queue(); + cds_list_for_each_entry_safe(event_enabler, event_tmpenabler, &session->enablers_head, node) - lttng_enabler_destroy(enabler); + lttng_event_enabler_destroy(event_enabler); cds_list_for_each_entry_safe(event, tmpevent, &session->events_head, node) _lttng_event_destroy(event); @@ -246,6 +409,88 @@ void lttng_session_destroy(struct lttng_session *session) free(session); } +void lttng_event_notifier_group_destroy( + struct lttng_event_notifier_group *event_notifier_group) +{ + int close_ret; + struct lttng_event_notifier_enabler *notifier_enabler, *tmpnotifier_enabler; + struct lttng_event_notifier *notifier, *tmpnotifier; + + if (!event_notifier_group) { + return; + } + + cds_list_for_each_entry(notifier, + &event_notifier_group->event_notifiers_head, node) + _lttng_event_notifier_unregister(notifier); + + lttng_ust_synchronize_trace(); + + cds_list_for_each_entry_safe(notifier_enabler, tmpnotifier_enabler, + &event_notifier_group->enablers_head, node) + lttng_event_notifier_enabler_destroy(notifier_enabler); + + cds_list_for_each_entry_safe(notifier, tmpnotifier, + &event_notifier_group->event_notifiers_head, node) + _lttng_event_notifier_destroy(notifier); + + if (event_notifier_group->error_counter) + lttng_ust_counter_destroy(event_notifier_group->error_counter); + + /* Close the notification fd to the listener of event_notifiers. */ + + lttng_ust_lock_fd_tracker(); + close_ret = close(event_notifier_group->notification_fd); + if (!close_ret) { + lttng_ust_delete_fd_from_tracker( + event_notifier_group->notification_fd); + } else { + PERROR("close"); + abort(); + } + lttng_ust_unlock_fd_tracker(); + + cds_list_del(&event_notifier_group->node); + + free(event_notifier_group); +} + +static +void lttng_enabler_destroy(struct lttng_enabler *enabler) +{ + struct lttng_ust_bytecode_node *filter_node, *tmp_filter_node; + struct lttng_ust_excluder_node *excluder_node, *tmp_excluder_node; + + if (!enabler) { + return; + } + + /* Destroy filter bytecode */ + cds_list_for_each_entry_safe(filter_node, tmp_filter_node, + &enabler->filter_bytecode_head, node) { + free(filter_node); + } + + /* Destroy excluders */ + cds_list_for_each_entry_safe(excluder_node, tmp_excluder_node, + &enabler->excluder_head, node) { + free(excluder_node); + } +} + + void lttng_event_notifier_enabler_destroy(struct lttng_event_notifier_enabler *event_notifier_enabler) +{ + if (!event_notifier_enabler) { + return; + } + + cds_list_del(&event_notifier_enabler->node); + + lttng_enabler_destroy(lttng_event_notifier_enabler_as_enabler(event_notifier_enabler)); + + free(event_notifier_enabler); +} + static int lttng_enum_create(const struct lttng_enum_desc *desc, struct lttng_session *session) @@ -253,21 +498,19 @@ int lttng_enum_create(const struct lttng_enum_desc *desc, const char *enum_name = desc->name; struct lttng_enum *_enum; struct cds_hlist_head *head; - struct cds_hlist_node *node; int ret = 0; size_t name_len = strlen(enum_name); uint32_t hash; int notify_socket; + /* Check if this enum is already registered for this session. */ hash = jhash(enum_name, name_len, 0); head = &session->enums_ht.table[hash & (LTTNG_UST_ENUM_HT_SIZE - 1)]; - cds_hlist_for_each_entry(_enum, node, head, hlist) { - assert(_enum->desc); - if (!strncmp(_enum->desc->name, desc->name, - LTTNG_UST_SYM_NAME_LEN - 1)) { - ret = -EEXIST; - goto exist; - } + + _enum = lttng_ust_enum_get_from_desc(session, desc); + if (_enum) { + ret = -EEXIST; + goto exist; } notify_socket = lttng_get_notify_socket(session->owner); @@ -316,7 +559,20 @@ int lttng_create_enum_check(const struct lttng_type *type, const struct lttng_enum_desc *enum_desc; int ret; - enum_desc = type->u.basic.enumeration.desc; + enum_desc = type->u.legacy.basic.enumeration.desc; + ret = lttng_enum_create(enum_desc, session); + if (ret && ret != -EEXIST) { + DBG("Unable to create enum error: (%d)", ret); + return ret; + } + break; + } + case atype_enum_nestable: + { + const struct lttng_enum_desc *enum_desc; + int ret; + + enum_desc = type->u.enum_nestable.desc; ret = lttng_enum_create(enum_desc, session); if (ret && ret != -EEXIST) { DBG("Unable to create enum error: (%d)", ret); @@ -331,7 +587,7 @@ int lttng_create_enum_check(const struct lttng_type *type, int ret; tag_field_generic = lttng_ust_dynamic_type_tag_field(); - enum_desc = tag_field_generic->type.u.basic.enumeration.desc; + enum_desc = tag_field_generic->type.u.enum_nestable.desc; ret = lttng_enum_create(enum_desc, session); if (ret && ret != -EEXIST) { DBG("Unable to create enum error: (%d)", ret); @@ -384,6 +640,16 @@ int lttng_create_all_ctx_enums(size_t nr_fields, return 0; } +/* + * Ensure that a state-dump will be performed for this session at the end + * of the current handle_message(). + */ +int lttng_session_statedump(struct lttng_session *session) +{ + session->statedump_pending = 1; + lttng_ust_sockinfo_session_enabled(session->owner); + return 0; +} int lttng_session_enable(struct lttng_session *session) { @@ -403,6 +669,9 @@ int lttng_session_enable(struct lttng_session *session) /* Set transient enabler state to "enabled" */ session->tstate = 1; + /* We need to sync enablers with session before activation. */ + lttng_session_sync_event_enablers(session); + /* * Snapshot the number of events per channel to know the type of header * we need to use. @@ -430,7 +699,7 @@ int lttng_session_enable(struct lttng_session *session) ret = ustcomm_register_channel(notify_socket, session, session->objd, - chan->objd, + chan->parent.objd, nr_fields, fields, &chan_id, @@ -446,15 +715,13 @@ int lttng_session_enable(struct lttng_session *session) } } - /* We need to sync enablers with session before activation. */ - lttng_session_sync_enablers(session); - /* Set atomically the state to "active" */ CMM_ACCESS_ONCE(session->active) = 1; CMM_ACCESS_ONCE(session->been_active) = 1; - session->statedump_pending = 1; - lttng_ust_sockinfo_session_enabled(session->owner); + ret = lttng_session_statedump(session); + if (ret) + return ret; end: return ret; } @@ -472,70 +739,187 @@ int lttng_session_disable(struct lttng_session *session) /* Set transient enabler state to "disabled" */ session->tstate = 0; - lttng_session_sync_enablers(session); + lttng_session_sync_event_enablers(session); end: return ret; } -int lttng_channel_enable(struct lttng_channel *channel) +int lttng_event_container_enable(struct lttng_event_container *container) { int ret = 0; - if (channel->enabled) { + if (container->enabled) { ret = -EBUSY; goto end; } /* Set transient enabler state to "enabled" */ - channel->tstate = 1; - lttng_session_sync_enablers(channel->session); - /* Set atomically the state to "enabled" */ - CMM_ACCESS_ONCE(channel->enabled) = 1; + container->tstate = 1; + lttng_session_sync_event_enablers(container->session); + /* Atomically set the state to "enabled" */ + switch (container->type) { + case LTTNG_EVENT_CONTAINER_CHANNEL: + { + struct lttng_channel *channel = caa_container_of(container, + struct lttng_channel, parent); + + CMM_ACCESS_ONCE(channel->enabled) = 1; /* Backward compatibility */ + break; + } + default: + break; + } + CMM_ACCESS_ONCE(container->enabled) = 1; end: return ret; } -int lttng_channel_disable(struct lttng_channel *channel) +int lttng_event_container_disable(struct lttng_event_container *container) { int ret = 0; - if (!channel->enabled) { + if (!container->enabled) { ret = -EBUSY; goto end; } - /* Set atomically the state to "disabled" */ - CMM_ACCESS_ONCE(channel->enabled) = 0; + /* Atomically set the state to "disabled" */ + CMM_ACCESS_ONCE(container->enabled) = 0; + switch (container->type) { + case LTTNG_EVENT_CONTAINER_CHANNEL: + { + struct lttng_channel *channel = caa_container_of(container, + struct lttng_channel, parent); + + CMM_ACCESS_ONCE(channel->enabled) = 0; /* Backward compatibility */ + break; + } + default: + break; + } /* Set transient enabler state to "enabled" */ - channel->tstate = 0; - lttng_session_sync_enablers(channel->session); + container->tstate = 0; + lttng_session_sync_event_enablers(container->session); end: return ret; } +static inline +struct cds_hlist_head *borrow_hash_table_bucket( + struct cds_hlist_head *hash_table, + unsigned int hash_table_size, + const char *name) +{ + size_t name_len; + uint32_t hash; + + name_len = strlen(name); + + hash = jhash(name, name_len, 0); + return &hash_table[hash & (hash_table_size - 1)]; +} + +static +int format_event_key(char *key_string, const struct lttng_counter_key *key, + const char *full_name) +{ + const struct lttng_counter_key_dimension *dim; + size_t i, left = LTTNG_KEY_TOKEN_STRING_LEN_MAX; + char buf[LTTNG_UST_SYM_NAME_LEN]; + const char *provider_name, *event_name; + + if (lttng_split_provider_event_name(full_name, buf, &provider_name, &event_name)) + return -EINVAL; + key_string[0] = '\0'; + if (!key || !key->nr_dimensions) + return 0; + /* Currently event keys can only be specified on a single dimension. */ + if (key->nr_dimensions != 1) + return -EINVAL; + dim = &key->key_dimensions[0]; + for (i = 0; i < dim->nr_key_tokens; i++) { + const struct lttng_key_token *token = &dim->key_tokens[i]; + size_t token_len; + const char *str; + + switch (token->type) { + case LTTNG_KEY_TOKEN_STRING: + str = token->arg.string; + break; + case LTTNG_KEY_TOKEN_EVENT_NAME: + str = event_name; + break; + case LTTNG_KEY_TOKEN_PROVIDER_NAME: + str = provider_name; + break; + default: + return -EINVAL; + } + token_len = strlen(str); + if (token_len >= left) + return -EINVAL; + strcat(key_string, str); + left -= token_len; + } + return 0; +} + +static +bool match_event_token(struct lttng_event_container *container, + struct lttng_event *event, uint64_t token) +{ + if (container->coalesce_hits) + return true; + if (event->user_token == token) + return true; + return false; +} + /* * Supports event creation while tracing session is active. */ static -int lttng_event_create(const struct lttng_event_desc *desc, - struct lttng_channel *chan) +int lttng_event_create(struct lttng_event_enabler *event_enabler, + const struct lttng_event_desc *event_desc, + const struct lttng_counter_key *key) { - const char *event_name = desc->name; + struct lttng_event_container *container = event_enabler->container; struct lttng_event *event; - struct lttng_session *session = chan->session; - struct cds_hlist_head *head; - struct cds_hlist_node *node; + struct lttng_session *session = container->session; + const char *event_name; + struct cds_hlist_head *name_head; + char key_string[LTTNG_KEY_TOKEN_STRING_LEN_MAX]; int ret = 0; - size_t name_len = strlen(event_name); - uint32_t hash; int notify_socket, loglevel; const char *uri; - hash = jhash(event_name, name_len, 0); - head = &chan->session->events_ht.table[hash & (LTTNG_UST_EVENT_HT_SIZE - 1)]; - cds_hlist_for_each_entry(event, node, head, hlist) { - assert(event->desc); - if (!strncmp(event->desc->name, desc->name, - LTTNG_UST_SYM_NAME_LEN - 1) - && chan == event->chan) { + event_name = event_desc->name; + if (format_event_key(key_string, key, event_name)) { + ret = -EINVAL; + goto type_error; + } + + name_head = borrow_hash_table_bucket(session->events_name_ht.table, + LTTNG_UST_EVENT_HT_SIZE, event_name); + cds_hlist_for_each_entry_2(event, name_head, name_hlist) { + bool same_event = false, same_container = false, same_key = false, + same_token = false; + + WARN_ON_ONCE(!event->desc); + if (event_desc) { + if (event->desc == event_desc) + same_event = true; + } else { + if (!strcmp(event_name, event->desc->name)) + same_event = true; + } + if (container == event->container) { + same_container = true; + if (match_event_token(container, event, + event_enabler->base.user_token)) + same_token = true; + } + if (key_string[0] == '\0' || !strcmp(key_string, event->key)) + same_key = true; + if (same_event && same_container && same_key && same_token) { ret = -EEXIST; goto exist; } @@ -547,7 +931,7 @@ int lttng_event_create(const struct lttng_event_desc *desc, goto socket_error; } - ret = lttng_create_all_event_enums(desc->nr_fields, desc->fields, + ret = lttng_create_all_event_enums(event_desc->nr_fields, event_desc->fields, session); if (ret < 0) { DBG("Error (%d) adding enum to session", ret); @@ -562,21 +946,26 @@ int lttng_event_create(const struct lttng_event_desc *desc, ret = -ENOMEM; goto cache_error; } - event->chan = chan; + /* for backward compatibility */ + event->chan = lttng_event_container_get_channel(container); /* Event will be enabled by enabler sync. */ event->enabled = 0; event->registered = 0; - CDS_INIT_LIST_HEAD(&event->bytecode_runtime_head); + CDS_INIT_LIST_HEAD(&event->filter_bytecode_runtime_head); CDS_INIT_LIST_HEAD(&event->enablers_ref_head); - event->desc = desc; + event->desc = event_desc; + event->container = container; + strcpy(event->key, key_string); + if (!container->coalesce_hits) + event->user_token = event_enabler->base.user_token; - if (desc->loglevel) + if (event_desc->loglevel) loglevel = *(*event->desc->loglevel); else loglevel = TRACE_DEFAULT; - if (desc->u.ext.model_emf_uri) - uri = *(desc->u.ext.model_emf_uri); + if (event_desc->u.ext.model_emf_uri) + uri = *(event_desc->u.ext.model_emf_uri); else uri = NULL; @@ -584,23 +973,23 @@ int lttng_event_create(const struct lttng_event_desc *desc, ret = ustcomm_register_event(notify_socket, session, session->objd, - chan->objd, - event_name, + container->objd, + event_desc->name, loglevel, - desc->signature, - desc->nr_fields, - desc->fields, + event_desc->signature, + event_desc->nr_fields, + event_desc->fields, uri, - &event->id); + event_enabler->base.user_token, + &event->id, + &event->counter_index); if (ret < 0) { DBG("Error (%d) registering event to sessiond", ret); goto sessiond_register_error; } - /* Populate lttng_event structure before tracepoint registration. */ - cmm_smp_wmb(); - cds_list_add(&event->node, &chan->session->events_head); - cds_hlist_add_head(&event->hlist, head); + cds_list_add(&event->node, &session->events_head); + cds_hlist_add_head(&event->name_hlist, name_head); return 0; sessiond_register_error: @@ -609,20 +998,86 @@ cache_error: create_enum_error: socket_error: exist: +type_error: + return ret; +} + +static +int lttng_event_notifier_create(const struct lttng_event_desc *desc, + uint64_t token, uint64_t error_counter_index, + struct lttng_event_notifier_group *event_notifier_group) +{ + struct lttng_event_notifier *event_notifier; + struct cds_hlist_head *head; + int ret = 0; + + /* + * Get the hashtable bucket the created lttng_event_notifier object + * should be inserted. + */ + head = borrow_hash_table_bucket( + event_notifier_group->event_notifiers_ht.table, + LTTNG_UST_EVENT_NOTIFIER_HT_SIZE, desc->name); + + event_notifier = zmalloc(sizeof(struct lttng_event_notifier)); + if (!event_notifier) { + ret = -ENOMEM; + goto error; + } + + event_notifier->group = event_notifier_group; + event_notifier->user_token = token; + event_notifier->error_counter_index = error_counter_index; + + /* Event notifier will be enabled by enabler sync. */ + event_notifier->enabled = 0; + event_notifier->registered = 0; + + CDS_INIT_LIST_HEAD(&event_notifier->filter_bytecode_runtime_head); + CDS_INIT_LIST_HEAD(&event_notifier->capture_bytecode_runtime_head); + CDS_INIT_LIST_HEAD(&event_notifier->enablers_ref_head); + event_notifier->desc = desc; + event_notifier->notification_send = lttng_event_notifier_notification_send; + + cds_list_add(&event_notifier->node, + &event_notifier_group->event_notifiers_head); + cds_hlist_add_head(&event_notifier->hlist, head); + + return 0; + +error: return ret; } static -int lttng_desc_match_wildcard_enabler(const struct lttng_event_desc *desc, +void _lttng_event_notifier_destroy(struct lttng_event_notifier *event_notifier) +{ + struct lttng_enabler_ref *enabler_ref, *tmp_enabler_ref; + + /* Remove from event_notifier list. */ + cds_list_del(&event_notifier->node); + /* Remove from event_notifier hash table. */ + cds_hlist_del(&event_notifier->hlist); + + lttng_free_event_notifier_filter_runtime(event_notifier); + + /* Free event_notifier enabler refs */ + cds_list_for_each_entry_safe(enabler_ref, tmp_enabler_ref, + &event_notifier->enablers_ref_head, node) + free(enabler_ref); + free(event_notifier); +} + +static +int lttng_desc_match_star_glob_enabler(const struct lttng_event_desc *desc, struct lttng_enabler *enabler) { int loglevel = 0; unsigned int has_loglevel = 0; - assert(enabler->type == LTTNG_ENABLER_WILDCARD); - /* Compare excluding final '*' */ - if (strncmp(desc->name, enabler->event_param.name, - strlen(enabler->event_param.name) - 1)) + assert(enabler->format_type == LTTNG_ENABLER_FORMAT_STAR_GLOB); + if (!strutils_star_glob_match(enabler->event_param.name, SIZE_MAX, + desc->name, SIZE_MAX)) return 0; if (desc->loglevel) { loglevel = *(*desc->loglevel); @@ -643,7 +1098,7 @@ int lttng_desc_match_event_enabler(const struct lttng_event_desc *desc, int loglevel = 0; unsigned int has_loglevel = 0; - assert(enabler->type == LTTNG_ENABLER_EVENT); + assert(enabler->format_type == LTTNG_ENABLER_FORMAT_EVENT); if (strcmp(desc->name, enabler->event_param.name)) return 0; if (desc->loglevel) { @@ -662,35 +1117,36 @@ static int lttng_desc_match_enabler(const struct lttng_event_desc *desc, struct lttng_enabler *enabler) { - struct lttng_ust_excluder_node *excluder; - - /* If event matches with an excluder, return 'does not match' */ - cds_list_for_each_entry(excluder, &enabler->excluder_head, node) { - int count; - - for (count = 0; count < excluder->excluder.count; count++) { - int found, len; - char *excluder_name; - - excluder_name = (char *) (excluder->excluder.names) - + count * LTTNG_UST_SYM_NAME_LEN; - len = strnlen(excluder_name, LTTNG_UST_SYM_NAME_LEN); - if (len > 0 && excluder_name[len - 1] == '*') { - found = !strncmp(desc->name, excluder_name, - len - 1); - } else { - found = !strncmp(desc->name, excluder_name, - LTTNG_UST_SYM_NAME_LEN - 1); - } - if (found) { - return 0; + switch (enabler->format_type) { + case LTTNG_ENABLER_FORMAT_STAR_GLOB: + { + struct lttng_ust_excluder_node *excluder; + + if (!lttng_desc_match_star_glob_enabler(desc, enabler)) { + return 0; + } + + /* + * If the matching event matches with an excluder, + * return 'does not match' + */ + cds_list_for_each_entry(excluder, &enabler->excluder_head, node) { + int count; + + for (count = 0; count < excluder->excluder.count; count++) { + int len; + char *excluder_name; + + excluder_name = (char *) (excluder->excluder.names) + + count * LTTNG_UST_SYM_NAME_LEN; + len = strnlen(excluder_name, LTTNG_UST_SYM_NAME_LEN); + if (len > 0 && strutils_star_glob_match(excluder_name, len, desc->name, SIZE_MAX)) + return 0; } } + return 1; } - switch (enabler->type) { - case LTTNG_ENABLER_WILDCARD: - return lttng_desc_match_wildcard_enabler(desc, enabler); - case LTTNG_ENABLER_EVENT: + case LTTNG_ENABLER_FORMAT_EVENT: return lttng_desc_match_event_enabler(desc, enabler); default: return -EINVAL; @@ -698,24 +1154,41 @@ int lttng_desc_match_enabler(const struct lttng_event_desc *desc, } static -int lttng_event_match_enabler(struct lttng_event *event, - struct lttng_enabler *enabler) +bool lttng_event_enabler_match_event(struct lttng_event_enabler *event_enabler, + struct lttng_event *event) +{ + if (lttng_desc_match_enabler(event->desc, + lttng_event_enabler_as_enabler(event_enabler)) > 0 + && event->container == event_enabler->container + && match_event_token(event->container, event, event_enabler->base.user_token)) + return true; + else + return false; +} + +static +int lttng_event_notifier_enabler_match_event_notifier( + struct lttng_event_notifier_enabler *event_notifier_enabler, + struct lttng_event_notifier *event_notifier) { - if (lttng_desc_match_enabler(event->desc, enabler) - && event->chan == enabler->chan) + bool desc_matches = lttng_desc_match_enabler(event_notifier->desc, + lttng_event_notifier_enabler_as_enabler(event_notifier_enabler)) > 0; + + if (desc_matches && event_notifier->group == event_notifier_enabler->group && + event_notifier->user_token == event_notifier_enabler->base.user_token) return 1; else return 0; } static -struct lttng_enabler_ref * lttng_event_enabler_ref(struct lttng_event *event, +struct lttng_enabler_ref *lttng_enabler_ref( + struct cds_list_head *enabler_ref_list, struct lttng_enabler *enabler) { struct lttng_enabler_ref *enabler_ref; - cds_list_for_each_entry(enabler_ref, - &event->enablers_ref_head, node) { + cds_list_for_each_entry(enabler_ref, enabler_ref_list, node) { if (enabler_ref->ref == enabler) return enabler_ref; } @@ -727,12 +1200,10 @@ struct lttng_enabler_ref * lttng_event_enabler_ref(struct lttng_event *event, * tracepoint probes. */ static -void lttng_create_event_if_missing(struct lttng_enabler *enabler) +void lttng_create_event_if_missing(struct lttng_event_enabler *event_enabler) { - struct lttng_session *session = enabler->chan->session; struct lttng_probe_desc *probe_desc; const struct lttng_event_desc *desc; - struct lttng_event *event; int i; struct cds_list_head *probe_list; @@ -744,38 +1215,20 @@ void lttng_create_event_if_missing(struct lttng_enabler *enabler) */ cds_list_for_each_entry(probe_desc, probe_list, head) { for (i = 0; i < probe_desc->nr_events; i++) { - int found = 0, ret; - struct cds_hlist_head *head; - struct cds_hlist_node *node; - const char *event_name; - size_t name_len; - uint32_t hash; + int ret; desc = probe_desc->event_desc[i]; - if (!lttng_desc_match_enabler(desc, enabler)) + if (lttng_desc_match_enabler(desc, + lttng_event_enabler_as_enabler(event_enabler)) <= 0) continue; - event_name = desc->name; - name_len = strlen(event_name); - /* - * Check if already created. - */ - hash = jhash(event_name, name_len, 0); - head = &session->events_ht.table[hash & (LTTNG_UST_EVENT_HT_SIZE - 1)]; - cds_hlist_for_each_entry(event, node, head, hlist) { - if (event->desc == desc - && event->chan == enabler->chan) - found = 1; - } - if (found) + /* Try to create an event for this event probe. */ + ret = lttng_event_create(event_enabler, + probe_desc->event_desc[i], + &event_enabler->key); + /* Skip if event is already found. */ + if (ret == -EEXIST) continue; - - /* - * We need to create an event for this - * event probe. - */ - ret = lttng_event_create(probe_desc->event_desc[i], - enabler->chan); if (ret) { DBG("Unable to create event %s, error %d\n", probe_desc->event_desc[i]->name, ret); @@ -784,27 +1237,172 @@ void lttng_create_event_if_missing(struct lttng_enabler *enabler) } } +static +void probe_provider_event_for_each(struct lttng_probe_desc *provider_desc, + void (*event_func)(struct lttng_session *session, + struct lttng_event *event), + void (*event_notifier_func)(struct lttng_event_notifier *event_notifier)) +{ + struct cds_hlist_node *node, *tmp_node; + struct cds_list_head *sessionsp; + unsigned int i; + + /* Get handle on list of sessions. */ + sessionsp = _lttng_get_sessions(); + + /* + * Iterate over all events in the probe provider descriptions and + * sessions to queue the unregistration of the events. + */ + for (i = 0; i < provider_desc->nr_events; i++) { + const struct lttng_event_desc *event_desc; + struct lttng_event_notifier_group *event_notifier_group; + struct lttng_event_notifier *event_notifier; + struct lttng_session *session; + struct cds_hlist_head *head; + struct lttng_event *event; + + event_desc = provider_desc->event_desc[i]; + + /* + * Iterate over all session to find the current event + * description. + */ + cds_list_for_each_entry(session, sessionsp, node) { + /* + * Get the list of events in the hashtable bucket and + * iterate to find the event matching this descriptor. + */ + head = borrow_hash_table_bucket( + session->events_name_ht.table, + LTTNG_UST_EVENT_HT_SIZE, event_desc->name); + + cds_hlist_for_each_entry_safe(event, node, tmp_node, head, name_hlist) { + if (event_desc == event->desc) { + event_func(session, event); + break; + } + } + } + + /* + * Iterate over all event_notifier groups to find the current event + * description. + */ + cds_list_for_each_entry(event_notifier_group, &event_notifier_groups, node) { + /* + * Get the list of event_notifiers in the hashtable bucket and + * iterate to find the event_notifier matching this + * descriptor. + */ + head = borrow_hash_table_bucket( + event_notifier_group->event_notifiers_ht.table, + LTTNG_UST_EVENT_NOTIFIER_HT_SIZE, event_desc->name); + + cds_hlist_for_each_entry_safe(event_notifier, node, tmp_node, head, hlist) { + if (event_desc == event_notifier->desc) { + event_notifier_func(event_notifier); + break; + } + } + } + } +} + +static +void _unregister_event(struct lttng_session *session, + struct lttng_event *event) +{ + _lttng_event_unregister(event); +} + +static +void _event_enum_destroy(struct lttng_session *session, + struct lttng_event *event) +{ + unsigned int i; + + /* Destroy enums of the current event. */ + for (i = 0; i < event->desc->nr_fields; i++) { + const struct lttng_enum_desc *enum_desc; + const struct lttng_event_field *field; + struct lttng_enum *curr_enum; + + field = &(event->desc->fields[i]); + switch (field->type.atype) { + case atype_enum: + enum_desc = field->type.u.legacy.basic.enumeration.desc; + break; + case atype_enum_nestable: + enum_desc = field->type.u.enum_nestable.desc; + break; + default: + continue; + } + + curr_enum = lttng_ust_enum_get_from_desc(session, enum_desc); + if (curr_enum) { + _lttng_enum_destroy(curr_enum); + } + } + + /* Destroy event. */ + _lttng_event_destroy(event); +} + /* - * Create events associated with an enabler (if not already present), + * Iterate over all the UST sessions to unregister and destroy all probes from + * the probe provider descriptor received as argument. Must me called with the + * ust_lock held. + */ +void lttng_probe_provider_unregister_events( + struct lttng_probe_desc *provider_desc) +{ + /* + * Iterate over all events in the probe provider descriptions and sessions + * to queue the unregistration of the events. + */ + probe_provider_event_for_each(provider_desc, _unregister_event, + _lttng_event_notifier_unregister); + + /* Wait for grace period. */ + lttng_ust_synchronize_trace(); + /* Prune the unregistration queue. */ + __tracepoint_probe_prune_release_queue(); + + /* + * It is now safe to destroy the events and remove them from the event list + * and hashtables. + */ + probe_provider_event_for_each(provider_desc, _event_enum_destroy, + _lttng_event_notifier_destroy); +} + +/* + * Create events associated with an event enabler (if not already present), * and add backward reference from the event to the enabler. */ static -int lttng_enabler_ref_events(struct lttng_enabler *enabler) +int lttng_event_enabler_ref_events(struct lttng_event_enabler *event_enabler) { - struct lttng_session *session = enabler->chan->session; + struct lttng_session *session = event_enabler->container->session; struct lttng_event *event; + if (!lttng_event_enabler_as_enabler(event_enabler)->enabled) + goto end; + /* First ensure that probe events are created for this enabler. */ - lttng_create_event_if_missing(enabler); + lttng_create_event_if_missing(event_enabler); /* For each event matching enabler in session event list. */ cds_list_for_each_entry(event, &session->events_head, node) { struct lttng_enabler_ref *enabler_ref; - if (!lttng_event_match_enabler(event, enabler)) + if (!lttng_event_enabler_match_event(event_enabler, event)) continue; - enabler_ref = lttng_event_enabler_ref(event, enabler); + enabler_ref = lttng_enabler_ref(&event->enablers_ref_head, + lttng_event_enabler_as_enabler(event_enabler)); if (!enabler_ref) { /* * If no backward ref, create it. @@ -813,7 +1411,8 @@ int lttng_enabler_ref_events(struct lttng_enabler *enabler) enabler_ref = zmalloc(sizeof(*enabler_ref)); if (!enabler_ref) return -ENOMEM; - enabler_ref->ref = enabler; + enabler_ref->ref = lttng_event_enabler_as_enabler( + event_enabler); cds_list_add(&enabler_ref->node, &event->enablers_ref_head); } @@ -821,10 +1420,14 @@ int lttng_enabler_ref_events(struct lttng_enabler *enabler) /* * Link filter bytecodes if not linked yet. */ - lttng_enabler_event_link_bytecode(event, enabler); + lttng_enabler_link_bytecode(event->desc, + &session->ctx, + &event->filter_bytecode_runtime_head, + <tng_event_enabler_as_enabler(event_enabler)->filter_bytecode_head); /* TODO: merge event context. */ } +end: return 0; } @@ -838,7 +1441,17 @@ int lttng_fix_pending_events(void) struct lttng_session *session; cds_list_for_each_entry(session, &sessions, node) { - lttng_session_lazy_sync_enablers(session); + lttng_session_lazy_sync_event_enablers(session); + } + return 0; +} + +int lttng_fix_pending_event_notifiers(void) +{ + struct lttng_event_notifier_group *event_notifier_group; + + cds_list_for_each_entry(event_notifier_group, &event_notifier_groups, node) { + lttng_event_notifier_group_sync_enablers(event_notifier_group); } return 0; } @@ -879,7 +1492,11 @@ void _lttng_event_destroy(struct lttng_event *event) { struct lttng_enabler_ref *enabler_ref, *tmp_enabler_ref; + /* Remove from event list. */ cds_list_del(&event->node); + /* Remove from event hash table. */ + cds_hlist_del(&event->name_hlist); + lttng_destroy_context(event->ctx); lttng_free_event_filter_runtime(event); /* Free event enabler refs */ @@ -893,6 +1510,7 @@ static void _lttng_enum_destroy(struct lttng_enum *_enum) { cds_list_del(&_enum->node); + cds_hlist_del(&_enum->hlist); free(_enum); } @@ -904,64 +1522,248 @@ void lttng_ust_events_exit(void) lttng_session_destroy(session); } +static +int copy_counter_key(struct lttng_counter_key *key, + const struct lttng_ust_counter_key *key_param) +{ + size_t i, j, nr_dimensions; + + nr_dimensions = key_param->nr_dimensions; + if (nr_dimensions > LTTNG_COUNTER_DIMENSION_MAX) + return -EINVAL; + key->nr_dimensions = nr_dimensions; + for (i = 0; i < nr_dimensions; i++) { + const struct lttng_ust_counter_key_dimension *udim = + &key_param->key_dimensions[i]; + struct lttng_counter_key_dimension *dim = + &key->key_dimensions[i]; + size_t nr_key_tokens; + + nr_key_tokens = udim->nr_key_tokens; + if (!nr_key_tokens || nr_key_tokens > LTTNG_NR_KEY_TOKEN) + return -EINVAL; + dim->nr_key_tokens = nr_key_tokens; + for (j = 0; j < nr_key_tokens; j++) { + const struct lttng_ust_key_token *utoken = + &udim->key_tokens[j]; + struct lttng_key_token *token = + &dim->key_tokens[j]; + + switch (utoken->type) { + case LTTNG_UST_KEY_TOKEN_STRING: + { + size_t len; + + token->type = LTTNG_KEY_TOKEN_STRING; + len = strnlen(utoken->arg.string, LTTNG_KEY_TOKEN_STRING_LEN_MAX); + if (!len || len >= LTTNG_KEY_TOKEN_STRING_LEN_MAX) + return -EINVAL; + strcpy(token->arg.string, utoken->arg.string); + break; + } + case LTTNG_UST_KEY_TOKEN_EVENT_NAME: + token->type = LTTNG_KEY_TOKEN_EVENT_NAME; + break; + case LTTNG_UST_KEY_TOKEN_PROVIDER_NAME: + token->type = LTTNG_KEY_TOKEN_PROVIDER_NAME; + break; + default: + return -EINVAL; + } + } + } + return 0; +} + /* * Enabler management. */ -struct lttng_enabler *lttng_enabler_create(enum lttng_enabler_type type, +struct lttng_event_enabler *lttng_event_enabler_create( + enum lttng_enabler_format_type format_type, struct lttng_ust_event *event_param, - struct lttng_channel *chan) + const struct lttng_ust_counter_key *key, + struct lttng_event_container *container) { - struct lttng_enabler *enabler; + struct lttng_event_enabler *event_enabler; - enabler = zmalloc(sizeof(*enabler)); - if (!enabler) + event_enabler = zmalloc(sizeof(*event_enabler)); + if (!event_enabler) return NULL; - enabler->type = type; - CDS_INIT_LIST_HEAD(&enabler->filter_bytecode_head); - CDS_INIT_LIST_HEAD(&enabler->excluder_head); - memcpy(&enabler->event_param, event_param, - sizeof(enabler->event_param)); - enabler->chan = chan; + event_enabler->base.format_type = format_type; + event_enabler->base.user_token = event_param->token; + CDS_INIT_LIST_HEAD(&event_enabler->base.filter_bytecode_head); + CDS_INIT_LIST_HEAD(&event_enabler->base.excluder_head); + memcpy(&event_enabler->base.event_param, event_param, + sizeof(event_enabler->base.event_param)); + event_enabler->container = container; + if (key) { + if (copy_counter_key(&event_enabler->key, key)) + return NULL; + } /* ctx left NULL */ - enabler->enabled = 0; - cds_list_add(&enabler->node, &enabler->chan->session->enablers_head); - lttng_session_lazy_sync_enablers(enabler->chan->session); - return enabler; + event_enabler->base.enabled = 0; + cds_list_add(&event_enabler->node, &event_enabler->container->session->enablers_head); + lttng_session_lazy_sync_event_enablers(event_enabler->container->session); + + return event_enabler; +} + +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_ust_event_notifier *event_notifier_param) +{ + struct lttng_event_notifier_enabler *event_notifier_enabler; + + event_notifier_enabler = zmalloc(sizeof(*event_notifier_enabler)); + if (!event_notifier_enabler) + return NULL; + event_notifier_enabler->base.format_type = format_type; + CDS_INIT_LIST_HEAD(&event_notifier_enabler->base.filter_bytecode_head); + CDS_INIT_LIST_HEAD(&event_notifier_enabler->capture_bytecode_head); + CDS_INIT_LIST_HEAD(&event_notifier_enabler->base.excluder_head); + + event_notifier_enabler->error_counter_index = event_notifier_param->error_counter_index; + event_notifier_enabler->num_captures = 0; + + event_notifier_enabler->base.user_token = event_notifier_param->event.token; + memcpy(&event_notifier_enabler->base.event_param.name, + event_notifier_param->event.name, + sizeof(event_notifier_enabler->base.event_param.name)); + event_notifier_enabler->base.event_param.instrumentation = + event_notifier_param->event.instrumentation; + event_notifier_enabler->base.event_param.loglevel = + event_notifier_param->event.loglevel; + event_notifier_enabler->base.event_param.loglevel_type = + event_notifier_param->event.loglevel_type; + + event_notifier_enabler->base.enabled = 0; + event_notifier_enabler->group = event_notifier_group; + + cds_list_add(&event_notifier_enabler->node, + &event_notifier_group->enablers_head); + + lttng_event_notifier_group_sync_enablers(event_notifier_group); + + return event_notifier_enabler; +} + +int lttng_event_enabler_enable(struct lttng_event_enabler *event_enabler) +{ + lttng_event_enabler_as_enabler(event_enabler)->enabled = 1; + lttng_session_lazy_sync_event_enablers(event_enabler->container->session); + + return 0; +} + +int lttng_event_enabler_disable(struct lttng_event_enabler *event_enabler) +{ + lttng_event_enabler_as_enabler(event_enabler)->enabled = 0; + lttng_session_lazy_sync_event_enablers(event_enabler->container->session); + + return 0; +} + +static +void _lttng_enabler_attach_filter_bytecode(struct lttng_enabler *enabler, + struct lttng_ust_bytecode_node **bytecode) +{ + (*bytecode)->enabler = enabler; + cds_list_add_tail(&(*bytecode)->node, &enabler->filter_bytecode_head); + /* Take ownership of bytecode */ + *bytecode = NULL; +} + +int lttng_event_enabler_attach_filter_bytecode(struct lttng_event_enabler *event_enabler, + struct lttng_ust_bytecode_node **bytecode) +{ + _lttng_enabler_attach_filter_bytecode( + lttng_event_enabler_as_enabler(event_enabler), bytecode); + + lttng_session_lazy_sync_event_enablers(event_enabler->container->session); + return 0; } -int lttng_enabler_enable(struct lttng_enabler *enabler) +static +void _lttng_enabler_attach_exclusion(struct lttng_enabler *enabler, + struct lttng_ust_excluder_node **excluder) +{ + (*excluder)->enabler = enabler; + cds_list_add_tail(&(*excluder)->node, &enabler->excluder_head); + /* Take ownership of excluder */ + *excluder = NULL; +} + +int lttng_event_enabler_attach_exclusion(struct lttng_event_enabler *event_enabler, + struct lttng_ust_excluder_node **excluder) +{ + _lttng_enabler_attach_exclusion( + lttng_event_enabler_as_enabler(event_enabler), excluder); + + lttng_session_lazy_sync_event_enablers(event_enabler->container->session); + return 0; +} + +int lttng_event_notifier_enabler_enable( + struct lttng_event_notifier_enabler *event_notifier_enabler) { - enabler->enabled = 1; - lttng_session_lazy_sync_enablers(enabler->chan->session); + lttng_event_notifier_enabler_as_enabler(event_notifier_enabler)->enabled = 1; + lttng_event_notifier_group_sync_enablers(event_notifier_enabler->group); + return 0; } -int lttng_enabler_disable(struct lttng_enabler *enabler) +int lttng_event_notifier_enabler_disable( + struct lttng_event_notifier_enabler *event_notifier_enabler) { - enabler->enabled = 0; - lttng_session_lazy_sync_enablers(enabler->chan->session); + lttng_event_notifier_enabler_as_enabler(event_notifier_enabler)->enabled = 0; + lttng_event_notifier_group_sync_enablers(event_notifier_enabler->group); + return 0; } -int lttng_enabler_attach_bytecode(struct lttng_enabler *enabler, - struct lttng_ust_filter_bytecode_node *bytecode) +int lttng_event_notifier_enabler_attach_filter_bytecode( + struct lttng_event_notifier_enabler *event_notifier_enabler, + struct lttng_ust_bytecode_node **bytecode) { - bytecode->enabler = enabler; - cds_list_add_tail(&bytecode->node, &enabler->filter_bytecode_head); - lttng_session_lazy_sync_enablers(enabler->chan->session); + _lttng_enabler_attach_filter_bytecode( + lttng_event_notifier_enabler_as_enabler(event_notifier_enabler), + bytecode); + + lttng_event_notifier_group_sync_enablers(event_notifier_enabler->group); return 0; } -int lttng_enabler_attach_exclusion(struct lttng_enabler *enabler, - struct lttng_ust_excluder_node *excluder) +int lttng_event_notifier_enabler_attach_capture_bytecode( + struct lttng_event_notifier_enabler *event_notifier_enabler, + struct lttng_ust_bytecode_node **bytecode) { - excluder->enabler = enabler; - cds_list_add_tail(&excluder->node, &enabler->excluder_head); - lttng_session_lazy_sync_enablers(enabler->chan->session); + (*bytecode)->enabler = lttng_event_notifier_enabler_as_enabler( + event_notifier_enabler); + cds_list_add_tail(&(*bytecode)->node, + &event_notifier_enabler->capture_bytecode_head); + /* Take ownership of bytecode */ + *bytecode = NULL; + event_notifier_enabler->num_captures++; + + lttng_event_notifier_group_sync_enablers(event_notifier_enabler->group); + return 0; +} + +int lttng_event_notifier_enabler_attach_exclusion( + struct lttng_event_notifier_enabler *event_notifier_enabler, + struct lttng_ust_excluder_node **excluder) +{ + _lttng_enabler_attach_exclusion( + lttng_event_notifier_enabler_as_enabler(event_notifier_enabler), + excluder); + + lttng_event_notifier_group_sync_enablers(event_notifier_enabler->group); return 0; } int lttng_attach_context(struct lttng_ust_context *context_param, + union ust_args *uargs, struct lttng_ctx **ctx, struct lttng_session *session) { /* @@ -996,64 +1798,73 @@ int lttng_attach_context(struct lttng_ust_context *context_param, return lttng_add_ip_to_ctx(ctx); case LTTNG_UST_CONTEXT_CPU_ID: return lttng_add_cpu_id_to_ctx(ctx); + case LTTNG_UST_CONTEXT_APP_CONTEXT: + return lttng_ust_add_app_context_to_ctx_rcu(uargs->app_context.ctxname, + ctx); + case LTTNG_UST_CONTEXT_CGROUP_NS: + return lttng_add_cgroup_ns_to_ctx(ctx); + case LTTNG_UST_CONTEXT_IPC_NS: + return lttng_add_ipc_ns_to_ctx(ctx); + case LTTNG_UST_CONTEXT_MNT_NS: + return lttng_add_mnt_ns_to_ctx(ctx); + case LTTNG_UST_CONTEXT_NET_NS: + return lttng_add_net_ns_to_ctx(ctx); + case LTTNG_UST_CONTEXT_PID_NS: + return lttng_add_pid_ns_to_ctx(ctx); + case LTTNG_UST_CONTEXT_TIME_NS: + return lttng_add_time_ns_to_ctx(ctx); + case LTTNG_UST_CONTEXT_USER_NS: + return lttng_add_user_ns_to_ctx(ctx); + case LTTNG_UST_CONTEXT_UTS_NS: + return lttng_add_uts_ns_to_ctx(ctx); + case LTTNG_UST_CONTEXT_VUID: + return lttng_add_vuid_to_ctx(ctx); + case LTTNG_UST_CONTEXT_VEUID: + return lttng_add_veuid_to_ctx(ctx); + case LTTNG_UST_CONTEXT_VSUID: + return lttng_add_vsuid_to_ctx(ctx); + case LTTNG_UST_CONTEXT_VGID: + return lttng_add_vgid_to_ctx(ctx); + case LTTNG_UST_CONTEXT_VEGID: + return lttng_add_vegid_to_ctx(ctx); + case LTTNG_UST_CONTEXT_VSGID: + return lttng_add_vsgid_to_ctx(ctx); default: return -EINVAL; } } -int lttng_enabler_attach_context(struct lttng_enabler *enabler, +int lttng_event_enabler_attach_context(struct lttng_event_enabler *enabler, struct lttng_ust_context *context_param) { -#if 0 // disabled for now. - struct lttng_session *session = enabler->chan->session; - int ret; - - ret = lttng_attach_context(context_param, &enabler->ctx, - session); - if (ret) - return ret; - lttng_session_lazy_sync_enablers(enabler->chan->session); -#endif return -ENOSYS; } -static -void lttng_enabler_destroy(struct lttng_enabler *enabler) +void lttng_event_enabler_destroy(struct lttng_event_enabler *event_enabler) { - struct lttng_ust_filter_bytecode_node *filter_node, *tmp_filter_node; - struct lttng_ust_excluder_node *excluder_node, *tmp_excluder_node; - - /* Destroy filter bytecode */ - cds_list_for_each_entry_safe(filter_node, tmp_filter_node, - &enabler->filter_bytecode_head, node) { - free(filter_node); - } - - /* Destroy excluders */ - cds_list_for_each_entry_safe(excluder_node, tmp_excluder_node, - &enabler->excluder_head, node) { - free(excluder_node); + if (!event_enabler) { + return; } + cds_list_del(&event_enabler->node); - /* Destroy contexts */ - lttng_destroy_context(enabler->ctx); + lttng_enabler_destroy(lttng_event_enabler_as_enabler(event_enabler)); - cds_list_del(&enabler->node); - free(enabler); + lttng_destroy_context(event_enabler->ctx); + free(event_enabler); } /* - * lttng_session_sync_enablers should be called just before starting a + * lttng_session_sync_event_enablers should be called just before starting a * session. */ static -void lttng_session_sync_enablers(struct lttng_session *session) +void lttng_session_sync_event_enablers(struct lttng_session *session) { - struct lttng_enabler *enabler; + struct lttng_event_enabler *event_enabler; struct lttng_event *event; - cds_list_for_each_entry(enabler, &session->enablers_head, node) - lttng_enabler_ref_events(enabler); + cds_list_for_each_entry(event_enabler, &session->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 @@ -1077,7 +1888,7 @@ 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->tstate && event->container->tstate; CMM_STORE_SHARED(event->enabled, enabled); /* @@ -1106,12 +1917,231 @@ void lttng_session_sync_enablers(struct lttng_session *session) /* Enable filters */ cds_list_for_each_entry(runtime, - &event->bytecode_runtime_head, node) { - lttng_filter_sync_state(runtime); + &event->filter_bytecode_runtime_head, node) { + lttng_bytecode_filter_sync_state(runtime); + } + } + __tracepoint_probe_prune_release_queue(); +} + +/* Support for event notifier is introduced by probe provider major version 2. */ +static +bool lttng_ust_probe_supports_event_notifier(struct lttng_probe_desc *probe_desc) +{ + return probe_desc->major >= 2; +} + +static +void lttng_create_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_probe_desc *probe_desc; + struct cds_list_head *probe_list; + int i; + + probe_list = lttng_get_probe_list_head(); + + cds_list_for_each_entry(probe_desc, probe_list, head) { + for (i = 0; i < probe_desc->nr_events; i++) { + int ret; + bool found = false; + const struct lttng_event_desc *desc; + struct lttng_event_notifier *event_notifier; + struct cds_hlist_head *head; + struct cds_hlist_node *node; + + desc = probe_desc->event_desc[i]; + + if (lttng_desc_match_enabler(desc, + lttng_event_notifier_enabler_as_enabler(event_notifier_enabler)) <= 0) + continue; + + /* + * Given the current event_notifier group, get the bucket that + * the target event_notifier would be if it was already + * created. + */ + head = borrow_hash_table_bucket( + event_notifier_group->event_notifiers_ht.table, + LTTNG_UST_EVENT_NOTIFIER_HT_SIZE, desc->name); + + cds_hlist_for_each_entry(event_notifier, node, head, hlist) { + /* + * Check if event_notifier already exists by checking + * if the event_notifier and enabler share the same + * description and id. + */ + if (event_notifier->desc == desc && + event_notifier->user_token == event_notifier_enabler->base.user_token) { + found = true; + break; + } + } + + if (found) + continue; + + /* Check that the probe supports event notifiers, else report the error. */ + if (!lttng_ust_probe_supports_event_notifier(probe_desc)) { + ERR("Probe \"%s\" contains event \"%s\" which matches an enabled event notifier, " + "but its version (%u.%u) is too old and does not implement event notifiers. " + "It needs to be recompiled against a newer version of LTTng-UST, otherwise " + "this event will not generate any notification.", + probe_desc->provider, + desc->name, + probe_desc->major, + probe_desc->minor); + continue; + } + /* + * We need to create a event_notifier for this event probe. + */ + ret = lttng_event_notifier_create(desc, + event_notifier_enabler->base.user_token, + event_notifier_enabler->error_counter_index, + event_notifier_group); + if (ret) { + DBG("Unable to create event_notifier %s, error %d\n", + probe_desc->event_desc[i]->name, ret); + } } } } +/* + * Create event_notifiers associated with a event_notifier enabler (if not already present). + */ +static +int lttng_event_notifier_enabler_ref_event_notifiers( + struct lttng_event_notifier_enabler *event_notifier_enabler) +{ + struct lttng_event_notifier_group *event_notifier_group = event_notifier_enabler->group; + struct lttng_event_notifier *event_notifier; + + /* + * Only try to create event_notifiers for enablers that are enabled, the user + * might still be attaching filter or exclusion to the + * event_notifier_enabler. + */ + if (!lttng_event_notifier_enabler_as_enabler(event_notifier_enabler)->enabled) + goto end; + + /* 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. */ + cds_list_for_each_entry(event_notifier, &event_notifier_group->event_notifiers_head, node) { + struct lttng_enabler_ref *enabler_ref; + + if (!lttng_event_notifier_enabler_match_event_notifier(event_notifier_enabler, event_notifier)) + continue; + + enabler_ref = lttng_enabler_ref(&event_notifier->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_notifier to enabler. + */ + enabler_ref = zmalloc(sizeof(*enabler_ref)); + if (!enabler_ref) + return -ENOMEM; + + enabler_ref->ref = lttng_event_notifier_enabler_as_enabler( + event_notifier_enabler); + cds_list_add(&enabler_ref->node, + &event_notifier->enablers_ref_head); + } + + /* + * Link filter bytecodes if not linked yet. + */ + lttng_enabler_link_bytecode(event_notifier->desc, + &event_notifier_group->ctx, + &event_notifier->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->desc, + &event_notifier_group->ctx, &event_notifier->capture_bytecode_runtime_head, + &event_notifier_enabler->capture_bytecode_head); + + event_notifier->num_captures = event_notifier_enabler->num_captures; + } +end: + return 0; +} + +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_event_notifier *event_notifier; + + cds_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. + */ + cds_list_for_each_entry(event_notifier, &event_notifier_group->event_notifiers_head, node) { + struct lttng_enabler_ref *enabler_ref; + struct lttng_bytecode_runtime *runtime; + int enabled = 0, has_enablers_without_bytecode = 0; + + /* Enable event_notifiers */ + cds_list_for_each_entry(enabler_ref, + &event_notifier->enablers_ref_head, node) { + if (enabler_ref->ref->enabled) { + enabled = 1; + break; + } + } + + CMM_STORE_SHARED(event_notifier->enabled, enabled); + /* + * Sync tracepoint registration with event_notifier enabled + * state. + */ + if (enabled) { + if (!event_notifier->registered) + register_event_notifier(event_notifier); + } else { + if (event_notifier->registered) + unregister_event_notifier(event_notifier); + } + + /* Check if has enablers without bytecode enabled */ + cds_list_for_each_entry(enabler_ref, + &event_notifier->enablers_ref_head, node) { + if (enabler_ref->ref->enabled + && cds_list_empty(&enabler_ref->ref->filter_bytecode_head)) { + has_enablers_without_bytecode = 1; + break; + } + } + event_notifier->has_enablers_without_bytecode = + has_enablers_without_bytecode; + + /* Enable filters */ + cds_list_for_each_entry(runtime, + &event_notifier->filter_bytecode_runtime_head, node) { + lttng_bytecode_filter_sync_state(runtime); + } + + /* Enable captures. */ + cds_list_for_each_entry(runtime, + &event_notifier->capture_bytecode_runtime_head, node) { + lttng_bytecode_capture_sync_state(runtime); + } + } + __tracepoint_probe_prune_release_queue(); +} + /* * Apply enablers to session events, adding events to session if need * be. It is required after each modification applied to an active @@ -1119,12 +2149,12 @@ void lttng_session_sync_enablers(struct lttng_session *session) * "lazy" sync means we only sync if required. */ static -void lttng_session_lazy_sync_enablers(struct lttng_session *session) +void lttng_session_lazy_sync_event_enablers(struct lttng_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); } /* @@ -1167,3 +2197,31 @@ void lttng_ust_context_set_session_provider(const char *name, } } } + +/* + * Update all event_notifier groups with the given app context. + * Called with ust lock held. + * This is invoked when an application context gets loaded/unloaded. It + * ensures the context callbacks are in sync with the application + * context (either app context callbacks, or dummy callbacks). + */ +void lttng_ust_context_set_event_notifier_group_provider(const char *name, + size_t (*get_size)(struct lttng_ctx_field *field, size_t offset), + void (*record)(struct lttng_ctx_field *field, + struct lttng_ust_lib_ring_buffer_ctx *ctx, + struct lttng_channel *chan), + void (*get_value)(struct lttng_ctx_field *field, + struct lttng_ctx_value *value)) +{ + struct lttng_event_notifier_group *event_notifier_group; + + cds_list_for_each_entry(event_notifier_group, &event_notifier_groups, node) { + int ret; + + ret = lttng_ust_context_set_provider_rcu( + &event_notifier_group->ctx, + name, get_size, record, get_value); + if (ret) + abort(); + } +}