static void lttng_session_lazy_sync_event_enablers(struct lttng_kernel_session *session);
static void lttng_session_sync_event_enablers(struct lttng_kernel_session *session);
-static void lttng_event_notifier_enabler_destroy(struct lttng_event_notifier_enabler *event_notifier_enabler);
static void lttng_event_notifier_group_sync_enablers(struct lttng_event_notifier_group *event_notifier_group);
+static void lttng_event_enabler_sync(struct lttng_event_enabler_common *event_enabler);
static void _lttng_event_destroy(struct lttng_kernel_event_common *event);
static void _lttng_channel_destroy(struct lttng_kernel_channel_buffer *chan);
-static int _lttng_event_unregister(struct lttng_kernel_event_recorder *event);
-static int _lttng_event_notifier_unregister(struct lttng_kernel_event_notifier *event_notifier);
+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,
INIT_LIST_HEAD(&event_notifier_group->enablers_head);
INIT_LIST_HEAD(&event_notifier_group->event_notifiers_head);
- for (i = 0; i < LTTNG_EVENT_NOTIFIER_HT_SIZE; i++)
- INIT_HLIST_HEAD(&event_notifier_group->event_notifiers_ht.table[i]);
+ for (i = 0; i < LTTNG_EVENT_HT_SIZE; i++)
+ INIT_HLIST_HEAD(&event_notifier_group->events_ht.table[i]);
list_add(&event_notifier_group->node, &event_notifier_groups);
struct lttng_kernel_channel_buffer_private *chan_priv, *tmpchan_priv;
struct lttng_kernel_event_recorder_private *event_recorder_priv, *tmpevent_recorder_priv;
struct lttng_metadata_stream *metadata_stream;
- struct lttng_event_enabler *event_enabler, *tmp_event_enabler;
+ struct lttng_event_recorder_enabler *event_recorder_enabler, *tmp_event_recorder_enabler;
int ret;
mutex_lock(&sessions_mutex);
WRITE_ONCE(session->active, 0);
list_for_each_entry(chan_priv, &session->priv->chan, node) {
- ret = lttng_syscalls_unregister_channel(chan_priv->pub);
+ ret = lttng_syscalls_unregister_syscall_table(&chan_priv->parent.syscall_table);
WARN_ON(ret);
}
list_for_each_entry(event_recorder_priv, &session->priv->events, node) {
- ret = _lttng_event_unregister(event_recorder_priv->pub);
+ ret = _lttng_event_unregister(&event_recorder_priv->pub->parent);
WARN_ON(ret);
}
synchronize_trace(); /* Wait for in-flight events to complete */
list_for_each_entry(chan_priv, &session->priv->chan, node) {
- ret = lttng_syscalls_destroy_event(chan_priv->pub);
+ ret = lttng_syscalls_destroy_syscall_table(&chan_priv->parent.syscall_table);
WARN_ON(ret);
}
- list_for_each_entry_safe(event_enabler, tmp_event_enabler,
+ list_for_each_entry_safe(event_recorder_enabler, tmp_event_recorder_enabler,
&session->priv->enablers_head, node)
- lttng_event_enabler_destroy(event_enabler);
+ lttng_event_enabler_destroy(&event_recorder_enabler->parent);
list_for_each_entry_safe(event_recorder_priv, tmpevent_recorder_priv, &session->priv->events, node)
_lttng_event_destroy(&event_recorder_priv->pub->parent);
list_for_each_entry_safe(chan_priv, tmpchan_priv, &session->priv->chan, node) {
mutex_lock(&sessions_mutex);
- ret = lttng_syscalls_unregister_event_notifier_group(event_notifier_group);
+ ret = lttng_syscalls_unregister_syscall_table(&event_notifier_group->syscall_table);
WARN_ON(ret);
list_for_each_entry_safe(event_notifier_priv, tmpevent_notifier_priv,
&event_notifier_group->event_notifiers_head, node) {
- ret = _lttng_event_notifier_unregister(event_notifier_priv->pub);
+ ret = _lttng_event_unregister(&event_notifier_priv->pub->parent);
WARN_ON(ret);
}
irq_work_sync(&event_notifier_group->wakeup_pending);
- kfree(event_notifier_group->syscall_table.sc_filter);
+ ret = lttng_syscalls_destroy_syscall_table(&event_notifier_group->syscall_table);
+ WARN_ON(ret);
list_for_each_entry_safe(event_notifier_enabler, tmp_event_notifier_enabler,
&event_notifier_group->enablers_head, node)
- lttng_event_notifier_enabler_destroy(event_notifier_enabler);
+ lttng_event_enabler_destroy(&event_notifier_enabler->parent);
list_for_each_entry_safe(event_notifier_priv, tmpevent_notifier_priv,
&event_notifier_group->event_notifiers_head, node)
return ret;
}
-int lttng_channel_enable(struct lttng_kernel_channel_buffer *channel)
+static
+bool is_channel_buffer_metadata(struct lttng_kernel_channel_common *channel)
+{
+ struct lttng_kernel_channel_buffer *chan_buf;
+
+ if (channel->type != LTTNG_KERNEL_CHANNEL_TYPE_BUFFER)
+ return false;
+ chan_buf = container_of(channel, struct lttng_kernel_channel_buffer, parent);
+ if (chan_buf->priv->channel_type == METADATA_CHANNEL)
+ return true;
+ return false;
+}
+
+int lttng_channel_enable(struct lttng_kernel_channel_common *channel)
{
int ret = 0;
mutex_lock(&sessions_mutex);
- if (channel->priv->channel_type == METADATA_CHANNEL) {
+ if (is_channel_buffer_metadata(channel)) {
ret = -EPERM;
goto end;
}
- if (channel->parent.enabled) {
+ if (channel->enabled) {
ret = -EEXIST;
goto end;
}
/* Set transient enabler state to "enabled" */
- channel->priv->parent.tstate = 1;
- lttng_session_sync_event_enablers(channel->parent.session);
+ channel->priv->tstate = 1;
+ lttng_session_sync_event_enablers(channel->session);
/* Set atomically the state to "enabled" */
- WRITE_ONCE(channel->parent.enabled, 1);
+ WRITE_ONCE(channel->enabled, 1);
end:
mutex_unlock(&sessions_mutex);
return ret;
}
-int lttng_channel_disable(struct lttng_kernel_channel_buffer *channel)
+int lttng_channel_disable(struct lttng_kernel_channel_common *channel)
{
int ret = 0;
mutex_lock(&sessions_mutex);
- if (channel->priv->channel_type == METADATA_CHANNEL) {
+ if (is_channel_buffer_metadata(channel)) {
ret = -EPERM;
goto end;
}
- if (!channel->parent.enabled) {
+ if (!channel->enabled) {
ret = -EEXIST;
goto end;
}
/* Set atomically the state to "disabled" */
- WRITE_ONCE(channel->parent.enabled, 0);
+ WRITE_ONCE(channel->enabled, 0);
/* Set transient enabler state to "enabled" */
- channel->priv->parent.tstate = 0;
- lttng_session_sync_event_enablers(channel->parent.session);
+ channel->priv->tstate = 0;
+ lttng_session_sync_event_enablers(channel->session);
end:
mutex_unlock(&sessions_mutex);
return ret;
return ret;
}
-struct lttng_kernel_channel_buffer *lttng_channel_create(struct lttng_kernel_session *session,
+struct lttng_kernel_channel_buffer *lttng_channel_buffer_create(struct lttng_kernel_session *session,
const char *transport_name,
void *buf_addr,
size_t subbuf_size, size_t num_subbuf,
* Supports event creation while tracing session is active.
* Needs to be called with sessions mutex held.
*/
-struct lttng_kernel_event_recorder *_lttng_kernel_event_recorder_create(struct lttng_event_enabler *event_enabler,
+static
+struct lttng_kernel_event_recorder *_lttng_kernel_event_recorder_create(struct lttng_event_recorder_enabler *event_enabler,
const struct lttng_kernel_event_desc *event_desc)
{
+ struct lttng_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;
enum lttng_kernel_abi_instrumentation itype = event_param->instrumentation;
- struct lttng_kernel_session *session = chan->parent.session;
struct lttng_kernel_event_recorder *event_recorder;
struct lttng_kernel_event_recorder_private *event_recorder_priv;
+ struct lttng_kernel_event_common_private *event_priv;
const char *event_name;
struct hlist_head *head;
int ret;
goto type_error;
}
- head = utils_borrow_hash_table_bucket(session->priv->events_ht.table,
- LTTNG_EVENT_HT_SIZE, event_name);
- lttng_hlist_for_each_entry(event_recorder_priv, head, hlist) {
- WARN_ON_ONCE(!event_recorder_priv->parent.desc);
- if (!strncmp(event_recorder_priv->parent.desc->event_name, event_name,
+ 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) {
+ event_recorder_priv = container_of(event_priv, struct lttng_kernel_event_recorder_private, parent);
+
+ WARN_ON_ONCE(!event_priv->desc);
+ if (!strncmp(event_priv->desc->event_name, event_name,
LTTNG_KERNEL_ABI_SYM_NAME_LEN - 1)
&& chan == event_recorder_priv->pub->chan) {
ret = -EEXIST;
event_param->u.kprobe.symbol_name,
event_param->u.kprobe.offset,
event_param->u.kprobe.addr,
- event_recorder);
+ &event_recorder->parent);
if (ret) {
ret = -EINVAL;
goto register_error;
event_param->u.kretprobe.symbol_name,
event_param->u.kretprobe.offset,
event_param->u.kretprobe.addr,
- event_recorder, event_recorder_return);
+ &event_recorder->parent, &event_recorder_return->parent);
if (ret) {
kmem_cache_free(event_recorder_private_cache, event_recorder_return_priv);
kmem_cache_free(event_recorder_cache, event_recorder_return);
ret = lttng_uprobes_register_event(event_param->name,
event_param->u.uprobe.fd,
- event_recorder);
+ &event_recorder->parent);
if (ret)
goto register_error;
ret = try_module_get(event_recorder->priv->parent.desc->owner);
if (ret) {
goto statedump_error;
}
- hlist_add_head(&event_recorder->priv->hlist, head);
+ hlist_add_head(&event_recorder->priv->parent.hlist_node, head);
list_add(&event_recorder->priv->node, &chan->parent.session->priv->events);
return event_recorder;
return ERR_PTR(ret);
}
-struct lttng_kernel_event_notifier *_lttng_event_notifier_create(
- const struct lttng_kernel_event_desc *event_desc,
- uint64_t token, uint64_t error_counter_index,
- struct lttng_event_notifier_group *event_notifier_group,
- struct lttng_kernel_abi_event_notifier *event_notifier_param,
- enum lttng_kernel_abi_instrumentation itype)
+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;
+ uint64_t token = event_enabler->parent.user_token;
+ enum lttng_kernel_abi_instrumentation itype = event_param->instrumentation;
struct lttng_kernel_event_notifier *event_notifier;
struct lttng_kernel_event_notifier_private *event_notifier_priv;
+ struct lttng_kernel_event_common_private *event_priv;
struct lttng_counter *error_counter;
const char *event_name;
struct hlist_head *head;
case LTTNG_KERNEL_ABI_UPROBE:
lttng_fallthrough;
case LTTNG_KERNEL_ABI_SYSCALL:
- event_name = event_notifier_param->event.name;
+ event_name = event_param->name;
break;
case LTTNG_KERNEL_ABI_KRETPROBE:
goto type_error;
}
- head = utils_borrow_hash_table_bucket(event_notifier_group->event_notifiers_ht.table,
- LTTNG_EVENT_NOTIFIER_HT_SIZE, event_name);
- lttng_hlist_for_each_entry(event_notifier_priv, head, hlist) {
- WARN_ON_ONCE(!event_notifier_priv->parent.desc);
- if (!strncmp(event_notifier_priv->parent.desc->event_name, event_name,
+ 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) {
+ event_notifier_priv = container_of(event_priv, struct lttng_kernel_event_notifier_private, parent);
+
+ WARN_ON_ONCE(!event_priv->desc);
+ if (!strncmp(event_priv->desc->event_name, event_name,
LTTNG_KERNEL_ABI_SYM_NAME_LEN - 1)
&& event_notifier_group == event_notifier_priv->group
- && token == event_notifier_priv->parent.user_token) {
+ && token == event_priv->user_token) {
ret = -EEXIST;
goto exist;
}
event_notifier->parent.type = LTTNG_KERNEL_EVENT_TYPE_NOTIFIER;
event_notifier->priv->group = event_notifier_group;
- event_notifier->priv->parent.user_token = token;
- event_notifier->priv->error_counter_index = error_counter_index;
+ event_notifier->priv->parent.user_token = event_enabler->parent.user_token;
+ event_notifier->priv->error_counter_index = event_enabler->error_counter_index;
event_notifier->priv->num_captures = 0;
event_notifier->priv->parent.instrumentation = itype;
event_notifier->notification_send = lttng_event_notifier_notification_send;
* registration.
*/
smp_wmb();
- ret = lttng_kprobes_register_event_notifier(
- event_notifier_param->event.u.kprobe.symbol_name,
- event_notifier_param->event.u.kprobe.offset,
- event_notifier_param->event.u.kprobe.addr,
- event_notifier);
+ 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_notifier->parent);
if (ret) {
ret = -EINVAL;
goto register_error;
event_notifier->parent.enabled = 0;
event_notifier->priv->parent.registered = 0;
event_notifier->priv->parent.desc = event_desc;
- switch (event_notifier_param->event.u.syscall.entryexit) {
+ switch (event_param->u.syscall.entryexit) {
case LTTNG_KERNEL_ABI_SYSCALL_ENTRYEXIT:
ret = -EINVAL;
goto register_error;
event_notifier->priv->parent.u.syscall.entryexit = LTTNG_SYSCALL_EXIT;
break;
}
- switch (event_notifier_param->event.u.syscall.abi) {
+ switch (event_param->u.syscall.abi) {
case LTTNG_KERNEL_ABI_SYSCALL_ABI_ALL:
ret = -EINVAL;
goto register_error;
*/
smp_wmb();
- ret = lttng_uprobes_register_event_notifier(
- event_notifier_param->event.name,
- event_notifier_param->event.u.uprobe.fd,
- event_notifier);
+ ret = lttng_uprobes_register_event(event_param->name,
+ event_param->u.uprobe.fd,
+ &event_notifier->parent);
if (ret)
goto register_error;
ret = try_module_get(event_notifier->priv->parent.desc->owner);
}
list_add(&event_notifier->priv->node, &event_notifier_group->event_notifiers_head);
- hlist_add_head(&event_notifier->priv->hlist, head);
+ hlist_add_head(&event_notifier->priv->parent.hlist_node, head);
/*
* Clear the error counter bucket. The sessiond keeps track of which
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)
+{
+ struct lttng_kernel_event_common *event;
+
+ mutex_lock(&sessions_mutex);
+ event = _lttng_kernel_event_create(event_enabler, event_desc);
+ mutex_unlock(&sessions_mutex);
+ 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)
return counter->ops->counter_clear(counter->counter, dim_indexes);
}
-struct lttng_kernel_event_recorder *lttng_kernel_event_recorder_create(struct lttng_event_enabler *event_enabler,
- const struct lttng_kernel_event_desc *event_desc)
-{
- struct lttng_kernel_event_recorder *event;
-
- mutex_lock(&sessions_mutex);
- event = _lttng_kernel_event_recorder_create(event_enabler, event_desc);
- mutex_unlock(&sessions_mutex);
- return event;
-}
-
-struct lttng_kernel_event_notifier *lttng_event_notifier_create(
- const struct lttng_kernel_event_desc *event_desc,
- uint64_t id, uint64_t error_counter_index,
- struct lttng_event_notifier_group *event_notifier_group,
- struct lttng_kernel_abi_event_notifier *event_notifier_param,
- enum lttng_kernel_abi_instrumentation itype)
-{
- struct lttng_kernel_event_notifier *event_notifier;
-
- mutex_lock(&sessions_mutex);
- event_notifier = _lttng_event_notifier_create(event_desc, id,
- error_counter_index, event_notifier_group,
- event_notifier_param, itype);
- mutex_unlock(&sessions_mutex);
- return event_notifier;
-}
-
/* Only used for tracepoints for now. */
static
-void register_event(struct lttng_kernel_event_recorder *event_recorder)
+void register_event(struct lttng_kernel_event_common *event)
{
const struct lttng_kernel_event_desc *desc;
int ret = -EINVAL;
- if (event_recorder->priv->parent.registered)
+ if (event->priv->registered)
return;
- desc = event_recorder->priv->parent.desc;
- switch (event_recorder->priv->parent.instrumentation) {
+ desc = event->priv->desc;
+ switch (event->priv->instrumentation) {
case LTTNG_KERNEL_ABI_TRACEPOINT:
ret = lttng_wrapper_tracepoint_probe_register(desc->event_kname,
desc->tp_class->probe_callback,
- event_recorder);
+ event);
break;
case LTTNG_KERNEL_ABI_SYSCALL:
- ret = lttng_syscall_filter_enable_event(event_recorder->chan, event_recorder);
+ ret = lttng_syscall_filter_enable_event(event);
break;
case LTTNG_KERNEL_ABI_KPROBE:
lttng_fallthrough;
case LTTNG_KERNEL_ABI_UPROBE:
- lttng_fallthrough;
- case LTTNG_KERNEL_ABI_KRETPROBE:
ret = 0;
break;
+ case LTTNG_KERNEL_ABI_KRETPROBE:
+ switch (event->type) {
+ case LTTNG_KERNEL_EVENT_TYPE_RECORDER:
+ ret = 0;
+ break;
+ case LTTNG_KERNEL_EVENT_TYPE_NOTIFIER:
+ WARN_ON_ONCE(1);
+ break;
+ }
+ break;
+
case LTTNG_KERNEL_ABI_FUNCTION:
lttng_fallthrough;
case LTTNG_KERNEL_ABI_NOOP:
WARN_ON_ONCE(1);
}
if (!ret)
- event_recorder->priv->parent.registered = 1;
+ event->priv->registered = 1;
}
-/*
- * Only used internally at session destruction.
- */
-int _lttng_event_unregister(struct lttng_kernel_event_recorder *event_recorder)
+int _lttng_event_unregister(struct lttng_kernel_event_common *event)
{
- struct lttng_kernel_event_common_private *event_priv = &event_recorder->priv->parent;
+ struct lttng_kernel_event_common_private *event_priv = event->priv;
const struct lttng_kernel_event_desc *desc;
int ret = -EINVAL;
case LTTNG_KERNEL_ABI_TRACEPOINT:
ret = lttng_wrapper_tracepoint_probe_unregister(event_priv->desc->event_kname,
event_priv->desc->tp_class->probe_callback,
- event_recorder);
+ event);
break;
case LTTNG_KERNEL_ABI_KPROBE:
- lttng_kprobes_unregister_event(event_recorder);
+ lttng_kprobes_unregister_event(event);
ret = 0;
break;
case LTTNG_KERNEL_ABI_KRETPROBE:
- lttng_kretprobes_unregister(event_recorder);
- ret = 0;
+ switch (event->type) {
+ case LTTNG_KERNEL_EVENT_TYPE_RECORDER:
+ lttng_kretprobes_unregister(event);
+ ret = 0;
+ break;
+ case LTTNG_KERNEL_EVENT_TYPE_NOTIFIER:
+ WARN_ON_ONCE(1);
+ break;
+ }
break;
case LTTNG_KERNEL_ABI_SYSCALL:
- ret = lttng_syscall_filter_disable_event(event_recorder->chan, event_recorder);
+ ret = lttng_syscall_filter_disable_event(event);
break;
case LTTNG_KERNEL_ABI_NOOP:
- ret = 0;
+ switch (event->type) {
+ case LTTNG_KERNEL_EVENT_TYPE_RECORDER:
+ ret = 0;
+ break;
+ case LTTNG_KERNEL_EVENT_TYPE_NOTIFIER:
+ WARN_ON_ONCE(1);
+ break;
+ }
break;
case LTTNG_KERNEL_ABI_UPROBE:
- lttng_uprobes_unregister_event(event_recorder);
+ lttng_uprobes_unregister_event(event);
ret = 0;
break;
return ret;
}
-/* Only used for tracepoints for now. */
-static
-void register_event_notifier(struct lttng_kernel_event_notifier *event_notifier)
-{
- const struct lttng_kernel_event_desc *desc;
- int ret = -EINVAL;
-
- if (event_notifier->priv->parent.registered)
- return;
-
- desc = event_notifier->priv->parent.desc;
- switch (event_notifier->priv->parent.instrumentation) {
- case LTTNG_KERNEL_ABI_TRACEPOINT:
- ret = lttng_wrapper_tracepoint_probe_register(desc->event_kname,
- desc->tp_class->probe_callback,
- event_notifier);
- break;
-
- case LTTNG_KERNEL_ABI_SYSCALL:
- ret = lttng_syscall_filter_enable_event_notifier(event_notifier);
- break;
-
- case LTTNG_KERNEL_ABI_KPROBE:
- lttng_fallthrough;
- case LTTNG_KERNEL_ABI_UPROBE:
- ret = 0;
- break;
-
- case LTTNG_KERNEL_ABI_KRETPROBE:
- lttng_fallthrough;
- case LTTNG_KERNEL_ABI_FUNCTION:
- lttng_fallthrough;
- case LTTNG_KERNEL_ABI_NOOP:
- lttng_fallthrough;
- default:
- WARN_ON_ONCE(1);
- }
- if (!ret)
- event_notifier->priv->parent.registered = 1;
-}
-
-static
-int _lttng_event_notifier_unregister(
- struct lttng_kernel_event_notifier *event_notifier)
-{
- const struct lttng_kernel_event_desc *desc;
- int ret = -EINVAL;
-
- if (!event_notifier->priv->parent.registered)
- return 0;
-
- desc = event_notifier->priv->parent.desc;
- switch (event_notifier->priv->parent.instrumentation) {
- case LTTNG_KERNEL_ABI_TRACEPOINT:
- ret = lttng_wrapper_tracepoint_probe_unregister(event_notifier->priv->parent.desc->event_kname,
- event_notifier->priv->parent.desc->tp_class->probe_callback,
- event_notifier);
- break;
-
- case LTTNG_KERNEL_ABI_KPROBE:
- lttng_kprobes_unregister_event_notifier(event_notifier);
- ret = 0;
- break;
-
- case LTTNG_KERNEL_ABI_UPROBE:
- lttng_uprobes_unregister_event_notifier(event_notifier);
- ret = 0;
- break;
-
- case LTTNG_KERNEL_ABI_SYSCALL:
- ret = lttng_syscall_filter_disable_event_notifier(event_notifier);
- break;
-
- case LTTNG_KERNEL_ABI_KRETPROBE:
- lttng_fallthrough;
- case LTTNG_KERNEL_ABI_FUNCTION:
- lttng_fallthrough;
- case LTTNG_KERNEL_ABI_NOOP:
- lttng_fallthrough;
- default:
- WARN_ON_ONCE(1);
- }
- if (!ret)
- event_notifier->priv->parent.registered = 0;
- return ret;
-}
-
/*
* Only used internally at session destruction.
*/
case LTTNG_KERNEL_ABI_KPROBE:
module_put(event_priv->desc->owner);
- lttng_kprobes_destroy_event_private(event_recorder);
+ lttng_kprobes_destroy_event_private(&event_recorder->parent);
break;
case LTTNG_KERNEL_ABI_KRETPROBE:
module_put(event_priv->desc->owner);
- lttng_kretprobes_destroy_private(event_recorder);
+ lttng_kretprobes_destroy_private(&event_recorder->parent);
break;
case LTTNG_KERNEL_ABI_SYSCALL:
case LTTNG_KERNEL_ABI_UPROBE:
module_put(event_priv->desc->owner);
- lttng_uprobes_destroy_event_private(event_recorder);
+ lttng_uprobes_destroy_event_private(&event_recorder->parent);
break;
case LTTNG_KERNEL_ABI_FUNCTION:
case LTTNG_KERNEL_ABI_KPROBE:
module_put(event_notifier->priv->parent.desc->owner);
- lttng_kprobes_destroy_event_notifier_private(event_notifier);
+ lttng_kprobes_destroy_event_private(&event_notifier->parent);
break;
case LTTNG_KERNEL_ABI_SYSCALL:
case LTTNG_KERNEL_ABI_UPROBE:
module_put(event_notifier->priv->parent.desc->owner);
- lttng_uprobes_destroy_event_notifier_private(event_notifier);
+ lttng_uprobes_destroy_event_private(&event_notifier->parent);
break;
case LTTNG_KERNEL_ABI_KRETPROBE:
}
}
-static
-int lttng_event_enabler_match_event(struct lttng_event_enabler *event_enabler,
- struct lttng_kernel_event_recorder *event_recorder)
+bool lttng_event_enabler_match_event(struct lttng_event_enabler_common *event_enabler,
+ struct lttng_kernel_event_common *event)
{
- struct lttng_event_enabler_common *base_enabler = lttng_event_enabler_as_enabler(
- event_enabler);
+ if (event_enabler->event_param.instrumentation != event->priv->instrumentation)
+ return false;
- if (base_enabler->event_param.instrumentation != event_recorder->priv->parent.instrumentation)
- return 0;
- if (lttng_desc_match_enabler(event_recorder->priv->parent.desc, base_enabler)
- && event_recorder->chan == event_enabler->chan)
- return 1;
- else
- return 0;
+ 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 =
+ container_of(event, struct lttng_kernel_event_recorder, parent);
+
+ if (lttng_desc_match_enabler(event->priv->desc, event_enabler)
+ && event_recorder->chan == event_recorder_enabler->chan)
+ return true;
+ else
+ return false;
+ }
+ 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 =
+ container_of(event, struct lttng_kernel_event_notifier, parent);
+
+ if (lttng_desc_match_enabler(event->priv->desc, event_enabler)
+ && event_notifier->priv->group == event_notifier_enabler->group
+ && event->priv->user_token == event_enabler->user_token)
+ return true;
+ else
+ return false;
+ }
+ default:
+ WARN_ON_ONCE(1);
+ return false;
+ }
}
-static
-int lttng_event_notifier_enabler_match_event_notifier(struct lttng_event_notifier_enabler *event_notifier_enabler,
- struct lttng_kernel_event_notifier *event_notifier)
+bool lttng_event_enabler_desc_match_event(struct lttng_event_enabler_common *event_enabler,
+ const struct lttng_kernel_event_desc *desc,
+ struct lttng_kernel_event_common *event)
{
- struct lttng_event_enabler_common *base_enabler = lttng_event_notifier_enabler_as_enabler(
- event_notifier_enabler);
+ if (event_enabler->event_param.instrumentation != event->priv->instrumentation)
+ return false;
- if (base_enabler->event_param.instrumentation != event_notifier->priv->parent.instrumentation)
- return 0;
- if (lttng_desc_match_enabler(event_notifier->priv->parent.desc, base_enabler)
- && event_notifier->priv->group == event_notifier_enabler->group
- && event_notifier->priv->parent.user_token == event_notifier_enabler->parent.user_token)
- return 1;
- else
- return 0;
+ 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 =
+ container_of(event, struct lttng_kernel_event_recorder, parent);
+
+ if (event->priv->desc == desc && event_recorder->chan == event_recorder_enabler->chan)
+ return true;
+ else
+ return false;
+ }
+ 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 =
+ container_of(event, struct lttng_kernel_event_notifier, parent);
+
+ if (event->priv->desc == desc
+ && event_notifier->priv->group == event_notifier_enabler->group
+ && event->priv->user_token == event_enabler->user_token)
+ return true;
+ else
+ return false;
+ }
+ default:
+ WARN_ON_ONCE(1);
+ return false;
+ }
}
static
}
static
-void lttng_create_tracepoint_event_if_missing(struct lttng_event_enabler *event_enabler)
+void lttng_create_tracepoint_event_if_missing(struct lttng_event_recorder_enabler *event_enabler)
{
- struct lttng_kernel_session *session = event_enabler->chan->parent.session;
+ struct lttng_event_ht *events_ht = lttng_get_event_ht_from_enabler(&event_enabler->parent);
struct lttng_kernel_probe_desc *probe_desc;
const struct lttng_kernel_event_desc *desc;
int i;
for (i = 0; i < probe_desc->nr_events; i++) {
int found = 0;
struct hlist_head *head;
- struct lttng_kernel_event_recorder_private *event_recorder_private;
- struct lttng_kernel_event_recorder *event_recorder;
+ struct lttng_kernel_event_common *event;
+ struct lttng_kernel_event_common_private *event_priv;
desc = probe_desc->event_desc[i];
if (!lttng_desc_match_enabler(desc,
- lttng_event_enabler_as_enabler(event_enabler)))
+ lttng_event_recorder_enabler_as_enabler(event_enabler)))
continue;
/*
* Check if already created.
*/
- head = utils_borrow_hash_table_bucket(
- session->priv->events_ht.table, LTTNG_EVENT_HT_SIZE,
- desc->event_name);
- lttng_hlist_for_each_entry(event_recorder_private, head, hlist) {
- if (event_recorder_private->parent.desc == desc
- && event_recorder_private->pub->chan == event_enabler->chan)
+ head = utils_borrow_hash_table_bucket(events_ht->table, LTTNG_EVENT_HT_SIZE, desc->event_name);
+ lttng_hlist_for_each_entry(event_priv, head, hlist_node) {
+ if (lttng_event_enabler_desc_match_event(&event_enabler->parent, desc, event_priv->pub))
found = 1;
}
if (found)
continue;
/*
- * We need to create an event for this
- * event probe.
+ * We need to create an event for this event probe.
*/
- event_recorder = _lttng_kernel_event_recorder_create(event_enabler, desc);
- if (!event_recorder) {
+ event = _lttng_kernel_event_create(&event_enabler->parent, desc);
+ if (!event) {
printk(KERN_INFO "LTTng: Unable to create event %s\n",
probe_desc->event_desc[i]->event_name);
}
static
void lttng_create_tracepoint_event_notifier_if_missing(struct lttng_event_notifier_enabler *event_notifier_enabler)
{
- struct lttng_event_notifier_group *event_notifier_group = event_notifier_enabler->group;
+ struct lttng_event_ht *events_ht = lttng_get_event_ht_from_enabler(&event_notifier_enabler->parent);
struct lttng_kernel_probe_desc *probe_desc;
const struct lttng_kernel_event_desc *desc;
int i;
for (i = 0; i < probe_desc->nr_events; i++) {
int found = 0;
struct hlist_head *head;
- struct lttng_kernel_event_notifier_private *event_notifier_priv;
- struct lttng_kernel_event_notifier *event_notifier;
+ struct lttng_kernel_event_common *event;
+ struct lttng_kernel_event_common_private *event_priv;
desc = probe_desc->event_desc[i];
if (!lttng_desc_match_enabler(desc,
/*
* Check if already created.
*/
- head = utils_borrow_hash_table_bucket(
- event_notifier_group->event_notifiers_ht.table,
- LTTNG_EVENT_NOTIFIER_HT_SIZE, desc->event_name);
- lttng_hlist_for_each_entry(event_notifier_priv, head, hlist) {
- if (event_notifier_priv->parent.desc == desc
- && event_notifier_priv->parent.user_token == event_notifier_enabler->parent.user_token)
+ head = utils_borrow_hash_table_bucket(events_ht->table,
+ LTTNG_EVENT_HT_SIZE, desc->event_name);
+ lttng_hlist_for_each_entry(event_priv, head, hlist_node) {
+ if (lttng_event_enabler_desc_match_event(&event_notifier_enabler->parent, desc, event_priv->pub))
found = 1;
}
if (found)
/*
* We need to create a event_notifier for this event probe.
*/
- event_notifier = _lttng_event_notifier_create(desc,
- event_notifier_enabler->parent.user_token,
- event_notifier_enabler->error_counter_index,
- event_notifier_group, NULL,
- LTTNG_KERNEL_ABI_TRACEPOINT);
- if (IS_ERR(event_notifier)) {
+ event = _lttng_kernel_event_create(&event_notifier_enabler->parent, desc);
+ if (IS_ERR(event)) {
printk(KERN_INFO "Unable to create event_notifier %s\n",
probe_desc->event_desc[i]->event_name);
}
}
static
-void lttng_create_syscall_event_if_missing(struct lttng_event_enabler *event_enabler)
+void lttng_create_syscall_event_if_missing(struct lttng_event_enabler_common *event_enabler)
{
int ret;
WARN_ON_ONCE(ret);
}
-static
-void lttng_create_syscall_event_notifier_if_missing(struct lttng_event_notifier_enabler *event_notifier_enabler)
-{
- int ret;
-
- ret = lttng_syscalls_register_event_notifier(event_notifier_enabler);
- WARN_ON_ONCE(ret);
- ret = lttng_syscalls_create_matching_event_notifiers(event_notifier_enabler);
- WARN_ON_ONCE(ret);
-}
-
/*
* Create struct lttng_kernel_event_recorder if it is missing and present in the list of
* tracepoint probes.
* Should be called with sessions mutex held.
*/
static
-void lttng_create_event_if_missing(struct lttng_event_enabler *event_enabler)
+void lttng_create_event_if_missing(struct lttng_event_recorder_enabler *event_enabler)
{
switch (event_enabler->parent.event_param.instrumentation) {
case LTTNG_KERNEL_ABI_TRACEPOINT:
break;
case LTTNG_KERNEL_ABI_SYSCALL:
- lttng_create_syscall_event_if_missing(event_enabler);
+ lttng_create_syscall_event_if_missing(&event_enabler->parent);
break;
default:
* Should be called with sessions mutex held.
*/
static
-int lttng_event_enabler_ref_events(struct lttng_event_enabler *event_enabler)
+int lttng_event_enabler_ref_events(struct lttng_event_recorder_enabler *event_enabler)
{
struct lttng_kernel_channel_buffer *chan = event_enabler->chan;
struct lttng_kernel_session *session = event_enabler->chan->parent.session;
- struct lttng_event_enabler_common *base_enabler = lttng_event_enabler_as_enabler(event_enabler);
+ struct lttng_event_enabler_common *base_enabler = lttng_event_recorder_enabler_as_enabler(event_enabler);
struct lttng_kernel_event_recorder_private *event_recorder_priv;
if (base_enabler->event_param.instrumentation == LTTNG_KERNEL_ABI_SYSCALL &&
struct lttng_kernel_event_recorder *event_recorder = event_recorder_priv->pub;
struct lttng_enabler_ref *enabler_ref;
- if (!lttng_event_enabler_match_event(event_enabler, event_recorder))
+ if (!lttng_event_enabler_match_event(&event_enabler->parent, &event_recorder->parent))
continue;
enabler_ref = lttng_enabler_ref(&event_recorder_priv->parent.enablers_ref_head,
- lttng_event_enabler_as_enabler(event_enabler));
+ lttng_event_recorder_enabler_as_enabler(event_enabler));
if (!enabler_ref) {
/*
* If no backward ref, create it.
enabler_ref = kzalloc(sizeof(*enabler_ref), GFP_KERNEL);
if (!enabler_ref)
return -ENOMEM;
- enabler_ref->ref = lttng_event_enabler_as_enabler(event_enabler);
+ enabler_ref->ref = lttng_event_recorder_enabler_as_enabler(event_enabler);
list_add(&enabler_ref->node,
&event_recorder_priv->parent.enablers_ref_head);
}
lttng_enabler_link_bytecode(event_recorder_priv->parent.desc,
lttng_static_ctx,
&event_recorder_priv->parent.filter_bytecode_runtime_head,
- <tng_event_enabler_as_enabler(event_enabler)->filter_bytecode_head);
+ <tng_event_recorder_enabler_as_enabler(event_enabler)->filter_bytecode_head);
}
return 0;
}
break;
case LTTNG_KERNEL_ABI_SYSCALL:
- lttng_create_syscall_event_notifier_if_missing(event_notifier_enabler);
+ lttng_create_syscall_event_if_missing(&event_notifier_enabler->parent);
break;
default:
struct lttng_kernel_event_notifier *event_notifier = event_notifier_priv->pub;
struct lttng_enabler_ref *enabler_ref;
- if (!lttng_event_notifier_enabler_match_event_notifier(event_notifier_enabler, event_notifier))
+ if (!lttng_event_enabler_match_event(&event_notifier_enabler->parent, &event_notifier->parent))
continue;
enabler_ref = lttng_enabler_ref(&event_notifier_priv->parent.enablers_ref_head,
return 0;
}
-struct lttng_event_enabler *lttng_event_enabler_create(
+struct lttng_event_recorder_enabler *lttng_event_recorder_enabler_create(
enum lttng_enabler_format_type format_type,
struct lttng_kernel_abi_event *event_param,
struct lttng_kernel_channel_buffer *chan)
{
- struct lttng_event_enabler *event_enabler;
+ struct lttng_event_recorder_enabler *event_enabler;
event_enabler = kzalloc(sizeof(*event_enabler), GFP_KERNEL);
if (!event_enabler)
}
void lttng_event_enabler_session_add(struct lttng_kernel_session *session,
- struct lttng_event_enabler *event_enabler)
+ struct lttng_event_recorder_enabler *event_enabler)
{
mutex_lock(&sessions_mutex);
list_add(&event_enabler->node, &session->priv->enablers_head);
mutex_unlock(&sessions_mutex);
}
-int lttng_event_enabler_enable(struct lttng_event_enabler *event_enabler)
+int lttng_event_enabler_enable(struct lttng_event_enabler_common *event_enabler)
{
mutex_lock(&sessions_mutex);
- lttng_event_enabler_as_enabler(event_enabler)->enabled = 1;
- lttng_session_lazy_sync_event_enablers(event_enabler->chan->parent.session);
+ event_enabler->enabled = 1;
+ lttng_event_enabler_sync(event_enabler);
mutex_unlock(&sessions_mutex);
return 0;
}
-int lttng_event_enabler_disable(struct lttng_event_enabler *event_enabler)
+int lttng_event_enabler_disable(struct lttng_event_enabler_common *event_enabler)
{
mutex_lock(&sessions_mutex);
- lttng_event_enabler_as_enabler(event_enabler)->enabled = 0;
- lttng_session_lazy_sync_event_enablers(event_enabler->chan->parent.session);
+ event_enabler->enabled = 0;
+ lttng_event_enabler_sync(event_enabler);
mutex_unlock(&sessions_mutex);
return 0;
}
return ret;
}
-int lttng_event_enabler_attach_filter_bytecode(struct lttng_event_enabler *event_enabler,
+int lttng_event_enabler_attach_filter_bytecode(struct lttng_event_enabler_common *event_enabler,
struct lttng_kernel_abi_filter_bytecode __user *bytecode)
{
int ret;
- ret = lttng_enabler_attach_filter_bytecode(
- lttng_event_enabler_as_enabler(event_enabler), bytecode);
+ ret = lttng_enabler_attach_filter_bytecode(event_enabler, bytecode);
if (ret)
goto error;
-
- lttng_session_lazy_sync_event_enablers(event_enabler->chan->parent.session);
+ lttng_event_enabler_sync(event_enabler);
return 0;
error:
}
}
-void lttng_event_enabler_destroy(struct lttng_event_enabler *event_enabler)
+void lttng_event_enabler_destroy(struct lttng_event_enabler_common *event_enabler)
{
- lttng_enabler_destroy(lttng_event_enabler_as_enabler(event_enabler));
+ switch (event_enabler->enabler_type) {
+ case LTTNG_EVENT_ENABLER_TYPE_RECORDER:
+ {
+ struct lttng_event_recorder_enabler *event_recorder_enabler =
+ container_of(event_enabler, struct lttng_event_recorder_enabler, parent);
+
+ lttng_enabler_destroy(event_enabler);
+ if (event_recorder_enabler->published)
+ list_del(&event_recorder_enabler->node);
+ kfree(event_recorder_enabler);
+ break;
+ }
+ case LTTNG_EVENT_ENABLER_TYPE_NOTIFIER:
+ {
+ struct lttng_event_notifier_enabler *event_notifier_enabler =
+ container_of(event_enabler, struct lttng_event_notifier_enabler, parent);
- if (event_enabler->published)
- list_del(&event_enabler->node);
- kfree(event_enabler);
+ lttng_enabler_destroy(event_enabler);
+ if (event_notifier_enabler->published)
+ list_del(&event_notifier_enabler->node);
+ kfree(event_notifier_enabler);
+ break;
+ }
+ default:
+ WARN_ON_ONCE(1);
+ }
}
struct lttng_event_notifier_enabler *lttng_event_notifier_enabler_create(
- struct lttng_event_notifier_group *event_notifier_group,
enum lttng_enabler_format_type format_type,
- struct lttng_kernel_abi_event_notifier *event_notifier_param)
+ struct lttng_kernel_abi_event_notifier *event_notifier_param,
+ struct lttng_event_notifier_group *event_notifier_group)
{
struct lttng_event_notifier_enabler *event_notifier_enabler;
event_notifier_enabler->parent.enabled = 0;
event_notifier_enabler->parent.user_token = event_notifier_param->event.token;
event_notifier_enabler->group = event_notifier_group;
+ return event_notifier_enabler;
+}
+void lttng_event_notifier_enabler_group_add(struct lttng_event_notifier_group *event_notifier_group,
+ struct lttng_event_notifier_enabler *event_notifier_enabler)
+{
mutex_lock(&sessions_mutex);
list_add(&event_notifier_enabler->node, &event_notifier_enabler->group->enablers_head);
+ event_notifier_enabler->published = true;
lttng_event_notifier_group_sync_enablers(event_notifier_enabler->group);
-
mutex_unlock(&sessions_mutex);
-
- return event_notifier_enabler;
}
int lttng_event_notifier_enabler_enable(
return 0;
}
-int lttng_event_notifier_enabler_attach_filter_bytecode(
- struct lttng_event_notifier_enabler *event_notifier_enabler,
- struct lttng_kernel_abi_filter_bytecode __user *bytecode)
-{
- int ret;
-
- ret = lttng_enabler_attach_filter_bytecode(
- lttng_event_notifier_enabler_as_enabler(event_notifier_enabler),
- bytecode);
- if (ret)
- goto error;
-
- lttng_event_notifier_group_sync_enablers(event_notifier_enabler->group);
- return 0;
-
-error:
- return ret;
-}
-
int lttng_event_notifier_enabler_attach_capture_bytecode(
struct lttng_event_notifier_enabler *event_notifier_enabler,
struct lttng_kernel_abi_capture_bytecode __user *bytecode)
return ret;
}
-static
-void lttng_event_notifier_enabler_destroy(
- struct lttng_event_notifier_enabler *event_notifier_enabler)
-{
- if (!event_notifier_enabler) {
- return;
- }
-
- list_del(&event_notifier_enabler->node);
-
- lttng_enabler_destroy(lttng_event_notifier_enabler_as_enabler(event_notifier_enabler));
- kfree(event_notifier_enabler);
-}
-
/*
* lttng_session_sync_event_enablers should be called just before starting a
* session.
static
void lttng_session_sync_event_enablers(struct lttng_kernel_session *session)
{
- struct lttng_event_enabler *event_enabler;
+ struct lttng_event_recorder_enabler *event_enabler;
struct lttng_kernel_event_recorder_private *event_recorder_priv;
list_for_each_entry(event_enabler, &session->priv->enablers_head, node)
* state.
*/
if (enabled) {
- register_event(event_recorder);
+ register_event(&event_recorder->parent);
} else {
- _lttng_event_unregister(event_recorder);
+ _lttng_event_unregister(&event_recorder->parent);
}
/* Check if has enablers without bytecode enabled */
*/
if (enabled) {
if (!event_notifier_priv->parent.registered)
- register_event_notifier(event_notifier);
+ register_event(&event_notifier->parent);
} else {
if (event_notifier_priv->parent.registered)
- _lttng_event_notifier_unregister(event_notifier);
+ _lttng_event_unregister(&event_notifier->parent);
}
/* Check if has enablers without bytecode enabled */
}
}
+static
+void lttng_event_enabler_sync(struct lttng_event_enabler_common *event_enabler)
+{
+ switch (event_enabler->enabler_type) {
+ case LTTNG_EVENT_ENABLER_TYPE_RECORDER:
+ {
+ struct lttng_event_recorder_enabler *event_recorder_enabler =
+ container_of(event_enabler, struct lttng_event_recorder_enabler, parent);
+ lttng_session_lazy_sync_event_enablers(event_recorder_enabler->chan->parent.session);
+ break;
+ }
+ case LTTNG_EVENT_ENABLER_TYPE_NOTIFIER:
+ {
+ struct lttng_event_notifier_enabler *event_notifier_enabler =
+ container_of(event_enabler, struct lttng_event_notifier_enabler, parent);
+ lttng_event_notifier_group_sync_enablers(event_notifier_enabler->group);
+ break;
+ }
+ default:
+ WARN_ON_ONCE(1);
+ }
+}
+
/*
* Serialize at most one packet worth of metadata into a metadata
* channel.
projects / lttng-modules.git / blobdiff