#include <linux/file.h>
#include <linux/anon_inodes.h>
#include <wrapper/file.h>
-#include <linux/jhash.h>
#include <linux/uaccess.h>
#include <linux/vmalloc.h>
#include <linux/dmi.h>
#include <wrapper/types.h>
#include <lttng/kernel-version.h>
#include <lttng/events.h>
+#include <lttng/events-internal.h>
+#include <lttng/lttng-bytecode.h>
#include <lttng/tracer.h>
+#include <lttng/event-notifier-notification.h>
#include <lttng/abi-old.h>
#include <lttng/endian.h>
#include <lttng/string-utils.h>
+#include <lttng/utils.h>
#include <ringbuffer/backend.h>
#include <ringbuffer/frontend.h>
#include <wrapper/time.h>
#define METADATA_CACHE_DEFAULT_SIZE 4096
static LIST_HEAD(sessions);
+static LIST_HEAD(event_notifier_groups);
static LIST_HEAD(lttng_transport_list);
+static LIST_HEAD(lttng_counter_transport_list);
/*
* Protect the sessions and metadata caches.
*/
static DEFINE_MUTEX(sessions_mutex);
-static struct kmem_cache *event_cache;
-
-static void lttng_session_lazy_sync_enablers(struct lttng_session *session);
-static void lttng_session_sync_enablers(struct lttng_session *session);
-static void lttng_enabler_destroy(struct lttng_enabler *enabler);
-
-static void _lttng_event_destroy(struct lttng_event *event);
+static struct kmem_cache *event_recorder_cache;
+static struct kmem_cache *event_recorder_private_cache;
+static struct kmem_cache *event_notifier_cache;
+static struct kmem_cache *event_notifier_private_cache;
+
+static void lttng_session_lazy_sync_event_enablers(struct lttng_session *session);
+static void lttng_session_sync_event_enablers(struct lttng_session *session);
+static void lttng_event_enabler_destroy(struct lttng_event_enabler *event_enabler);
+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_destroy(struct lttng_kernel_event_common *event);
static void _lttng_channel_destroy(struct lttng_channel *chan);
-static int _lttng_event_unregister(struct lttng_event *event);
+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_metadata_statedump(struct lttng_session *session,
struct lttng_channel *chan,
- struct lttng_event *event);
+ struct lttng_kernel_event_recorder *event);
static
int _lttng_session_metadata_statedump(struct lttng_session *session);
static
void _lttng_metadata_channel_hangup(struct lttng_metadata_stream *stream);
static
int _lttng_type_statedump(struct lttng_session *session,
- const struct lttng_type *type,
+ const struct lttng_kernel_type_common *type,
+ enum lttng_kernel_string_encoding parent_encoding,
size_t nesting);
static
int _lttng_field_statedump(struct lttng_session *session,
- const struct lttng_event_field *field,
- size_t nesting);
+ const struct lttng_kernel_event_field *field,
+ size_t nesting, const char **prev_field_name_p);
void synchronize_trace(void)
{
-#if (LINUX_VERSION_CODE >= KERNEL_VERSION(5,1,0))
+#if (LTTNG_LINUX_VERSION_CODE >= LTTNG_KERNEL_VERSION(5,1,0))
synchronize_rcu();
#else
synchronize_sched();
#endif
-#if (LINUX_VERSION_CODE >= KERNEL_VERSION(3,4,0))
+#if (LTTNG_LINUX_VERSION_CODE >= LTTNG_KERNEL_VERSION(3,4,0))
#ifdef CONFIG_PREEMPT_RT_FULL
synchronize_rcu();
#endif
-#else /* (LINUX_VERSION_CODE >= KERNEL_VERSION(3,4,0)) */
+#else /* (LTTNG_LINUX_VERSION_CODE >= LTTNG_KERNEL_VERSION(3,4,0)) */
#ifdef CONFIG_PREEMPT_RT
synchronize_rcu();
#endif
-#endif /* (LINUX_VERSION_CODE >= KERNEL_VERSION(3,4,0)) */
+#endif /* (LTTNG_LINUX_VERSION_CODE >= LTTNG_KERNEL_VERSION(3,4,0)) */
}
void lttng_lock_sessions(void)
mutex_unlock(&sessions_mutex);
}
+static struct lttng_transport *lttng_transport_find(const char *name)
+{
+ struct lttng_transport *transport;
+
+ list_for_each_entry(transport, <tng_transport_list, node) {
+ if (!strcmp(transport->name, name))
+ return transport;
+ }
+ return NULL;
+}
+
/*
* Called with sessions lock held.
*/
return NULL;
}
+static
+struct lttng_counter_transport *lttng_counter_transport_find(const char *name)
+{
+ struct lttng_counter_transport *transport;
+
+ list_for_each_entry(transport, <tng_counter_transport_list, node) {
+ if (!strcmp(transport->name, name))
+ return transport;
+ }
+ return NULL;
+}
+
+struct lttng_counter *lttng_kernel_counter_create(
+ const char *counter_transport_name,
+ size_t number_dimensions, const size_t *dimensions_sizes)
+{
+ struct lttng_counter *counter = NULL;
+ struct lttng_counter_transport *counter_transport = NULL;
+
+ counter_transport = lttng_counter_transport_find(counter_transport_name);
+ if (!counter_transport) {
+ printk(KERN_WARNING "LTTng: counter transport %s not found.\n",
+ counter_transport_name);
+ goto notransport;
+ }
+ if (!try_module_get(counter_transport->owner)) {
+ printk(KERN_WARNING "LTTng: Can't lock counter transport module.\n");
+ goto notransport;
+ }
+
+ counter = lttng_kvzalloc(sizeof(struct lttng_counter), GFP_KERNEL);
+ if (!counter)
+ goto nomem;
+
+ /* Create event notifier error counter. */
+ counter->ops = &counter_transport->ops;
+ counter->transport = counter_transport;
+
+ counter->counter = counter->ops->counter_create(
+ number_dimensions, dimensions_sizes, 0);
+ if (!counter->counter) {
+ goto create_error;
+ }
+
+ return counter;
+
+create_error:
+ lttng_kvfree(counter);
+nomem:
+ if (counter_transport)
+ module_put(counter_transport->owner);
+notransport:
+ return NULL;
+}
+
+struct lttng_event_notifier_group *lttng_event_notifier_group_create(void)
+{
+ struct lttng_transport *transport = NULL;
+ struct lttng_event_notifier_group *event_notifier_group;
+ const char *transport_name = "relay-event-notifier";
+ size_t subbuf_size = 4096; //TODO
+ size_t num_subbuf = 16; //TODO
+ unsigned int switch_timer_interval = 0;
+ unsigned int read_timer_interval = 0;
+ int i;
+
+ mutex_lock(&sessions_mutex);
+
+ transport = lttng_transport_find(transport_name);
+ if (!transport) {
+ printk(KERN_WARNING "LTTng: transport %s not found\n",
+ transport_name);
+ goto notransport;
+ }
+ if (!try_module_get(transport->owner)) {
+ printk(KERN_WARNING "LTTng: Can't lock transport %s module.\n",
+ transport_name);
+ goto notransport;
+ }
+
+ event_notifier_group = lttng_kvzalloc(sizeof(struct lttng_event_notifier_group),
+ GFP_KERNEL);
+ if (!event_notifier_group)
+ goto nomem;
+
+ /*
+ * Initialize the ring buffer used to store event notifier
+ * notifications.
+ */
+ event_notifier_group->ops = &transport->ops;
+ event_notifier_group->chan = transport->ops.priv->channel_create(
+ transport_name, event_notifier_group, NULL,
+ subbuf_size, num_subbuf, switch_timer_interval,
+ read_timer_interval);
+ if (!event_notifier_group->chan)
+ goto create_error;
+
+ event_notifier_group->transport = transport;
+
+ INIT_LIST_HEAD(&event_notifier_group->enablers_head);
+ INIT_LIST_HEAD(&event_notifier_group->event_notifiers_head);
+ for (i = 0; i < LTTNG_EVENT_NOTIFIER_HT_SIZE; i++)
+ INIT_HLIST_HEAD(&event_notifier_group->event_notifiers_ht.table[i]);
+
+ list_add(&event_notifier_group->node, &event_notifier_groups);
+
+ mutex_unlock(&sessions_mutex);
+
+ return event_notifier_group;
+
+create_error:
+ lttng_kvfree(event_notifier_group);
+nomem:
+ if (transport)
+ module_put(transport->owner);
+notransport:
+ mutex_unlock(&sessions_mutex);
+ return NULL;
+}
+
void metadata_cache_destroy(struct kref *kref)
{
struct lttng_metadata_cache *cache =
void lttng_session_destroy(struct lttng_session *session)
{
struct lttng_channel *chan, *tmpchan;
- struct lttng_event *event, *tmpevent;
+ struct lttng_kernel_event_recorder_private *event_recorder_priv, *tmpevent_recorder_priv;
struct lttng_metadata_stream *metadata_stream;
- struct lttng_enabler *enabler, *tmpenabler;
+ struct lttng_event_enabler *event_enabler, *tmp_event_enabler;
int ret;
mutex_lock(&sessions_mutex);
WRITE_ONCE(session->active, 0);
list_for_each_entry(chan, &session->chan, list) {
- ret = lttng_syscalls_unregister(chan);
+ ret = lttng_syscalls_unregister_channel(chan);
WARN_ON(ret);
}
- list_for_each_entry(event, &session->events, list) {
- ret = _lttng_event_unregister(event);
+ list_for_each_entry(event_recorder_priv, &session->events, node) {
+ ret = _lttng_event_unregister(event_recorder_priv->pub);
WARN_ON(ret);
}
synchronize_trace(); /* Wait for in-flight events to complete */
- list_for_each_entry_safe(enabler, tmpenabler,
+ list_for_each_entry(chan, &session->chan, list) {
+ ret = lttng_syscalls_destroy_event(chan);
+ WARN_ON(ret);
+ }
+ list_for_each_entry_safe(event_enabler, tmp_event_enabler,
&session->enablers_head, node)
- lttng_enabler_destroy(enabler);
- list_for_each_entry_safe(event, tmpevent, &session->events, list)
- _lttng_event_destroy(event);
+ lttng_event_enabler_destroy(event_enabler);
+ list_for_each_entry_safe(event_recorder_priv, tmpevent_recorder_priv, &session->events, node)
+ _lttng_event_destroy(&event_recorder_priv->pub->parent);
list_for_each_entry_safe(chan, tmpchan, &session->chan, list) {
BUG_ON(chan->channel_type == METADATA_CHANNEL);
_lttng_channel_destroy(chan);
}
+ mutex_lock(&session->metadata_cache->lock);
list_for_each_entry(metadata_stream, &session->metadata_cache->metadata_stream, list)
_lttng_metadata_channel_hangup(metadata_stream);
+ mutex_unlock(&session->metadata_cache->lock);
lttng_id_tracker_destroy(&session->pid_tracker, false);
lttng_id_tracker_destroy(&session->vpid_tracker, false);
lttng_id_tracker_destroy(&session->uid_tracker, false);
lttng_kvfree(session);
}
+void lttng_event_notifier_group_destroy(
+ struct lttng_event_notifier_group *event_notifier_group)
+{
+ struct lttng_event_notifier_enabler *event_notifier_enabler, *tmp_event_notifier_enabler;
+ struct lttng_kernel_event_notifier_private *event_notifier_priv, *tmpevent_notifier_priv;
+ int ret;
+
+ if (!event_notifier_group)
+ return;
+
+ mutex_lock(&sessions_mutex);
+
+ ret = lttng_syscalls_unregister_event_notifier_group(event_notifier_group);
+ WARN_ON(ret);
+
+ list_for_each_entry_safe(event_notifier_priv, tmpevent_notifier_priv,
+ &event_notifier_group->event_notifiers_head, node) {
+ ret = _lttng_event_notifier_unregister(event_notifier_priv->pub);
+ WARN_ON(ret);
+ }
+
+ /* Wait for in-flight event notifier to complete */
+ synchronize_trace();
+
+ irq_work_sync(&event_notifier_group->wakeup_pending);
+
+ kfree(event_notifier_group->sc_filter);
+
+ 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);
+
+ list_for_each_entry_safe(event_notifier_priv, tmpevent_notifier_priv,
+ &event_notifier_group->event_notifiers_head, node)
+ _lttng_event_destroy(&event_notifier_priv->pub->parent);
+
+ if (event_notifier_group->error_counter) {
+ struct lttng_counter *error_counter = event_notifier_group->error_counter;
+
+ error_counter->ops->counter_destroy(error_counter->counter);
+ module_put(error_counter->transport->owner);
+ lttng_kvfree(error_counter);
+ event_notifier_group->error_counter = NULL;
+ }
+
+ event_notifier_group->ops->priv->channel_destroy(event_notifier_group->chan);
+ module_put(event_notifier_group->transport->owner);
+ list_del(&event_notifier_group->node);
+
+ mutex_unlock(&sessions_mutex);
+ lttng_kvfree(event_notifier_group);
+}
+
int lttng_session_statedump(struct lttng_session *session)
{
int ret;
session->tstate = 1;
/* We need to sync enablers with session before activation. */
- lttng_session_sync_enablers(session);
+ lttng_session_sync_event_enablers(session);
/*
* Snapshot the number of events per channel to know the type of header
/* Set transient enabler state to "disabled" */
session->tstate = 0;
- lttng_session_sync_enablers(session);
+ lttng_session_sync_event_enablers(session);
/* Set each stream's quiescent state. */
list_for_each_entry(chan, &session->chan, list) {
{
int ret = 0;
struct lttng_channel *chan;
- struct lttng_event *event;
+ struct lttng_kernel_event_recorder_private *event_recorder_priv;
struct lttng_metadata_cache *cache = session->metadata_cache;
struct lttng_metadata_stream *stream;
chan->metadata_dumped = 0;
}
- list_for_each_entry(event, &session->events, list) {
- event->metadata_dumped = 0;
+ list_for_each_entry(event_recorder_priv, &session->events, node) {
+ event_recorder_priv->metadata_dumped = 0;
}
ret = _lttng_session_metadata_statedump(session);
}
/* Set transient enabler state to "enabled" */
channel->tstate = 1;
- lttng_session_sync_enablers(channel->session);
+ lttng_session_sync_event_enablers(channel->session);
/* Set atomically the state to "enabled" */
WRITE_ONCE(channel->enabled, 1);
end:
WRITE_ONCE(channel->enabled, 0);
/* Set transient enabler state to "enabled" */
channel->tstate = 0;
- lttng_session_sync_enablers(channel->session);
+ lttng_session_sync_event_enablers(channel->session);
end:
mutex_unlock(&sessions_mutex);
return ret;
}
-int lttng_event_enable(struct lttng_event *event)
+int lttng_event_enable(struct lttng_kernel_event_common *event)
{
int ret = 0;
mutex_lock(&sessions_mutex);
- if (event->chan->channel_type == METADATA_CHANNEL) {
- ret = -EPERM;
- goto end;
+ switch (event->type) {
+ case LTTNG_KERNEL_EVENT_TYPE_RECORDER:
+ {
+ struct lttng_kernel_event_recorder *event_recorder =
+ container_of(event, struct lttng_kernel_event_recorder, parent);
+
+ if (event_recorder->chan->channel_type == METADATA_CHANNEL) {
+ ret = -EPERM;
+ goto end;
+ }
+ break;
}
+ case LTTNG_KERNEL_EVENT_TYPE_NOTIFIER:
+ switch (event->priv->instrumentation) {
+ case LTTNG_KERNEL_ABI_KRETPROBE:
+ ret = -EINVAL;
+ goto end;
+ default:
+ break;
+ }
+ break;
+ default:
+ break;
+ }
+
if (event->enabled) {
ret = -EEXIST;
goto end;
}
- switch (event->instrumentation) {
- case LTTNG_KERNEL_TRACEPOINT:
- case LTTNG_KERNEL_SYSCALL:
+ switch (event->priv->instrumentation) {
+ case LTTNG_KERNEL_ABI_TRACEPOINT: /* Fall-through */
+ case LTTNG_KERNEL_ABI_SYSCALL:
ret = -EINVAL;
break;
- case LTTNG_KERNEL_KPROBE:
- case LTTNG_KERNEL_UPROBE:
- case LTTNG_KERNEL_NOOP:
+
+ case LTTNG_KERNEL_ABI_KPROBE: /* Fall-through */
+ case LTTNG_KERNEL_ABI_UPROBE:
WRITE_ONCE(event->enabled, 1);
break;
- case LTTNG_KERNEL_KRETPROBE:
+
+ case LTTNG_KERNEL_ABI_KRETPROBE:
ret = lttng_kretprobes_event_enable_state(event, 1);
break;
- case LTTNG_KERNEL_FUNCTION: /* Fall-through. */
+
+ case LTTNG_KERNEL_ABI_FUNCTION: /* Fall-through */
+ case LTTNG_KERNEL_ABI_NOOP: /* Fall-through */
default:
WARN_ON_ONCE(1);
ret = -EINVAL;
return ret;
}
-int lttng_event_disable(struct lttng_event *event)
+int lttng_event_disable(struct lttng_kernel_event_common *event)
{
int ret = 0;
mutex_lock(&sessions_mutex);
- if (event->chan->channel_type == METADATA_CHANNEL) {
- ret = -EPERM;
- goto end;
+ switch (event->type) {
+ case LTTNG_KERNEL_EVENT_TYPE_RECORDER:
+ {
+ struct lttng_kernel_event_recorder *event_recorder =
+ container_of(event, struct lttng_kernel_event_recorder, parent);
+
+ if (event_recorder->chan->channel_type == METADATA_CHANNEL) {
+ ret = -EPERM;
+ goto end;
+ }
+ break;
+ }
+ case LTTNG_KERNEL_EVENT_TYPE_NOTIFIER:
+ switch (event->priv->instrumentation) {
+ case LTTNG_KERNEL_ABI_KRETPROBE:
+ ret = -EINVAL;
+ goto end;
+ default:
+ break;
+ }
+ break;
+ default:
+ break;
}
+
if (!event->enabled) {
ret = -EEXIST;
goto end;
}
- switch (event->instrumentation) {
- case LTTNG_KERNEL_TRACEPOINT:
- case LTTNG_KERNEL_SYSCALL:
+ switch (event->priv->instrumentation) {
+ case LTTNG_KERNEL_ABI_TRACEPOINT: /* Fall-through */
+ case LTTNG_KERNEL_ABI_SYSCALL:
ret = -EINVAL;
break;
- case LTTNG_KERNEL_KPROBE:
- case LTTNG_KERNEL_UPROBE:
- case LTTNG_KERNEL_NOOP:
+
+ case LTTNG_KERNEL_ABI_KPROBE: /* Fall-through */
+ case LTTNG_KERNEL_ABI_UPROBE:
WRITE_ONCE(event->enabled, 0);
break;
- case LTTNG_KERNEL_KRETPROBE:
+
+ case LTTNG_KERNEL_ABI_KRETPROBE:
ret = lttng_kretprobes_event_enable_state(event, 0);
break;
- case LTTNG_KERNEL_FUNCTION: /* Fall-through. */
+
+ case LTTNG_KERNEL_ABI_FUNCTION: /* Fall-through */
+ case LTTNG_KERNEL_ABI_NOOP: /* Fall-through */
default:
WARN_ON_ONCE(1);
ret = -EINVAL;
return ret;
}
-static struct lttng_transport *lttng_transport_find(const char *name)
-{
- struct lttng_transport *transport;
-
- list_for_each_entry(transport, <tng_transport_list, node) {
- if (!strcmp(transport->name, name))
- return transport;
- }
- return NULL;
-}
-
struct lttng_channel *lttng_channel_create(struct lttng_session *session,
const char *transport_name,
void *buf_addr,
goto active; /* Refuse to add channel to active session */
transport = lttng_transport_find(transport_name);
if (!transport) {
- printk(KERN_WARNING "LTTng transport %s not found\n",
+ printk(KERN_WARNING "LTTng: transport %s not found\n",
transport_name);
goto notransport;
}
if (!try_module_get(transport->owner)) {
- printk(KERN_WARNING "LTT : Can't lock transport module.\n");
+ printk(KERN_WARNING "LTTng: Can't lock transport module.\n");
goto notransport;
}
chan = kzalloc(sizeof(struct lttng_channel), GFP_KERNEL);
* headers. Therefore the "chan" information used as input
* should be already accessible.
*/
- chan->chan = transport->ops.channel_create(transport_name,
+ chan->chan = transport->ops.priv->channel_create(transport_name,
chan, buf_addr, subbuf_size, num_subbuf,
switch_timer_interval, read_timer_interval);
if (!chan->chan)
static
void _lttng_channel_destroy(struct lttng_channel *chan)
{
- chan->ops->channel_destroy(chan->chan);
+ chan->ops->priv->channel_destroy(chan->chan);
module_put(chan->transport->owner);
list_del(&chan->list);
- lttng_destroy_context(chan->ctx);
+ lttng_kernel_destroy_context(chan->ctx);
kfree(chan);
}
wake_up_interruptible(&stream->read_wait);
}
+
/*
* Supports event creation while tracing session is active.
* Needs to be called with sessions mutex held.
*/
-struct lttng_event *_lttng_event_create(struct lttng_channel *chan,
- struct lttng_kernel_event *event_param,
- void *filter,
- const struct lttng_event_desc *event_desc,
- enum lttng_kernel_instrumentation itype)
+struct lttng_kernel_event_recorder *_lttng_kernel_event_recorder_create(struct lttng_channel *chan,
+ struct lttng_kernel_abi_event *event_param,
+ const struct lttng_kernel_event_desc *event_desc,
+ enum lttng_kernel_abi_instrumentation itype)
{
struct lttng_session *session = chan->session;
- struct lttng_event *event;
+ struct lttng_kernel_event_recorder *event_recorder;
+ struct lttng_kernel_event_recorder_private *event_recorder_priv;
const char *event_name;
struct hlist_head *head;
- size_t name_len;
- uint32_t hash;
int ret;
if (chan->free_event_id == -1U) {
}
switch (itype) {
- case LTTNG_KERNEL_TRACEPOINT:
- event_name = event_desc->name;
- break;
- case LTTNG_KERNEL_KPROBE:
- case LTTNG_KERNEL_UPROBE:
- case LTTNG_KERNEL_KRETPROBE:
- case LTTNG_KERNEL_NOOP:
- case LTTNG_KERNEL_SYSCALL:
+ case LTTNG_KERNEL_ABI_TRACEPOINT:
+ event_name = event_desc->event_name;
+ break;
+
+ case LTTNG_KERNEL_ABI_KPROBE: /* Fall-through */
+ case LTTNG_KERNEL_ABI_UPROBE: /* Fall-through */
+ case LTTNG_KERNEL_ABI_KRETPROBE: /* Fall-through */
+ case LTTNG_KERNEL_ABI_SYSCALL:
event_name = event_param->name;
break;
- case LTTNG_KERNEL_FUNCTION: /* Fall-through. */
+
+ case LTTNG_KERNEL_ABI_FUNCTION: /* Fall-through */
+ case LTTNG_KERNEL_ABI_NOOP: /* Fall-through */
default:
WARN_ON_ONCE(1);
ret = -EINVAL;
goto type_error;
}
- name_len = strlen(event_name);
- hash = jhash(event_name, name_len, 0);
- head = &session->events_ht.table[hash & (LTTNG_EVENT_HT_SIZE - 1)];
- lttng_hlist_for_each_entry(event, head, hlist) {
- WARN_ON_ONCE(!event->desc);
- if (!strncmp(event->desc->name, event_name,
- LTTNG_KERNEL_SYM_NAME_LEN - 1)
- && chan == event->chan) {
+
+ head = utils_borrow_hash_table_bucket(session->events_ht.table,
+ LTTNG_EVENT_HT_SIZE, event_name);
+ lttng_hlist_for_each_entry(event_recorder_priv, head, hlist) {
+ WARN_ON_ONCE(!event_recorder_priv->parent.desc);
+ if (!strncmp(event_recorder_priv->parent.desc->event_name, event_name,
+ LTTNG_KERNEL_ABI_SYM_NAME_LEN - 1)
+ && chan == event_recorder_priv->pub->chan) {
ret = -EEXIST;
goto exist;
}
}
- event = kmem_cache_zalloc(event_cache, GFP_KERNEL);
- if (!event) {
+ event_recorder = kmem_cache_zalloc(event_recorder_cache, GFP_KERNEL);
+ if (!event_recorder) {
ret = -ENOMEM;
goto cache_error;
}
- event->chan = chan;
- event->filter = filter;
- event->id = chan->free_event_id++;
- event->instrumentation = itype;
- event->evtype = LTTNG_TYPE_EVENT;
- INIT_LIST_HEAD(&event->bytecode_runtime_head);
- INIT_LIST_HEAD(&event->enablers_ref_head);
+ event_recorder_priv = kmem_cache_zalloc(event_recorder_private_cache, GFP_KERNEL);
+ if (!event_recorder_priv) {
+ ret = -ENOMEM;
+ goto cache_private_error;
+ }
+ event_recorder_priv->pub = event_recorder;
+ event_recorder_priv->parent.pub = &event_recorder->parent;
+ event_recorder->priv = event_recorder_priv;
+ event_recorder->parent.priv = &event_recorder_priv->parent;
+ event_recorder->parent.type = LTTNG_KERNEL_EVENT_TYPE_RECORDER;
+
+ event_recorder->parent.run_filter = lttng_kernel_interpret_event_filter;
+ event_recorder->chan = chan;
+ event_recorder->priv->id = chan->free_event_id++;
+ event_recorder->priv->parent.instrumentation = itype;
+ INIT_LIST_HEAD(&event_recorder->priv->parent.filter_bytecode_runtime_head);
+ INIT_LIST_HEAD(&event_recorder->priv->parent.enablers_ref_head);
switch (itype) {
- case LTTNG_KERNEL_TRACEPOINT:
+ case LTTNG_KERNEL_ABI_TRACEPOINT:
/* Event will be enabled by enabler sync. */
- event->enabled = 0;
- event->registered = 0;
- event->desc = lttng_event_get(event_name);
- if (!event->desc) {
+ event_recorder->parent.enabled = 0;
+ event_recorder->priv->parent.registered = 0;
+ event_recorder->priv->parent.desc = lttng_event_desc_get(event_name);
+ if (!event_recorder->priv->parent.desc) {
ret = -ENOENT;
goto register_error;
}
/* Populate lttng_event structure before event registration. */
smp_wmb();
break;
- case LTTNG_KERNEL_KPROBE:
+
+ case LTTNG_KERNEL_ABI_KPROBE:
/*
* Needs to be explicitly enabled after creation, since
* we may want to apply filters.
*/
- event->enabled = 0;
- event->registered = 1;
+ event_recorder->parent.enabled = 0;
+ event_recorder->priv->parent.registered = 1;
/*
* Populate lttng_event structure before event
* registration.
*/
smp_wmb();
- ret = lttng_kprobes_register(event_name,
+ ret = lttng_kprobes_register_event(event_name,
event_param->u.kprobe.symbol_name,
event_param->u.kprobe.offset,
event_param->u.kprobe.addr,
- event);
+ event_recorder);
if (ret) {
ret = -EINVAL;
goto register_error;
}
- ret = try_module_get(event->desc->owner);
+ ret = try_module_get(event_recorder->priv->parent.desc->owner);
WARN_ON_ONCE(!ret);
break;
- case LTTNG_KERNEL_KRETPROBE:
+
+ case LTTNG_KERNEL_ABI_KRETPROBE:
{
- struct lttng_event *event_return;
+ struct lttng_kernel_event_recorder *event_recorder_return;
+ struct lttng_kernel_event_recorder_private *event_recorder_return_priv;
/* kretprobe defines 2 events */
/*
* Needs to be explicitly enabled after creation, since
* we may want to apply filters.
*/
- event->enabled = 0;
- event->registered = 1;
- event_return =
- kmem_cache_zalloc(event_cache, GFP_KERNEL);
- if (!event_return) {
+ event_recorder->parent.enabled = 0;
+ event_recorder->priv->parent.registered = 1;
+
+ event_recorder_return = kmem_cache_zalloc(event_recorder_cache, GFP_KERNEL);
+ if (!event_recorder_return) {
+ ret = -ENOMEM;
+ goto register_error;
+ }
+ event_recorder_return_priv = kmem_cache_zalloc(event_recorder_private_cache, GFP_KERNEL);
+ if (!event_recorder_return_priv) {
+ kmem_cache_free(event_recorder_cache, event_recorder_return);
ret = -ENOMEM;
goto register_error;
}
- event_return->chan = chan;
- event_return->filter = filter;
- event_return->id = chan->free_event_id++;
- event_return->enabled = 0;
- event_return->registered = 1;
- event_return->instrumentation = itype;
+ event_recorder_return_priv->pub = event_recorder_return;
+ event_recorder_return_priv->parent.pub = &event_recorder_return->parent;
+ event_recorder_return->priv = event_recorder_return_priv;
+ event_recorder_return->parent.priv = &event_recorder_return_priv->parent;
+ event_recorder_return->parent.type = LTTNG_KERNEL_EVENT_TYPE_RECORDER;
+
+ event_recorder_return->parent.run_filter = lttng_kernel_interpret_event_filter;
+ event_recorder_return->chan = chan;
+ event_recorder_return->priv->id = chan->free_event_id++;
+ event_recorder_return->priv->parent.instrumentation = itype;
+ event_recorder_return->parent.enabled = 0;
+ event_recorder_return->priv->parent.registered = 1;
+ INIT_LIST_HEAD(&event_recorder_return->priv->parent.filter_bytecode_runtime_head);
+ INIT_LIST_HEAD(&event_recorder_return->priv->parent.enablers_ref_head);
/*
* Populate lttng_event structure before kretprobe registration.
*/
event_param->u.kretprobe.symbol_name,
event_param->u.kretprobe.offset,
event_param->u.kretprobe.addr,
- event, event_return);
+ event_recorder, event_recorder_return);
if (ret) {
- kmem_cache_free(event_cache, event_return);
+ kmem_cache_free(event_recorder_private_cache, event_recorder_return_priv);
+ kmem_cache_free(event_recorder_cache, event_recorder_return);
ret = -EINVAL;
goto register_error;
}
/* Take 2 refs on the module: one per event. */
- ret = try_module_get(event->desc->owner);
+ ret = try_module_get(event_recorder->priv->parent.desc->owner);
WARN_ON_ONCE(!ret);
- ret = try_module_get(event->desc->owner);
+ ret = try_module_get(event_recorder_return->priv->parent.desc->owner);
WARN_ON_ONCE(!ret);
ret = _lttng_event_metadata_statedump(chan->session, chan,
- event_return);
+ event_recorder_return);
WARN_ON_ONCE(ret > 0);
if (ret) {
- kmem_cache_free(event_cache, event_return);
- module_put(event->desc->owner);
- module_put(event->desc->owner);
+ kmem_cache_free(event_recorder_private_cache, event_recorder_return_priv);
+ kmem_cache_free(event_recorder_cache, event_recorder_return);
+ module_put(event_recorder_return->priv->parent.desc->owner);
+ module_put(event_recorder->priv->parent.desc->owner);
goto statedump_error;
}
- list_add(&event_return->list, &chan->session->events);
+ list_add(&event_recorder_return->priv->node, &chan->session->events);
break;
}
- case LTTNG_KERNEL_NOOP:
- case LTTNG_KERNEL_SYSCALL:
+
+ case LTTNG_KERNEL_ABI_SYSCALL:
/*
* Needs to be explicitly enabled after creation, since
* we may want to apply filters.
*/
- event->enabled = 0;
- event->registered = 0;
- event->desc = event_desc;
- if (!event->desc) {
+ event_recorder->parent.enabled = 0;
+ event_recorder->priv->parent.registered = 0;
+ event_recorder->priv->parent.desc = event_desc;
+ switch (event_param->u.syscall.entryexit) {
+ case LTTNG_KERNEL_ABI_SYSCALL_ENTRYEXIT:
+ ret = -EINVAL;
+ goto register_error;
+ case LTTNG_KERNEL_ABI_SYSCALL_ENTRY:
+ event_recorder->priv->parent.u.syscall.entryexit = LTTNG_SYSCALL_ENTRY;
+ break;
+ case LTTNG_KERNEL_ABI_SYSCALL_EXIT:
+ event_recorder->priv->parent.u.syscall.entryexit = LTTNG_SYSCALL_EXIT;
+ break;
+ }
+ switch (event_param->u.syscall.abi) {
+ case LTTNG_KERNEL_ABI_SYSCALL_ABI_ALL:
+ ret = -EINVAL;
+ goto register_error;
+ case LTTNG_KERNEL_ABI_SYSCALL_ABI_NATIVE:
+ event_recorder->priv->parent.u.syscall.abi = LTTNG_SYSCALL_ABI_NATIVE;
+ break;
+ case LTTNG_KERNEL_ABI_SYSCALL_ABI_COMPAT:
+ event_recorder->priv->parent.u.syscall.abi = LTTNG_SYSCALL_ABI_COMPAT;
+ break;
+ }
+ if (!event_recorder->priv->parent.desc) {
ret = -EINVAL;
goto register_error;
}
break;
- case LTTNG_KERNEL_UPROBE:
+
+ case LTTNG_KERNEL_ABI_UPROBE:
/*
* Needs to be explicitly enabled after creation, since
* we may want to apply filters.
*/
- event->enabled = 0;
- event->registered = 1;
+ event_recorder->parent.enabled = 0;
+ event_recorder->priv->parent.registered = 1;
/*
* Populate lttng_event structure before event
*/
smp_wmb();
- ret = lttng_uprobes_register(event_param->name,
+ ret = lttng_uprobes_register_event(event_param->name,
event_param->u.uprobe.fd,
- event);
+ event_recorder);
if (ret)
goto register_error;
- ret = try_module_get(event->desc->owner);
+ ret = try_module_get(event_recorder->priv->parent.desc->owner);
WARN_ON_ONCE(!ret);
break;
- case LTTNG_KERNEL_FUNCTION: /* Fall-through */
+
+ case LTTNG_KERNEL_ABI_FUNCTION: /* Fall-through */
+ case LTTNG_KERNEL_ABI_NOOP: /* Fall-through */
default:
WARN_ON_ONCE(1);
ret = -EINVAL;
goto register_error;
}
- ret = _lttng_event_metadata_statedump(chan->session, chan, event);
+ ret = _lttng_event_metadata_statedump(chan->session, chan, event_recorder);
WARN_ON_ONCE(ret > 0);
if (ret) {
goto statedump_error;
}
- hlist_add_head(&event->hlist, head);
- list_add(&event->list, &chan->session->events);
- return event;
+ hlist_add_head(&event_recorder->priv->hlist, head);
+ list_add(&event_recorder->priv->node, &chan->session->events);
+ return event_recorder;
statedump_error:
/* If a statedump error occurs, events will not be readable. */
register_error:
- kmem_cache_free(event_cache, event);
+ kmem_cache_free(event_recorder_private_cache, event_recorder_priv);
+cache_private_error:
+ kmem_cache_free(event_recorder_cache, event_recorder);
cache_error:
exist:
type_error:
return ERR_PTR(ret);
}
-struct lttng_event *lttng_event_create(struct lttng_channel *chan,
- struct lttng_kernel_event *event_param,
- void *filter,
- const struct lttng_event_desc *event_desc,
- enum lttng_kernel_instrumentation itype)
+struct lttng_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)
{
- struct lttng_event *event;
+ struct lttng_kernel_event_notifier *event_notifier;
+ struct lttng_kernel_event_notifier_private *event_notifier_priv;
+ struct lttng_counter *error_counter;
+ const char *event_name;
+ struct hlist_head *head;
+ int ret;
+
+ switch (itype) {
+ case LTTNG_KERNEL_ABI_TRACEPOINT:
+ event_name = event_desc->event_name;
+ break;
+
+ case LTTNG_KERNEL_ABI_KPROBE: /* Fall-through */
+ case LTTNG_KERNEL_ABI_UPROBE: /* Fall-through */
+ case LTTNG_KERNEL_ABI_SYSCALL:
+ event_name = event_notifier_param->event.name;
+ break;
+
+ case LTTNG_KERNEL_ABI_KRETPROBE: /* Fall-through */
+ case LTTNG_KERNEL_ABI_FUNCTION: /* Fall-through */
+ case LTTNG_KERNEL_ABI_NOOP: /* Fall-through */
+ default:
+ WARN_ON_ONCE(1);
+ ret = -EINVAL;
+ 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,
+ LTTNG_KERNEL_ABI_SYM_NAME_LEN - 1)
+ && event_notifier_group == event_notifier_priv->group
+ && token == event_notifier_priv->parent.user_token) {
+ ret = -EEXIST;
+ goto exist;
+ }
+ }
+
+ event_notifier = kmem_cache_zalloc(event_notifier_cache, GFP_KERNEL);
+ if (!event_notifier) {
+ ret = -ENOMEM;
+ goto cache_error;
+ }
+ event_notifier_priv = kmem_cache_zalloc(event_notifier_private_cache, GFP_KERNEL);
+ if (!event_notifier_priv) {
+ ret = -ENOMEM;
+ goto cache_private_error;
+ }
+ event_notifier_priv->pub = event_notifier;
+ event_notifier_priv->parent.pub = &event_notifier->parent;
+ event_notifier->priv = event_notifier_priv;
+ event_notifier->parent.priv = &event_notifier_priv->parent;
+ event_notifier->parent.type = LTTNG_KERNEL_EVENT_TYPE_NOTIFIER;
+
+ event_notifier->priv->group = event_notifier_group;
+ event_notifier->priv->parent.user_token = token;
+ event_notifier->priv->error_counter_index = error_counter_index;
+ event_notifier->priv->num_captures = 0;
+ event_notifier->priv->parent.instrumentation = itype;
+ event_notifier->notification_send = lttng_event_notifier_notification_send;
+ INIT_LIST_HEAD(&event_notifier->priv->parent.filter_bytecode_runtime_head);
+ INIT_LIST_HEAD(&event_notifier->priv->parent.enablers_ref_head);
+ INIT_LIST_HEAD(&event_notifier->priv->capture_bytecode_runtime_head);
+ event_notifier->parent.run_filter = lttng_kernel_interpret_event_filter;
+
+ switch (itype) {
+ case LTTNG_KERNEL_ABI_TRACEPOINT:
+ /* Event will be enabled by enabler sync. */
+ event_notifier->parent.enabled = 0;
+ event_notifier->priv->parent.registered = 0;
+ event_notifier->priv->parent.desc = lttng_event_desc_get(event_name);
+ if (!event_notifier->priv->parent.desc) {
+ ret = -ENOENT;
+ goto register_error;
+ }
+ /* Populate lttng_event_notifier structure before event registration. */
+ smp_wmb();
+ break;
+
+ case LTTNG_KERNEL_ABI_KPROBE:
+ /*
+ * Needs to be explicitly enabled after creation, since
+ * we may want to apply filters.
+ */
+ event_notifier->parent.enabled = 0;
+ event_notifier->priv->parent.registered = 1;
+ /*
+ * Populate lttng_event_notifier structure before event
+ * registration.
+ */
+ smp_wmb();
+ ret = lttng_kprobes_register_event_notifier(
+ event_notifier_param->event.u.kprobe.symbol_name,
+ event_notifier_param->event.u.kprobe.offset,
+ event_notifier_param->event.u.kprobe.addr,
+ event_notifier);
+ if (ret) {
+ ret = -EINVAL;
+ goto register_error;
+ }
+ ret = try_module_get(event_notifier->priv->parent.desc->owner);
+ WARN_ON_ONCE(!ret);
+ break;
+
+ case LTTNG_KERNEL_ABI_SYSCALL:
+ /*
+ * Needs to be explicitly enabled after creation, since
+ * we may want to apply filters.
+ */
+ event_notifier->parent.enabled = 0;
+ event_notifier->priv->parent.registered = 0;
+ event_notifier->priv->parent.desc = event_desc;
+ switch (event_notifier_param->event.u.syscall.entryexit) {
+ case LTTNG_KERNEL_ABI_SYSCALL_ENTRYEXIT:
+ ret = -EINVAL;
+ goto register_error;
+ case LTTNG_KERNEL_ABI_SYSCALL_ENTRY:
+ event_notifier->priv->parent.u.syscall.entryexit = LTTNG_SYSCALL_ENTRY;
+ break;
+ case LTTNG_KERNEL_ABI_SYSCALL_EXIT:
+ event_notifier->priv->parent.u.syscall.entryexit = LTTNG_SYSCALL_EXIT;
+ break;
+ }
+ switch (event_notifier_param->event.u.syscall.abi) {
+ case LTTNG_KERNEL_ABI_SYSCALL_ABI_ALL:
+ ret = -EINVAL;
+ goto register_error;
+ case LTTNG_KERNEL_ABI_SYSCALL_ABI_NATIVE:
+ event_notifier->priv->parent.u.syscall.abi = LTTNG_SYSCALL_ABI_NATIVE;
+ break;
+ case LTTNG_KERNEL_ABI_SYSCALL_ABI_COMPAT:
+ event_notifier->priv->parent.u.syscall.abi = LTTNG_SYSCALL_ABI_COMPAT;
+ break;
+ }
+
+ if (!event_notifier->priv->parent.desc) {
+ ret = -EINVAL;
+ goto register_error;
+ }
+ break;
+
+ case LTTNG_KERNEL_ABI_UPROBE:
+ /*
+ * Needs to be explicitly enabled after creation, since
+ * we may want to apply filters.
+ */
+ event_notifier->parent.enabled = 0;
+ event_notifier->priv->parent.registered = 1;
+
+ /*
+ * Populate lttng_event_notifier structure before
+ * event_notifier registration.
+ */
+ smp_wmb();
+
+ ret = lttng_uprobes_register_event_notifier(
+ event_notifier_param->event.name,
+ event_notifier_param->event.u.uprobe.fd,
+ event_notifier);
+ if (ret)
+ goto register_error;
+ ret = try_module_get(event_notifier->priv->parent.desc->owner);
+ WARN_ON_ONCE(!ret);
+ break;
+
+ case LTTNG_KERNEL_ABI_KRETPROBE: /* Fall-through */
+ case LTTNG_KERNEL_ABI_FUNCTION: /* Fall-through */
+ case LTTNG_KERNEL_ABI_NOOP: /* Fall-through */
+ default:
+ WARN_ON_ONCE(1);
+ ret = -EINVAL;
+ goto register_error;
+ }
+
+ list_add(&event_notifier->priv->node, &event_notifier_group->event_notifiers_head);
+ hlist_add_head(&event_notifier->priv->hlist, head);
+
+ /*
+ * Clear the error counter bucket. The sessiond keeps track of which
+ * bucket is currently in use. We trust it. The session lock
+ * synchronizes against concurrent creation of the error
+ * counter.
+ */
+ error_counter = event_notifier_group->error_counter;
+ if (error_counter) {
+ size_t dimension_index[1];
+
+ /*
+ * Check that the index is within the boundary of the counter.
+ */
+ if (event_notifier->priv->error_counter_index >= event_notifier_group->error_counter_len) {
+ printk(KERN_INFO "LTTng: event_notifier: Error counter index out-of-bound: counter-len=%zu, index=%llu\n",
+ event_notifier_group->error_counter_len, event_notifier->priv->error_counter_index);
+ ret = -EINVAL;
+ goto register_error;
+ }
+
+ dimension_index[0] = event_notifier->priv->error_counter_index;
+ ret = error_counter->ops->counter_clear(error_counter->counter, dimension_index);
+ if (ret) {
+ printk(KERN_INFO "LTTng: event_notifier: Unable to clear error counter bucket %llu\n",
+ event_notifier->priv->error_counter_index);
+ goto register_error;
+ }
+ }
+
+ return event_notifier;
+
+register_error:
+ kmem_cache_free(event_notifier_private_cache, event_notifier_priv);
+cache_private_error:
+ kmem_cache_free(event_notifier_cache, event_notifier);
+cache_error:
+exist:
+type_error:
+ return ERR_PTR(ret);
+}
+
+int lttng_kernel_counter_read(struct lttng_counter *counter,
+ const size_t *dim_indexes, int32_t cpu,
+ int64_t *val, bool *overflow, bool *underflow)
+{
+ return counter->ops->counter_read(counter->counter, dim_indexes,
+ cpu, val, overflow, underflow);
+}
+
+int lttng_kernel_counter_aggregate(struct lttng_counter *counter,
+ const size_t *dim_indexes, int64_t *val,
+ bool *overflow, bool *underflow)
+{
+ return counter->ops->counter_aggregate(counter->counter, dim_indexes,
+ val, overflow, underflow);
+}
+
+int lttng_kernel_counter_clear(struct lttng_counter *counter,
+ const size_t *dim_indexes)
+{
+ return counter->ops->counter_clear(counter->counter, dim_indexes);
+}
+
+struct lttng_kernel_event_recorder *lttng_kernel_event_recorder_create(struct lttng_channel *chan,
+ struct lttng_kernel_abi_event *event_param,
+ const struct lttng_kernel_event_desc *event_desc,
+ enum lttng_kernel_abi_instrumentation itype)
+{
+ struct lttng_kernel_event_recorder *event;
mutex_lock(&sessions_mutex);
- event = _lttng_event_create(chan, event_param, filter, event_desc,
- itype);
+ event = _lttng_kernel_event_recorder_create(chan, event_param, event_desc, itype);
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_event *event)
+void register_event(struct lttng_kernel_event_recorder *event_recorder)
{
- const struct lttng_event_desc *desc;
+ const struct lttng_kernel_event_desc *desc;
int ret = -EINVAL;
- if (event->registered)
+ if (event_recorder->priv->parent.registered)
return;
- desc = event->desc;
- switch (event->instrumentation) {
- case LTTNG_KERNEL_TRACEPOINT:
- ret = lttng_wrapper_tracepoint_probe_register(desc->kname,
+ desc = event_recorder->priv->parent.desc;
+ switch (event_recorder->priv->parent.instrumentation) {
+ case LTTNG_KERNEL_ABI_TRACEPOINT:
+ ret = lttng_wrapper_tracepoint_probe_register(desc->event_kname,
desc->probe_callback,
- event);
+ event_recorder);
break;
- case LTTNG_KERNEL_SYSCALL:
- ret = lttng_syscall_filter_enable(event->chan,
- desc->name);
+
+ case LTTNG_KERNEL_ABI_SYSCALL:
+ ret = lttng_syscall_filter_enable_event(event_recorder->chan, event_recorder);
break;
- case LTTNG_KERNEL_KPROBE:
- case LTTNG_KERNEL_UPROBE:
- case LTTNG_KERNEL_KRETPROBE:
- case LTTNG_KERNEL_NOOP:
+
+ case LTTNG_KERNEL_ABI_KPROBE: /* Fall-through */
+ case LTTNG_KERNEL_ABI_UPROBE: /* Fall-through */
+ case LTTNG_KERNEL_ABI_KRETPROBE:
ret = 0;
break;
- case LTTNG_KERNEL_FUNCTION: /* Fall-through */
+
+ case LTTNG_KERNEL_ABI_FUNCTION: /* Fall-through */
+ case LTTNG_KERNEL_ABI_NOOP: /* Fall-through */
default:
WARN_ON_ONCE(1);
}
if (!ret)
- event->registered = 1;
+ event_recorder->priv->parent.registered = 1;
}
/*
* Only used internally at session destruction.
*/
-int _lttng_event_unregister(struct lttng_event *event)
+int _lttng_event_unregister(struct lttng_kernel_event_recorder *event_recorder)
{
- const struct lttng_event_desc *desc;
+ struct lttng_kernel_event_common_private *event_priv = &event_recorder->priv->parent;
+ const struct lttng_kernel_event_desc *desc;
int ret = -EINVAL;
- if (!event->registered)
+ if (!event_priv->registered)
return 0;
- desc = event->desc;
- switch (event->instrumentation) {
- case LTTNG_KERNEL_TRACEPOINT:
- ret = lttng_wrapper_tracepoint_probe_unregister(event->desc->kname,
- event->desc->probe_callback,
- event);
+ desc = event_priv->desc;
+ switch (event_priv->instrumentation) {
+ case LTTNG_KERNEL_ABI_TRACEPOINT:
+ ret = lttng_wrapper_tracepoint_probe_unregister(event_priv->desc->event_kname,
+ event_priv->desc->probe_callback,
+ event_recorder);
break;
- case LTTNG_KERNEL_KPROBE:
- lttng_kprobes_unregister(event);
+
+ case LTTNG_KERNEL_ABI_KPROBE:
+ lttng_kprobes_unregister_event(event_recorder);
ret = 0;
break;
- case LTTNG_KERNEL_KRETPROBE:
- lttng_kretprobes_unregister(event);
+
+ case LTTNG_KERNEL_ABI_KRETPROBE:
+ lttng_kretprobes_unregister(event_recorder);
ret = 0;
break;
- case LTTNG_KERNEL_SYSCALL:
- ret = lttng_syscall_filter_disable(event->chan,
- desc->name);
+
+ case LTTNG_KERNEL_ABI_SYSCALL:
+ ret = lttng_syscall_filter_disable_event(event_recorder->chan, event_recorder);
break;
- case LTTNG_KERNEL_NOOP:
+
+ case LTTNG_KERNEL_ABI_NOOP:
ret = 0;
break;
- case LTTNG_KERNEL_UPROBE:
- lttng_uprobes_unregister(event);
+
+ case LTTNG_KERNEL_ABI_UPROBE:
+ lttng_uprobes_unregister_event(event_recorder);
ret = 0;
break;
- case LTTNG_KERNEL_FUNCTION: /* Fall-through */
+
+ case LTTNG_KERNEL_ABI_FUNCTION: /* Fall-through */
default:
WARN_ON_ONCE(1);
}
if (!ret)
- event->registered = 0;
+ event_priv->registered = 0;
return ret;
}
-/*
- * Only used internally at session destruction.
- */
+/* Only used for tracepoints for now. */
static
-void _lttng_event_destroy(struct lttng_event *event)
+void register_event_notifier(struct lttng_kernel_event_notifier *event_notifier)
{
- switch (event->instrumentation) {
- case LTTNG_KERNEL_TRACEPOINT:
- lttng_event_put(event->desc);
+ 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->probe_callback,
+ event_notifier);
break;
- case LTTNG_KERNEL_KPROBE:
- module_put(event->desc->owner);
- lttng_kprobes_destroy_private(event);
+
+ case LTTNG_KERNEL_ABI_SYSCALL:
+ ret = lttng_syscall_filter_enable_event_notifier(event_notifier);
break;
- case LTTNG_KERNEL_KRETPROBE:
- module_put(event->desc->owner);
- lttng_kretprobes_destroy_private(event);
+
+ case LTTNG_KERNEL_ABI_KPROBE: /* Fall-through */
+ case LTTNG_KERNEL_ABI_UPROBE:
+ ret = 0;
break;
- case LTTNG_KERNEL_NOOP:
- case LTTNG_KERNEL_SYSCALL:
+
+ case LTTNG_KERNEL_ABI_KRETPROBE: /* Fall-through */
+ case LTTNG_KERNEL_ABI_FUNCTION: /* Fall-through */
+ case LTTNG_KERNEL_ABI_NOOP: /* Fall-through */
+ 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->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: /* Fall-through */
+ case LTTNG_KERNEL_ABI_FUNCTION: /* Fall-through */
+ case LTTNG_KERNEL_ABI_NOOP: /* Fall-through */
+ default:
+ WARN_ON_ONCE(1);
+ }
+ if (!ret)
+ event_notifier->priv->parent.registered = 0;
+ return ret;
+}
+
+/*
+ * Only used internally at session destruction.
+ */
+static
+void _lttng_event_destroy(struct lttng_kernel_event_common *event)
+{
+ struct lttng_kernel_event_common_private *event_priv = event->priv;
+ struct lttng_enabler_ref *enabler_ref, *tmp_enabler_ref;
+
+ lttng_free_event_filter_runtime(event);
+ /* Free event enabler refs */
+ list_for_each_entry_safe(enabler_ref, tmp_enabler_ref,
+ &event_priv->enablers_ref_head, node)
+ kfree(enabler_ref);
+
+ switch (event->type) {
+ case LTTNG_KERNEL_EVENT_TYPE_RECORDER:
+ {
+ struct lttng_kernel_event_recorder *event_recorder =
+ container_of(event, struct lttng_kernel_event_recorder, parent);
+
+ switch (event_priv->instrumentation) {
+ case LTTNG_KERNEL_ABI_TRACEPOINT:
+ lttng_event_desc_put(event_priv->desc);
+ break;
+
+ case LTTNG_KERNEL_ABI_KPROBE:
+ module_put(event_priv->desc->owner);
+ lttng_kprobes_destroy_event_private(event_recorder);
+ break;
+
+ case LTTNG_KERNEL_ABI_KRETPROBE:
+ module_put(event_priv->desc->owner);
+ lttng_kretprobes_destroy_private(event_recorder);
+ break;
+
+ case LTTNG_KERNEL_ABI_SYSCALL:
+ break;
+
+ case LTTNG_KERNEL_ABI_UPROBE:
+ module_put(event_priv->desc->owner);
+ lttng_uprobes_destroy_event_private(event_recorder);
+ break;
+
+ case LTTNG_KERNEL_ABI_FUNCTION: /* Fall-through */
+ case LTTNG_KERNEL_ABI_NOOP: /* Fall-through */
+ default:
+ WARN_ON_ONCE(1);
+ }
+ list_del(&event_recorder->priv->node);
+ kmem_cache_free(event_recorder_private_cache, event_recorder->priv);
+ kmem_cache_free(event_recorder_cache, event_recorder);
break;
- case LTTNG_KERNEL_UPROBE:
- module_put(event->desc->owner);
- lttng_uprobes_destroy_private(event);
+ }
+ case LTTNG_KERNEL_EVENT_TYPE_NOTIFIER:
+ {
+ struct lttng_kernel_event_notifier *event_notifier =
+ container_of(event, struct lttng_kernel_event_notifier, parent);
+
+ switch (event_notifier->priv->parent.instrumentation) {
+ case LTTNG_KERNEL_ABI_TRACEPOINT:
+ lttng_event_desc_put(event_notifier->priv->parent.desc);
+ break;
+
+ case LTTNG_KERNEL_ABI_KPROBE:
+ module_put(event_notifier->priv->parent.desc->owner);
+ lttng_kprobes_destroy_event_notifier_private(event_notifier);
+ break;
+
+ case LTTNG_KERNEL_ABI_SYSCALL:
+ break;
+
+ case LTTNG_KERNEL_ABI_UPROBE:
+ module_put(event_notifier->priv->parent.desc->owner);
+ lttng_uprobes_destroy_event_notifier_private(event_notifier);
+ break;
+
+ case LTTNG_KERNEL_ABI_KRETPROBE: /* Fall-through */
+ case LTTNG_KERNEL_ABI_FUNCTION: /* Fall-through */
+ case LTTNG_KERNEL_ABI_NOOP: /* Fall-through */
+ default:
+ WARN_ON_ONCE(1);
+ }
+ list_del(&event_notifier->priv->node);
+ kmem_cache_free(event_notifier_private_cache, event_notifier->priv);
+ kmem_cache_free(event_notifier_cache, event_notifier);
break;
- case LTTNG_KERNEL_FUNCTION: /* Fall-through */
+ }
default:
WARN_ON_ONCE(1);
}
- list_del(&event->list);
- lttng_destroy_context(event->ctx);
- kmem_cache_free(event_cache, event);
}
struct lttng_id_tracker *get_tracker(struct lttng_session *session,
return 1;
}
-static
-int lttng_desc_match_enabler(const struct lttng_event_desc *desc,
+int lttng_desc_match_enabler(const struct lttng_kernel_event_desc *desc,
struct lttng_enabler *enabler)
{
const char *desc_name, *enabler_name;
+ bool compat = false, entry = false;
enabler_name = enabler->event_param.name;
switch (enabler->event_param.instrumentation) {
- case LTTNG_KERNEL_TRACEPOINT:
- desc_name = desc->name;
+ case LTTNG_KERNEL_ABI_TRACEPOINT:
+ desc_name = desc->event_name;
+ switch (enabler->format_type) {
+ case LTTNG_ENABLER_FORMAT_STAR_GLOB:
+ return lttng_match_enabler_star_glob(desc_name, enabler_name);
+ case LTTNG_ENABLER_FORMAT_NAME:
+ return lttng_match_enabler_name(desc_name, enabler_name);
+ default:
+ return -EINVAL;
+ }
break;
- case LTTNG_KERNEL_SYSCALL:
- desc_name = desc->name;
- if (!strncmp(desc_name, "compat_", strlen("compat_")))
+
+ case LTTNG_KERNEL_ABI_SYSCALL:
+ desc_name = desc->event_name;
+ if (!strncmp(desc_name, "compat_", strlen("compat_"))) {
desc_name += strlen("compat_");
+ compat = true;
+ }
if (!strncmp(desc_name, "syscall_exit_",
strlen("syscall_exit_"))) {
desc_name += strlen("syscall_exit_");
} else if (!strncmp(desc_name, "syscall_entry_",
strlen("syscall_entry_"))) {
desc_name += strlen("syscall_entry_");
+ entry = true;
} else {
WARN_ON_ONCE(1);
return -EINVAL;
}
+ switch (enabler->event_param.u.syscall.entryexit) {
+ case LTTNG_KERNEL_ABI_SYSCALL_ENTRYEXIT:
+ break;
+ case LTTNG_KERNEL_ABI_SYSCALL_ENTRY:
+ if (!entry)
+ return 0;
+ break;
+ case LTTNG_KERNEL_ABI_SYSCALL_EXIT:
+ if (entry)
+ return 0;
+ break;
+ default:
+ return -EINVAL;
+ }
+ switch (enabler->event_param.u.syscall.abi) {
+ case LTTNG_KERNEL_ABI_SYSCALL_ABI_ALL:
+ break;
+ case LTTNG_KERNEL_ABI_SYSCALL_ABI_NATIVE:
+ if (compat)
+ return 0;
+ break;
+ case LTTNG_KERNEL_ABI_SYSCALL_ABI_COMPAT:
+ if (!compat)
+ return 0;
+ break;
+ default:
+ return -EINVAL;
+ }
+ switch (enabler->event_param.u.syscall.match) {
+ case LTTNG_KERNEL_ABI_SYSCALL_MATCH_NAME:
+ switch (enabler->format_type) {
+ case LTTNG_ENABLER_FORMAT_STAR_GLOB:
+ return lttng_match_enabler_star_glob(desc_name, enabler_name);
+ case LTTNG_ENABLER_FORMAT_NAME:
+ return lttng_match_enabler_name(desc_name, enabler_name);
+ default:
+ return -EINVAL;
+ }
+ break;
+ case LTTNG_KERNEL_ABI_SYSCALL_MATCH_NR:
+ return -EINVAL; /* Not implemented. */
+ default:
+ return -EINVAL;
+ }
break;
+
default:
WARN_ON_ONCE(1);
return -EINVAL;
}
- switch (enabler->type) {
- case LTTNG_ENABLER_STAR_GLOB:
- return lttng_match_enabler_star_glob(desc_name, enabler_name);
- case LTTNG_ENABLER_NAME:
- return lttng_match_enabler_name(desc_name, enabler_name);
- default:
- return -EINVAL;
- }
}
static
-int lttng_event_match_enabler(struct lttng_event *event,
- struct lttng_enabler *enabler)
+int lttng_event_enabler_match_event(struct lttng_event_enabler *event_enabler,
+ struct lttng_kernel_event_recorder *event_recorder)
+{
+ struct lttng_enabler *base_enabler = lttng_event_enabler_as_enabler(
+ event_enabler);
+
+ if (base_enabler->event_param.instrumentation != event_recorder->priv->parent.instrumentation)
+ return 0;
+ if (lttng_desc_match_enabler(event_recorder->priv->parent.desc, base_enabler)
+ && event_recorder->chan == event_enabler->chan)
+ return 1;
+ else
+ return 0;
+}
+
+static
+int lttng_event_notifier_enabler_match_event_notifier(struct lttng_event_notifier_enabler *event_notifier_enabler,
+ struct lttng_kernel_event_notifier *event_notifier)
{
- if (enabler->event_param.instrumentation != event->instrumentation)
+ struct lttng_enabler *base_enabler = lttng_event_notifier_enabler_as_enabler(
+ event_notifier_enabler);
+
+ if (base_enabler->event_param.instrumentation != event_notifier->priv->parent.instrumentation)
return 0;
- if (lttng_desc_match_enabler(event->desc, enabler)
- && event->chan == enabler->chan)
+ if (lttng_desc_match_enabler(event_notifier->priv->parent.desc, base_enabler)
+ && event_notifier->priv->group == event_notifier_enabler->group
+ && event_notifier->priv->parent.user_token == event_notifier_enabler->base.user_token)
return 1;
else
return 0;
}
static
-struct lttng_enabler_ref *lttng_event_enabler_ref(struct lttng_event *event,
+struct lttng_enabler_ref *lttng_enabler_ref(
+ struct list_head *enablers_ref_list,
struct lttng_enabler *enabler)
{
struct lttng_enabler_ref *enabler_ref;
- list_for_each_entry(enabler_ref,
- &event->enablers_ref_head, node) {
+ list_for_each_entry(enabler_ref, enablers_ref_list, node) {
if (enabler_ref->ref == enabler)
return enabler_ref;
}
}
static
-void lttng_create_tracepoint_if_missing(struct lttng_enabler *enabler)
+void lttng_create_tracepoint_event_if_missing(struct lttng_event_enabler *event_enabler)
{
- struct lttng_session *session = enabler->chan->session;
- struct lttng_probe_desc *probe_desc;
- const struct lttng_event_desc *desc;
+ struct lttng_session *session = event_enabler->chan->session;
+ struct lttng_kernel_probe_desc *probe_desc;
+ const struct lttng_kernel_event_desc *desc;
int i;
struct list_head *probe_list;
for (i = 0; i < probe_desc->nr_events; i++) {
int found = 0;
struct hlist_head *head;
- const char *event_name;
- size_t name_len;
- uint32_t hash;
- struct lttng_event *event;
+ struct lttng_kernel_event_recorder_private *event_recorder_private;
+ struct lttng_kernel_event_recorder *event_recorder;
desc = probe_desc->event_desc[i];
- if (!lttng_desc_match_enabler(desc, enabler))
+ if (!lttng_desc_match_enabler(desc,
+ lttng_event_enabler_as_enabler(event_enabler)))
continue;
- event_name = desc->name;
- name_len = strlen(event_name);
/*
* Check if already created.
*/
- hash = jhash(event_name, name_len, 0);
- head = &session->events_ht.table[hash & (LTTNG_EVENT_HT_SIZE - 1)];
- lttng_hlist_for_each_entry(event, head, hlist) {
- if (event->desc == desc
- && event->chan == enabler->chan)
+ head = utils_borrow_hash_table_bucket(
+ session->events_ht.table, LTTNG_EVENT_HT_SIZE,
+ desc->event_name);
+ lttng_hlist_for_each_entry(event_recorder_private, head, hlist) {
+ if (event_recorder_private->parent.desc == desc
+ && event_recorder_private->pub->chan == event_enabler->chan)
found = 1;
}
if (found)
* We need to create an event for this
* event probe.
*/
- event = _lttng_event_create(enabler->chan,
- NULL, NULL, desc,
- LTTNG_KERNEL_TRACEPOINT);
- if (!event) {
- printk(KERN_INFO "Unable to create event %s\n",
- probe_desc->event_desc[i]->name);
+ event_recorder = _lttng_kernel_event_recorder_create(event_enabler->chan,
+ NULL, desc, LTTNG_KERNEL_ABI_TRACEPOINT);
+ if (!event_recorder) {
+ printk(KERN_INFO "LTTng: Unable to create event %s\n",
+ probe_desc->event_desc[i]->event_name);
}
}
}
}
static
-void lttng_create_syscall_if_missing(struct lttng_enabler *enabler)
+void lttng_create_tracepoint_event_notifier_if_missing(struct lttng_event_notifier_enabler *event_notifier_enabler)
+{
+ struct lttng_event_notifier_group *event_notifier_group = event_notifier_enabler->group;
+ struct lttng_kernel_probe_desc *probe_desc;
+ const struct lttng_kernel_event_desc *desc;
+ int i;
+ struct list_head *probe_list;
+
+ probe_list = lttng_get_probe_list_head();
+ /*
+ * For each probe event, if we find that a probe event matches
+ * our enabler, create an associated lttng_event_notifier if not
+ * already present.
+ */
+ list_for_each_entry(probe_desc, probe_list, head) {
+ for (i = 0; i < probe_desc->nr_events; i++) {
+ int found = 0;
+ struct hlist_head *head;
+ struct lttng_kernel_event_notifier_private *event_notifier_priv;
+ struct lttng_kernel_event_notifier *event_notifier;
+
+ desc = probe_desc->event_desc[i];
+ if (!lttng_desc_match_enabler(desc,
+ lttng_event_notifier_enabler_as_enabler(event_notifier_enabler)))
+ continue;
+
+ /*
+ * Check if already created.
+ */
+ head = utils_borrow_hash_table_bucket(
+ event_notifier_group->event_notifiers_ht.table,
+ LTTNG_EVENT_NOTIFIER_HT_SIZE, desc->event_name);
+ lttng_hlist_for_each_entry(event_notifier_priv, head, hlist) {
+ if (event_notifier_priv->parent.desc == desc
+ && event_notifier_priv->parent.user_token == event_notifier_enabler->base.user_token)
+ found = 1;
+ }
+ if (found)
+ continue;
+
+ /*
+ * We need to create a event_notifier for this event probe.
+ */
+ event_notifier = _lttng_event_notifier_create(desc,
+ event_notifier_enabler->base.user_token,
+ event_notifier_enabler->error_counter_index,
+ event_notifier_group, NULL,
+ LTTNG_KERNEL_ABI_TRACEPOINT);
+ if (IS_ERR(event_notifier)) {
+ printk(KERN_INFO "Unable to create event_notifier %s\n",
+ probe_desc->event_desc[i]->event_name);
+ }
+ }
+ }
+}
+
+static
+void lttng_create_syscall_event_if_missing(struct lttng_event_enabler *event_enabler)
+{
+ int ret;
+
+ ret = lttng_syscalls_register_event(event_enabler);
+ 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(enabler->chan, NULL);
+ 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_event if it is missing and present in the list of
+ * 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_enabler *enabler)
+void lttng_create_event_if_missing(struct lttng_event_enabler *event_enabler)
{
- switch (enabler->event_param.instrumentation) {
- case LTTNG_KERNEL_TRACEPOINT:
- lttng_create_tracepoint_if_missing(enabler);
+ switch (event_enabler->base.event_param.instrumentation) {
+ case LTTNG_KERNEL_ABI_TRACEPOINT:
+ lttng_create_tracepoint_event_if_missing(event_enabler);
break;
- case LTTNG_KERNEL_SYSCALL:
- lttng_create_syscall_if_missing(enabler);
+
+ case LTTNG_KERNEL_ABI_SYSCALL:
+ lttng_create_syscall_event_if_missing(event_enabler);
break;
+
default:
WARN_ON_ONCE(1);
break;
}
/*
- * Create events associated with an enabler (if not already present),
+ * Create events associated with an event_enabler (if not already present),
* and add backward reference from the event to the enabler.
* Should be called with sessions mutex held.
*/
static
-int lttng_enabler_ref_events(struct lttng_enabler *enabler)
+int lttng_event_enabler_ref_events(struct lttng_event_enabler *event_enabler)
{
- struct lttng_session *session = enabler->chan->session;
- struct lttng_event *event;
+ struct lttng_channel *chan = event_enabler->chan;
+ struct lttng_session *session = event_enabler->chan->session;
+ struct lttng_enabler *base_enabler = lttng_event_enabler_as_enabler(event_enabler);
+ struct lttng_kernel_event_recorder_private *event_recorder_priv;
+
+ if (base_enabler->event_param.instrumentation == LTTNG_KERNEL_ABI_SYSCALL &&
+ base_enabler->event_param.u.syscall.abi == LTTNG_KERNEL_ABI_SYSCALL_ABI_ALL &&
+ base_enabler->event_param.u.syscall.match == LTTNG_KERNEL_ABI_SYSCALL_MATCH_NAME &&
+ !strcmp(base_enabler->event_param.name, "*")) {
+ int enabled = base_enabler->enabled;
+ enum lttng_kernel_abi_syscall_entryexit entryexit = base_enabler->event_param.u.syscall.entryexit;
+
+ if (entryexit == LTTNG_KERNEL_ABI_SYSCALL_ENTRY || entryexit == LTTNG_KERNEL_ABI_SYSCALL_ENTRYEXIT)
+ WRITE_ONCE(chan->syscall_all_entry, enabled);
+
+ if (entryexit == LTTNG_KERNEL_ABI_SYSCALL_EXIT || entryexit == LTTNG_KERNEL_ABI_SYSCALL_ENTRYEXIT)
+ WRITE_ONCE(chan->syscall_all_exit, enabled);
+ }
/* First ensure that probe events are created for this enabler. */
- lttng_create_event_if_missing(enabler);
+ lttng_create_event_if_missing(event_enabler);
+
+ /* For each event matching event_enabler in session event list. */
+ list_for_each_entry(event_recorder_priv, &session->events, node) {
+ struct lttng_kernel_event_recorder *event_recorder = event_recorder_priv->pub;
+ struct lttng_enabler_ref *enabler_ref;
+
+ if (!lttng_event_enabler_match_event(event_enabler, event_recorder))
+ continue;
+ enabler_ref = lttng_enabler_ref(&event_recorder_priv->parent.enablers_ref_head,
+ lttng_event_enabler_as_enabler(event_enabler));
+ if (!enabler_ref) {
+ /*
+ * If no backward ref, create it.
+ * Add backward ref from event to event_enabler.
+ */
+ enabler_ref = kzalloc(sizeof(*enabler_ref), GFP_KERNEL);
+ if (!enabler_ref)
+ return -ENOMEM;
+ enabler_ref->ref = lttng_event_enabler_as_enabler(event_enabler);
+ list_add(&enabler_ref->node,
+ &event_recorder_priv->parent.enablers_ref_head);
+ }
+
+ /*
+ * Link filter bytecodes if not linked yet.
+ */
+ lttng_enabler_link_bytecode(event_recorder_priv->parent.desc,
+ lttng_static_ctx,
+ &event_recorder_priv->parent.filter_bytecode_runtime_head,
+ <tng_event_enabler_as_enabler(event_enabler)->filter_bytecode_head);
+ }
+ return 0;
+}
+
+/*
+ * Create struct lttng_kernel_event_notifier if it is missing and present in the list of
+ * tracepoint probes.
+ * Should be called with sessions mutex held.
+ */
+static
+void lttng_create_event_notifier_if_missing(struct lttng_event_notifier_enabler *event_notifier_enabler)
+{
+ switch (event_notifier_enabler->base.event_param.instrumentation) {
+ case LTTNG_KERNEL_ABI_TRACEPOINT:
+ lttng_create_tracepoint_event_notifier_if_missing(event_notifier_enabler);
+ break;
+
+ case LTTNG_KERNEL_ABI_SYSCALL:
+ lttng_create_syscall_event_notifier_if_missing(event_notifier_enabler);
+ break;
+
+ default:
+ WARN_ON_ONCE(1);
+ break;
+ }
+}
+
+/*
+ * Create event_notifiers associated with a event_notifier enabler (if not already present).
+ */
+static
+int lttng_event_notifier_enabler_ref_event_notifiers(
+ struct lttng_event_notifier_enabler *event_notifier_enabler)
+{
+ struct lttng_event_notifier_group *event_notifier_group = event_notifier_enabler->group;
+ struct lttng_enabler *base_enabler = lttng_event_notifier_enabler_as_enabler(event_notifier_enabler);
+ struct lttng_kernel_event_notifier_private *event_notifier_priv;
- /* For each event matching enabler in session event list. */
- list_for_each_entry(event, &session->events, list) {
+ if (base_enabler->event_param.instrumentation == LTTNG_KERNEL_ABI_SYSCALL &&
+ base_enabler->event_param.u.syscall.abi == LTTNG_KERNEL_ABI_SYSCALL_ABI_ALL &&
+ base_enabler->event_param.u.syscall.match == LTTNG_KERNEL_ABI_SYSCALL_MATCH_NAME &&
+ !strcmp(base_enabler->event_param.name, "*")) {
+
+ int enabled = base_enabler->enabled;
+ enum lttng_kernel_abi_syscall_entryexit entryexit = base_enabler->event_param.u.syscall.entryexit;
+
+ if (entryexit == LTTNG_KERNEL_ABI_SYSCALL_ENTRY || entryexit == LTTNG_KERNEL_ABI_SYSCALL_ENTRYEXIT)
+ WRITE_ONCE(event_notifier_group->syscall_all_entry, enabled);
+
+ if (entryexit == LTTNG_KERNEL_ABI_SYSCALL_EXIT || entryexit == LTTNG_KERNEL_ABI_SYSCALL_ENTRYEXIT)
+ WRITE_ONCE(event_notifier_group->syscall_all_exit, enabled);
+
+ }
+
+ /* First ensure that probe event_notifiers are created for this enabler. */
+ lttng_create_event_notifier_if_missing(event_notifier_enabler);
+
+ /* Link the created event_notifier with its associated enabler. */
+ list_for_each_entry(event_notifier_priv, &event_notifier_group->event_notifiers_head, node) {
+ struct lttng_kernel_event_notifier *event_notifier = event_notifier_priv->pub;
struct lttng_enabler_ref *enabler_ref;
- if (!lttng_event_match_enabler(event, enabler))
+ if (!lttng_event_notifier_enabler_match_event_notifier(event_notifier_enabler, event_notifier))
continue;
- enabler_ref = lttng_event_enabler_ref(event, enabler);
+
+ enabler_ref = lttng_enabler_ref(&event_notifier_priv->parent.enablers_ref_head,
+ lttng_event_notifier_enabler_as_enabler(event_notifier_enabler));
if (!enabler_ref) {
/*
* If no backward ref, create it.
- * Add backward ref from event to enabler.
+ * Add backward ref from event_notifier to enabler.
*/
enabler_ref = kzalloc(sizeof(*enabler_ref), GFP_KERNEL);
if (!enabler_ref)
return -ENOMEM;
- enabler_ref->ref = enabler;
+
+ enabler_ref->ref = lttng_event_notifier_enabler_as_enabler(
+ event_notifier_enabler);
list_add(&enabler_ref->node,
- &event->enablers_ref_head);
+ &event_notifier_priv->parent.enablers_ref_head);
}
/*
* Link filter bytecodes if not linked yet.
*/
- lttng_enabler_event_link_bytecode(event, enabler);
+ lttng_enabler_link_bytecode(event_notifier_priv->parent.desc,
+ lttng_static_ctx, &event_notifier_priv->parent.filter_bytecode_runtime_head,
+ <tng_event_notifier_enabler_as_enabler(event_notifier_enabler)->filter_bytecode_head);
+
+ /* Link capture bytecodes if not linked yet. */
+ lttng_enabler_link_bytecode(event_notifier_priv->parent.desc,
+ lttng_static_ctx, &event_notifier_priv->capture_bytecode_runtime_head,
+ &event_notifier_enabler->capture_bytecode_head);
- /* TODO: merge event context. */
+ event_notifier_priv->num_captures = event_notifier_enabler->num_captures;
}
return 0;
}
struct lttng_session *session;
list_for_each_entry(session, &sessions, list)
- lttng_session_lazy_sync_enablers(session);
+ lttng_session_lazy_sync_event_enablers(session);
+ return 0;
+}
+
+static bool lttng_event_notifier_group_has_active_event_notifiers(
+ struct lttng_event_notifier_group *event_notifier_group)
+{
+ struct lttng_event_notifier_enabler *event_notifier_enabler;
+
+ list_for_each_entry(event_notifier_enabler, &event_notifier_group->enablers_head,
+ node) {
+ if (event_notifier_enabler->base.enabled)
+ return true;
+ }
+ return false;
+}
+
+bool lttng_event_notifier_active(void)
+{
+ struct lttng_event_notifier_group *event_notifier_group;
+
+ list_for_each_entry(event_notifier_group, &event_notifier_groups, node) {
+ if (lttng_event_notifier_group_has_active_event_notifiers(event_notifier_group))
+ return true;
+ }
+ return false;
+}
+
+int lttng_fix_pending_event_notifiers(void)
+{
+ struct lttng_event_notifier_group *event_notifier_group;
+
+ list_for_each_entry(event_notifier_group, &event_notifier_groups, node)
+ lttng_event_notifier_group_sync_enablers(event_notifier_group);
return 0;
}
-struct lttng_enabler *lttng_enabler_create(enum lttng_enabler_type type,
- struct lttng_kernel_event *event_param,
+struct lttng_event_enabler *lttng_event_enabler_create(
+ enum lttng_enabler_format_type format_type,
+ struct lttng_kernel_abi_event *event_param,
struct lttng_channel *chan)
{
- struct lttng_enabler *enabler;
+ struct lttng_event_enabler *event_enabler;
- enabler = kzalloc(sizeof(*enabler), GFP_KERNEL);
- if (!enabler)
+ event_enabler = kzalloc(sizeof(*event_enabler), GFP_KERNEL);
+ if (!event_enabler)
return NULL;
- enabler->type = type;
- INIT_LIST_HEAD(&enabler->filter_bytecode_head);
- memcpy(&enabler->event_param, event_param,
- sizeof(enabler->event_param));
- enabler->chan = chan;
+ event_enabler->base.format_type = format_type;
+ 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;
/* ctx left NULL */
- enabler->enabled = 0;
- enabler->evtype = LTTNG_TYPE_ENABLER;
+ event_enabler->base.enabled = 0;
mutex_lock(&sessions_mutex);
- list_add(&enabler->node, &enabler->chan->session->enablers_head);
- lttng_session_lazy_sync_enablers(enabler->chan->session);
+ list_add(&event_enabler->node, &event_enabler->chan->session->enablers_head);
+ lttng_session_lazy_sync_event_enablers(event_enabler->chan->session);
mutex_unlock(&sessions_mutex);
- return enabler;
+ return event_enabler;
}
-int lttng_enabler_enable(struct lttng_enabler *enabler)
+int lttng_event_enabler_enable(struct lttng_event_enabler *event_enabler)
{
mutex_lock(&sessions_mutex);
- enabler->enabled = 1;
- lttng_session_lazy_sync_enablers(enabler->chan->session);
+ lttng_event_enabler_as_enabler(event_enabler)->enabled = 1;
+ lttng_session_lazy_sync_event_enablers(event_enabler->chan->session);
mutex_unlock(&sessions_mutex);
return 0;
}
-int lttng_enabler_disable(struct lttng_enabler *enabler)
+int lttng_event_enabler_disable(struct lttng_event_enabler *event_enabler)
{
mutex_lock(&sessions_mutex);
- enabler->enabled = 0;
- lttng_session_lazy_sync_enablers(enabler->chan->session);
+ lttng_event_enabler_as_enabler(event_enabler)->enabled = 0;
+ lttng_session_lazy_sync_event_enablers(event_enabler->chan->session);
mutex_unlock(&sessions_mutex);
return 0;
}
-int lttng_enabler_attach_bytecode(struct lttng_enabler *enabler,
- struct lttng_kernel_filter_bytecode __user *bytecode)
+static
+int lttng_enabler_attach_filter_bytecode(struct lttng_enabler *enabler,
+ struct lttng_kernel_abi_filter_bytecode __user *bytecode)
{
- struct lttng_filter_bytecode_node *bytecode_node;
+ struct lttng_kernel_bytecode_node *bytecode_node;
uint32_t bytecode_len;
int ret;
ret = get_user(bytecode_len, &bytecode->len);
if (ret)
return ret;
- bytecode_node = kzalloc(sizeof(*bytecode_node) + bytecode_len,
+ bytecode_node = lttng_kvzalloc(sizeof(*bytecode_node) + bytecode_len,
GFP_KERNEL);
if (!bytecode_node)
return -ENOMEM;
sizeof(*bytecode) + bytecode_len);
if (ret)
goto error_free;
+
+ bytecode_node->type = LTTNG_KERNEL_BYTECODE_TYPE_FILTER;
bytecode_node->enabler = enabler;
/* Enforce length based on allocated size */
bytecode_node->bc.len = bytecode_len;
list_add_tail(&bytecode_node->node, &enabler->filter_bytecode_head);
- lttng_session_lazy_sync_enablers(enabler->chan->session);
+
return 0;
error_free:
- kfree(bytecode_node);
+ lttng_kvfree(bytecode_node);
return ret;
}
-int lttng_event_add_callsite(struct lttng_event *event,
- struct lttng_kernel_event_callsite __user *callsite)
+int lttng_event_enabler_attach_filter_bytecode(struct lttng_event_enabler *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);
+ if (ret)
+ goto error;
- switch (event->instrumentation) {
- case LTTNG_KERNEL_UPROBE:
- return lttng_uprobes_add_callsite(event, callsite);
- default:
- return -EINVAL;
- }
+ lttng_session_lazy_sync_event_enablers(event_enabler->chan->session);
+ return 0;
+
+error:
+ return ret;
}
-int lttng_enabler_attach_context(struct lttng_enabler *enabler,
- struct lttng_kernel_context *context_param)
+int lttng_event_add_callsite(struct lttng_kernel_event_common *event,
+ struct lttng_kernel_abi_event_callsite __user *callsite)
{
- return -ENOSYS;
+
+ switch (event->priv->instrumentation) {
+ case LTTNG_KERNEL_ABI_UPROBE:
+ return lttng_uprobes_event_add_callsite(event, callsite);
+ default:
+ return -EINVAL;
+ }
}
static
void lttng_enabler_destroy(struct lttng_enabler *enabler)
{
- struct lttng_filter_bytecode_node *filter_node, *tmp_filter_node;
+ struct lttng_kernel_bytecode_node *filter_node, *tmp_filter_node;
/* Destroy filter bytecode */
list_for_each_entry_safe(filter_node, tmp_filter_node,
&enabler->filter_bytecode_head, node) {
- kfree(filter_node);
+ lttng_kvfree(filter_node);
+ }
+}
+
+static
+void lttng_event_enabler_destroy(struct lttng_event_enabler *event_enabler)
+{
+ lttng_enabler_destroy(lttng_event_enabler_as_enabler(event_enabler));
+
+ list_del(&event_enabler->node);
+ kfree(event_enabler);
+}
+
+struct lttng_event_notifier_enabler *lttng_event_notifier_enabler_create(
+ struct lttng_event_notifier_group *event_notifier_group,
+ enum lttng_enabler_format_type format_type,
+ struct lttng_kernel_abi_event_notifier *event_notifier_param)
+{
+ struct lttng_event_notifier_enabler *event_notifier_enabler;
+
+ event_notifier_enabler = kzalloc(sizeof(*event_notifier_enabler), GFP_KERNEL);
+ if (!event_notifier_enabler)
+ return NULL;
+
+ event_notifier_enabler->base.format_type = format_type;
+ INIT_LIST_HEAD(&event_notifier_enabler->base.filter_bytecode_head);
+ INIT_LIST_HEAD(&event_notifier_enabler->capture_bytecode_head);
+
+ event_notifier_enabler->error_counter_index = event_notifier_param->error_counter_index;
+ event_notifier_enabler->num_captures = 0;
+
+ memcpy(&event_notifier_enabler->base.event_param, &event_notifier_param->event,
+ sizeof(event_notifier_enabler->base.event_param));
+
+ event_notifier_enabler->base.enabled = 0;
+ event_notifier_enabler->base.user_token = event_notifier_param->event.token;
+ event_notifier_enabler->group = event_notifier_group;
+
+ mutex_lock(&sessions_mutex);
+ list_add(&event_notifier_enabler->node, &event_notifier_enabler->group->enablers_head);
+ lttng_event_notifier_group_sync_enablers(event_notifier_enabler->group);
+
+ mutex_unlock(&sessions_mutex);
+
+ return event_notifier_enabler;
+}
+
+int lttng_event_notifier_enabler_enable(
+ struct lttng_event_notifier_enabler *event_notifier_enabler)
+{
+ mutex_lock(&sessions_mutex);
+ lttng_event_notifier_enabler_as_enabler(event_notifier_enabler)->enabled = 1;
+ lttng_event_notifier_group_sync_enablers(event_notifier_enabler->group);
+ mutex_unlock(&sessions_mutex);
+ return 0;
+}
+
+int lttng_event_notifier_enabler_disable(
+ struct lttng_event_notifier_enabler *event_notifier_enabler)
+{
+ mutex_lock(&sessions_mutex);
+ lttng_event_notifier_enabler_as_enabler(event_notifier_enabler)->enabled = 0;
+ lttng_event_notifier_group_sync_enablers(event_notifier_enabler->group);
+ mutex_unlock(&sessions_mutex);
+ return 0;
+}
+
+int lttng_event_notifier_enabler_attach_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)
+{
+ struct lttng_kernel_bytecode_node *bytecode_node;
+ struct lttng_enabler *enabler =
+ lttng_event_notifier_enabler_as_enabler(event_notifier_enabler);
+ uint32_t bytecode_len;
+ int ret;
+
+ ret = get_user(bytecode_len, &bytecode->len);
+ if (ret)
+ return ret;
+
+ bytecode_node = lttng_kvzalloc(sizeof(*bytecode_node) + bytecode_len,
+ GFP_KERNEL);
+ if (!bytecode_node)
+ return -ENOMEM;
+
+ ret = copy_from_user(&bytecode_node->bc, bytecode,
+ sizeof(*bytecode) + bytecode_len);
+ if (ret)
+ goto error_free;
+
+ bytecode_node->type = LTTNG_KERNEL_BYTECODE_TYPE_CAPTURE;
+ bytecode_node->enabler = enabler;
+
+ /* Enforce length based on allocated size */
+ bytecode_node->bc.len = bytecode_len;
+ list_add_tail(&bytecode_node->node, &event_notifier_enabler->capture_bytecode_head);
+
+ event_notifier_enabler->num_captures++;
+
+ lttng_event_notifier_group_sync_enablers(event_notifier_enabler->group);
+ goto end;
+
+error_free:
+ lttng_kvfree(bytecode_node);
+end:
+ return ret;
+}
+
+static
+void lttng_event_notifier_enabler_destroy(
+ struct lttng_event_notifier_enabler *event_notifier_enabler)
+{
+ if (!event_notifier_enabler) {
+ return;
}
- /* Destroy contexts */
- lttng_destroy_context(enabler->ctx);
+ list_del(&event_notifier_enabler->node);
- list_del(&enabler->node);
- kfree(enabler);
+ lttng_enabler_destroy(lttng_event_notifier_enabler_as_enabler(event_notifier_enabler));
+ kfree(event_notifier_enabler);
}
/*
- * lttng_session_sync_enablers should be called just before starting a
+ * lttng_session_sync_event_enablers should be called just before starting a
* session.
* Should be called with sessions mutex held.
*/
static
-void lttng_session_sync_enablers(struct lttng_session *session)
+void lttng_session_sync_event_enablers(struct lttng_session *session)
{
- struct lttng_enabler *enabler;
- struct lttng_event *event;
+ struct lttng_event_enabler *event_enabler;
+ struct lttng_kernel_event_recorder_private *event_recorder_priv;
- list_for_each_entry(enabler, &session->enablers_head, node)
- lttng_enabler_ref_events(enabler);
+ list_for_each_entry(event_enabler, &session->enablers_head, node)
+ lttng_event_enabler_ref_events(event_enabler);
/*
* For each event, if at least one of its enablers is enabled,
* and its channel and session transient states are enabled, we
* enable the event, else we disable it.
*/
- list_for_each_entry(event, &session->events, list) {
+ list_for_each_entry(event_recorder_priv, &session->events, node) {
+ struct lttng_kernel_event_recorder *event_recorder = event_recorder_priv->pub;
struct lttng_enabler_ref *enabler_ref;
- struct lttng_bytecode_runtime *runtime;
- int enabled = 0, has_enablers_without_bytecode = 0;
+ struct lttng_kernel_bytecode_runtime *runtime;
+ int enabled = 0, has_enablers_without_filter_bytecode = 0;
+ int nr_filters = 0;
- switch (event->instrumentation) {
- case LTTNG_KERNEL_TRACEPOINT:
- case LTTNG_KERNEL_SYSCALL:
+ switch (event_recorder_priv->parent.instrumentation) {
+ case LTTNG_KERNEL_ABI_TRACEPOINT: /* Fall-through */
+ case LTTNG_KERNEL_ABI_SYSCALL:
/* Enable events */
list_for_each_entry(enabler_ref,
- &event->enablers_ref_head, node) {
+ &event_recorder_priv->parent.enablers_ref_head, node) {
if (enabler_ref->ref->enabled) {
enabled = 1;
break;
}
}
break;
+
default:
/* Not handled with lazy sync. */
continue;
* intesection of session and channel transient enable
* states.
*/
- enabled = enabled && session->tstate && event->chan->tstate;
+ enabled = enabled && session->tstate && event_recorder->chan->tstate;
- WRITE_ONCE(event->enabled, enabled);
+ WRITE_ONCE(event_recorder->parent.enabled, enabled);
/*
* Sync tracepoint registration with event enabled
* state.
*/
if (enabled) {
- register_event(event);
+ register_event(event_recorder);
} else {
- _lttng_event_unregister(event);
+ _lttng_event_unregister(event_recorder);
}
/* Check if has enablers without bytecode enabled */
list_for_each_entry(enabler_ref,
- &event->enablers_ref_head, node) {
+ &event_recorder_priv->parent.enablers_ref_head, node) {
if (enabler_ref->ref->enabled
&& list_empty(&enabler_ref->ref->filter_bytecode_head)) {
- has_enablers_without_bytecode = 1;
+ has_enablers_without_filter_bytecode = 1;
break;
}
}
- event->has_enablers_without_bytecode =
- has_enablers_without_bytecode;
+ event_recorder_priv->parent.has_enablers_without_filter_bytecode =
+ has_enablers_without_filter_bytecode;
/* Enable filters */
list_for_each_entry(runtime,
- &event->bytecode_runtime_head, node)
- lttng_filter_sync_state(runtime);
+ &event_recorder_priv->parent.filter_bytecode_runtime_head, node) {
+ lttng_bytecode_sync_state(runtime);
+ nr_filters++;
+ }
+ WRITE_ONCE(event_recorder_priv->parent.pub->eval_filter,
+ !(has_enablers_without_filter_bytecode || !nr_filters));
}
}
* Should be called with sessions mutex held.
*/
static
-void lttng_session_lazy_sync_enablers(struct lttng_session *session)
+void lttng_session_lazy_sync_event_enablers(struct lttng_session *session)
{
/* We can skip if session is not active */
if (!session->active)
return;
- lttng_session_sync_enablers(session);
+ lttng_session_sync_event_enablers(session);
+}
+
+static
+void lttng_event_notifier_group_sync_enablers(struct lttng_event_notifier_group *event_notifier_group)
+{
+ struct lttng_event_notifier_enabler *event_notifier_enabler;
+ struct lttng_kernel_event_notifier_private *event_notifier_priv;
+
+ list_for_each_entry(event_notifier_enabler, &event_notifier_group->enablers_head, node)
+ lttng_event_notifier_enabler_ref_event_notifiers(event_notifier_enabler);
+
+ /*
+ * For each event_notifier, if at least one of its enablers is enabled,
+ * we enable the event_notifier, else we disable it.
+ */
+ list_for_each_entry(event_notifier_priv, &event_notifier_group->event_notifiers_head, node) {
+ struct lttng_kernel_event_notifier *event_notifier = event_notifier_priv->pub;
+ struct lttng_enabler_ref *enabler_ref;
+ struct lttng_kernel_bytecode_runtime *runtime;
+ int enabled = 0, has_enablers_without_filter_bytecode = 0;
+ int nr_filters = 0, nr_captures = 0;
+
+ switch (event_notifier_priv->parent.instrumentation) {
+ case LTTNG_KERNEL_ABI_TRACEPOINT: /* Fall-through */
+ case LTTNG_KERNEL_ABI_SYSCALL:
+ /* Enable event_notifiers */
+ list_for_each_entry(enabler_ref,
+ &event_notifier_priv->parent.enablers_ref_head, node) {
+ if (enabler_ref->ref->enabled) {
+ enabled = 1;
+ break;
+ }
+ }
+ break;
+
+ default:
+ /* Not handled with sync. */
+ continue;
+ }
+
+ WRITE_ONCE(event_notifier->parent.enabled, enabled);
+ /*
+ * Sync tracepoint registration with event_notifier enabled
+ * state.
+ */
+ if (enabled) {
+ if (!event_notifier_priv->parent.registered)
+ register_event_notifier(event_notifier);
+ } else {
+ if (event_notifier_priv->parent.registered)
+ _lttng_event_notifier_unregister(event_notifier);
+ }
+
+ /* Check if has enablers without bytecode enabled */
+ list_for_each_entry(enabler_ref,
+ &event_notifier_priv->parent.enablers_ref_head, node) {
+ if (enabler_ref->ref->enabled
+ && list_empty(&enabler_ref->ref->filter_bytecode_head)) {
+ has_enablers_without_filter_bytecode = 1;
+ break;
+ }
+ }
+ event_notifier_priv->parent.has_enablers_without_filter_bytecode =
+ has_enablers_without_filter_bytecode;
+
+ /* Enable filters */
+ list_for_each_entry(runtime,
+ &event_notifier_priv->parent.filter_bytecode_runtime_head, node) {
+ lttng_bytecode_sync_state(runtime);
+ nr_filters++;
+ }
+ WRITE_ONCE(event_notifier_priv->parent.pub->eval_filter,
+ !(has_enablers_without_filter_bytecode || !nr_filters));
+
+ /* Enable captures */
+ list_for_each_entry(runtime,
+ &event_notifier_priv->capture_bytecode_runtime_head, node) {
+ lttng_bytecode_sync_state(runtime);
+ nr_captures++;
+ }
+ WRITE_ONCE(event_notifier->eval_capture, !!nr_captures);
+ }
}
/*
int lttng_metadata_output_channel(struct lttng_metadata_stream *stream,
struct channel *chan, bool *coherent)
{
- struct lib_ring_buffer_ctx ctx;
+ struct lttng_kernel_ring_buffer_ctx ctx;
int ret = 0;
size_t len, reserve_len;
if (!len)
goto end;
reserve_len = min_t(size_t,
- stream->transport->ops.packet_avail_size(chan),
+ stream->transport->ops.priv->packet_avail_size(chan),
len);
- lib_ring_buffer_ctx_init(&ctx, chan, NULL, reserve_len,
- sizeof(char), -1);
+ lib_ring_buffer_ctx_init(&ctx, chan, reserve_len,
+ sizeof(char), NULL);
/*
* If reservation failed, return an error to the caller.
*/
- ret = stream->transport->ops.event_reserve(&ctx, 0);
+ ret = stream->transport->ops.event_reserve(&ctx);
if (ret != 0) {
printk(KERN_WARNING "LTTng: Metadata event reservation failed\n");
stream->coherent = false;
size_t len;
va_list ap;
- WARN_ON_ONCE(!READ_ONCE(session->active));
+ WARN_ON_ONCE(!LTTNG_READ_ONCE(session->active));
va_start(ap, fmt);
str = kvasprintf(GFP_KERNEL, fmt, ap);
static
int lttng_field_name_statedump(struct lttng_session *session,
- const struct lttng_event_field *field,
+ const struct lttng_kernel_event_field *field,
size_t nesting)
{
return lttng_metadata_printf(session, " _%s;\n", field->name);
static
int _lttng_integer_type_statedump(struct lttng_session *session,
- const struct lttng_type *type,
+ const struct lttng_kernel_type_integer *type,
+ enum lttng_kernel_string_encoding parent_encoding,
size_t nesting)
{
int ret;
- WARN_ON_ONCE(type->atype != atype_integer);
ret = print_tabs(session, nesting);
if (ret)
return ret;
ret = lttng_metadata_printf(session,
"integer { size = %u; align = %u; signed = %u; encoding = %s; base = %u;%s }",
- type->u.integer.size,
- type->u.integer.alignment,
- type->u.integer.signedness,
- (type->u.integer.encoding == lttng_encode_none)
+ type->size,
+ type->alignment,
+ type->signedness,
+ (parent_encoding == lttng_kernel_string_encoding_none)
? "none"
- : (type->u.integer.encoding == lttng_encode_UTF8)
+ : (parent_encoding == lttng_kernel_string_encoding_UTF8)
? "UTF8"
: "ASCII",
- type->u.integer.base,
+ type->base,
#if __BYTE_ORDER == __BIG_ENDIAN
- type->u.integer.reverse_byte_order ? " byte_order = le;" : ""
+ type->reverse_byte_order ? " byte_order = le;" : ""
#else
- type->u.integer.reverse_byte_order ? " byte_order = be;" : ""
+ type->reverse_byte_order ? " byte_order = be;" : ""
#endif
);
return ret;
*/
static
int _lttng_struct_type_statedump(struct lttng_session *session,
- const struct lttng_type *type,
+ const struct lttng_kernel_type_struct *type,
size_t nesting)
{
+ const char *prev_field_name = NULL;
int ret;
uint32_t i, nr_fields;
unsigned int alignment;
- WARN_ON_ONCE(type->atype != atype_struct_nestable);
-
ret = print_tabs(session, nesting);
if (ret)
return ret;
"struct {\n");
if (ret)
return ret;
- nr_fields = type->u.struct_nestable.nr_fields;
+ nr_fields = type->nr_fields;
for (i = 0; i < nr_fields; i++) {
- const struct lttng_event_field *iter_field;
+ const struct lttng_kernel_event_field *iter_field;
- iter_field = &type->u.struct_nestable.fields[i];
- ret = _lttng_field_statedump(session, iter_field, nesting + 1);
+ iter_field = type->fields[i];
+ ret = _lttng_field_statedump(session, iter_field, nesting + 1, &prev_field_name);
if (ret)
return ret;
}
ret = print_tabs(session, nesting);
if (ret)
return ret;
- alignment = type->u.struct_nestable.alignment;
+ alignment = type->alignment;
if (alignment) {
ret = lttng_metadata_printf(session,
"} align(%u)",
*/
static
int _lttng_struct_field_statedump(struct lttng_session *session,
- const struct lttng_event_field *field,
+ const struct lttng_kernel_event_field *field,
size_t nesting)
{
int ret;
ret = _lttng_struct_type_statedump(session,
- &field->type, nesting);
+ lttng_kernel_get_type_struct(field->type), nesting);
if (ret)
return ret;
return lttng_field_name_statedump(session, field, nesting);
*/
static
int _lttng_variant_type_statedump(struct lttng_session *session,
- const struct lttng_type *type,
- size_t nesting)
+ const struct lttng_kernel_type_variant *type,
+ size_t nesting,
+ const char *prev_field_name)
{
+ const char *tag_name;
int ret;
uint32_t i, nr_choices;
- WARN_ON_ONCE(type->atype != atype_variant_nestable);
+ tag_name = type->tag_name;
+ if (!tag_name)
+ tag_name = prev_field_name;
+ if (!tag_name)
+ return -EINVAL;
/*
* CTF 1.8 does not allow expressing nonzero variant alignment in a nestable way.
*/
- if (type->u.variant_nestable.alignment != 0)
+ if (type->alignment != 0)
return -EINVAL;
ret = print_tabs(session, nesting);
if (ret)
return ret;
ret = lttng_metadata_printf(session,
"variant <_%s> {\n",
- type->u.variant_nestable.tag_name);
+ tag_name);
if (ret)
return ret;
- nr_choices = type->u.variant_nestable.nr_choices;
+ nr_choices = type->nr_choices;
for (i = 0; i < nr_choices; i++) {
- const struct lttng_event_field *iter_field;
+ const struct lttng_kernel_event_field *iter_field;
- iter_field = &type->u.variant_nestable.choices[i];
- ret = _lttng_field_statedump(session, iter_field, nesting + 1);
+ iter_field = type->choices[i];
+ ret = _lttng_field_statedump(session, iter_field, nesting + 1, NULL);
if (ret)
return ret;
}
*/
static
int _lttng_variant_field_statedump(struct lttng_session *session,
- const struct lttng_event_field *field,
- size_t nesting)
+ const struct lttng_kernel_event_field *field,
+ size_t nesting,
+ const char *prev_field_name)
{
int ret;
ret = _lttng_variant_type_statedump(session,
- &field->type, nesting);
+ lttng_kernel_get_type_variant(field->type), nesting,
+ prev_field_name);
if (ret)
return ret;
return lttng_field_name_statedump(session, field, nesting);
*/
static
int _lttng_array_field_statedump(struct lttng_session *session,
- const struct lttng_event_field *field,
+ const struct lttng_kernel_event_field *field,
size_t nesting)
{
int ret;
- const struct lttng_type *elem_type;
+ const struct lttng_kernel_type_array *array_type;
+ const struct lttng_kernel_type_common *elem_type;
- WARN_ON_ONCE(field->type.atype != atype_array_nestable);
+ array_type = lttng_kernel_get_type_array(field->type);
+ WARN_ON_ONCE(!array_type);
- if (field->type.u.array_nestable.alignment) {
+ if (array_type->alignment) {
ret = print_tabs(session, nesting);
if (ret)
return ret;
ret = lttng_metadata_printf(session,
"struct { } align(%u) _%s_padding;\n",
- field->type.u.array_nestable.alignment * CHAR_BIT,
+ array_type->alignment * CHAR_BIT,
field->name);
if (ret)
return ret;
* Nested compound types: Only array of structures and variants are
* currently supported.
*/
- elem_type = field->type.u.array_nestable.elem_type;
- switch (elem_type->atype) {
- case atype_integer:
- case atype_struct_nestable:
- case atype_variant_nestable:
- ret = _lttng_type_statedump(session, elem_type, nesting);
+ elem_type = array_type->elem_type;
+ switch (elem_type->type) {
+ case lttng_kernel_type_integer:
+ case lttng_kernel_type_struct:
+ case lttng_kernel_type_variant:
+ ret = _lttng_type_statedump(session, elem_type,
+ array_type->encoding, nesting);
if (ret)
return ret;
break;
ret = lttng_metadata_printf(session,
" _%s[%u];\n",
field->name,
- field->type.u.array_nestable.length);
+ array_type->length);
return ret;
}
*/
static
int _lttng_sequence_field_statedump(struct lttng_session *session,
- const struct lttng_event_field *field,
- size_t nesting)
+ const struct lttng_kernel_event_field *field,
+ size_t nesting,
+ const char *prev_field_name)
{
int ret;
const char *length_name;
- const struct lttng_type *elem_type;
+ const struct lttng_kernel_type_sequence *sequence_type;
+ const struct lttng_kernel_type_common *elem_type;
- WARN_ON_ONCE(field->type.atype != atype_sequence_nestable);
+ sequence_type = lttng_kernel_get_type_sequence(field->type);
+ WARN_ON_ONCE(!sequence_type);
- length_name = field->type.u.sequence_nestable.length_name;
+ length_name = sequence_type->length_name;
+ if (!length_name)
+ length_name = prev_field_name;
+ if (!length_name)
+ return -EINVAL;
- if (field->type.u.sequence_nestable.alignment) {
+ if (sequence_type->alignment) {
ret = print_tabs(session, nesting);
if (ret)
return ret;
ret = lttng_metadata_printf(session,
"struct { } align(%u) _%s_padding;\n",
- field->type.u.sequence_nestable.alignment * CHAR_BIT,
+ sequence_type->alignment * CHAR_BIT,
field->name);
if (ret)
return ret;
* Nested compound types: Only array of structures and variants are
* currently supported.
*/
- elem_type = field->type.u.sequence_nestable.elem_type;
- switch (elem_type->atype) {
- case atype_integer:
- case atype_struct_nestable:
- case atype_variant_nestable:
- ret = _lttng_type_statedump(session, elem_type, nesting);
+ elem_type = sequence_type->elem_type;
+ switch (elem_type->type) {
+ case lttng_kernel_type_integer:
+ case lttng_kernel_type_struct:
+ case lttng_kernel_type_variant:
+ ret = _lttng_type_statedump(session, elem_type,
+ sequence_type->encoding, nesting);
if (ret)
return ret;
break;
ret = lttng_metadata_printf(session,
" _%s[ _%s ];\n",
field->name,
- field->type.u.sequence_nestable.length_name);
+ length_name);
return ret;
}
*/
static
int _lttng_enum_type_statedump(struct lttng_session *session,
- const struct lttng_type *type,
+ const struct lttng_kernel_type_enum *type,
size_t nesting)
{
- const struct lttng_enum_desc *enum_desc;
- const struct lttng_type *container_type;
+ const struct lttng_kernel_enum_desc *enum_desc;
+ const struct lttng_kernel_type_common *container_type;
int ret;
unsigned int i, nr_entries;
- container_type = type->u.enum_nestable.container_type;
- if (container_type->atype != atype_integer) {
+ container_type = type->container_type;
+ if (container_type->type != lttng_kernel_type_integer) {
ret = -EINVAL;
goto end;
}
- enum_desc = type->u.enum_nestable.desc;
+ enum_desc = type->desc;
nr_entries = enum_desc->nr_entries;
ret = print_tabs(session, nesting);
ret = lttng_metadata_printf(session, "enum : ");
if (ret)
goto end;
- ret = _lttng_integer_type_statedump(session, container_type, 0);
+ ret = _lttng_integer_type_statedump(session, lttng_kernel_get_type_integer(container_type),
+ lttng_kernel_string_encoding_none, 0);
if (ret)
goto end;
ret = lttng_metadata_printf(session, " {\n");
goto end;
/* Dump all entries */
for (i = 0; i < nr_entries; i++) {
- const struct lttng_enum_entry *entry = &enum_desc->entries[i];
+ const struct lttng_kernel_enum_entry *entry = enum_desc->entries[i];
int j, len;
ret = print_tabs(session, nesting + 1);
*/
static
int _lttng_enum_field_statedump(struct lttng_session *session,
- const struct lttng_event_field *field,
+ const struct lttng_kernel_event_field *field,
size_t nesting)
{
int ret;
+ const struct lttng_kernel_type_enum *enum_type;
- ret = _lttng_enum_type_statedump(session, &field->type, nesting);
+ enum_type = lttng_kernel_get_type_enum(field->type);
+ WARN_ON_ONCE(!enum_type);
+ ret = _lttng_enum_type_statedump(session, enum_type, nesting);
if (ret)
return ret;
return lttng_field_name_statedump(session, field, nesting);
static
int _lttng_integer_field_statedump(struct lttng_session *session,
- const struct lttng_event_field *field,
+ const struct lttng_kernel_event_field *field,
size_t nesting)
{
int ret;
- ret = _lttng_integer_type_statedump(session, &field->type, nesting);
+ ret = _lttng_integer_type_statedump(session, lttng_kernel_get_type_integer(field->type),
+ lttng_kernel_string_encoding_none, nesting);
if (ret)
return ret;
return lttng_field_name_statedump(session, field, nesting);
static
int _lttng_string_type_statedump(struct lttng_session *session,
- const struct lttng_type *type,
+ const struct lttng_kernel_type_string *type,
size_t nesting)
{
int ret;
- WARN_ON_ONCE(type->atype != atype_string);
/* Default encoding is UTF8 */
ret = print_tabs(session, nesting);
if (ret)
return ret;
ret = lttng_metadata_printf(session,
"string%s",
- type->u.string.encoding == lttng_encode_ASCII ?
+ type->encoding == lttng_kernel_string_encoding_ASCII ?
" { encoding = ASCII; }" : "");
return ret;
}
static
int _lttng_string_field_statedump(struct lttng_session *session,
- const struct lttng_event_field *field,
+ const struct lttng_kernel_event_field *field,
size_t nesting)
{
+ const struct lttng_kernel_type_string *string_type;
int ret;
- WARN_ON_ONCE(field->type.atype != atype_string);
- ret = _lttng_string_type_statedump(session, &field->type, nesting);
+ string_type = lttng_kernel_get_type_string(field->type);
+ WARN_ON_ONCE(!string_type);
+ ret = _lttng_string_type_statedump(session, string_type, nesting);
if (ret)
return ret;
return lttng_field_name_statedump(session, field, nesting);
*/
static
int _lttng_type_statedump(struct lttng_session *session,
- const struct lttng_type *type,
+ const struct lttng_kernel_type_common *type,
+ enum lttng_kernel_string_encoding parent_encoding,
size_t nesting)
{
int ret = 0;
- switch (type->atype) {
- case atype_integer:
- ret = _lttng_integer_type_statedump(session, type, nesting);
+ switch (type->type) {
+ case lttng_kernel_type_integer:
+ ret = _lttng_integer_type_statedump(session,
+ lttng_kernel_get_type_integer(type),
+ parent_encoding, nesting);
break;
- case atype_enum_nestable:
- ret = _lttng_enum_type_statedump(session, type, nesting);
+ case lttng_kernel_type_enum:
+ ret = _lttng_enum_type_statedump(session,
+ lttng_kernel_get_type_enum(type),
+ nesting);
break;
- case atype_string:
- ret = _lttng_string_type_statedump(session, type, nesting);
+ case lttng_kernel_type_string:
+ ret = _lttng_string_type_statedump(session,
+ lttng_kernel_get_type_string(type),
+ nesting);
break;
- case atype_struct_nestable:
- ret = _lttng_struct_type_statedump(session, type, nesting);
+ case lttng_kernel_type_struct:
+ ret = _lttng_struct_type_statedump(session,
+ lttng_kernel_get_type_struct(type),
+ nesting);
break;
- case atype_variant_nestable:
- ret = _lttng_variant_type_statedump(session, type, nesting);
+ case lttng_kernel_type_variant:
+ ret = _lttng_variant_type_statedump(session,
+ lttng_kernel_get_type_variant(type),
+ nesting, NULL);
break;
/* Nested arrays and sequences are not supported yet. */
- case atype_array_nestable:
- case atype_sequence_nestable:
+ case lttng_kernel_type_array:
+ case lttng_kernel_type_sequence:
default:
WARN_ON_ONCE(1);
return -EINVAL;
*/
static
int _lttng_field_statedump(struct lttng_session *session,
- const struct lttng_event_field *field,
- size_t nesting)
+ const struct lttng_kernel_event_field *field,
+ size_t nesting,
+ const char **prev_field_name_p)
{
+ const char *prev_field_name = NULL;
int ret = 0;
- switch (field->type.atype) {
- case atype_integer:
+ if (prev_field_name_p)
+ prev_field_name = *prev_field_name_p;
+ switch (field->type->type) {
+ case lttng_kernel_type_integer:
ret = _lttng_integer_field_statedump(session, field, nesting);
break;
- case atype_enum_nestable:
+ case lttng_kernel_type_enum:
ret = _lttng_enum_field_statedump(session, field, nesting);
break;
- case atype_string:
+ case lttng_kernel_type_string:
ret = _lttng_string_field_statedump(session, field, nesting);
break;
- case atype_struct_nestable:
+ case lttng_kernel_type_struct:
ret = _lttng_struct_field_statedump(session, field, nesting);
break;
- case atype_array_nestable:
+ case lttng_kernel_type_array:
ret = _lttng_array_field_statedump(session, field, nesting);
break;
- case atype_sequence_nestable:
- ret = _lttng_sequence_field_statedump(session, field, nesting);
+ case lttng_kernel_type_sequence:
+ ret = _lttng_sequence_field_statedump(session, field, nesting, prev_field_name);
break;
- case atype_variant_nestable:
- ret = _lttng_variant_field_statedump(session, field, nesting);
+ case lttng_kernel_type_variant:
+ ret = _lttng_variant_field_statedump(session, field, nesting, prev_field_name);
break;
default:
WARN_ON_ONCE(1);
return -EINVAL;
}
+ if (prev_field_name_p)
+ *prev_field_name_p = field->name;
return ret;
}
static
int _lttng_context_metadata_statedump(struct lttng_session *session,
- struct lttng_ctx *ctx)
+ struct lttng_kernel_ctx *ctx)
{
+ const char *prev_field_name = NULL;
int ret = 0;
int i;
if (!ctx)
return 0;
for (i = 0; i < ctx->nr_fields; i++) {
- const struct lttng_ctx_field *field = &ctx->fields[i];
+ const struct lttng_kernel_ctx_field *field = &ctx->fields[i];
- ret = _lttng_field_statedump(session, &field->event_field, 2);
+ ret = _lttng_field_statedump(session, field->event_field, 2, &prev_field_name);
if (ret)
return ret;
}
static
int _lttng_fields_metadata_statedump(struct lttng_session *session,
- struct lttng_event *event)
+ struct lttng_kernel_event_recorder *event_recorder)
{
- const struct lttng_event_desc *desc = event->desc;
+ const char *prev_field_name = NULL;
+ const struct lttng_kernel_event_desc *desc = event_recorder->priv->parent.desc;
int ret = 0;
int i;
for (i = 0; i < desc->nr_fields; i++) {
- const struct lttng_event_field *field = &desc->fields[i];
+ const struct lttng_kernel_event_field *field = desc->fields[i];
- ret = _lttng_field_statedump(session, field, 2);
+ ret = _lttng_field_statedump(session, field, 2, &prev_field_name);
if (ret)
return ret;
}
static
int _lttng_event_metadata_statedump(struct lttng_session *session,
struct lttng_channel *chan,
- struct lttng_event *event)
+ struct lttng_kernel_event_recorder *event_recorder)
{
int ret = 0;
- if (event->metadata_dumped || !READ_ONCE(session->active))
+ if (event_recorder->priv->metadata_dumped || !LTTNG_READ_ONCE(session->active))
return 0;
if (chan->channel_type == METADATA_CHANNEL)
return 0;
" name = \"%s\";\n"
" id = %u;\n"
" stream_id = %u;\n",
- event->desc->name,
- event->id,
- event->chan->id);
- if (ret)
- goto end;
-
- if (event->ctx) {
- ret = lttng_metadata_printf(session,
- " context := struct {\n");
- if (ret)
- goto end;
- }
- ret = _lttng_context_metadata_statedump(session, event->ctx);
+ event_recorder->priv->parent.desc->event_name,
+ event_recorder->priv->id,
+ event_recorder->chan->id);
if (ret)
goto end;
- if (event->ctx) {
- ret = lttng_metadata_printf(session,
- " };\n");
- if (ret)
- goto end;
- }
ret = lttng_metadata_printf(session,
" fields := struct {\n"
if (ret)
goto end;
- ret = _lttng_fields_metadata_statedump(session, event);
+ ret = _lttng_fields_metadata_statedump(session, event_recorder);
if (ret)
goto end;
if (ret)
goto end;
- event->metadata_dumped = 1;
+ event_recorder->priv->metadata_dumped = 1;
end:
lttng_metadata_end(session);
return ret;
{
int ret = 0;
- if (chan->metadata_dumped || !READ_ONCE(session->active))
+ if (chan->metadata_dumped || !LTTNG_READ_ONCE(session->active))
return 0;
if (chan->channel_type == METADATA_CHANNEL)
unsigned char uuid_s[37], clock_uuid_s[BOOT_ID_LEN];
const char *product_uuid;
struct lttng_channel *chan;
- struct lttng_event *event;
+ struct lttng_kernel_event_recorder_private *event_recorder_priv;
int ret = 0;
- if (!READ_ONCE(session->active))
+ if (!LTTNG_READ_ONCE(session->active))
return 0;
lttng_metadata_begin(session);
goto end;
}
- list_for_each_entry(event, &session->events, list) {
- ret = _lttng_event_metadata_statedump(session, event->chan, event);
+ list_for_each_entry(event_recorder_priv, &session->events, node) {
+ ret = _lttng_event_metadata_statedump(session, event_recorder_priv->pub->chan,
+ event_recorder_priv->pub);
if (ret)
goto end;
}
}
EXPORT_SYMBOL_GPL(lttng_transport_unregister);
-#if (LINUX_VERSION_CODE >= KERNEL_VERSION(4,10,0))
+void lttng_counter_transport_register(struct lttng_counter_transport *transport)
+{
+ /*
+ * Make sure no page fault can be triggered by the module about to be
+ * registered. We deal with this here so we don't have to call
+ * vmalloc_sync_mappings() in each module's init.
+ */
+ wrapper_vmalloc_sync_mappings();
+
+ mutex_lock(&sessions_mutex);
+ list_add_tail(&transport->node, <tng_counter_transport_list);
+ mutex_unlock(&sessions_mutex);
+}
+EXPORT_SYMBOL_GPL(lttng_counter_transport_register);
+
+void lttng_counter_transport_unregister(struct lttng_counter_transport *transport)
+{
+ mutex_lock(&sessions_mutex);
+ list_del(&transport->node);
+ mutex_unlock(&sessions_mutex);
+}
+EXPORT_SYMBOL_GPL(lttng_counter_transport_unregister);
+
+#if (LTTNG_LINUX_VERSION_CODE >= LTTNG_KERNEL_VERSION(4,10,0))
enum cpuhp_state lttng_hp_prepare;
enum cpuhp_state lttng_hp_online;
cpuhp_remove_multi_state(lttng_hp_prepare);
}
-#else /* #if (LINUX_VERSION_CODE >= KERNEL_VERSION(4,10,0)) */
+#else /* #if (LTTNG_LINUX_VERSION_CODE >= LTTNG_KERNEL_VERSION(4,10,0)) */
static int lttng_init_cpu_hotplug(void)
{
return 0;
static void lttng_exit_cpu_hotplug(void)
{
}
-#endif /* #else #if (LINUX_VERSION_CODE >= KERNEL_VERSION(4,10,0)) */
+#endif /* #else #if (LTTNG_LINUX_VERSION_CODE >= LTTNG_KERNEL_VERSION(4,10,0)) */
static int __init lttng_events_init(void)
ret = lttng_tracepoint_init();
if (ret)
goto error_tp;
- event_cache = KMEM_CACHE(lttng_event, 0);
- if (!event_cache) {
+ event_recorder_cache = KMEM_CACHE(lttng_kernel_event_recorder, 0);
+ if (!event_recorder_cache) {
+ ret = -ENOMEM;
+ goto error_kmem_event_recorder;
+ }
+ event_recorder_private_cache = KMEM_CACHE(lttng_kernel_event_recorder_private, 0);
+ if (!event_recorder_private_cache) {
+ ret = -ENOMEM;
+ goto error_kmem_event_recorder_private;
+ }
+ event_notifier_cache = KMEM_CACHE(lttng_kernel_event_notifier, 0);
+ if (!event_notifier_cache) {
+ ret = -ENOMEM;
+ goto error_kmem_event_notifier;
+ }
+ event_notifier_private_cache = KMEM_CACHE(lttng_kernel_event_notifier_private, 0);
+ if (!event_notifier_private_cache) {
ret = -ENOMEM;
- goto error_kmem;
+ goto error_kmem_event_notifier_private;
}
ret = lttng_abi_init();
if (ret)
error_logger:
lttng_abi_exit();
error_abi:
- kmem_cache_destroy(event_cache);
-error_kmem:
+ kmem_cache_destroy(event_notifier_private_cache);
+error_kmem_event_notifier_private:
+ kmem_cache_destroy(event_notifier_cache);
+error_kmem_event_notifier:
+ kmem_cache_destroy(event_recorder_private_cache);
+error_kmem_event_recorder_private:
+ kmem_cache_destroy(event_recorder_cache);
+error_kmem_event_recorder:
lttng_tracepoint_exit();
error_tp:
lttng_context_exit();
lttng_abi_exit();
list_for_each_entry_safe(session, tmpsession, &sessions, list)
lttng_session_destroy(session);
- kmem_cache_destroy(event_cache);
+ kmem_cache_destroy(event_recorder_cache);
+ kmem_cache_destroy(event_recorder_private_cache);
+ kmem_cache_destroy(event_notifier_cache);
+ kmem_cache_destroy(event_notifier_private_cache);
lttng_tracepoint_exit();
lttng_context_exit();
printk(KERN_NOTICE "LTTng: Unloaded modules v%s.%s.%s%s (%s)%s%s\n",
projects / lttng-modules.git / blobdiff