X-Git-Url: http://git.lttng.org./?a=blobdiff_plain;f=ltt-debugfs-abi.c;h=0ac886113c35c5711dfb6c1060aeda22ee1df0dc;hb=dda6a249b86e7f06e82fb18a26e981522d9e852d;hp=f856fc8f775c1307e7e994c7a7a0b2d9e7439ba4;hpb=3b923e5b756af2f3cc9082143735704e79e5f3ba;p=lttng-modules.git diff --git a/ltt-debugfs-abi.c b/ltt-debugfs-abi.c index f856fc8f..0ac88611 100644 --- a/ltt-debugfs-abi.c +++ b/ltt-debugfs-abi.c @@ -22,7 +22,14 @@ * - Takes instrumentation source specific arguments. */ +#include #include +#include +#include +#include +#include +#include +#include "ltt-debugfs-abi.h" #include "ltt-events.h" /* @@ -36,34 +43,17 @@ static const struct file_operations lttng_session_fops; static const struct file_operations lttng_channel_fops; static const struct file_operations lttng_event_fops; -/* - * LTTng DebugFS ABI structures. - */ - -struct lttng_channel { - int overwrite; /* 1: overwrite, 0: discard */ - u64 subbuf_size; - u64 num_subbuf; - unsigned int switch_timer_interval; - unsigned int read_timer_interval; -}; - -struct lttng_event { - enum instrum_type itype; - char name[]; -}; - static int lttng_abi_create_session(void) { struct ltt_session *session; struct file *session_file; - int session_fd; + int session_fd, ret; session = ltt_session_create(); if (!session) return -ENOMEM; - session_fd = get_unused_fd_flags(O_RDWR); + session_fd = get_unused_fd(); if (session_fd < 0) { ret = session_fd; goto fd_error; @@ -115,7 +105,7 @@ static const struct file_operations lttng_fops = { #ifdef CONFIG_COMPAT .compat_ioctl = lttng_ioctl, #endif -} +}; int lttng_abi_create_channel(struct file *session_file, struct lttng_channel __user *uchan_param) @@ -129,7 +119,7 @@ int lttng_abi_create_channel(struct file *session_file, if (copy_from_user(&chan_param, uchan_param, sizeof(chan_param))) return -EFAULT; - chan_fd = get_unused_fd_flags(O_RDWR); + chan_fd = get_unused_fd(); if (chan_fd < 0) { ret = chan_fd; goto fd_error; @@ -145,20 +135,20 @@ 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 = 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); + 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; + ret = -EINVAL; goto chan_error; } - channel->file = chan_file; + chan->file = chan_file; chan_file->private_data = chan; fd_install(chan_fd, chan_file); /* The channel created holds a reference on the session */ - atomic_inc(&session_file->f_count); + atomic_long_inc(&session_file->f_count); return chan_fd; @@ -195,8 +185,6 @@ long lttng_session_ioctl(struct file *file, unsigned int cmd, unsigned long arg) return ltt_session_start(session); case LTTNG_SESSION_STOP: return ltt_session_stop(session); - case LTTNG_SESSION_FINALIZE: - return ltt_session_finalize(session); default: return -ENOIOCTLCMD; } @@ -214,7 +202,10 @@ static int lttng_session_release(struct inode *inode, struct file *file) { struct ltt_session *session = file->private_data; - return ltt_session_destroy(session); + + if (session) + ltt_session_destroy(session); + return 0; } static const struct file_operations lttng_session_fops = { @@ -223,7 +214,7 @@ static const struct file_operations lttng_session_fops = { #ifdef CONFIG_COMPAT .compat_ioctl = lttng_session_ioctl, #endif -} +}; static int lttng_abi_open_stream(struct file *channel_file) @@ -231,12 +222,13 @@ int lttng_abi_open_stream(struct file *channel_file) struct ltt_channel *channel = channel_file->private_data; struct lib_ring_buffer *buf; int stream_fd, ret; + struct file *stream_file; - buf = ltt_buffer_read_open(channel->chan); + buf = channel->ops->buffer_read_open(channel->chan); if (!buf) return -ENOENT; - stream_fd = get_unused_fd_flags(O_RDWR); + stream_fd = get_unused_fd(); if (stream_fd < 0) { ret = stream_fd; goto fd_error; @@ -249,14 +241,17 @@ int lttng_abi_open_stream(struct file *channel_file) goto file_error; } fd_install(stream_fd, stream_file); - /* The stream holds a reference on the channel */ - atomic_inc(&channel_file->f_count); + /* + * The stream holds a reference to the channel within the generic ring + * buffer library, so no need to hold a refcount on the channel and + * session files here. + */ return stream_fd; file_error: put_unused_fd(stream_fd); fd_error: - ltt_buffer_read_close(buf); + channel->ops->buffer_read_close(buf); return ret; } @@ -269,18 +264,26 @@ int lttng_abi_create_event(struct file *channel_file, char *event_name; struct lttng_event event_param; int event_fd, ret; + struct file *event_file; + void *probe; if (copy_from_user(&event_param, uevent_param, sizeof(event_param))) return -EFAULT; event_name = kmalloc(PATH_MAX, GFP_KERNEL); if (!event_name) return -ENOMEM; - if (strncpy_from_user(event_name, &uevent_param->name, PATH_MAX)) { + if (strncpy_from_user(event_name, uevent_param->name, PATH_MAX) < 0) { ret = -EFAULT; goto name_error; } event_name[PATH_MAX - 1] = '\0'; - event_fd = get_unused_fd_flags(O_RDWR); + + probe = ltt_probe_get(event_name); + if (!probe) { + ret = -ENOENT; + goto probe_error; + } + event_fd = get_unused_fd(); if (event_fd < 0) { ret = event_fd; goto fd_error; @@ -296,7 +299,8 @@ int lttng_abi_create_event(struct file *channel_file, * We tolerate no failure path after event creation. It will stay * invariant for the rest of the session. */ - event = ltt_event_create(channel, event_param->itype, event_name, NULL); + event = ltt_event_create(channel, event_name, event_param.itype, + probe, NULL); if (!event) { goto event_error; ret = -EEXIST; @@ -304,7 +308,7 @@ int lttng_abi_create_event(struct file *channel_file, event_file->private_data = event; fd_install(event_fd, event_file); /* The event holds a reference on the channel */ - atomic_inc(&channel_file->f_count); + atomic_long_inc(&channel_file->f_count); kfree(event_name); return event_fd; @@ -313,6 +317,8 @@ event_error: file_error: put_unused_fd(event_fd); fd_error: + ltt_probe_put(probe); +probe_error: name_error: kfree(event_name); return ret; @@ -380,7 +386,9 @@ static int lttng_channel_release(struct inode *inode, struct file *file) { struct ltt_channel *channel = file->private_data; - fput(channel->session->file); + + if (channel) + fput(channel->session->file); return 0; } @@ -394,27 +402,30 @@ static const struct file_operations lttng_channel_fops = { #ifdef CONFIG_COMPAT .compat_ioctl = lttng_channel_ioctl, #endif -} +}; static int lttng_event_release(struct inode *inode, struct file *file) { struct ltt_event *event = file->private_data; - fput(event->chan->file); + + if (event) + fput(event->chan->file); return 0; } /* TODO: filter control ioctl */ static const struct file_operations lttng_event_fops = { .release = lttng_event_release, -} +}; -static int __init ltt_debugfs_abi_init(void) +int __init ltt_debugfs_abi_init(void) { int ret = 0; - lttng_dentry = debugfs_create_file("lttng", NULL); - if (IS_ERR(lttng_dentry) || !lttng_dentry) + lttng_dentry = debugfs_create_file("lttng", S_IWUSR, NULL, NULL, + <tng_fops); + if (IS_ERR(lttng_dentry) || !lttng_dentry) { printk(KERN_ERR "Error creating LTTng control file\n"); ret = -ENOMEM; goto error; @@ -423,7 +434,7 @@ error: return ret; } -static void __exit ltt_debugfs_abi_exit(void) +void __exit ltt_debugfs_abi_exit(void) { - debugfs_remote(lttng_dentry); + debugfs_remove(lttng_dentry); }