From: Mathieu Desnoyers Date: Thu, 25 Nov 2010 00:33:43 +0000 (-0500) Subject: ongoing ABI implementation X-Git-Tag: v2.0-pre1~215 X-Git-Url: https://git.lttng.org./?a=commitdiff_plain;h=ad1c05e136eba463795ba592e5f6c27542643e16;p=lttng-modules.git ongoing ABI implementation Signed-off-by: Mathieu Desnoyers --- diff --git a/ltt-debugfs-abi.c b/ltt-debugfs-abi.c index 7ee2eca5..fe70f9a9 100644 --- a/ltt-debugfs-abi.c +++ b/ltt-debugfs-abi.c @@ -7,17 +7,23 @@ * * Mimic system calls for: * - session creation, returns a file descriptor or failure. - * - channel creation, returns a file descriptor or failure. - * - Takes a session file descriptor parameter - * - Takes all channel options as parameters. - * - event creation, returns a file descriptor or failure. - * - Takes an event name as parameter - * - Takes an instrumentation source as parameter - * - e.g. tracepoints, dynamic_probes... - * - Takes instrumentation source specific arguments. + * - channel creation, returns a file descriptor or failure. + * - Operates on a session file descriptor + * - Takes all channel options as parameters. + * - stream get, returns a file descriptor or failure. + * - Operates on a channel file descriptor. + * - stream notifier get, returns a file descriptor or failure. + * - Operates on a channel file descriptor. + * - event creation, returns a file descriptor or failure. + * - Operates on a channel file descriptor + * - Takes an event name as parameter + * - Takes an instrumentation source as parameter + * - e.g. tracepoints, dynamic_probes... + * - Takes instrumentation source specific arguments. */ #include +#include "ltt-events.h" /* * This is LTTng's own personal way to create a system call as an external @@ -25,6 +31,9 @@ */ static struct dentry *lttng_dentry; +static const struct file_operations lttng_fops; +static const struct file_operations lttng_session_fops; +static const struct file_operations lttng_channel_fops; /* * LTTng DebugFS ABI structures. @@ -45,6 +54,7 @@ struct lttng_event { char name[]; }; +static int lttng_abi_create_session(void) { struct ltt_session *session; @@ -60,12 +70,13 @@ int lttng_abi_create_session(void) goto fd_error; } session_file = anon_inode_getfile("[lttng_session]", - <tng_fops, + <tng_session_fops, session, O_RDWR); if (IS_ERR(session_file)) { ret = PTR_ERR(session_file); goto file_error; } + fd_install(session_fd, session_file); return session_fd; file_error: @@ -75,96 +86,234 @@ fd_error: return ret; } -int lttng_abi_create_channel(struct lttng_channel __user *uchan_param) +/** + * lttng_ioctl - lttng syscall through ioctl + * + * @filp: the file + * @cmd: the command + * @arg: command arg + * + * This ioctl implements lttng commands: + * LTTNG_SESSION + * Returns a LTTng trace session file descriptor + * + * The returned session will be deleted when its file descriptor is closed. + */ +static +long lttng_ioctl(struct file *filp, unsigned int cmd, unsigned long arg) +{ + switch (cmd) { + case LTTNG_SESSION: + return lttng_abi_create_session(); + default: + return -ENOIOCTLCMD; + } +} + +#ifdef CONFIG_COMPAT +static +long lttng_compat_ioctl(struct file *filp, unsigned int cmd, unsigned long arg) +{ + switch (cmd) { + case LTTNG_SESSION: + return lttng_abi_create_session(); + default: + return -ENOIOCTLCMD; + } +} +#endif + +static const struct file_operations lttng_fops = { + .unlocked_ioctl = lttng_ioctl, +#ifdef CONFIG_COMPAT + .compat_ioctl = lttng_compat_ioctl, +#endif +} + +int lttng_abi_create_channel(struct file *session_filp, + struct lttng_channel __user *uchan_param) { + struct ltt_session *session = session_filp->private_data; struct ltt_channel *chan; - struct file *chan_file; + struct file *chan_filp; struct lttng_channel chan_param; int chan_fd; + int ret = 0; if (copy_from_user(&chan_param, ucham_param, sizeof(chan_param))) return -EFAULT; - /* TODO: fetch session pointer from file descriptor */ - chan = ltt_channel_create(); - if (!chan) - return -ENOMEM; + chan = ltt_channel_create(session, chan_param->overwrite, NULL, + chan_param->subbuf_size, + chan_param->num_subbuf, + chan_param->switch_timer_interval, + chan_param->read_timer_interval); + if (!chan) { + ret = -ENOMEM; + goto chan_error; + } chan_fd = get_unused_fd_flags(O_RDWR); if (chan_fd < 0) { ret = chan_fd; goto fd_error; } - chan_file = anon_inode_getfile("[lttng_channel]", - <tng_fops, + chan_filp = anon_inode_getfile("[lttng_channel]", + <tng_channel_fops, chan, O_RDWR); - if (IS_ERR(chan_file)) { - ret = PTR_ERR(chan_file); + if (IS_ERR(chan_filp)) { + ret = PTR_ERR(chan_filp); goto file_error; } + + /* The channel created holds a reference on the session */ + atomic_inc(&session_filp->f_count); + return chan_fd; file_error: put_unused_fd(chan_fd); fd_error: ltt_channel_destroy(chan); +chan_error: return ret; } /** - * lttng_ioctl - lttng syscall through ioctl + * lttng_session_ioctl - lttng session fd ioctl * * @filp: the file * @cmd: the command * @arg: command arg * * This ioctl implements lttng commands: - * LTTNG_SESSION - * Returns a LTTng trace session file descriptor * LTTNG_CHANNEL * Returns a LTTng channel file descriptor + * + * The returned channel will be deleted when its file descriptor is closed. + */ +static +long lttng_session_ioctl(struct file *filp, unsigned int cmd, unsigned long arg) +{ + switch (cmd) { + case LTTNG_CHANNEL: + return lttng_abi_create_channel(filp, (struct lttng_channel __user *)arg); + default: + return -ENOIOCTLCMD; + } +} + +#ifdef CONFIG_COMPAT +static +long lttng_session_compat_ioctl(struct file *filp, unsigned int cmd, unsigned long arg) +{ + switch (cmd) { + case LTTNG_CHANNEL: + return lttng_abi_create_channel(filp, (struct lttng_channel __user *)arg); + default: + return -ENOIOCTLCMD; + } +} +#endif + +static const struct file_operations lttng_session_fops = { + .unlocked_ioctl = lttng_session_ioctl, +#ifdef CONFIG_COMPAT + .compat_ioctl = lttng_session_compat_ioctl, +#endif +} + +static +int lttng_abi_open_stream(struct file *channel_filp) +{ + struct ltt_channel *channel = channel_filp->private_data; + struct lib_ring_buffer *buf; + int stream_fd, ret; + + buf = ltt_buffer_read_open(channel->chan); + if (!buf) + return -ENOENT; + + stream_fd = get_unused_fd_flags(O_RDWR); + if (stream_fd < 0) { + ret = stream_fd; + goto fd_error; + } + stream_filp = anon_inode_getfile("[lttng_stream]", + <tng_stream_fops, + buf, O_RDWR); + if (IS_ERR(stream_filp)) { + ret = PTR_ERR(stream_filp); + goto file_error; + } + + /* The stream holds a reference on the channel */ + atomic_inc(&channel_filp->f_count); + return stream_fd; + +file_error: + put_unused_fd(stream_fd); +fd_error: + ltt_buffer_read_close(buf); + return ret; +} + + +/** + * lttng_channel_ioctl - lttng syscall through ioctl + * + * @filp: the file + * @cmd: the command + * @arg: command arg + * + * This ioctl implements lttng commands: + * LTTNG_STREAM + * Returns an event stream file descriptor or failure. + * (typically, one event stream records events from one CPU) + * LTTNG_STREAM_NOTIFIER + * Returns a file descriptor that can be used to monitor + * addition/removal of streams to/from a channel. (e.g. notifier + * called on CPU hotplug). * LTTNG_EVENT - * Returns a file descriptor or failure. + * Returns an event file descriptor or failure. * * The returned session will be deleted when its file descriptor is closed. * Channel and event file descriptors also hold a reference on the session. */ -long lttng_ioctl(struct file *filp, unsigned int cmd, unsigned long arg) +static +long lttng_channel_ioctl(struct file *filp, unsigned int cmd, unsigned long arg) { - struct inode *inode = filp->f_dentry->d_inode; - switch (cmd) { - case LTTNG_SESSION: - return lttng_abi_create_session(); - case LTTNG_CHANNEL: - return lttng_abi_create_channel((struct lttng_channel __user *)arg); + case LTTNG_STREAM: + return lttng_abi_open_stream(filp); + case LTTNG_STREAM_NOTIFIER: + return lttng_abi_open_stream_notifier(filp); case LTTNG_EVENT: - return lttng_abi_create_event((struct lttng_event __user *)arg); + return lttng_abi_create_event(filp, (struct lttng_event __user *)arg); default: return -ENOIOCTLCMD; } } #ifdef CONFIG_COMPAT -long lttng_compat_ioctl(struct file *filp, unsigned int cmd, unsigned long arg) +static +long lttng_channel_compat_ioctl(struct file *filp, unsigned int cmd, unsigned long arg) { - struct inode *inode = filp->f_dentry->d_inode; - switch (cmd) { - case LTTNG_SESSION: - return lttng_abi_create_session(); - case LTTNG_CHANNEL: - return lttng_abi_create_channel((struct lttng_channel __user *)arg); + case LTTNG_STREAM: + return lttng_abi_get_stream(filp); + case LTTNG_STREAM_NOTIFIER: + return lttng_abi_get_stream_notifier(filp); case LTTNG_EVENT: - return lttng_abi_create_event((struct lttng_event __user *)arg); + return lttng_abi_create_event(filp, (struct lttng_event __user *)arg); default: return -ENOIOCTLCMD; } } #endif -const struct file_operations lttng_file_operations = { - .unlocked_ioctl = lttng_ioctl, +static const struct file_operations lttng_channel_fops = { + .unlocked_ioctl = lttng_channel_ioctl, #ifdef CONFIG_COMPAT - .compat_ioctl = lttng_compat_ioctl, + .compat_ioctl = lttng_channel_compat_ioctl, #endif } diff --git a/ltt-ring-buffer-client.h b/ltt-ring-buffer-client.h index a262da10..c70c62b3 100644 --- a/ltt-ring-buffer-client.h +++ b/ltt-ring-buffer-client.h @@ -216,6 +216,26 @@ void ltt_channel_destroy(struct channel *chan) kfree(chan_priv); } +static +struct lib_ring_buffer *ltt_buffer_read_open(struct channel *chan) +{ + struct lib_ring_buffer *buf; + int cpu; + + for_each_channel_cpu(cpu, chan->chan) { + buf = channel_get_ring_buffer(&config_config, chan, cpu); + if (!lib_ring_buffer_open_read(buf)) + return buf; + } + return NULL; +} + +static +struct lib_ring_buffer *ltt_buffer_read_close(struct lib_ring_buffer *buf) +{ + lib_ring_buffer_release_read(buf); +} + static void ltt_relay_remove_dirs(struct ltt_trace *trace) { debugfs_remove(trace->dentry.trace_root); @@ -249,6 +269,8 @@ static struct ltt_transport ltt_relay_transport = { .remove_dirs = ltt_relay_remove_dirs, .create_channel = ltt_channel_create, .destroy_channel = ltt_channel_destroy, + .buffer_read_open = ltt_buffer_read_open, + .buffer_read_close = ltt_buffer_read_close, }, };