X-Git-Url: https://git.lttng.org/?a=blobdiff_plain;f=src%2Flttng-abi.c;h=caec803fe51e018f470ce03bb7003fbbaa73517f;hb=0e41488f1d347fe2f4988acc4b7c63ee02fe4026;hp=aa1b0195eff6515ddee759871cc3fd4e25ee2f51;hpb=8cdc1a8180681ebd144f8c0009e76cdc7331b36a;p=lttng-modules.git

diff --git a/src/lttng-abi.c b/src/lttng-abi.c
index aa1b0195..caec803f 100644
--- a/src/lttng-abi.c
+++ b/src/lttng-abi.c
@@ -23,6 +23,7 @@
  *     - Takes instrumentation source specific arguments.
  */
 
+#include <asm/barrier.h>
 #include <linux/module.h>
 #include <linux/proc_fs.h>
 #include <linux/anon_inodes.h>
@@ -34,10 +35,9 @@
 #include <ringbuffer/vfs.h>
 #include <ringbuffer/backend.h>
 #include <ringbuffer/frontend.h>
+#include <wrapper/compiler_attributes.h>
 #include <wrapper/poll.h>
-#include <wrapper/file.h>
 #include <wrapper/kref.h>
-#include <wrapper/barrier.h>
 #include <lttng/string-utils.h>
 #include <lttng/abi.h>
 #include <lttng/abi-old.h>
@@ -98,7 +98,7 @@ int lttng_abi_create_session(void)
 	session = lttng_session_create();
 	if (!session)
 		return -ENOMEM;
