static void _lttng_channel_destroy(struct lttng_kernel_channel_buffer *chan);
static int _lttng_event_unregister(struct lttng_kernel_event_common *event);
static
-int _lttng_event_metadata_statedump(struct lttng_kernel_session *session,
- struct lttng_kernel_channel_buffer *chan,
- struct lttng_kernel_event_recorder *event);
+int _lttng_event_recorder_metadata_statedump(struct lttng_kernel_event_common *event);
static
int _lttng_session_metadata_statedump(struct lttng_kernel_session *session);
static
wake_up_interruptible(&stream->read_wait);
}
+static
+bool lttng_kernel_event_id_available(struct lttng_event_enabler_common *event_enabler)
+{
+ struct lttng_kernel_abi_event *event_param = &event_enabler->event_param;
+ enum lttng_kernel_abi_instrumentation itype = event_param->instrumentation;
+
+ switch (event_enabler->enabler_type) {
+ case LTTNG_EVENT_ENABLER_TYPE_RECORDER:
+ {
+ struct lttng_event_recorder_enabler *event_recorder_enabler =
+ container_of(event_enabler, struct lttng_event_recorder_enabler, parent);
+ struct lttng_kernel_channel_buffer *chan = event_recorder_enabler->chan;
+
+ switch (itype) {
+ case LTTNG_KERNEL_ABI_TRACEPOINT:
+ lttng_fallthrough;
+ case LTTNG_KERNEL_ABI_KPROBE:
+ lttng_fallthrough;
+ case LTTNG_KERNEL_ABI_SYSCALL:
+ lttng_fallthrough;
+ case LTTNG_KERNEL_ABI_UPROBE:
+ if (chan->priv->free_event_id == -1U)
+ return false;
+ return true;
+ case LTTNG_KERNEL_ABI_KRETPROBE:
+ /* kretprobes require 2 event IDs. */
+ if (chan->priv->free_event_id >= -2U)
+ return false;
+ return true;
+ default:
+ WARN_ON_ONCE(1);
+ return false;
+ }
+ }
+ case LTTNG_EVENT_ENABLER_TYPE_NOTIFIER:
+ return true;
+ default:
+ WARN_ON_ONCE(1);
+ return false;
+ }
+}
+
static
struct lttng_kernel_event_common *lttng_kernel_event_alloc(struct lttng_event_enabler_common *event_enabler)
{
}
}
+static
+int lttng_kernel_event_notifier_clear_error_counter(struct lttng_kernel_event_common *event)
+{
+ switch (event->type) {
+ case LTTNG_KERNEL_EVENT_TYPE_RECORDER:
+ return 0;
+ case LTTNG_KERNEL_EVENT_TYPE_NOTIFIER:
+ {
+ struct lttng_kernel_event_notifier *event_notifier =
+ container_of(event, struct lttng_kernel_event_notifier, parent);
+ struct lttng_counter *error_counter;
+ struct lttng_event_notifier_group *event_notifier_group = event_notifier->priv->group;
+ size_t dimension_index[1];
+ int ret;
+
+ /*
+ * Clear the error counter bucket. The sessiond keeps track of which
+ * bucket is currently in use. We trust it. The session lock
+ * synchronizes against concurrent creation of the error
+ * counter.
+ */
+ error_counter = event_notifier_group->error_counter;
+ if (!error_counter)
+ return 0;
+ /*
+ * Check that the index is within the boundary of the counter.
+ */
+ if (event_notifier->priv->error_counter_index >= event_notifier_group->error_counter_len) {
+ printk(KERN_INFO "LTTng: event_notifier: Error counter index out-of-bound: counter-len=%zu, index=%llu\n",
+ event_notifier_group->error_counter_len, event_notifier->priv->error_counter_index);
+ return -EINVAL;
+ }
+
+ dimension_index[0] = event_notifier->priv->error_counter_index;
+ ret = error_counter->ops->counter_clear(error_counter->counter, dimension_index);
+ if (ret) {
+ printk(KERN_INFO "LTTng: event_notifier: Unable to clear error counter bucket %llu\n",
+ event_notifier->priv->error_counter_index);
+ return -EINVAL;
+ }
+ return 0;
+ }
+ default:
+ return -EINVAL;
+ }
+}
+
/*
* Supports event creation while tracing session is active.
* Needs to be called with sessions mutex held.
*/
-static
-struct lttng_kernel_event_recorder *_lttng_kernel_event_recorder_create(struct lttng_event_recorder_enabler *event_enabler,
+struct lttng_kernel_event_common *_lttng_kernel_event_create(struct lttng_event_enabler_common *event_enabler,
const struct lttng_kernel_event_desc *event_desc)
{
- struct lttng_event_ht *events_ht = lttng_get_event_ht_from_enabler(&event_enabler->parent);
- struct lttng_kernel_channel_buffer *chan = event_enabler->chan;
- struct lttng_kernel_abi_event *event_param = &event_enabler->parent.event_param;
+ struct lttng_event_ht *events_ht = lttng_get_event_ht_from_enabler(event_enabler);
+ struct list_head *event_list_head = lttng_get_event_list_head_from_enabler(event_enabler);
+ struct lttng_kernel_abi_event *event_param = &event_enabler->event_param;
enum lttng_kernel_abi_instrumentation itype = event_param->instrumentation;
struct lttng_kernel_event_common_private *event_priv;
struct lttng_kernel_event_common *event;
- struct lttng_kernel_event_recorder *event_recorder;
const char *event_name;
struct hlist_head *head;
int ret;
- if (chan->priv->free_event_id == -1U) {
+ if (!lttng_kernel_event_id_available(event_enabler)) {
ret = -EMFILE;
goto full;
}
head = utils_borrow_hash_table_bucket(events_ht->table, LTTNG_EVENT_HT_SIZE, event_name);
lttng_hlist_for_each_entry(event_priv, head, hlist_node) {
- if (lttng_event_enabler_event_name_match_event(&event_enabler->parent, event_name, event_priv->pub)) {
+ if (lttng_event_enabler_event_name_match_event(event_enabler, event_name, event_priv->pub)) {
ret = -EEXIST;
goto exist;
}
}
- event = lttng_kernel_event_alloc(&event_enabler->parent);
+ event = lttng_kernel_event_alloc(event_enabler);
if (!event) {
ret = -ENOMEM;
goto alloc_error;
}
- event_recorder = container_of(event, struct lttng_kernel_event_recorder, parent);
switch (itype) {
case LTTNG_KERNEL_ABI_TRACEPOINT:
case LTTNG_KERNEL_ABI_KRETPROBE:
{
struct lttng_kernel_event_common *event_return;
- struct lttng_kernel_event_recorder *event_recorder_return;
/* kretprobe defines 2 events */
/*
event->enabled = 0;
event->priv->registered = 1;
- event_return = lttng_kernel_event_alloc(&event_enabler->parent);
+ event_return = lttng_kernel_event_alloc(event_enabler);
if (!event) {
ret = -ENOMEM;
goto alloc_error;
}
- event_recorder_return = container_of(event_return, struct lttng_kernel_event_recorder, parent);
event_return->enabled = 0;
event_return->priv->registered = 1;
WARN_ON_ONCE(!ret);
ret = try_module_get(event_return->priv->desc->owner);
WARN_ON_ONCE(!ret);
- ret = _lttng_event_metadata_statedump(chan->parent.session, chan, event_recorder_return);
+ ret = _lttng_event_recorder_metadata_statedump(event_return);
WARN_ON_ONCE(ret > 0);
if (ret) {
lttng_kernel_event_free(event_return);
module_put(event->priv->desc->owner);
goto statedump_error;
}
- list_add(&event_return->priv->node, &chan->parent.session->priv->events);
+ list_add(&event_return->priv->node, event_list_head);
break;
}
ret = -EINVAL;
goto register_error;
}
- ret = _lttng_event_metadata_statedump(chan->parent.session, chan, event_recorder);
+
+ ret = _lttng_event_recorder_metadata_statedump(event);
WARN_ON_ONCE(ret > 0);
if (ret) {
goto statedump_error;
}
- hlist_add_head(&event->priv->hlist_node, head);
- list_add(&event->priv->node, &chan->parent.session->priv->events);
- return event_recorder;
-
-statedump_error:
- /* If a statedump error occurs, events will not be readable. */
-register_error:
- lttng_kernel_event_free(event);
-alloc_error:
-exist:
-type_error:
-full:
- return ERR_PTR(ret);
-}
-
-static
-struct lttng_kernel_event_notifier *_lttng_kernel_event_notifier_create(struct lttng_event_notifier_enabler *event_enabler,
- const struct lttng_kernel_event_desc *event_desc)
-{
- struct lttng_event_ht *events_ht = lttng_get_event_ht_from_enabler(&event_enabler->parent);
- struct lttng_event_notifier_group *event_notifier_group = event_enabler->group;
- struct lttng_kernel_abi_event *event_param = &event_enabler->parent.event_param;
- enum lttng_kernel_abi_instrumentation itype = event_param->instrumentation;
- struct lttng_kernel_event_common_private *event_priv;
- struct lttng_kernel_event_common *event;
- struct lttng_kernel_event_notifier *event_notifier;
- struct lttng_counter *error_counter;
- const char *event_name;
- struct hlist_head *head;
- int ret;
-
- switch (itype) {
- case LTTNG_KERNEL_ABI_TRACEPOINT:
- event_name = event_desc->event_name;
- break;
-
- case LTTNG_KERNEL_ABI_KPROBE:
- lttng_fallthrough;
- case LTTNG_KERNEL_ABI_UPROBE:
- lttng_fallthrough;
- case LTTNG_KERNEL_ABI_SYSCALL:
- event_name = event_param->name;
- break;
- case LTTNG_KERNEL_ABI_KRETPROBE:
- lttng_fallthrough;
- case LTTNG_KERNEL_ABI_FUNCTION:
- lttng_fallthrough;
- case LTTNG_KERNEL_ABI_NOOP:
- lttng_fallthrough;
- default:
- WARN_ON_ONCE(1);
- ret = -EINVAL;
- goto type_error;
- }
-
- head = utils_borrow_hash_table_bucket(events_ht->table, LTTNG_EVENT_HT_SIZE, event_name);
- lttng_hlist_for_each_entry(event_priv, head, hlist_node) {
- if (lttng_event_enabler_event_name_match_event(&event_enabler->parent, event_name, event_priv->pub)) {
- ret = -EEXIST;
- goto exist;
- }
- }
-
- event = lttng_kernel_event_alloc(&event_enabler->parent);
- if (!event) {
- ret = -ENOMEM;
- goto alloc_error;
- }
- event_notifier = container_of(event, struct lttng_kernel_event_notifier, parent);
-
- switch (itype) {
- case LTTNG_KERNEL_ABI_TRACEPOINT:
- /* Event will be enabled by enabler sync. */
- event->enabled = 0;
- event->priv->registered = 0;
- event->priv->desc = lttng_event_desc_get(event_name);
- if (!event->priv->desc) {
- ret = -ENOENT;
- goto register_error;
- }
- /* Populate lttng_event_notifier structure before event registration. */
- smp_wmb();
- break;
-
- case LTTNG_KERNEL_ABI_KPROBE:
- /*
- * Needs to be explicitly enabled after creation, since
- * we may want to apply filters.
- */
- event->enabled = 0;
- event->priv->registered = 1;
- /*
- * Populate lttng_event_notifier structure before event
- * registration.
- */
- smp_wmb();
- ret = lttng_kprobes_register_event(event_param->u.kprobe.symbol_name,
- event_param->u.kprobe.symbol_name,
- event_param->u.kprobe.offset,
- event_param->u.kprobe.addr,
- event);
- if (ret) {
- ret = -EINVAL;
- goto register_error;
- }
- ret = try_module_get(event->priv->desc->owner);
- WARN_ON_ONCE(!ret);
- break;
-
- case LTTNG_KERNEL_ABI_SYSCALL:
- /*
- * Needs to be explicitly enabled after creation, since
- * we may want to apply filters.
- */
- event->enabled = 0;
- event->priv->registered = 0;
- event->priv->desc = event_desc;
- switch (event_param->u.syscall.entryexit) {
- case LTTNG_KERNEL_ABI_SYSCALL_ENTRYEXIT:
- ret = -EINVAL;
- goto register_error;
- case LTTNG_KERNEL_ABI_SYSCALL_ENTRY:
- event->priv->u.syscall.entryexit = LTTNG_SYSCALL_ENTRY;
- break;
- case LTTNG_KERNEL_ABI_SYSCALL_EXIT:
- event->priv->u.syscall.entryexit = LTTNG_SYSCALL_EXIT;
- break;
- }
- switch (event_param->u.syscall.abi) {
- case LTTNG_KERNEL_ABI_SYSCALL_ABI_ALL:
- ret = -EINVAL;
- goto register_error;
- case LTTNG_KERNEL_ABI_SYSCALL_ABI_NATIVE:
- event->priv->u.syscall.abi = LTTNG_SYSCALL_ABI_NATIVE;
- break;
- case LTTNG_KERNEL_ABI_SYSCALL_ABI_COMPAT:
- event->priv->u.syscall.abi = LTTNG_SYSCALL_ABI_COMPAT;
- break;
- }
-
- if (!event->priv->desc) {
- ret = -EINVAL;
- goto register_error;
- }
- break;
-
- case LTTNG_KERNEL_ABI_UPROBE:
- /*
- * Needs to be explicitly enabled after creation, since
- * we may want to apply filters.
- */
- event->enabled = 0;
- event->priv->registered = 1;
-
- /*
- * Populate lttng_event_notifier structure before
- * event_notifier registration.
- */
- smp_wmb();
-
- ret = lttng_uprobes_register_event(event_param->name,
- event_param->u.uprobe.fd,
- event);
- if (ret)
- goto register_error;
- ret = try_module_get(event->priv->desc->owner);
- WARN_ON_ONCE(!ret);
- break;
-
- case LTTNG_KERNEL_ABI_KRETPROBE:
- lttng_fallthrough;
- case LTTNG_KERNEL_ABI_FUNCTION:
- lttng_fallthrough;
- case LTTNG_KERNEL_ABI_NOOP:
- lttng_fallthrough;
- default:
- WARN_ON_ONCE(1);
- ret = -EINVAL;
+ ret = lttng_kernel_event_notifier_clear_error_counter(event);
+ if (ret)
goto register_error;
- }
- list_add(&event->priv->node, &event_notifier_group->event_notifiers_head);
hlist_add_head(&event->priv->hlist_node, head);
+ list_add(&event->priv->node, event_list_head);
- /*
- * Clear the error counter bucket. The sessiond keeps track of which
- * bucket is currently in use. We trust it. The session lock
- * synchronizes against concurrent creation of the error
- * counter.
- */
- error_counter = event_notifier_group->error_counter;
- if (error_counter) {
- size_t dimension_index[1];
-
- /*
- * Check that the index is within the boundary of the counter.
- */
- if (event_notifier->priv->error_counter_index >= event_notifier_group->error_counter_len) {
- printk(KERN_INFO "LTTng: event_notifier: Error counter index out-of-bound: counter-len=%zu, index=%llu\n",
- event_notifier_group->error_counter_len, event_notifier->priv->error_counter_index);
- ret = -EINVAL;
- goto register_error;
- }
-
- dimension_index[0] = event_notifier->priv->error_counter_index;
- ret = error_counter->ops->counter_clear(error_counter->counter, dimension_index);
- if (ret) {
- printk(KERN_INFO "LTTng: event_notifier: Unable to clear error counter bucket %llu\n",
- event_notifier->priv->error_counter_index);
- goto register_error;
- }
- }
-
- return event_notifier;
+ return event;
+statedump_error:
+ /* If a statedump error occurs, events will not be readable. */
register_error:
lttng_kernel_event_free(event);
alloc_error:
exist:
type_error:
+full:
return ERR_PTR(ret);
}
-struct lttng_kernel_event_common *_lttng_kernel_event_create(struct lttng_event_enabler_common *event_enabler,
- const struct lttng_kernel_event_desc *event_desc)
-{
- switch (event_enabler->enabler_type) {
- case LTTNG_EVENT_ENABLER_TYPE_RECORDER:
- {
- struct lttng_event_recorder_enabler *event_recorder_enabler =
- container_of(event_enabler, struct lttng_event_recorder_enabler, parent);
- struct lttng_kernel_event_recorder *event_recorder;
-
- event_recorder = _lttng_kernel_event_recorder_create(event_recorder_enabler, event_desc);
- if (!event_recorder)
- return NULL;
- return &event_recorder->parent;
- }
- case LTTNG_EVENT_ENABLER_TYPE_NOTIFIER:
- {
- struct lttng_event_notifier_enabler *event_notifier_enabler =
- container_of(event_enabler, struct lttng_event_notifier_enabler, parent);
- struct lttng_kernel_event_notifier *event_notifier;
-
- event_notifier = _lttng_kernel_event_notifier_create(event_notifier_enabler, event_desc);
- if (!event_notifier)
- return NULL;
- return &event_notifier->parent;
- }
- default:
- return NULL;
- }
-}
-
struct lttng_kernel_event_common *lttng_kernel_event_create(struct lttng_event_enabler_common *event_enabler,
const struct lttng_kernel_event_desc *event_desc)
{
return event;
}
-
-
int lttng_kernel_counter_read(struct lttng_counter *counter,
const size_t *dim_indexes, int32_t cpu,
int64_t *val, bool *overflow, bool *underflow)
}
static
-void lttng_create_tracepoint_event_if_missing(struct lttng_event_enabler_common *event_enabler)
+void lttng_event_enabler_create_tracepoint_events_if_missing(struct lttng_event_enabler_common *event_enabler)
{
struct lttng_event_ht *events_ht = lttng_get_event_ht_from_enabler(event_enabler);
struct lttng_kernel_probe_desc *probe_desc;
}
}
-static
-void lttng_create_syscall_event_if_missing(struct lttng_event_enabler_common *event_enabler)
-{
- int ret;
-
- ret = lttng_syscalls_register_event(event_enabler);
- WARN_ON_ONCE(ret);
-}
-
/*
* Create event if it is missing and present in the list of tracepoint probes.
* Should be called with sessions mutex held.
*/
static
-void lttng_create_event_if_missing(struct lttng_event_enabler_common *event_enabler)
+void lttng_event_enabler_create_events_if_missing(struct lttng_event_enabler_common *event_enabler)
{
+ int ret;
+
switch (event_enabler->event_param.instrumentation) {
case LTTNG_KERNEL_ABI_TRACEPOINT:
- lttng_create_tracepoint_event_if_missing(event_enabler);
+ lttng_event_enabler_create_tracepoint_events_if_missing(event_enabler);
break;
case LTTNG_KERNEL_ABI_SYSCALL:
- lttng_create_syscall_event_if_missing(event_enabler);
+ ret = lttng_event_enabler_create_syscall_events_if_missing(event_enabler);
+ WARN_ON_ONCE(ret);
break;
default:
lttng_syscall_table_set_wildcard_all(event_enabler);
/* First ensure that probe events are created for this enabler. */
- lttng_create_event_if_missing(event_enabler);
+ lttng_event_enabler_create_events_if_missing(event_enabler);
/* Link the created event with its associated enabler. */
list_for_each_entry(event_priv, event_list_head, node) {
* transaction.
*/
static
-int _lttng_event_metadata_statedump(struct lttng_kernel_session *session,
- struct lttng_kernel_channel_buffer *chan,
- struct lttng_kernel_event_recorder *event_recorder)
+int _lttng_event_recorder_metadata_statedump(struct lttng_kernel_event_common *event)
{
+ struct lttng_kernel_event_recorder *event_recorder;
+ struct lttng_kernel_channel_buffer *chan;
+ struct lttng_kernel_session *session;
int ret = 0;
+ if (event->type != LTTNG_KERNEL_EVENT_TYPE_RECORDER)
+ return 0;
+ event_recorder = container_of(event, struct lttng_kernel_event_recorder, parent);
+ chan = event_recorder->chan;
+ session = chan->parent.session;
+
if (event_recorder->priv->metadata_dumped || !LTTNG_READ_ONCE(session->active))
return 0;
if (chan->priv->channel_type == METADATA_CHANNEL)
}
list_for_each_entry(event_recorder_priv, &session->priv->events, parent.node) {
- ret = _lttng_event_metadata_statedump(session, event_recorder_priv->pub->chan,
- event_recorder_priv->pub);
+ ret = _lttng_event_recorder_metadata_statedump(&event_recorder_priv->pub->parent);
if (ret)
goto end;
}