* - Takes instrumentation source specific arguments.
*/
+#include <asm/barrier.h>
#include <linux/module.h>
#include <linux/proc_fs.h>
#include <linux/anon_inodes.h>
#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>
static
int lttng_abi_create_session(void)
{
- struct lttng_session *session;
+ struct lttng_kernel_session *session;
struct file *session_file;
int session_fd, ret;
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;
ret = PTR_ERR(session_file);
goto file_error;
}
- session->file = session_file;
+ session->priv->file = session_file;
fd_install(session_fd, session_file);
return session_fd;
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;
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;
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;
static
long lttng_abi_add_context(struct file *file,
struct lttng_kernel_abi_context *context_param,
- struct lttng_kernel_ctx **ctx, struct lttng_session *session)
+ struct lttng_kernel_ctx **ctx, struct lttng_kernel_session *session)
{
- if (session->been_active)
+ if (session->priv->been_active)
return -EPERM;
switch (context_param->ctx) {
struct lttng_kernel_abi_channel *chan_param,
enum channel_type channel_type)
{
- struct lttng_session *session = session_file->private_data;
+ 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;
* 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,
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);
}
static
-int lttng_abi_session_set_name(struct lttng_session *session,
+int lttng_abi_session_set_name(struct lttng_kernel_session *session,
struct lttng_kernel_abi_session_name *name)
{
size_t len;
return -EINVAL;
}
- strcpy(session->name, name->name);
+ strcpy(session->priv->name, name->name);
return 0;
}
static
-int lttng_abi_session_set_creation_time(struct lttng_session *session,
+int lttng_abi_session_set_creation_time(struct lttng_kernel_session *session,
struct lttng_kernel_abi_session_creation_time *time)
{
size_t len;
return -EINVAL;
}
- strcpy(session->creation_time, time->iso8601);
+ strcpy(session->priv->creation_time, time->iso8601);
return 0;
}
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++)
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++)
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++)
return lttng_kernel_counter_clear(counter, indexes);
}
default:
- WARN_ON_ONCE(1);
return -ENOSYS;
}
}
static
long lttng_session_ioctl(struct file *file, unsigned int cmd, unsigned long arg)
{
- struct lttng_session *session = file->private_data;
+ struct lttng_kernel_session *session = file->private_data;
struct lttng_kernel_abi_channel chan_param;
struct lttng_kernel_abi_old_channel old_chan_param;
+ /*
+ * Handle backward compatibility. OLD commands have wrong
+ * directions, replace them by the correct direction.
+ */
+ switch (cmd) {
+ case LTTNG_KERNEL_ABI_OLD_SESSION_TRACK_PID:
+ cmd = LTTNG_KERNEL_ABI_SESSION_TRACK_PID;
+ break;
+ case LTTNG_KERNEL_ABI_OLD_SESSION_UNTRACK_PID:
+ cmd = LTTNG_KERNEL_ABI_SESSION_UNTRACK_PID;
+ break;
+ case LTTNG_KERNEL_ABI_OLD_SESSION_TRACK_ID:
+ cmd = LTTNG_KERNEL_ABI_SESSION_TRACK_ID;
+ break;
+ case LTTNG_KERNEL_ABI_OLD_SESSION_UNTRACK_ID:
+ cmd = LTTNG_KERNEL_ABI_SESSION_UNTRACK_ID;
+ break;
+ case LTTNG_KERNEL_ABI_OLD_SESSION_LIST_TRACKER_IDS:
+ cmd = LTTNG_KERNEL_ABI_SESSION_LIST_TRACKER_IDS;
+ break;
+ case LTTNG_KERNEL_ABI_OLD_SESSION_SET_NAME:
+ cmd = LTTNG_KERNEL_ABI_SESSION_SET_NAME;
+ break;
+ case LTTNG_KERNEL_ABI_OLD_SESSION_SET_CREATION_TIME:
+ cmd = LTTNG_KERNEL_ABI_SESSION_SET_CREATION_TIME;
+ break;
+ default:
+ /* Nothing to do. */
+ break;
+ }
+
switch (cmd) {
case LTTNG_KERNEL_ABI_OLD_CHANNEL:
{
static
int lttng_session_release(struct inode *inode, struct file *file)
{
- struct lttng_session *session = file->private_data;
+ struct lttng_kernel_session *session = file->private_data;
if (session)
lttng_session_destroy(session);
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;
/* 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;
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;
}
{
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();
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);
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);
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;
{
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;
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) {
*/
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
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) {
{
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;
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) {
*/
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
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) {
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;
/*
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);
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);
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);
}
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;
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->buffer_read_open(channel->chan);
+ buf = channel->ops->priv->buffer_read_open(channel->priv->rb_chan);
if (!buf)
return -ENOENT;
return ret;
fd_error:
- channel->ops->buffer_read_close(buf);
+ channel->ops->priv->buffer_read_close(buf);
return ret;
}
static
int lttng_abi_open_metadata_stream(struct file *channel_file)
{
- struct lttng_channel *channel = channel_file->private_data;
- struct lttng_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->buffer_read_open(channel->chan);
+ buf = channel->ops->priv->buffer_read_open(channel->priv->rb_chan);
if (!buf)
return -ENOENT;
ret = -ENOMEM;
goto nomem;
}
- metadata_stream->metadata_cache = session->metadata_cache;
+ metadata_stream->metadata_cache = session->priv->metadata_cache;
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;
goto notransport;
}
- if (!lttng_kref_get(&session->metadata_cache->refcount)) {
+ if (!lttng_kref_get(&session->priv->metadata_cache->refcount)) {
ret = -EOVERFLOW;
goto kref_error;
}
if (ret < 0)
goto fd_error;
- mutex_lock(&session->metadata_cache->lock);
+ mutex_lock(&session->priv->metadata_cache->lock);
list_add(&metadata_stream->list,
- &session->metadata_cache->metadata_stream);
- mutex_unlock(&session->metadata_cache->lock);
+ &session->priv->metadata_cache->metadata_stream);
+ mutex_unlock(&session->priv->metadata_cache->lock);
return ret;
fd_error:
- kref_put(&session->metadata_cache->refcount, metadata_cache_destroy);
+ kref_put(&session->priv->metadata_cache->refcount, metadata_cache_destroy);
kref_error:
module_put(metadata_stream->transport->owner);
notransport:
kfree(metadata_stream);
nomem:
- channel->ops->buffer_read_close(buf);
+ channel->ops->priv->buffer_read_close(buf);
return ret;
}
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;
- buf = event_notifier_group->ops->buffer_read_open(chan);
+ buf = event_notifier_group->ops->priv->buffer_read_open(chan);
if (!buf)
return -ENOENT;
fd_error:
atomic_long_dec(¬if_file->f_count);
refcount_error:
- event_notifier_group->ops->buffer_read_close(buf);
+ event_notifier_group->ops->priv->buffer_read_close(buf);
return ret;
}
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:
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;
}
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;
}
switch (event_param->instrumentation) {
- case LTTNG_KERNEL_ABI_TRACEPOINT: /* Fall-through */
+ case LTTNG_KERNEL_ABI_TRACEPOINT:
+ lttng_fallthrough;
case LTTNG_KERNEL_ABI_SYSCALL:
fops = <tng_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 = <tng_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;
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_event *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_event_create(channel, event_param,
- NULL, 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;
static
long lttng_event_notifier_event_ioctl(struct file *file, unsigned int cmd, unsigned long arg)
{
- struct lttng_event_notifier *event_notifier = file->private_data;
+ struct lttng_kernel_event_notifier *event_notifier = file->private_data;
switch (cmd) {
case LTTNG_KERNEL_ABI_ENABLE:
- return lttng_event_notifier_enable(event_notifier);
+ return lttng_event_enable(&event_notifier->parent);
case LTTNG_KERNEL_ABI_DISABLE:
- return lttng_event_notifier_disable(event_notifier);
+ return lttng_event_disable(&event_notifier->parent);
case LTTNG_KERNEL_ABI_FILTER:
return -EINVAL;
case LTTNG_KERNEL_ABI_CAPTURE:
return -EINVAL;
case LTTNG_KERNEL_ABI_ADD_CALLSITE:
- return lttng_event_notifier_add_callsite(event_notifier,
+ return lttng_event_add_callsite(&event_notifier->parent,
(struct lttng_kernel_abi_event_callsite __user *) arg);
default:
return -ENOIOCTLCMD;
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(
static
int lttng_event_notifier_event_release(struct inode *inode, struct file *file)
{
- struct lttng_event_notifier *event_notifier = file->private_data;
+ struct lttng_kernel_event_notifier *event_notifier = file->private_data;
if (event_notifier)
- fput(event_notifier->group->file);
+ fput(event_notifier->priv->group->file);
return 0;
}
}
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 = <tng_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 = <tng_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;
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;
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;
* 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_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, NULL,
- 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;
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;
* 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;
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:
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);
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;
*/
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->get_hp_wait_queue(channel->chan),
+ poll_wait(file, channel->ops->priv->get_hp_wait_queue(channel->priv->rb_chan),
wait);
- if (channel->ops->is_disabled(channel->chan))
+ if (channel->ops->priv->is_disabled(channel->priv->rb_chan))
return POLLERR;
- if (channel->ops->is_finalized(channel->chan))
+ if (channel->ops->priv->is_finalized(channel->priv->rb_chan))
return POLLHUP;
- if (channel->ops->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;
}
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->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->file);
+ fput(channel->parent.session->priv->file);
lttng_metadata_channel_destroy(channel);
}
static
long lttng_event_recorder_event_ioctl(struct file *file, unsigned int cmd, unsigned long arg)
{
- struct lttng_event *event = file->private_data;
+ struct lttng_kernel_event_recorder *event_recorder = file->private_data;
switch (cmd) {
case LTTNG_KERNEL_ABI_OLD_CONTEXT:
}
case LTTNG_KERNEL_ABI_OLD_ENABLE:
case LTTNG_KERNEL_ABI_ENABLE:
- return lttng_event_enable(event);
+ return lttng_event_enable(&event_recorder->parent);
case LTTNG_KERNEL_ABI_OLD_DISABLE:
case LTTNG_KERNEL_ABI_DISABLE:
- return lttng_event_disable(event);
+ return lttng_event_disable(&event_recorder->parent);
case LTTNG_KERNEL_ABI_FILTER:
return -EINVAL;
case LTTNG_KERNEL_ABI_ADD_CALLSITE:
- return lttng_event_add_callsite(event,
+ return lttng_event_add_callsite(&event_recorder->parent,
(struct lttng_kernel_abi_event_callsite __user *) arg);
default:
return -ENOIOCTLCMD;
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:
}
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;
static
int lttng_event_recorder_event_release(struct inode *inode, struct file *file)
{
- struct lttng_event *event = file->private_data;
+ 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;
}
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;
- const struct lttng_channel_ops *ops = chan->backend.priv_ops;
+ 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;
if (atomic_read(&chan->record_disabled))
{
uint64_t ts;
- ret = ops->timestamp_begin(config, buf, &ts);
+ ret = ops->priv->timestamp_begin(config, buf, &ts);
if (ret < 0)
goto error;
return put_u64(ts, arg);
{
uint64_t ts;
- ret = ops->timestamp_end(config, buf, &ts);
+ ret = ops->priv->timestamp_end(config, buf, &ts);
if (ret < 0)
goto error;
return put_u64(ts, arg);
{
uint64_t ed;
- ret = ops->events_discarded(config, buf, &ed);
+ ret = ops->priv->events_discarded(config, buf, &ed);
if (ret < 0)
goto error;
return put_u64(ed, arg);
{
uint64_t cs;
- ret = ops->content_size(config, buf, &cs);
+ ret = ops->priv->content_size(config, buf, &cs);
if (ret < 0)
goto error;
return put_u64(cs, arg);
{
uint64_t ps;
- ret = ops->packet_size(config, buf, &ps);
+ ret = ops->priv->packet_size(config, buf, &ps);
if (ret < 0)
goto error;
return put_u64(ps, arg);
{
uint64_t si;
- ret = ops->stream_id(config, buf, &si);
+ ret = ops->priv->stream_id(config, buf, &si);
if (ret < 0)
goto error;
return put_u64(si, arg);
{
uint64_t ts;
- ret = ops->current_timestamp(config, buf, &ts);
+ ret = ops->priv->current_timestamp(config, buf, &ts);
if (ret < 0)
goto error;
return put_u64(ts, arg);
{
uint64_t seq;
- ret = ops->sequence_number(config, buf, &seq);
+ ret = ops->priv->sequence_number(config, buf, &seq);
if (ret < 0)
goto error;
return put_u64(seq, arg);
{
uint64_t id;
- ret = ops->instance_id(config, buf, &id);
+ ret = ops->priv->instance_id(config, buf, &id);
if (ret < 0)
goto error;
return put_u64(id, arg);
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;
- const struct lttng_channel_ops *ops = chan->backend.priv_ops;
+ 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;
if (atomic_read(&chan->record_disabled))
{
uint64_t ts;
- ret = ops->timestamp_begin(config, buf, &ts);
+ ret = ops->priv->timestamp_begin(config, buf, &ts);
if (ret < 0)
goto error;
return put_u64(ts, arg);
{
uint64_t ts;
- ret = ops->timestamp_end(config, buf, &ts);
+ ret = ops->priv->timestamp_end(config, buf, &ts);
if (ret < 0)
goto error;
return put_u64(ts, arg);
{
uint64_t ed;
- ret = ops->events_discarded(config, buf, &ed);
+ ret = ops->priv->events_discarded(config, buf, &ed);
if (ret < 0)
goto error;
return put_u64(ed, arg);
{
uint64_t cs;
- ret = ops->content_size(config, buf, &cs);
+ ret = ops->priv->content_size(config, buf, &cs);
if (ret < 0)
goto error;
return put_u64(cs, arg);
{
uint64_t ps;
- ret = ops->packet_size(config, buf, &ps);
+ ret = ops->priv->packet_size(config, buf, &ps);
if (ret < 0)
goto error;
return put_u64(ps, arg);
{
uint64_t si;
- ret = ops->stream_id(config, buf, &si);
+ ret = ops->priv->stream_id(config, buf, &si);
if (ret < 0)
goto error;
return put_u64(si, arg);
{
uint64_t ts;
- ret = ops->current_timestamp(config, buf, &ts);
+ ret = ops->priv->current_timestamp(config, buf, &ts);
if (ret < 0)
goto error;
return put_u64(ts, arg);
{
uint64_t seq;
- ret = ops->sequence_number(config, buf, &seq);
+ ret = ops->priv->sequence_number(config, buf, &seq);
if (ret < 0)
goto error;
return put_u64(seq, arg);
{
uint64_t id;
- ret = ops->instance_id(config, buf, &id);
+ ret = ops->priv->instance_id(config, buf, &id);
if (ret < 0)
goto error;
return put_u64(id, arg);
projects / lttng-modules.git / blobdiff