-	session_fd = lttng_get_unused_fd();
+	session_fd = get_unused_fd_flags(0);
 	if (session_fd < 0) {
 		ret = session_fd;
 		goto fd_error;
@@ -140,7 +140,7 @@ int lttng_abi_create_event_notifier_group(void)
 	if (!event_notifier_group)
 		return -ENOMEM;
 
-	event_notifier_group_fd = lttng_get_unused_fd();
+	event_notifier_group_fd = get_unused_fd_flags(0);
 	if (event_notifier_group_fd < 0) {
 		ret = event_notifier_group_fd;
 		goto fd_error;
@@ -173,7 +173,7 @@ int lttng_abi_tracepoint_list(void)
 	struct file *tracepoint_list_file;
 	int file_fd, ret;
 
-	file_fd = lttng_get_unused_fd();
+	file_fd = get_unused_fd_flags(0);
 	if (file_fd < 0) {
 		ret = file_fd;
 		goto fd_error;
@@ -213,7 +213,7 @@ int lttng_abi_syscall_list(void)
 	struct file *syscall_list_file;
 	int file_fd, ret;
 
-	file_fd = lttng_get_unused_fd();
+	file_fd = get_unused_fd_flags(0);
 	if (file_fd < 0) {
 		ret = file_fd;
 		goto fd_error;
@@ -491,12 +491,12 @@ int lttng_abi_create_channel(struct file *session_file,
 	struct lttng_kernel_session *session = session_file->private_data;
 	const struct file_operations *fops = NULL;
 	const char *transport_name;
-	struct lttng_channel *chan;
+	struct lttng_kernel_channel_buffer *chan;
 	struct file *chan_file;
 	int chan_fd;
 	int ret = 0;
 
-	chan_fd = lttng_get_unused_fd();
+	chan_fd = get_unused_fd_flags(0);
 	if (chan_fd < 0) {
 		ret = chan_fd;
 		goto fd_error;
@@ -549,7 +549,7 @@ int lttng_abi_create_channel(struct file *session_file,
 	 * We tolerate no failure path after channel creation. It will stay
 	 * invariant for the rest of the session.
 	 */
-	chan = lttng_channel_create(session, transport_name, NULL,
+	chan = lttng_channel_buffer_create(session, transport_name, NULL,
 				  chan_param->subbuf_size,
 				  chan_param->num_subbuf,
 				  chan_param->switch_timer_interval,
@@ -559,7 +559,7 @@ int lttng_abi_create_channel(struct file *session_file,
 		ret = -EINVAL;
 		goto chan_error;
 	}
-	chan->file = chan_file;
+	chan->priv->parent.file = chan_file;
 	chan_file->private_data = chan;
 	fd_install(chan_fd, chan_file);
 
@@ -649,6 +649,8 @@ long lttng_counter_ioctl(struct file *file, unsigned int cmd, unsigned long arg)
 		if (validate_zeroed_padding(local_counter_read.padding,
 				sizeof(local_counter_read.padding)))
 			return -EINVAL;
+		if (local_counter_read.index.number_dimensions > LTTNG_KERNEL_ABI_COUNTER_DIMENSION_MAX)
+			return -EINVAL;
 
 		/* Cast all indexes into size_t. */
 		for (i = 0; i < local_counter_read.index.number_dimensions; i++)
@@ -684,6 +686,8 @@ long lttng_counter_ioctl(struct file *file, unsigned int cmd, unsigned long arg)
 		if (validate_zeroed_padding(local_counter_aggregate.padding,
 				sizeof(local_counter_aggregate.padding)))
 			return -EINVAL;
+		if (local_counter_aggregate.index.number_dimensions > LTTNG_KERNEL_ABI_COUNTER_DIMENSION_MAX)
+			return -EINVAL;
 
 		/* Cast all indexes into size_t. */
 		for (i = 0; i < local_counter_aggregate.index.number_dimensions; i++)
@@ -715,6 +719,8 @@ long lttng_counter_ioctl(struct file *file, unsigned int cmd, unsigned long arg)
 		if (validate_zeroed_padding(local_counter_clear.padding,
 				sizeof(local_counter_clear.padding)))
 			return -EINVAL;
+		if (local_counter_clear.index.number_dimensions > LTTNG_KERNEL_ABI_COUNTER_DIMENSION_MAX)
+			return -EINVAL;
 
 		/* Cast all indexes into size_t. */
 		for (i = 0; i < local_counter_clear.index.number_dimensions; i++)
@@ -723,7 +729,6 @@ long lttng_counter_ioctl(struct file *file, unsigned int cmd, unsigned long arg)
 		return lttng_kernel_counter_clear(counter, indexes);
 	}
 	default:
-		WARN_ON_ONCE(1);
 		return -ENOSYS;
 	}
 }
@@ -999,8 +1004,8 @@ ssize_t lttng_event_notifier_group_notif_read(struct file *filp, char __user *us
 		size_t count, loff_t *ppos)
 {
 	struct lttng_event_notifier_group *event_notifier_group = filp->private_data;
-	struct channel *chan = event_notifier_group->chan;
-	struct lib_ring_buffer *buf = event_notifier_group->buf;
+	struct lttng_kernel_ring_buffer_channel *chan = event_notifier_group->chan;
+	struct lttng_kernel_ring_buffer *buf = event_notifier_group->buf;
 	ssize_t read_count = 0, len;
 	size_t read_offset;
 
@@ -1010,7 +1015,7 @@ ssize_t lttng_event_notifier_group_notif_read(struct file *filp, char __user *us
 
 	/* Finish copy of previous record */
 	if (*ppos != 0) {
-		if (read_count < count) {
+		if (count != 0) {
 			len = chan->iter.len_left;
 			read_offset = *ppos;
 			goto skip_get_next;
@@ -1090,7 +1095,8 @@ nodata:
 	chan->iter.len_left = 0;
 
 put_record:
-	lib_ring_buffer_put_current_record(buf);
+	if (*ppos == 0)
+		lib_ring_buffer_put_current_record(buf);
 	return read_count;
 }
 
@@ -1105,9 +1111,9 @@ unsigned int lttng_event_notifier_group_notif_poll(struct file *filp,
 {
 	unsigned int mask = 0;
 	struct lttng_event_notifier_group *event_notifier_group = filp->private_data;
-	struct channel *chan = event_notifier_group->chan;
-	struct lib_ring_buffer *buf = event_notifier_group->buf;
-	const struct lib_ring_buffer_config *config = &chan->backend.config;
+	struct lttng_kernel_ring_buffer_channel *chan = event_notifier_group->chan;
+	struct lttng_kernel_ring_buffer *buf = event_notifier_group->buf;
+	const struct lttng_kernel_ring_buffer_config *config = &chan->backend.config;
 	int finalized, disabled;
 	unsigned long consumed, offset;
 	size_t subbuffer_header_size = config->cb.subbuffer_header_size();
@@ -1179,7 +1185,7 @@ retry:
 static int lttng_event_notifier_group_notif_open(struct inode *inode, struct file *file)
 {
 	struct lttng_event_notifier_group *event_notifier_group = inode->i_private;
-	struct lib_ring_buffer *buf = event_notifier_group->buf;
+	struct lttng_kernel_ring_buffer *buf = event_notifier_group->buf;
 
 	file->private_data = event_notifier_group;
 	return lib_ring_buffer_open(inode, file, buf);
@@ -1195,7 +1201,7 @@ static int lttng_event_notifier_group_notif_open(struct inode *inode, struct fil
 static int lttng_event_notifier_group_notif_release(struct inode *inode, struct file *file)
 {
 	struct lttng_event_notifier_group *event_notifier_group = file->private_data;
-	struct lib_ring_buffer *buf = event_notifier_group->buf;
+	struct lttng_kernel_ring_buffer *buf = event_notifier_group->buf;
 	int ret;
 
 	ret = lib_ring_buffer_release(inode, file, buf);
@@ -1225,7 +1231,7 @@ unsigned int lttng_metadata_ring_buffer_poll(struct file *filp,
 		poll_table *wait)
 {
 	struct lttng_metadata_stream *stream = filp->private_data;
-	struct lib_ring_buffer *buf = stream->priv;
+	struct lttng_kernel_ring_buffer *buf = stream->priv;
 	int finalized;
 	unsigned int mask = 0;
 
@@ -1301,7 +1307,7 @@ long lttng_metadata_ring_buffer_ioctl(struct file *filp,
 {
 	int ret;
 	struct lttng_metadata_stream *stream = filp->private_data;
-	struct lib_ring_buffer *buf = stream->priv;
+	struct lttng_kernel_ring_buffer *buf = stream->priv;
 	unsigned int rb_cmd;
 	bool coherent;
 
@@ -1314,8 +1320,8 @@ long lttng_metadata_ring_buffer_ioctl(struct file *filp,
 	case LTTNG_KERNEL_ABI_RING_BUFFER_GET_NEXT_SUBBUF:
 	{
 		struct lttng_metadata_stream *stream = filp->private_data;
-		struct lib_ring_buffer *buf = stream->priv;
-		struct channel *chan = buf->backend.chan;
+		struct lttng_kernel_ring_buffer *buf = stream->priv;
+		struct lttng_kernel_ring_buffer_channel *chan = buf->backend.chan;
 
 		ret = lttng_metadata_output_channel(stream, chan, NULL);
 		if (ret > 0) {
@@ -1332,12 +1338,13 @@ long lttng_metadata_ring_buffer_ioctl(struct file *filp,
 		 */
 		return -ENOSYS;
 	}
-	case LTTNG_KERNEL_ABI_RING_BUFFER_FLUSH_EMPTY:	/* Fall-through. */
+	case LTTNG_KERNEL_ABI_RING_BUFFER_FLUSH_EMPTY:
+		lttng_fallthrough;
 	case LTTNG_KERNEL_ABI_RING_BUFFER_FLUSH:
 	{
 		struct lttng_metadata_stream *stream = filp->private_data;
-		struct lib_ring_buffer *buf = stream->priv;
-		struct channel *chan = buf->backend.chan;
+		struct lttng_kernel_ring_buffer *buf = stream->priv;
+		struct lttng_kernel_ring_buffer_channel *chan = buf->backend.chan;
 
 		/*
 		 * Before doing the actual ring buffer flush, write up to one
@@ -1363,8 +1370,8 @@ long lttng_metadata_ring_buffer_ioctl(struct file *filp,
 	case LTTNG_KERNEL_ABI_RING_BUFFER_GET_NEXT_SUBBUF_METADATA_CHECK:
 	{
 		struct lttng_metadata_stream *stream = filp->private_data;
-		struct lib_ring_buffer *buf = stream->priv;
-		struct channel *chan = buf->backend.chan;
+		struct lttng_kernel_ring_buffer *buf = stream->priv;
+		struct lttng_kernel_ring_buffer_channel *chan = buf->backend.chan;
 
 		ret = lttng_metadata_output_channel(stream, chan, &coherent);
 		if (ret > 0) {
@@ -1410,7 +1417,7 @@ long lttng_metadata_ring_buffer_compat_ioctl(struct file *filp,
 {
 	int ret;
 	struct lttng_metadata_stream *stream = filp->private_data;
-	struct lib_ring_buffer *buf = stream->priv;
+	struct lttng_kernel_ring_buffer *buf = stream->priv;
 	unsigned int rb_cmd;
 	bool coherent;
 
@@ -1423,8 +1430,8 @@ long lttng_metadata_ring_buffer_compat_ioctl(struct file *filp,
 	case LTTNG_KERNEL_ABI_RING_BUFFER_GET_NEXT_SUBBUF:
 	{
 		struct lttng_metadata_stream *stream = filp->private_data;
-		struct lib_ring_buffer *buf = stream->priv;
-		struct channel *chan = buf->backend.chan;
+		struct lttng_kernel_ring_buffer *buf = stream->priv;
+		struct lttng_kernel_ring_buffer_channel *chan = buf->backend.chan;
 
 		ret = lttng_metadata_output_channel(stream, chan, NULL);
 		if (ret > 0) {
@@ -1441,12 +1448,13 @@ long lttng_metadata_ring_buffer_compat_ioctl(struct file *filp,
 		 */
 		return -ENOSYS;
 	}
-	case LTTNG_KERNEL_ABI_RING_BUFFER_FLUSH_EMPTY:	/* Fall-through. */
+	case LTTNG_KERNEL_ABI_RING_BUFFER_FLUSH_EMPTY:
+		lttng_fallthrough;
 	case LTTNG_KERNEL_ABI_RING_BUFFER_FLUSH:
 	{
 		struct lttng_metadata_stream *stream = filp->private_data;
-		struct lib_ring_buffer *buf = stream->priv;
-		struct channel *chan = buf->backend.chan;
+		struct lttng_kernel_ring_buffer *buf = stream->priv;
+		struct lttng_kernel_ring_buffer_channel *chan = buf->backend.chan;
 
 		/*
 		 * Before doing the actual ring buffer flush, write up to one
@@ -1472,8 +1480,8 @@ long lttng_metadata_ring_buffer_compat_ioctl(struct file *filp,
 	case LTTNG_KERNEL_ABI_RING_BUFFER_GET_NEXT_SUBBUF_METADATA_CHECK:
 	{
 		struct lttng_metadata_stream *stream = filp->private_data;
-		struct lib_ring_buffer *buf = stream->priv;
-		struct channel *chan = buf->backend.chan;
+		struct lttng_kernel_ring_buffer *buf = stream->priv;
+		struct lttng_kernel_ring_buffer_channel *chan = buf->backend.chan;
 
 		ret = lttng_metadata_output_channel(stream, chan, &coherent);
 		if (ret > 0) {
@@ -1521,7 +1529,7 @@ static
 int lttng_metadata_ring_buffer_open(struct inode *inode, struct file *file)
 {
 	struct lttng_metadata_stream *stream = inode->i_private;
-	struct lib_ring_buffer *buf = stream->priv;
+	struct lttng_kernel_ring_buffer *buf = stream->priv;
 
 	file->private_data = buf;
 	/*
@@ -1539,7 +1547,7 @@ static
 int lttng_metadata_ring_buffer_release(struct inode *inode, struct file *file)
 {
 	struct lttng_metadata_stream *stream = file->private_data;
-	struct lib_ring_buffer *buf = stream->priv;
+	struct lttng_kernel_ring_buffer *buf = stream->priv;
 
 	mutex_lock(&stream->metadata_cache->lock);
 	list_del(&stream->list);
@@ -1556,7 +1564,7 @@ ssize_t lttng_metadata_ring_buffer_splice_read(struct file *in, loff_t *ppos,
 		unsigned int flags)
 {
 	struct lttng_metadata_stream *stream = in->private_data;
-	struct lib_ring_buffer *buf = stream->priv;
+	struct lttng_kernel_ring_buffer *buf = stream->priv;
 
 	return lib_ring_buffer_splice_read(in, ppos, pipe, len,
 			flags, buf);
@@ -1567,7 +1575,7 @@ int lttng_metadata_ring_buffer_mmap(struct file *filp,
 		struct vm_area_struct *vma)
 {
 	struct lttng_metadata_stream *stream = filp->private_data;
-	struct lib_ring_buffer *buf = stream->priv;
+	struct lttng_kernel_ring_buffer *buf = stream->priv;
 
 	return lib_ring_buffer_mmap(filp, vma, buf);
 }
@@ -1594,7 +1602,7 @@ int lttng_abi_create_stream_fd(struct file *channel_file, void *stream_priv,
 	int stream_fd, ret;
 	struct file *stream_file;
 
-	stream_fd = lttng_get_unused_fd();
+	stream_fd = get_unused_fd_flags(0);
 	if (stream_fd < 0) {
 		ret = stream_fd;
 		goto fd_error;
@@ -1627,12 +1635,12 @@ fd_error:
 static
 int lttng_abi_open_stream(struct file *channel_file)
 {
-	struct lttng_channel *channel = channel_file->private_data;
-	struct lib_ring_buffer *buf;
+	struct lttng_kernel_channel_buffer *channel = channel_file->private_data;
+	struct lttng_kernel_ring_buffer *buf;
 	int ret;
 	void *stream_priv;
 
-	buf = channel->ops->priv->buffer_read_open(channel->chan);
+	buf = channel->ops->priv->buffer_read_open(channel->priv->rb_chan);
 	if (!buf)
 		return -ENOENT;
 
@@ -1653,14 +1661,14 @@ fd_error:
 static
 int lttng_abi_open_metadata_stream(struct file *channel_file)
 {
-	struct lttng_channel *channel = channel_file->private_data;
-	struct lttng_kernel_session *session = channel->session;
-	struct lib_ring_buffer *buf;
+	struct lttng_kernel_channel_buffer *channel = channel_file->private_data;
+	struct lttng_kernel_session *session = channel->parent.session;
+	struct lttng_kernel_ring_buffer *buf;
 	int ret;
 	struct lttng_metadata_stream *metadata_stream;
 	void *stream_priv;
 
-	buf = channel->ops->priv->buffer_read_open(channel->chan);
+	buf = channel->ops->priv->buffer_read_open(channel->priv->rb_chan);
 	if (!buf)
 		return -ENOENT;
 
@@ -1674,7 +1682,7 @@ int lttng_abi_open_metadata_stream(struct file *channel_file)
 	init_waitqueue_head(&metadata_stream->read_wait);
 	metadata_stream->priv = buf;
 	stream_priv = metadata_stream;
-	metadata_stream->transport = channel->transport;
+	metadata_stream->transport = channel->priv->transport;
 	/* Initial state is an empty metadata, considered as incoherent. */
 	metadata_stream->coherent = false;
 
@@ -1720,8 +1728,8 @@ static
 int lttng_abi_open_event_notifier_group_stream(struct file *notif_file)
 {
 	struct lttng_event_notifier_group *event_notifier_group = notif_file->private_data;
-	struct channel *chan = event_notifier_group->chan;
-	struct lib_ring_buffer *buf;
+	struct lttng_kernel_ring_buffer_channel *chan = event_notifier_group->chan;
+	struct lttng_kernel_ring_buffer *buf;
 	int ret;
 	void *stream_priv;
 
@@ -1758,8 +1766,10 @@ int lttng_abi_validate_event_param(struct lttng_kernel_abi_event *event_param)
 	switch (event_param->instrumentation) {
 	case LTTNG_KERNEL_ABI_SYSCALL:
 		switch (event_param->u.syscall.entryexit) {
-		case LTTNG_KERNEL_ABI_SYSCALL_ENTRY:	/* Fall-through */
-		case LTTNG_KERNEL_ABI_SYSCALL_EXIT:		/* Fall-through */
+		case LTTNG_KERNEL_ABI_SYSCALL_ENTRY:
+			lttng_fallthrough;
+		case LTTNG_KERNEL_ABI_SYSCALL_EXIT:
+			lttng_fallthrough;
 		case LTTNG_KERNEL_ABI_SYSCALL_ENTRYEXIT:
 			break;
 		default:
@@ -1783,20 +1793,26 @@ int lttng_abi_validate_event_param(struct lttng_kernel_abi_event *event_param)
 		switch (event_param->u.kretprobe.entryexit) {
 		case LTTNG_KERNEL_ABI_SYSCALL_ENTRYEXIT:
 			break;
-		case LTTNG_KERNEL_ABI_SYSCALL_ENTRY:	/* Fall-through */
-		case LTTNG_KERNEL_ABI_SYSCALL_EXIT:		/* Fall-through */
+		case LTTNG_KERNEL_ABI_SYSCALL_ENTRY:
+			lttng_fallthrough;
+		case LTTNG_KERNEL_ABI_SYSCALL_EXIT:
+			lttng_fallthrough;
 		default:
 			return -EINVAL;
 		}
 		break;
 
-	case LTTNG_KERNEL_ABI_TRACEPOINT:	/* Fall-through */
-	case LTTNG_KERNEL_ABI_KPROBE:	/* Fall-through */
+	case LTTNG_KERNEL_ABI_TRACEPOINT:
+		lttng_fallthrough;
+	case LTTNG_KERNEL_ABI_KPROBE:
+		lttng_fallthrough;
 	case LTTNG_KERNEL_ABI_UPROBE:
 		break;
 
-	case LTTNG_KERNEL_ABI_FUNCTION:	/* Fall-through */
-	case LTTNG_KERNEL_ABI_NOOP:		/* Fall-through */
+	case LTTNG_KERNEL_ABI_FUNCTION:
+		lttng_fallthrough;
+	case LTTNG_KERNEL_ABI_NOOP:
+		lttng_fallthrough;
 	default:
 		return -EINVAL;
 	}
@@ -1808,7 +1824,7 @@ int lttng_abi_create_event(struct file *channel_file,
 			   struct lttng_kernel_abi_event *event_param)
 {
 	const struct file_operations *fops;
-	struct lttng_channel *channel = channel_file->private_data;
+	struct lttng_kernel_channel_buffer *channel = channel_file->private_data;
 	int event_fd, ret;
 	struct file *event_file;
 	void *priv;
@@ -1830,23 +1846,28 @@ int lttng_abi_create_event(struct file *channel_file,
 	}
 
 	switch (event_param->instrumentation) {
-	case LTTNG_KERNEL_ABI_TRACEPOINT:		/* Fall-through */
+	case LTTNG_KERNEL_ABI_TRACEPOINT:
+		lttng_fallthrough;
 	case LTTNG_KERNEL_ABI_SYSCALL:
 		fops = &lttng_event_recorder_enabler_fops;
 		break;
-	case LTTNG_KERNEL_ABI_KPROBE:			/* Fall-through */
-	case LTTNG_KERNEL_ABI_KRETPROBE:		/* Fall-through */
+	case LTTNG_KERNEL_ABI_KPROBE:
+		lttng_fallthrough;
+	case LTTNG_KERNEL_ABI_KRETPROBE:
+		lttng_fallthrough;
 	case LTTNG_KERNEL_ABI_UPROBE:
 		fops = &lttng_event_recorder_event_fops;
 		break;
 
-	case LTTNG_KERNEL_ABI_FUNCTION:			/* Fall-through */
-	case LTTNG_KERNEL_ABI_NOOP:			/* Fall-through */
+	case LTTNG_KERNEL_ABI_FUNCTION:
+		lttng_fallthrough;
+	case LTTNG_KERNEL_ABI_NOOP:
+		lttng_fallthrough;
 	default:
 		return -EINVAL;
 	}
 
-	event_fd = lttng_get_unused_fd();
+	event_fd = get_unused_fd_flags(0);
 	if (event_fd < 0) {
 		ret = event_fd;
 		goto fd_error;
@@ -1867,49 +1888,63 @@ int lttng_abi_create_event(struct file *channel_file,
 		goto event_error;
 
 	switch (event_param->instrumentation) {
-	case LTTNG_KERNEL_ABI_TRACEPOINT:		/* Fall-through */
+	case LTTNG_KERNEL_ABI_TRACEPOINT:
+		lttng_fallthrough;
 	case LTTNG_KERNEL_ABI_SYSCALL:
 	{
-		struct lttng_event_enabler *event_enabler;
+		struct lttng_event_recorder_enabler *event_enabler;
 
 		if (strutils_is_star_glob_pattern(event_param->name)) {
 			/*
 			 * If the event name is a star globbing pattern,
 			 * we create the special star globbing enabler.
 			 */
-			event_enabler = lttng_event_enabler_create(LTTNG_ENABLER_FORMAT_STAR_GLOB,
+			event_enabler = lttng_event_recorder_enabler_create(LTTNG_ENABLER_FORMAT_STAR_GLOB,
 				event_param, channel);
 		} else {
-			event_enabler = lttng_event_enabler_create(LTTNG_ENABLER_FORMAT_NAME,
+			event_enabler = lttng_event_recorder_enabler_create(LTTNG_ENABLER_FORMAT_NAME,
 				event_param, channel);
 		}
+		if (event_enabler)
+			lttng_event_enabler_session_add(channel->parent.session, event_enabler);
 		priv = event_enabler;
 		break;
 	}
 
-	case LTTNG_KERNEL_ABI_KPROBE:			/* Fall-through */
-	case LTTNG_KERNEL_ABI_KRETPROBE:		/* Fall-through */
+	case LTTNG_KERNEL_ABI_KPROBE:
+		lttng_fallthrough;
+	case LTTNG_KERNEL_ABI_KRETPROBE:
+		lttng_fallthrough;
 	case LTTNG_KERNEL_ABI_UPROBE:
 	{
-		struct lttng_kernel_event_recorder *event;
+		struct lttng_kernel_event_common *event;
+		struct lttng_event_recorder_enabler *event_enabler;
 
+		event_enabler = lttng_event_recorder_enabler_create(LTTNG_ENABLER_FORMAT_NAME,
+				event_param, channel);
+		if (!event_enabler) {
+			ret = -ENOMEM;
+			goto event_error;
+		}
 		/*
 		 * We tolerate no failure path after event creation. It
 		 * will stay invariant for the rest of the session.
 		 */
-		event = lttng_kernel_event_recorder_create(channel, event_param,
-				NULL, event_param->instrumentation);
-		WARN_ON_ONCE(!event);
+		event = lttng_kernel_event_create(&event_enabler->parent, NULL);
+		WARN_ON_ONCE(IS_ERR(event));
+		lttng_event_enabler_destroy(&event_enabler->parent);
 		if (IS_ERR(event)) {
 			ret = PTR_ERR(event);
 			goto event_error;
 		}
-		priv = event;
+		priv = container_of(event, struct lttng_kernel_event_recorder, parent);
 		break;
 	}
 
-	case LTTNG_KERNEL_ABI_FUNCTION:			/* Fall-through */
-	case LTTNG_KERNEL_ABI_NOOP:			/* Fall-through */
+	case LTTNG_KERNEL_ABI_FUNCTION:
+		lttng_fallthrough;
+	case LTTNG_KERNEL_ABI_NOOP:
+		lttng_fallthrough;
 	default:
 		ret = -EINVAL;
 		goto event_error;
@@ -1957,12 +1992,11 @@ long lttng_event_notifier_enabler_ioctl(struct file *file, unsigned int cmd, uns
 
 	switch (cmd) {
 	case LTTNG_KERNEL_ABI_ENABLE:
-		return lttng_event_notifier_enabler_enable(event_notifier_enabler);
+		return lttng_event_enabler_enable(&event_notifier_enabler->parent);
 	case LTTNG_KERNEL_ABI_DISABLE:
-		return lttng_event_notifier_enabler_disable(event_notifier_enabler);
+		return lttng_event_enabler_disable(&event_notifier_enabler->parent);
 	case LTTNG_KERNEL_ABI_FILTER:
-		return lttng_event_notifier_enabler_attach_filter_bytecode(
-				event_notifier_enabler,
+		return lttng_event_enabler_attach_filter_bytecode(&event_notifier_enabler->parent,
 			(struct lttng_kernel_abi_filter_bytecode __user *) arg);
 	case LTTNG_KERNEL_ABI_CAPTURE:
 		return lttng_event_notifier_enabler_attach_capture_bytecode(
@@ -2043,18 +2077,23 @@ int lttng_abi_create_event_notifier(struct file *event_notifier_group_file,
 	}
 
 	switch (event_notifier_param->event.instrumentation) {
-	case LTTNG_KERNEL_ABI_TRACEPOINT:		/* Fall-through */
+	case LTTNG_KERNEL_ABI_TRACEPOINT:
+		lttng_fallthrough;
 	case LTTNG_KERNEL_ABI_SYSCALL:
 		fops = &lttng_event_notifier_enabler_fops;
 		break;
-	case LTTNG_KERNEL_ABI_KPROBE:			/* Fall-through */
-	case LTTNG_KERNEL_ABI_KRETPROBE:		/* Fall-through */
+	case LTTNG_KERNEL_ABI_KPROBE:
+		lttng_fallthrough;
+	case LTTNG_KERNEL_ABI_KRETPROBE:
+		lttng_fallthrough;
 	case LTTNG_KERNEL_ABI_UPROBE:
 		fops = &lttng_event_notifier_event_fops;
 		break;
 
-	case LTTNG_KERNEL_ABI_FUNCTION:			/* Fall-through */
-	case LTTNG_KERNEL_ABI_NOOP:			/* Fall-through */
+	case LTTNG_KERNEL_ABI_FUNCTION:
+		lttng_fallthrough;
+	case LTTNG_KERNEL_ABI_NOOP:
+		lttng_fallthrough;
 	default:
 		ret = -EINVAL;
 		goto inval_instr;
@@ -2062,7 +2101,7 @@ int lttng_abi_create_event_notifier(struct file *event_notifier_group_file,
 
 	event_notifier_param->event.name[LTTNG_KERNEL_ABI_SYM_NAME_LEN - 1] = '\0';
 
-	event_notifier_fd = lttng_get_unused_fd();
+	event_notifier_fd = get_unused_fd_flags(0);
 	if (event_notifier_fd < 0) {
 		ret = event_notifier_fd;
 		goto fd_error;
@@ -2086,7 +2125,8 @@ int lttng_abi_create_event_notifier(struct file *event_notifier_group_file,
 		goto event_notifier_error;
 
 	switch (event_notifier_param->event.instrumentation) {
-	case LTTNG_KERNEL_ABI_TRACEPOINT:		/* Fall-through */
+	case LTTNG_KERNEL_ABI_TRACEPOINT:
+		lttng_fallthrough;
 	case LTTNG_KERNEL_ABI_SYSCALL:
 	{
 		struct lttng_event_notifier_enabler *enabler;
@@ -2097,46 +2137,51 @@ int lttng_abi_create_event_notifier(struct file *event_notifier_group_file,
 			 * we create the special star globbing enabler.
 			 */
 			enabler = lttng_event_notifier_enabler_create(
-					event_notifier_group,
 					LTTNG_ENABLER_FORMAT_STAR_GLOB,
-					event_notifier_param);
+					event_notifier_param,
+					event_notifier_group);
 		} else {
 			enabler = lttng_event_notifier_enabler_create(
-					event_notifier_group,
 					LTTNG_ENABLER_FORMAT_NAME,
-					event_notifier_param);
+					event_notifier_param,
+					event_notifier_group);
 		}
+		if (enabler)
+			lttng_event_notifier_enabler_group_add(event_notifier_group, enabler);
 		priv = enabler;
 		break;
 	}
 
-	case LTTNG_KERNEL_ABI_KPROBE:			/* Fall-through */
-	case LTTNG_KERNEL_ABI_KRETPROBE:		/* Fall-through */
+	case LTTNG_KERNEL_ABI_KPROBE:
+		lttng_fallthrough;
+	case LTTNG_KERNEL_ABI_KRETPROBE:
+		lttng_fallthrough;
 	case LTTNG_KERNEL_ABI_UPROBE:
 	{
-		struct lttng_kernel_event_notifier *event_notifier;
+		struct lttng_kernel_event_common *event;
+		struct lttng_event_notifier_enabler *event_notifier_enabler;
 
-		/*
-		 * We tolerate no failure path after event notifier creation.
-		 * It will stay invariant for the rest of the session.
-		 */
-		event_notifier = lttng_event_notifier_create(NULL,
-				event_notifier_param->event.token,
-				event_notifier_param->error_counter_index,
-				event_notifier_group,
-				event_notifier_param,
-				event_notifier_param->event.instrumentation);
-		WARN_ON_ONCE(!event_notifier);
-		if (IS_ERR(event_notifier)) {
-			ret = PTR_ERR(event_notifier);
+		event_notifier_enabler = lttng_event_notifier_enabler_create(LTTNG_ENABLER_FORMAT_NAME,
+				event_notifier_param, event_notifier_group);
+		if (!event_notifier_enabler) {
+			ret = -ENOMEM;
 			goto event_notifier_error;
 		}
-		priv = event_notifier;
+		event = lttng_kernel_event_create(&event_notifier_enabler->parent, NULL);
+		WARN_ON_ONCE(IS_ERR(event));
+		lttng_event_enabler_destroy(&event_notifier_enabler->parent);
+		if (IS_ERR(event)) {
+			ret = PTR_ERR(event);
+			goto event_notifier_error;
+		}
+		priv = container_of(event, struct lttng_kernel_event_notifier, parent);
 		break;
 	}
 
-	case LTTNG_KERNEL_ABI_FUNCTION:			/* Fall-through */
-	case LTTNG_KERNEL_ABI_NOOP:			/* Fall-through */
+	case LTTNG_KERNEL_ABI_FUNCTION:
+		lttng_fallthrough;
+	case LTTNG_KERNEL_ABI_NOOP:
+		lttng_fallthrough;
 	default:
 		ret = -EINVAL;
 		goto event_notifier_error;
@@ -2203,7 +2248,7 @@ long lttng_abi_event_notifier_group_create_error_counter(
 		goto fd_error;
 	}
 
-	counter_fd = lttng_get_unused_fd();
+	counter_fd = get_unused_fd_flags(0);
 	if (counter_fd < 0) {
 		ret = counter_fd;
 		goto fd_error;
@@ -2237,7 +2282,7 @@ long lttng_abi_event_notifier_group_create_error_counter(
 	 * in record_error. Ensures the counter is created and the
 	 * error_counter_len is set before they are used.
 	 */
-	lttng_smp_store_release(&event_notifier_group->error_counter, counter);
+	smp_store_release(&event_notifier_group->error_counter, counter);
 
 	counter->file = counter_file;
 	counter->owner = event_notifier_group->file;
@@ -2342,7 +2387,7 @@ static const struct file_operations lttng_event_notifier_group_fops = {
 static
 long lttng_channel_ioctl(struct file *file, unsigned int cmd, unsigned long arg)
 {
-	struct lttng_channel *channel = file->private_data;
+	struct lttng_kernel_channel_buffer *channel = file->private_data;
 
 	switch (cmd) {
 	case LTTNG_KERNEL_ABI_OLD_STREAM:
@@ -2465,7 +2510,7 @@ old_event_end:
 
 		ret = lttng_abi_add_context(file,
 				ucontext_param,
-				&channel->ctx, channel->session);
+				&channel->priv->ctx, channel->parent.session);
 
 old_ctx_error_free_old_param:
 		kfree(old_ucontext_param);
@@ -2484,16 +2529,16 @@ old_ctx_end:
 			return -EFAULT;
 		return lttng_abi_add_context(file,
 				&ucontext_param,
-				&channel->ctx, channel->session);
+				&channel->priv->ctx, channel->parent.session);
 	}
 	case LTTNG_KERNEL_ABI_OLD_ENABLE:
 	case LTTNG_KERNEL_ABI_ENABLE:
-		return lttng_channel_enable(channel);
+		return lttng_channel_enable(&channel->parent);
 	case LTTNG_KERNEL_ABI_OLD_DISABLE:
 	case LTTNG_KERNEL_ABI_DISABLE:
-		return lttng_channel_disable(channel);
+		return lttng_channel_disable(&channel->parent);
 	case LTTNG_KERNEL_ABI_SYSCALL_MASK:
-		return lttng_channel_syscall_mask(channel,
+		return lttng_syscall_table_get_active_mask(&channel->priv->parent.syscall_table,
 			(struct lttng_kernel_abi_syscall_mask __user *) arg);
 	default:
 		return -ENOIOCTLCMD;
@@ -2533,19 +2578,19 @@ long lttng_metadata_ioctl(struct file *file, unsigned int cmd, unsigned long arg
  */
 unsigned int lttng_channel_poll(struct file *file, poll_table *wait)
 {
-	struct lttng_channel *channel = file->private_data;
+	struct lttng_kernel_channel_buffer *channel = file->private_data;
 	unsigned int mask = 0;
 
 	if (file->f_mode & FMODE_READ) {
 		poll_wait_set_exclusive(wait);
-		poll_wait(file, channel->ops->priv->get_hp_wait_queue(channel->chan),
+		poll_wait(file, channel->ops->priv->get_hp_wait_queue(channel->priv->rb_chan),
 			  wait);
 
-		if (channel->ops->priv->is_disabled(channel->chan))
+		if (channel->ops->priv->is_disabled(channel->priv->rb_chan))
 			return POLLERR;
-		if (channel->ops->priv->is_finalized(channel->chan))
+		if (channel->ops->priv->is_finalized(channel->priv->rb_chan))
 			return POLLHUP;
-		if (channel->ops->priv->buffer_has_read_closed_stream(channel->chan))
+		if (channel->ops->priv->buffer_has_read_closed_stream(channel->priv->rb_chan))
 			return POLLIN | POLLRDNORM;
 		return 0;
 	}
@@ -2556,20 +2601,20 @@ unsigned int lttng_channel_poll(struct file *file, poll_table *wait)
 static
 int lttng_channel_release(struct inode *inode, struct file *file)
 {
-	struct lttng_channel *channel = file->private_data;
+	struct lttng_kernel_channel_buffer *channel = file->private_data;
 
 	if (channel)
-		fput(channel->session->priv->file);
+		fput(channel->parent.session->priv->file);
 	return 0;
 }
 
 static
 int lttng_metadata_channel_release(struct inode *inode, struct file *file)
 {
-	struct lttng_channel *channel = file->private_data;
+	struct lttng_kernel_channel_buffer *channel = file->private_data;
 
 	if (channel) {
-		fput(channel->session->priv->file);
+		fput(channel->parent.session->priv->file);
 		lttng_metadata_channel_destroy(channel);
 	}
 
@@ -2660,7 +2705,7 @@ long lttng_event_recorder_event_ioctl(struct file *file, unsigned int cmd, unsig
 static
 long lttng_event_recorder_enabler_ioctl(struct file *file, unsigned int cmd, unsigned long arg)
 {
-	struct lttng_event_enabler *event_enabler = file->private_data;
+	struct lttng_event_recorder_enabler *event_enabler = file->private_data;
 
 	switch (cmd) {
 	case LTTNG_KERNEL_ABI_OLD_CONTEXT:
@@ -2675,13 +2720,12 @@ long lttng_event_recorder_enabler_ioctl(struct file *file, unsigned int cmd, uns
 	}
 	case LTTNG_KERNEL_ABI_OLD_ENABLE:
 	case LTTNG_KERNEL_ABI_ENABLE:
-		return lttng_event_enabler_enable(event_enabler);
+		return lttng_event_enabler_enable(&event_enabler->parent);
 	case LTTNG_KERNEL_ABI_OLD_DISABLE:
 	case LTTNG_KERNEL_ABI_DISABLE:
-		return lttng_event_enabler_disable(event_enabler);
+		return lttng_event_enabler_disable(&event_enabler->parent);
 	case LTTNG_KERNEL_ABI_FILTER:
-		return lttng_event_enabler_attach_filter_bytecode(
-			event_enabler,
+		return lttng_event_enabler_attach_filter_bytecode(&event_enabler->parent,
 			(struct lttng_kernel_abi_filter_bytecode __user *) arg);
 	case LTTNG_KERNEL_ABI_ADD_CALLSITE:
 		return -EINVAL;
@@ -2696,17 +2740,17 @@ int lttng_event_recorder_event_release(struct inode *inode, struct file *file)
 	struct lttng_kernel_event_recorder *event = file->private_data;
 
 	if (event)
-		fput(event->chan->file);
+		fput(event->chan->priv->parent.file);
 	return 0;
 }
 
 static
 int lttng_event_recorder_enabler_release(struct inode *inode, struct file *file)
 {
-	struct lttng_event_enabler *event_enabler = file->private_data;
+	struct lttng_event_recorder_enabler *event_enabler = file->private_data;
 
 	if (event_enabler)
-		fput(event_enabler->chan->file);
+		fput(event_enabler->chan->priv->parent.file);
 	return 0;
 }
 
@@ -2741,9 +2785,9 @@ static int put_u32(uint32_t val, unsigned long arg)
 static long lttng_stream_ring_buffer_ioctl(struct file *filp,
 		unsigned int cmd, unsigned long arg)
 {
-	struct lib_ring_buffer *buf = filp->private_data;
-	struct channel *chan = buf->backend.chan;
-	const struct lib_ring_buffer_config *config = &chan->backend.config;
+	struct lttng_kernel_ring_buffer *buf = filp->private_data;
+	struct lttng_kernel_ring_buffer_channel *chan = buf->backend.chan;
+	const struct lttng_kernel_ring_buffer_config *config = &chan->backend.config;
 	const struct lttng_kernel_channel_buffer_ops *ops = chan->backend.priv_ops;
 	int ret;
 
@@ -2845,9 +2889,9 @@ error:
 static long lttng_stream_ring_buffer_compat_ioctl(struct file *filp,
 		unsigned int cmd, unsigned long arg)
 {
-	struct lib_ring_buffer *buf = filp->private_data;
-	struct channel *chan = buf->backend.chan;
-	const struct lib_ring_buffer_config *config = &chan->backend.config;
+	struct lttng_kernel_ring_buffer *buf = filp->private_data;
+	struct lttng_kernel_ring_buffer_channel *chan = buf->backend.chan;
+	const struct lttng_kernel_ring_buffer_config *config = &chan->backend.config;
 	const struct lttng_kernel_channel_buffer_ops *ops = chan->backend.priv_ops;
 	int ret;