#include <wrapper/tracepoint.h>
#include <wrapper/list.h>
#include <wrapper/types.h>
+#include <wrapper/barrier.h>
#include <lttng/kernel-version.h>
#include <lttng/events.h>
#include <lttng/lttng-bytecode.h>
#include <lttng/utils.h>
#include <ringbuffer/backend.h>
#include <ringbuffer/frontend.h>
+#include <counter/counter.h>
#include <wrapper/time.h>
#define METADATA_CACHE_DEFAULT_SIZE 4096
static void _lttng_event_destroy(struct lttng_event *event);
static void _lttng_event_notifier_destroy(struct lttng_event_notifier *event_notifier);
-static void _lttng_channel_destroy(struct lttng_channel *chan);
+static void _lttng_channel_destroy(struct lttng_channel *channel);
+static void _lttng_session_counter_destroy(struct lttng_counter *counter);
static int _lttng_event_unregister(struct lttng_event *event);
static int _lttng_event_notifier_unregister(struct lttng_event_notifier *event_notifier);
static
int _lttng_event_metadata_statedump(struct lttng_session *session,
- struct lttng_channel *chan,
struct lttng_event *event);
static
int _lttng_session_metadata_statedump(struct lttng_session *session);
const struct lttng_event_field *field,
size_t nesting);
+static bool lttng_event_container_is_metadata_channel(struct lttng_event_container *container)
+{
+ switch (container->type) {
+ case LTTNG_EVENT_CONTAINER_CHANNEL:
+ {
+ struct lttng_channel *chan = lttng_event_container_get_channel(container);
+
+ return chan->channel_type == METADATA_CHANNEL;
+ }
+ case LTTNG_EVENT_CONTAINER_COUNTER:
+ return false;
+ default:
+ return false;
+ }
+}
+
+static bool lttng_event_within_metadata_channel(struct lttng_event *event)
+{
+ return lttng_event_container_is_metadata_channel(event->container);
+}
+
void synchronize_trace(void)
{
#if (LTTNG_LINUX_VERSION_CODE >= LTTNG_KERNEL_VERSION(5,1,0))
goto err;
INIT_LIST_HEAD(&session->chan);
INIT_LIST_HEAD(&session->events);
+ INIT_LIST_HEAD(&session->counters);
lttng_guid_gen(&session->uuid);
metadata_cache = kzalloc(sizeof(struct lttng_metadata_cache),
sizeof(metadata_cache->uuid));
INIT_LIST_HEAD(&session->enablers_head);
for (i = 0; i < LTTNG_EVENT_HT_SIZE; i++)
- INIT_HLIST_HEAD(&session->events_ht.table[i]);
+ INIT_HLIST_HEAD(&session->events_name_ht.table[i]);
+ for (i = 0; i < LTTNG_EVENT_HT_SIZE; i++)
+ INIT_HLIST_HEAD(&session->events_key_ht.table[i]);
list_add(&session->list, &sessions);
session->pid_tracker.session = session;
session->pid_tracker.tracker_type = TRACKER_PID;
return NULL;
}
+static
struct lttng_counter *lttng_kernel_counter_create(
const char *counter_transport_name,
- size_t number_dimensions, const size_t *dimensions_sizes)
+ size_t number_dimensions, const size_t *dimensions_sizes,
+ bool coalesce_hits)
{
- struct lttng_counter *counter = NULL;
struct lttng_counter_transport *counter_transport = NULL;
+ struct lttng_counter *counter = NULL;
+ struct lttng_event_container *container;
counter_transport = lttng_counter_transport_find(counter_transport_name);
if (!counter_transport) {
counter = lttng_kvzalloc(sizeof(struct lttng_counter), GFP_KERNEL);
if (!counter)
goto nomem;
-
+ container = lttng_counter_get_event_container(counter);
+ container->type = LTTNG_EVENT_CONTAINER_COUNTER;
+ container->coalesce_hits = coalesce_hits;
/* Create event notifier error counter. */
counter->ops = &counter_transport->ops;
counter->transport = counter_transport;
+ mutex_init(&counter->map.lock);
counter->counter = counter->ops->counter_create(
number_dimensions, dimensions_sizes, 0);
if (!counter->counter) {
+ printk(KERN_WARNING "LTTng: Error creating counter");
goto create_error;
}
return NULL;
}
+static
+void lttng_kernel_counter_destroy(struct lttng_counter *counter)
+{
+ counter->ops->counter_destroy(counter->counter);
+ module_put(counter->transport->owner);
+ lttng_kvfree(counter->map.descriptors);
+ lttng_kvfree(counter);
+}
+
+int lttng_event_notifier_group_set_error_counter(
+ struct lttng_event_notifier_group *event_notifier_group,
+ const char *counter_transport_name,
+ size_t counter_len)
+{
+ struct lttng_counter *counter;
+ int ret;
+
+ /*
+ * Lock sessions to provide mutual exclusion against concurrent
+ * modification of trigger group, which would result in
+ * overwriting the error counter if set concurrently.
+ */
+ mutex_lock(&sessions_mutex);
+
+ if (event_notifier_group->error_counter) {
+ printk(KERN_ERR "Error counter already set in event notifier group\n");
+ ret = -EBUSY;
+ goto error;
+ }
+
+ counter = lttng_kernel_counter_create(counter_transport_name,
+ 1, &counter_len, false);
+ if (!counter) {
+ ret = -EINVAL;
+ goto error;
+ }
+
+ event_notifier_group->error_counter_len = counter_len;
+ /*
+ * store-release to publish error counter matches load-acquire
+ * in record_error. Ensures the counter is created and the
+ * error_counter_len is set before they are used.
+ */
+ lttng_smp_store_release(&event_notifier_group->error_counter,
+ counter);
+
+ mutex_unlock(&sessions_mutex);
+ return 0;
+
+error:
+ mutex_unlock(&sessions_mutex);
+ return ret;
+}
+
struct lttng_event_notifier_group *lttng_event_notifier_group_create(void)
{
struct lttng_transport *transport = NULL;
return NULL;
}
+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,
+ bool coalesce_hits)
+{
+ struct lttng_counter *counter;
+ struct lttng_event_container *container;
+
+ counter = lttng_kernel_counter_create(counter_transport_name,
+ number_dimensions, dimensions_sizes,
+ coalesce_hits);
+ if (!counter) {
+ goto counter_error;
+ }
+ container = lttng_counter_get_event_container(counter);
+
+ mutex_lock(&sessions_mutex);
+ container->session = session;
+ list_add(&counter->node, &session->counters);
+ mutex_unlock(&sessions_mutex);
+
+ return counter;
+
+counter_error:
+ return NULL;
+}
+
void metadata_cache_destroy(struct kref *kref)
{
struct lttng_metadata_cache *cache =
struct lttng_event *event, *tmpevent;
struct lttng_metadata_stream *metadata_stream;
struct lttng_event_enabler *event_enabler, *tmp_event_enabler;
+ struct lttng_counter *counter, *tmpcounter;
int ret;
mutex_lock(&sessions_mutex);
WRITE_ONCE(session->active, 0);
list_for_each_entry(chan, &session->chan, list) {
- ret = lttng_syscalls_unregister_channel(chan);
+ ret = lttng_syscalls_unregister_event_container(lttng_channel_get_event_container(chan));
+ WARN_ON(ret);
+ }
+ list_for_each_entry(counter, &session->counters, node) {
+ ret = lttng_syscalls_unregister_event_container(lttng_counter_get_event_container(counter));
WARN_ON(ret);
}
list_for_each_entry(event, &session->events, list) {
}
synchronize_trace(); /* Wait for in-flight events to complete */
list_for_each_entry(chan, &session->chan, list) {
- ret = lttng_syscalls_destroy_event(chan);
+ ret = lttng_syscalls_destroy_event_container(lttng_channel_get_event_container(chan));
+ WARN_ON(ret);
+ }
+ list_for_each_entry(counter, &session->counters, node) {
+ ret = lttng_syscalls_destroy_event_container(lttng_counter_get_event_container(counter));
WARN_ON(ret);
}
list_for_each_entry_safe(event_enabler, tmp_event_enabler,
BUG_ON(chan->channel_type == METADATA_CHANNEL);
_lttng_channel_destroy(chan);
}
+ list_for_each_entry_safe(counter, tmpcounter, &session->counters, node)
+ _lttng_session_counter_destroy(counter);
mutex_lock(&session->metadata_cache->lock);
list_for_each_entry(metadata_stream, &session->metadata_cache->metadata_stream, list)
_lttng_metadata_channel_hangup(metadata_stream);
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);
+ lttng_kernel_counter_destroy(error_counter);
event_notifier_group->error_counter = NULL;
}
return ret;
}
-int lttng_channel_enable(struct lttng_channel *channel)
+int lttng_event_container_enable(struct lttng_event_container *container)
{
int ret = 0;
mutex_lock(&sessions_mutex);
- if (channel->channel_type == METADATA_CHANNEL) {
+ if (lttng_event_container_is_metadata_channel(container)) {
ret = -EPERM;
goto end;
}
- if (channel->enabled) {
+ if (container->enabled) {
ret = -EEXIST;
goto end;
}
/* Set transient enabler state to "enabled" */
- channel->tstate = 1;
- lttng_session_sync_event_enablers(channel->session);
+ container->tstate = 1;
+ lttng_session_sync_event_enablers(container->session);
/* Set atomically the state to "enabled" */
- WRITE_ONCE(channel->enabled, 1);
+ WRITE_ONCE(container->enabled, 1);
end:
mutex_unlock(&sessions_mutex);
return ret;
}
-int lttng_channel_disable(struct lttng_channel *channel)
+int lttng_event_container_disable(struct lttng_event_container *container)
{
int ret = 0;
mutex_lock(&sessions_mutex);
- if (channel->channel_type == METADATA_CHANNEL) {
+ if (lttng_event_container_is_metadata_channel(container)) {
ret = -EPERM;
goto end;
}
- if (!channel->enabled) {
+ if (!container->enabled) {
ret = -EEXIST;
goto end;
}
/* Set atomically the state to "disabled" */
- WRITE_ONCE(channel->enabled, 0);
+ WRITE_ONCE(container->enabled, 0);
/* Set transient enabler state to "enabled" */
- channel->tstate = 0;
- lttng_session_sync_event_enablers(channel->session);
+ container->tstate = 0;
+ lttng_session_sync_event_enablers(container->session);
end:
mutex_unlock(&sessions_mutex);
return ret;
int ret = 0;
mutex_lock(&sessions_mutex);
- if (event->chan->channel_type == METADATA_CHANNEL) {
+ if (lttng_event_within_metadata_channel(event)) {
ret = -EPERM;
goto end;
}
int ret = 0;
mutex_lock(&sessions_mutex);
- if (event->chan->channel_type == METADATA_CHANNEL) {
+ if (lttng_event_within_metadata_channel(event)) {
ret = -EPERM;
goto end;
}
unsigned int read_timer_interval,
enum channel_type channel_type)
{
- struct lttng_channel *chan;
+ struct lttng_event_container *container;
+ struct lttng_channel *chan = NULL;
struct lttng_transport *transport = NULL;
mutex_lock(&sessions_mutex);
printk(KERN_WARNING "LTTng: Can't lock transport module.\n");
goto notransport;
}
- chan = kzalloc(sizeof(struct lttng_channel), GFP_KERNEL);
+ chan = lttng_kvzalloc(sizeof(struct lttng_channel), GFP_KERNEL);
if (!chan)
goto nomem;
- chan->session = session;
+ container = lttng_channel_get_event_container(chan);
+ container->type = LTTNG_EVENT_CONTAINER_CHANNEL;
+ container->session = session;
+ container->tstate = 1;
+ container->enabled = 1;
+ /*
+ * The ring buffer always coalesces hits from various event
+ * enablers matching a given event to a single event record within the
+ * ring buffer.
+ */
+ container->coalesce_hits = true;
+
chan->id = session->free_chan_id++;
chan->ops = &transport->ops;
/*
* should be already accessible.
*/
chan->chan = transport->ops.channel_create(transport_name,
- chan, buf_addr, subbuf_size, num_subbuf,
+ container, buf_addr, subbuf_size, num_subbuf,
switch_timer_interval, read_timer_interval);
if (!chan->chan)
goto create_error;
- chan->tstate = 1;
- chan->enabled = 1;
chan->transport = transport;
chan->channel_type = channel_type;
list_add(&chan->list, &session->chan);
return chan;
create_error:
- kfree(chan);
+ lttng_kvfree(chan);
nomem:
if (transport)
module_put(transport->owner);
return NULL;
}
+static
+void _lttng_session_counter_destroy(struct lttng_counter *counter)
+{
+ list_del(&counter->node);
+ lttng_kernel_counter_destroy(counter);
+}
+
/*
* Only used internally at session destruction for per-cpu channels, and
* when metadata channel is released.
module_put(chan->transport->owner);
list_del(&chan->list);
lttng_destroy_context(chan->ctx);
- kfree(chan);
+ lttng_kvfree(chan);
}
void lttng_metadata_channel_destroy(struct lttng_channel *chan)
{
BUG_ON(chan->channel_type != METADATA_CHANNEL);
-
/* Protect the metadata cache with the sessions_mutex. */
mutex_lock(&sessions_mutex);
_lttng_channel_destroy(chan);
wake_up_interruptible(&stream->read_wait);
}
+static
+bool lttng_event_container_current_id_full(struct lttng_event_container *container)
+{
+ switch (container->type) {
+ case LTTNG_EVENT_CONTAINER_CHANNEL:
+ {
+ struct lttng_channel *channel = lttng_event_container_get_channel(container);
+
+ return channel->free_event_id == -1U;
+ }
+ case LTTNG_EVENT_CONTAINER_COUNTER:
+ {
+ struct lttng_counter *counter = lttng_event_container_get_counter(container);
+ size_t nr_dimensions, max_nr_elem;
+
+ if (lttng_counter_get_nr_dimensions(&counter->counter->config,
+ counter->counter, &nr_dimensions))
+ return true;
+ WARN_ON_ONCE(nr_dimensions != 1);
+ if (nr_dimensions != 1)
+ return true;
+ if (lttng_counter_get_max_nr_elem(&counter->counter->config,
+ counter->counter, &max_nr_elem))
+ return true;
+ return counter->free_index >= max_nr_elem;
+ }
+ default:
+ WARN_ON_ONCE(1);
+ return true;
+ }
+}
+
+
+static
+int lttng_event_container_allocate_id(struct lttng_event_container *container,
+ const char *key_string, size_t *id)
+{
+ struct lttng_session *session = container->session;
+ struct lttng_event *event;
+
+ if (key_string[0]) {
+ struct hlist_head *head;
+
+ head = utils_borrow_hash_table_bucket(session->events_key_ht.table,
+ LTTNG_EVENT_HT_SIZE, key_string);
+ lttng_hlist_for_each_entry(event, head, key_hlist) {
+ if (!strcmp(key_string, event->key)) {
+ /* Same key, use same id. */
+ *id = event->id;
+ return 0;
+ }
+ }
+ }
+
+ if (lttng_event_container_current_id_full(container)) {
+ return -EMFILE;
+ }
+
+ switch (container->type) {
+ case LTTNG_EVENT_CONTAINER_CHANNEL:
+ {
+ struct lttng_channel *channel = lttng_event_container_get_channel(container);
+ *id = channel->free_event_id++;
+ break;
+ }
+ case LTTNG_EVENT_CONTAINER_COUNTER:
+ {
+ struct lttng_counter *counter = lttng_event_container_get_counter(container);
+ *id = counter->free_index++;
+ break;
+ }
+ default:
+ WARN_ON_ONCE(1);
+ return 0;
+ }
+
+ return 0;
+}
+
+static
+int format_event_key(char *key_string, const struct lttng_counter_key *key,
+ const char *event_name)
+{
+ const struct lttng_counter_key_dimension *dim;
+ size_t i, left = LTTNG_KEY_TOKEN_STRING_LEN_MAX;
+
+ 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;
+ 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;
+}
+
+static
+int lttng_counter_append_descriptor(struct lttng_counter *counter,
+ uint64_t user_token,
+ size_t index,
+ const char *key)
+{
+ struct lttng_counter_map *map = &counter->map;
+ struct lttng_counter_map_descriptor *last;
+ int ret = 0;
+
+ if (strlen(key) >= LTTNG_KERNEL_COUNTER_KEY_LEN) {
+ WARN_ON_ONCE(1);
+ return -EOVERFLOW;
+ }
+ mutex_lock(&map->lock);
+ if (map->nr_descriptors == map->alloc_len) {
+ struct lttng_counter_map_descriptor *new_table, *old_table;
+ size_t old_len = map->nr_descriptors;
+ size_t new_len = max_t(size_t, old_len + 1, map->alloc_len * 2);
+
+ old_table = map->descriptors;
+ new_table = lttng_kvzalloc(sizeof(struct lttng_counter_map_descriptor) * new_len,
+ GFP_KERNEL);
+ if (!new_table) {
+ ret = -ENOMEM;
+ goto unlock;
+ }
+
+ if (old_table)
+ memcpy(new_table, old_table, old_len * sizeof(struct lttng_counter_map_descriptor));
+
+ map->descriptors = new_table;
+ map->alloc_len = new_len;
+ lttng_kvfree(old_table);
+ }
+ last = &map->descriptors[map->nr_descriptors++];
+ last->user_token = user_token;
+ last->array_index = index;
+ strcpy(last->key, key);
+unlock:
+ mutex_unlock(&map->lock);
+ return ret;
+}
/*
* 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_event *_lttng_event_create(struct lttng_event_container *container,
struct lttng_kernel_event *event_param,
+ const struct lttng_counter_key *key,
void *filter,
const struct lttng_event_desc *event_desc,
- enum lttng_kernel_instrumentation itype)
+ enum lttng_kernel_instrumentation itype,
+ uint64_t token)
{
- struct lttng_session *session = chan->session;
+ struct lttng_session *session;
struct lttng_event *event;
- const char *event_name;
- struct hlist_head *head;
+ char event_name[LTTNG_KERNEL_SYM_NAME_LEN];
+ struct hlist_head *name_head, *key_head;
+ char key_string[LTTNG_KEY_TOKEN_STRING_LEN_MAX];
int ret;
- if (chan->free_event_id == -1U) {
- ret = -EMFILE;
- goto full;
- }
-
+ session = container->session;
switch (itype) {
case LTTNG_KERNEL_TRACEPOINT:
- event_name = event_desc->name;
+ if (strlen(event_desc->name) >= LTTNG_KERNEL_SYM_NAME_LEN) {
+ ret = -EINVAL;
+ goto type_error;
+ }
+ strcpy(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:
- event_name = event_param->name;
+ if (strlen(event_param->name) >= LTTNG_KERNEL_SYM_NAME_LEN) {
+ ret = -EINVAL;
+ goto type_error;
+ }
+ strcpy(event_name, event_param->name);
+ break;
+ case LTTNG_KERNEL_KRETPROBE:
+ if (strlen(event_param->name) >= LTTNG_KERNEL_SYM_NAME_LEN) {
+ ret = -EINVAL;
+ goto type_error;
+ }
+ strcpy(event_name, event_param->name);
+ if (strlen(event_name) + strlen("_entry") >= LTTNG_KERNEL_SYM_NAME_LEN) {
+ ret = -EINVAL;
+ goto type_error;
+ }
+ strcat(event_name, "_entry");
break;
case LTTNG_KERNEL_FUNCTION: /* Fall-through. */
+ case LTTNG_KERNEL_NOOP: /* Fall-through. */
default:
WARN_ON_ONCE(1);
ret = -EINVAL;
goto type_error;
}
- head = utils_borrow_hash_table_bucket(session->events_ht.table,
+ if (format_event_key(key_string, key, event_name)) {
+ ret = -EINVAL;
+ goto type_error;
+ }
+
+ name_head = utils_borrow_hash_table_bucket(session->events_name_ht.table,
LTTNG_EVENT_HT_SIZE, event_name);
- lttng_hlist_for_each_entry(event, head, hlist) {
+ lttng_hlist_for_each_entry(event, name_head, name_hlist) {
+ bool same_event = false, same_container = false, same_key = false,
+ same_token = false;
+
WARN_ON_ONCE(!event->desc);
- if (!strncmp(event->desc->name, event_name,
- LTTNG_KERNEL_SYM_NAME_LEN - 1)
- && chan == event->chan) {
+ 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, 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;
}
ret = -ENOMEM;
goto cache_error;
}
- event->chan = chan;
+ event->container = container;
event->filter = filter;
- event->id = chan->free_event_id++;
event->instrumentation = itype;
event->evtype = LTTNG_TYPE_EVENT;
+ if (!container->coalesce_hits)
+ event->user_token = token;
INIT_LIST_HEAD(&event->filter_bytecode_runtime_head);
INIT_LIST_HEAD(&event->enablers_ref_head);
+ if (lttng_event_container_allocate_id(container, key_string,
+ &event->id)) {
+ ret = -EMFILE;
+ goto full;
+ }
+ if (key_string[0]) {
+ key_head = utils_borrow_hash_table_bucket(session->events_key_ht.table,
+ LTTNG_EVENT_HT_SIZE, key_string);
+ hlist_add_head(&event->key_hlist, key_head);
+ }
+ strcpy(event->key, key_string);
switch (itype) {
case LTTNG_KERNEL_TRACEPOINT:
ret = -EINVAL;
goto register_error;
}
+ event->u.kprobe.user_token = token;
ret = try_module_get(event->desc->owner);
WARN_ON_ONCE(!ret);
+
+ /* Append descriptor to counter. */
+ switch (container->type) {
+ case LTTNG_EVENT_CONTAINER_COUNTER:
+ {
+ struct lttng_counter *counter;
+ const char *name = "<UNKNOWN>";
+ int ret;
+
+ counter = lttng_event_container_get_counter(container);
+ if (event->key[0])
+ name = event->key;
+ else
+ name = event_name;
+ ret = lttng_counter_append_descriptor(counter,
+ token, event->id,
+ name);
+ if (ret) {
+ WARN_ON_ONCE(1);
+ }
+ break;
+ }
+ case LTTNG_EVENT_CONTAINER_CHANNEL:
+ default:
+ break;
+ }
break;
case LTTNG_KERNEL_KRETPROBE:
{
*/
event->enabled = 0;
event->registered = 1;
+ event->u.kretprobe.user_token = token;
+
+ /* Append descriptor to counter. */
+ switch (container->type) {
+ case LTTNG_EVENT_CONTAINER_COUNTER:
+ {
+ struct lttng_counter *counter;
+ const char *name = "<UNKNOWN>";
+ int ret;
+
+ counter = lttng_event_container_get_counter(container);
+ if (event->key[0])
+ name = event->key;
+ else
+ name = event_name;
+ ret = lttng_counter_append_descriptor(counter,
+ token, event->id,
+ name);
+ if (ret) {
+ WARN_ON_ONCE(1);
+ }
+ break;
+ }
+ case LTTNG_EVENT_CONTAINER_CHANNEL:
+ default:
+ break;
+ }
+
event_return =
kmem_cache_zalloc(event_cache, GFP_KERNEL);
if (!event_return) {
ret = -ENOMEM;
goto register_error;
}
- event_return->chan = chan;
+ event_return->container = container;
event_return->filter = filter;
- event_return->id = chan->free_event_id++;
+
+ strcpy(event_name, event_param->name);
+ if (strlen(event_name) + strlen("_return") >= LTTNG_KERNEL_SYM_NAME_LEN) {
+ ret = -EINVAL;
+ goto register_error;
+ }
+ strcat(event_name, "_return");
+ if (format_event_key(key_string, key, event_name)) {
+ ret = -EINVAL;
+ goto register_error;
+ }
+ if (lttng_event_container_allocate_id(container, key_string, &event_return->id)) {
+ kmem_cache_free(event_cache, event_return);
+ ret = -EMFILE;
+ goto register_error;
+ }
+ key_head = utils_borrow_hash_table_bucket(session->events_key_ht.table,
+ LTTNG_EVENT_HT_SIZE, key_string);
+ hlist_add_head(&event_return->key_hlist, key_head);
event_return->enabled = 0;
event_return->registered = 1;
event_return->instrumentation = itype;
INIT_LIST_HEAD(&event_return->filter_bytecode_runtime_head);
INIT_LIST_HEAD(&event_return->enablers_ref_head);
+ event_return->u.kretprobe.user_token = token;
+ strcpy(event_return->key, key_string);
/*
* Populate lttng_event structure before kretprobe registration.
*/
WARN_ON_ONCE(!ret);
ret = try_module_get(event->desc->owner);
WARN_ON_ONCE(!ret);
- ret = _lttng_event_metadata_statedump(chan->session, chan,
- event_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);
- goto statedump_error;
+
+ /* Append exit descriptor to counter. */
+ switch (container->type) {
+ case LTTNG_EVENT_CONTAINER_COUNTER:
+ {
+ struct lttng_counter *counter;
+ const char *name = "<UNKNOWN>";
+ int ret;
+
+ counter = lttng_event_container_get_counter(container);
+ if (event_return->key[0])
+ name = event_return->key;
+ else
+ name = event_name;
+ ret = lttng_counter_append_descriptor(counter,
+ token, event_return->id,
+ name);
+ if (ret) {
+ WARN_ON_ONCE(1);
+ }
+ break;
+ }
+ case LTTNG_EVENT_CONTAINER_CHANNEL:
+ default:
+ break;
}
- list_add(&event_return->list, &chan->session->events);
+ switch (container->type) {
+ case LTTNG_EVENT_CONTAINER_CHANNEL:
+ ret = _lttng_event_metadata_statedump(session, event_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);
+ goto statedump_error;
+ }
+ break;
+ case LTTNG_EVENT_CONTAINER_COUNTER:
+ default:
+ break;
+ }
+ list_add(&event_return->list, &session->events);
break;
}
- case LTTNG_KERNEL_NOOP:
case LTTNG_KERNEL_SYSCALL:
/*
* Needs to be explicitly enabled after creation, since
*/
event->enabled = 0;
event->registered = 1;
+ event->u.uprobe.user_token = token;
/*
* Populate lttng_event structure before event
*/
smp_wmb();
- ret = lttng_uprobes_register_event(event_param->name,
+ ret = lttng_uprobes_register_event(event_name,
event_param->u.uprobe.fd,
event);
if (ret)
goto register_error;
ret = try_module_get(event->desc->owner);
WARN_ON_ONCE(!ret);
+
+ /* Append descriptor to counter. */
+ switch (container->type) {
+ case LTTNG_EVENT_CONTAINER_COUNTER:
+ {
+ struct lttng_counter *counter;
+ const char *name = "<UNKNOWN>";
+ int ret;
+
+ counter = lttng_event_container_get_counter(container);
+ if (event->key[0])
+ name = event->key;
+ else
+ name = event_name;
+ ret = lttng_counter_append_descriptor(counter,
+ token, event->id,
+ name);
+ if (ret) {
+ WARN_ON_ONCE(1);
+ }
+ break;
+ }
+ case LTTNG_EVENT_CONTAINER_CHANNEL:
+ default:
+ break;
+ }
break;
- case LTTNG_KERNEL_FUNCTION: /* Fall-through */
+ case LTTNG_KERNEL_FUNCTION: /* Fall-through. */
+ case LTTNG_KERNEL_NOOP: /* Fall-through.*/
default:
WARN_ON_ONCE(1);
ret = -EINVAL;
goto register_error;
}
- ret = _lttng_event_metadata_statedump(chan->session, chan, event);
- WARN_ON_ONCE(ret > 0);
- if (ret) {
- goto statedump_error;
+ switch (container->type) {
+ case LTTNG_EVENT_CONTAINER_CHANNEL:
+ ret = _lttng_event_metadata_statedump(session, event);
+ WARN_ON_ONCE(ret > 0);
+ if (ret) {
+ goto statedump_error;
+ }
+ break;
+ case LTTNG_EVENT_CONTAINER_COUNTER:
+ default:
+ break;
}
- hlist_add_head(&event->hlist, head);
- list_add(&event->list, &chan->session->events);
+ hlist_add_head(&event->name_hlist, name_head);
+ list_add(&event->list, &session->events);
return event;
statedump_error:
/* If a statedump error occurs, events will not be readable. */
register_error:
+full:
kmem_cache_free(event_cache, event);
cache_error:
exist:
type_error:
-full:
return ERR_PTR(ret);
}
return counter->ops->counter_clear(counter->counter, dim_indexes);
}
-struct lttng_event *lttng_event_create(struct lttng_channel *chan,
+struct lttng_event *lttng_event_create(struct lttng_event_container *container,
struct lttng_kernel_event *event_param,
+ const struct lttng_counter_key *key,
void *filter,
const struct lttng_event_desc *event_desc,
- enum lttng_kernel_instrumentation itype)
+ enum lttng_kernel_instrumentation itype,
+ uint64_t token)
{
struct lttng_event *event;
mutex_lock(&sessions_mutex);
- event = _lttng_event_create(chan, event_param, filter, event_desc,
- itype);
+ event = _lttng_event_create(container, event_param, key, filter, event_desc,
+ itype, token);
mutex_unlock(&sessions_mutex);
return event;
}
switch (event->instrumentation) {
case LTTNG_KERNEL_TRACEPOINT:
ret = lttng_wrapper_tracepoint_probe_register(desc->kname,
- desc->probe_callback,
- event);
+ desc->probe_callback, event);
break;
case LTTNG_KERNEL_SYSCALL:
- ret = lttng_syscall_filter_enable_event(event->chan, event);
+ ret = lttng_syscall_filter_enable_event(event->container, event);
break;
case LTTNG_KERNEL_KPROBE:
case LTTNG_KERNEL_UPROBE:
switch (event->instrumentation) {
case LTTNG_KERNEL_TRACEPOINT:
ret = lttng_wrapper_tracepoint_probe_unregister(event->desc->kname,
- event->desc->probe_callback,
- event);
+ event->desc->probe_callback, event);
break;
case LTTNG_KERNEL_KPROBE:
lttng_kprobes_unregister_event(event);
ret = 0;
break;
case LTTNG_KERNEL_SYSCALL:
- ret = lttng_syscall_filter_disable_event(event->chan, event);
+ ret = lttng_syscall_filter_disable_event(event->container, event);
break;
case LTTNG_KERNEL_NOOP:
ret = 0;
}
static
-int lttng_event_enabler_match_event(struct lttng_event_enabler *event_enabler,
+bool lttng_event_enabler_match_event(struct lttng_event_enabler *event_enabler,
struct lttng_event *event)
{
struct lttng_enabler *base_enabler = lttng_event_enabler_as_enabler(
event_enabler);
- if (base_enabler->event_param.instrumentation != event->instrumentation)
- return 0;
- if (lttng_desc_match_enabler(event->desc, base_enabler)
- && event->chan == event_enabler->chan)
- return 1;
+ if (base_enabler->event_param.instrumentation == event->instrumentation
+ && lttng_desc_match_enabler(event->desc, base_enabler) > 0
+ && event->container == event_enabler->container
+ && match_event_token(event->container, event, event_enabler->base.user_token))
+ return true;
else
- return 0;
+ return false;
}
static
if (base_enabler->event_param.instrumentation != event_notifier->instrumentation)
return 0;
- if (lttng_desc_match_enabler(event_notifier->desc, base_enabler)
+ if (lttng_desc_match_enabler(event_notifier->desc, base_enabler) > 0
&& event_notifier->group == event_notifier_enabler->group
&& event_notifier->user_token == event_notifier_enabler->base.user_token)
return 1;
static
void lttng_create_tracepoint_event_if_missing(struct lttng_event_enabler *event_enabler)
{
- struct lttng_session *session = event_enabler->chan->session;
struct lttng_probe_desc *probe_desc;
const struct lttng_event_desc *desc;
int i;
*/
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_event *event;
desc = probe_desc->event_desc[i];
- if (!lttng_desc_match_enabler(desc,
- lttng_event_enabler_as_enabler(event_enabler)))
+ if (lttng_desc_match_enabler(desc,
+ lttng_event_enabler_as_enabler(event_enabler)) <= 0)
continue;
- /*
- * Check if already created.
- */
- head = utils_borrow_hash_table_bucket(
- session->events_ht.table, LTTNG_EVENT_HT_SIZE,
- desc->name);
- lttng_hlist_for_each_entry(event, head, hlist) {
- if (event->desc == desc
- && event->chan == event_enabler->chan)
- found = 1;
- }
- if (found)
+ /* Try to create an event for this event probe. */
+ event = _lttng_event_create(event_enabler->container,
+ NULL, &event_enabler->key, NULL, desc,
+ LTTNG_KERNEL_TRACEPOINT,
+ event_enabler->base.user_token);
+ /* Skip if event is already found. */
+ if (IS_ERR(event) && PTR_ERR(event) == -EEXIST)
continue;
-
- /*
- * We need to create an event for this
- * event probe.
- */
- event = _lttng_event_create(event_enabler->chan,
- NULL, NULL, desc,
- LTTNG_KERNEL_TRACEPOINT);
- if (!event) {
+ if (IS_ERR(event)) {
printk(KERN_INFO "LTTng: Unable to create event %s\n",
probe_desc->event_desc[i]->name);
}
struct lttng_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)))
+ if (lttng_desc_match_enabler(desc,
+ lttng_event_notifier_enabler_as_enabler(event_notifier_enabler)) <= 0)
continue;
/*
static
int lttng_event_enabler_ref_events(struct lttng_event_enabler *event_enabler)
{
- struct lttng_channel *chan = event_enabler->chan;
- struct lttng_session *session = event_enabler->chan->session;
+ struct lttng_event_container *container = event_enabler->container;
+ struct lttng_session *session = container->session;
struct lttng_enabler *base_enabler = lttng_event_enabler_as_enabler(event_enabler);
struct lttng_event *event;
enum lttng_kernel_syscall_entryexit entryexit = base_enabler->event_param.u.syscall.entryexit;
if (entryexit == LTTNG_KERNEL_SYSCALL_ENTRY || entryexit == LTTNG_KERNEL_SYSCALL_ENTRYEXIT)
- WRITE_ONCE(chan->syscall_all_entry, enabled);
+ WRITE_ONCE(container->syscall_all_entry, enabled);
if (entryexit == LTTNG_KERNEL_SYSCALL_EXIT || entryexit == LTTNG_KERNEL_SYSCALL_ENTRYEXIT)
- WRITE_ONCE(chan->syscall_all_exit, enabled);
+ WRITE_ONCE(container->syscall_all_exit, enabled);
}
/* First ensure that probe events are created for this enabler. */
enabler_ref->ref = lttng_event_enabler_as_enabler(event_enabler);
list_add(&enabler_ref->node,
&event->enablers_ref_head);
+ /* Append descriptor to counter. */
+ switch (container->type) {
+ case LTTNG_EVENT_CONTAINER_COUNTER:
+ {
+ struct lttng_counter *counter;
+ const char *name = "<UNKNOWN>";
+ int ret;
+
+ counter = lttng_event_container_get_counter(container);
+ if (event->key[0])
+ name = event->key;
+ else if (event->desc && event->desc->name)
+ name = event->desc->name;
+ ret = lttng_counter_append_descriptor(counter,
+ event_enabler->base.user_token, event->id,
+ name);
+ if (ret) {
+ WARN_ON_ONCE(1);
+ return ret;
+ }
+ break;
+ }
+ case LTTNG_EVENT_CONTAINER_CHANNEL:
+ default:
+ break;
+ }
}
/*
struct lttng_event_enabler *lttng_event_enabler_create(
enum lttng_enabler_format_type format_type,
struct lttng_kernel_event *event_param,
- struct lttng_channel *chan)
+ const struct lttng_counter_key *key,
+ struct lttng_event_container *container)
{
struct lttng_event_enabler *event_enabler;
INIT_LIST_HEAD(&event_enabler->base.filter_bytecode_head);
memcpy(&event_enabler->base.event_param, event_param,
sizeof(event_enabler->base.event_param));
- event_enabler->chan = chan;
+ event_enabler->container = container;
/* ctx left NULL */
event_enabler->base.enabled = 0;
event_enabler->base.evtype = LTTNG_TYPE_ENABLER;
+ event_enabler->base.user_token = event_param->token;
+ if (key)
+ event_enabler->key = *key;
mutex_lock(&sessions_mutex);
- list_add(&event_enabler->node, &event_enabler->chan->session->enablers_head);
- lttng_session_lazy_sync_event_enablers(event_enabler->chan->session);
+ list_add(&event_enabler->node, &event_enabler->container->session->enablers_head);
+ lttng_session_lazy_sync_event_enablers(event_enabler->container->session);
mutex_unlock(&sessions_mutex);
return event_enabler;
}
{
mutex_lock(&sessions_mutex);
lttng_event_enabler_as_enabler(event_enabler)->enabled = 1;
- lttng_session_lazy_sync_event_enablers(event_enabler->chan->session);
+ lttng_session_lazy_sync_event_enablers(event_enabler->container->session);
mutex_unlock(&sessions_mutex);
return 0;
}
{
mutex_lock(&sessions_mutex);
lttng_event_enabler_as_enabler(event_enabler)->enabled = 0;
- lttng_session_lazy_sync_event_enablers(event_enabler->chan->session);
+ lttng_session_lazy_sync_event_enablers(event_enabler->container->session);
mutex_unlock(&sessions_mutex);
return 0;
}
if (ret)
goto error;
- lttng_session_lazy_sync_event_enablers(event_enabler->chan->session);
+ lttng_session_lazy_sync_event_enablers(event_enabler->container->session);
return 0;
error:
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
+ * and its event container and session transient states are enabled, we
* enable the event, else we disable it.
*/
list_for_each_entry(event, &session->events, list) {
}
/*
* Enabled state is based on union of enablers, with
- * intesection of session and channel transient enable
+ * intesection of session and event container transient enable
* states.
*/
- enabled = enabled && session->tstate && event->chan->tstate;
+ enabled = enabled && session->tstate && event->container->tstate;
WRITE_ONCE(event->enabled, enabled);
/*
list_for_each_entry(runtime,
&event_notifier->capture_bytecode_runtime_head, node)
lttng_bytecode_capture_sync_state(runtime);
+
+ WRITE_ONCE(event_notifier->eval_capture, !!event_notifier->num_captures);
}
}
*/
static
int _lttng_event_metadata_statedump(struct lttng_session *session,
- struct lttng_channel *chan,
struct lttng_event *event)
{
+ struct lttng_channel *chan;
int ret = 0;
+ WARN_ON_ONCE(event->container->type != LTTNG_EVENT_CONTAINER_CHANNEL);
+ chan = lttng_event_container_get_channel(event->container);
if (event->metadata_dumped || !LTTNG_READ_ONCE(session->active))
return 0;
if (chan->channel_type == METADATA_CHANNEL)
ret = lttng_metadata_printf(session,
"event {\n"
" name = \"%s\";\n"
- " id = %u;\n"
+ " id = %zu;\n"
" stream_id = %u;\n",
event->desc->name,
event->id,
- event->chan->id);
+ chan->id);
if (ret)
goto end;
}
list_for_each_entry(event, &session->events, list) {
- ret = _lttng_event_metadata_statedump(session, event->chan, event);
+ /* Skip counter container. */
+ if (event->container->type != LTTNG_EVENT_CONTAINER_CHANNEL)
+ continue;
+ ret = _lttng_event_metadata_statedump(session, event);
if (ret)
goto end;
}
projects / deliverable / lttng-modules.git / blobdiff