X-Git-Url: https://git.lttng.org/?a=blobdiff_plain;f=ltt-debugfs-abi.c;h=0b8a60a2698d7901e6c86c4f391149f6d5225098;hb=3db41b2c5d1fef77ca065dc8ef7f0fdd9c17cf32;hp=d013fa5a86a4e1fd33507ceff92dab0c509386de;hpb=d6d808f3780d0b519aaf966e66df501730db7d13;p=lttng-modules.git diff --git a/ltt-debugfs-abi.c b/ltt-debugfs-abi.c index d013fa5a..0b8a60a2 100644 --- a/ltt-debugfs-abi.c +++ b/ltt-debugfs-abi.c @@ -20,6 +20,8 @@ * - Takes an instrumentation source as parameter * - e.g. tracepoints, dynamic_probes... * - Takes instrumentation source specific arguments. + * + * Dual LGPL v2.1/GPL v2 license. */ #include @@ -30,6 +32,7 @@ #include #include "wrapper/vmalloc.h" /* for wrapper_vmalloc_sync_all() */ #include "wrapper/ringbuffer/vfs.h" +#include "wrapper/poll.h" #include "ltt-debugfs-abi.h" #include "ltt-events.h" #include "ltt-tracer.h" @@ -46,6 +49,11 @@ static const struct file_operations lttng_channel_fops; static const struct file_operations lttng_metadata_fops; static const struct file_operations lttng_event_fops; +/* + * Teardown management: opened file descriptors keep a refcount on the module, + * so it can only exit when all file descriptors are closed. + */ + enum channel_type { PER_CPU_CHANNEL, METADATA_CHANNEL, @@ -84,6 +92,43 @@ fd_error: return ret; } +static +int lttng_abi_tracepoint_list(void) +{ + struct file *tracepoint_list_file; + int file_fd, ret; + + file_fd = get_unused_fd(); + if (file_fd < 0) { + ret = file_fd; + goto fd_error; + } + + tracepoint_list_file = anon_inode_getfile("[lttng_session]", + <tng_tracepoint_list_fops, + NULL, O_RDWR); + if (IS_ERR(tracepoint_list_file)) { + ret = PTR_ERR(tracepoint_list_file); + goto file_error; + } + ret = lttng_tracepoint_list_fops.open(NULL, tracepoint_list_file); + if (ret < 0) + goto open_error; + fd_install(file_fd, tracepoint_list_file); + if (file_fd < 0) { + ret = file_fd; + goto fd_error; + } + return file_fd; + +open_error: + fput(tracepoint_list_file); +file_error: + put_unused_fd(file_fd); +fd_error: + return ret; +} + static long lttng_abi_tracer_version(struct file *file, struct lttng_kernel_tracer_version __user *uversion_param) @@ -99,6 +144,49 @@ long lttng_abi_tracer_version(struct file *file, return 0; } +static +long lttng_abi_add_context(struct file *file, + struct lttng_kernel_context __user *ucontext_param, + struct lttng_ctx **ctx, struct ltt_session *session) +{ + struct lttng_kernel_context context_param; + + if (session->been_active) + return -EPERM; + + if (copy_from_user(&context_param, ucontext_param, sizeof(context_param))) + return -EFAULT; + + switch (context_param.ctx) { + case LTTNG_KERNEL_CONTEXT_PID: + return lttng_add_pid_to_ctx(ctx); + case LTTNG_KERNEL_CONTEXT_PRIO: + return lttng_add_prio_to_ctx(ctx); + case LTTNG_KERNEL_CONTEXT_NICE: + return lttng_add_nice_to_ctx(ctx); + case LTTNG_KERNEL_CONTEXT_VPID: + return lttng_add_vpid_to_ctx(ctx); + case LTTNG_KERNEL_CONTEXT_TID: + return lttng_add_tid_to_ctx(ctx); + case LTTNG_KERNEL_CONTEXT_VTID: + return lttng_add_vtid_to_ctx(ctx); + case LTTNG_KERNEL_CONTEXT_PPID: + return lttng_add_ppid_to_ctx(ctx); + case LTTNG_KERNEL_CONTEXT_VPPID: + return lttng_add_vppid_to_ctx(ctx); + case LTTNG_KERNEL_CONTEXT_PERF_COUNTER: + context_param.u.perf_counter.name[LTTNG_SYM_NAME_LEN - 1] = '\0'; + return lttng_add_perf_counter_to_ctx(context_param.u.perf_counter.type, + context_param.u.perf_counter.config, + context_param.u.perf_counter.name, + ctx); + case LTTNG_KERNEL_CONTEXT_COMM: + return lttng_add_comm_to_ctx(ctx); + default: + return -EINVAL; + } +} + /** * lttng_ioctl - lttng syscall through ioctl * @@ -109,6 +197,12 @@ long lttng_abi_tracer_version(struct file *file, * This ioctl implements lttng commands: * LTTNG_KERNEL_SESSION * Returns a LTTng trace session file descriptor + * LTTNG_KERNEL_TRACER_VERSION + * Returns the LTTng kernel tracer version + * LTTNG_KERNEL_TRACEPOINT_LIST + * Returns a file descriptor listing available tracepoints + * LTTNG_KERNEL_WAIT_QUIESCENT + * Returns after all previously running probes have completed * * The returned session will be deleted when its file descriptor is closed. */ @@ -121,12 +215,32 @@ long lttng_ioctl(struct file *file, unsigned int cmd, unsigned long arg) case LTTNG_KERNEL_TRACER_VERSION: return lttng_abi_tracer_version(file, (struct lttng_kernel_tracer_version __user *) arg); + case LTTNG_KERNEL_TRACEPOINT_LIST: + return lttng_abi_tracepoint_list(); + case LTTNG_KERNEL_WAIT_QUIESCENT: + synchronize_trace(); + return 0; + case LTTNG_KERNEL_CALIBRATE: + { + struct lttng_kernel_calibrate __user *ucalibrate = + (struct lttng_kernel_calibrate __user *) arg; + struct lttng_kernel_calibrate calibrate; + int ret; + + if (copy_from_user(&calibrate, ucalibrate, sizeof(calibrate))) + return -EFAULT; + ret = lttng_calibrate(&calibrate); + if (copy_to_user(ucalibrate, &calibrate, sizeof(calibrate))) + return -EFAULT; + return ret; + } default: return -ENOIOCTLCMD; } } static const struct file_operations lttng_fops = { + .owner = THIS_MODULE, .unlocked_ioctl = lttng_ioctl, #ifdef CONFIG_COMPAT .compat_ioctl = lttng_ioctl, @@ -142,31 +256,23 @@ static void lttng_metadata_create_events(struct file *channel_file) { struct ltt_channel *channel = channel_file->private_data; - char *event_name = "lttng_metadata"; - const struct lttng_event_desc *event_desc; + static struct lttng_kernel_event metadata_params = { + .instrumentation = LTTNG_KERNEL_TRACEPOINT, + .name = "lttng_metadata", + }; struct ltt_event *event; - int ret; - event_desc = ltt_event_get(event_name); - if (!event_desc) { - ret = -ENOENT; - goto get_error; - } /* * We tolerate no failure path after event creation. It will stay * invariant for the rest of the session. */ - event = ltt_event_create(channel, event_name, LTTNG_KERNEL_TRACEPOINTS, - event_desc, NULL); + event = ltt_event_create(channel, &metadata_params, NULL); if (!event) { goto create_error; - ret = -EEXIST; } return; create_error: - ltt_event_put(event_desc); -get_error: WARN_ON(1); return; /* not allowed to return error */ } @@ -177,7 +283,7 @@ int lttng_abi_create_channel(struct file *session_file, enum channel_type channel_type) { struct ltt_session *session = session_file->private_data; - const struct file_operations *fops; + const struct file_operations *fops = NULL; const char *transport_name; struct ltt_channel *chan; struct file *chan_file; @@ -192,8 +298,17 @@ int lttng_abi_create_channel(struct file *session_file, ret = chan_fd; goto fd_error; } + switch (channel_type) { + case PER_CPU_CHANNEL: + fops = <tng_channel_fops; + break; + case METADATA_CHANNEL: + fops = <tng_metadata_fops; + break; + } + chan_file = anon_inode_getfile("[lttng_channel]", - <tng_channel_fops, + fops, NULL, O_RDWR); if (IS_ERR(chan_file)) { ret = PTR_ERR(chan_file); @@ -201,13 +316,23 @@ int lttng_abi_create_channel(struct file *session_file, } switch (channel_type) { case PER_CPU_CHANNEL: - transport_name = chan_param.overwrite ? - "relay-overwrite" : "relay-discard"; - fops = <tng_channel_fops; + if (chan_param.output == LTTNG_KERNEL_SPLICE) { + transport_name = chan_param.overwrite ? + "relay-overwrite" : "relay-discard"; + } else if (chan_param.output == LTTNG_KERNEL_MMAP) { + transport_name = chan_param.overwrite ? + "relay-overwrite-mmap" : "relay-discard-mmap"; + } else { + return -EINVAL; + } break; case METADATA_CHANNEL: - transport_name = "relay-metadata"; - fops = <tng_metadata_fops; + if (chan_param.output == LTTNG_KERNEL_SPLICE) + transport_name = "relay-metadata"; + else if (chan_param.output == LTTNG_KERNEL_MMAP) + transport_name = "relay-metadata-mmap"; + else + return -EINVAL; break; default: transport_name = ""; @@ -230,8 +355,8 @@ int lttng_abi_create_channel(struct file *session_file, chan_file->private_data = chan; fd_install(chan_fd, chan_file); if (channel_type == METADATA_CHANNEL) { - lttng_metadata_create_events(chan_file); session->metadata = chan; + lttng_metadata_create_events(chan_file); } /* The channel created holds a reference on the session */ @@ -257,6 +382,12 @@ fd_error: * This ioctl implements lttng commands: * LTTNG_KERNEL_CHANNEL * Returns a LTTng channel file descriptor + * LTTNG_KERNEL_ENABLE + * Enables tracing for a session (weak enable) + * LTTNG_KERNEL_DISABLE + * Disables tracing for a session (strong disable) + * LTTNG_KERNEL_METADATA + * Returns a LTTng metadata file descriptor * * The returned channel will be deleted when its file descriptor is closed. */ @@ -271,9 +402,11 @@ long lttng_session_ioctl(struct file *file, unsigned int cmd, unsigned long arg) (struct lttng_kernel_channel __user *) arg, PER_CPU_CHANNEL); case LTTNG_KERNEL_SESSION_START: - return ltt_session_start(session); + case LTTNG_KERNEL_ENABLE: + return ltt_session_enable(session); case LTTNG_KERNEL_SESSION_STOP: - return ltt_session_stop(session); + case LTTNG_KERNEL_DISABLE: + return ltt_session_disable(session); case LTTNG_KERNEL_METADATA: return lttng_abi_create_channel(file, (struct lttng_kernel_channel __user *) arg, @@ -302,6 +435,7 @@ int lttng_session_release(struct inode *inode, struct file *file) } static const struct file_operations lttng_session_fops = { + .owner = THIS_MODULE, .release = lttng_session_release, .unlocked_ioctl = lttng_session_ioctl, #ifdef CONFIG_COMPAT @@ -359,28 +493,26 @@ int lttng_abi_create_event(struct file *channel_file, struct lttng_kernel_event __user *uevent_param) { struct ltt_channel *channel = channel_file->private_data; - const struct lttng_event_desc *event_desc; struct ltt_event *event; - char *event_name; struct lttng_kernel_event event_param; int event_fd, ret; struct file *event_file; 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) < 0) { - ret = -EFAULT; - goto name_error; - } - event_name[PATH_MAX - 1] = '\0'; - - event_desc = ltt_event_get(event_name); - if (!event_desc) { - ret = -ENOENT; - goto get_error; + event_param.name[LTTNG_SYM_NAME_LEN - 1] = '\0'; + switch (event_param.instrumentation) { + case LTTNG_KERNEL_KRETPROBE: + event_param.u.kretprobe.symbol_name[LTTNG_SYM_NAME_LEN - 1] = '\0'; + break; + case LTTNG_KERNEL_KPROBE: + event_param.u.kprobe.symbol_name[LTTNG_SYM_NAME_LEN - 1] = '\0'; + break; + case LTTNG_KERNEL_FUNCTION: + event_param.u.ftrace.symbol_name[LTTNG_SYM_NAME_LEN - 1] = '\0'; + break; + default: + break; } event_fd = get_unused_fd(); if (event_fd < 0) { @@ -398,17 +530,15 @@ 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_name, &event_param, - event_desc, NULL); + event = ltt_event_create(channel, &event_param, NULL); if (!event) { - ret = -EEXIST; + ret = -EINVAL; goto event_error; } event_file->private_data = event; fd_install(event_fd, event_file); /* The event holds a reference on the channel */ atomic_long_inc(&channel_file->f_count); - kfree(event_name); return event_fd; event_error: @@ -416,10 +546,6 @@ event_error: file_error: put_unused_fd(event_fd); fd_error: - ltt_event_put(event_desc); -get_error: -name_error: - kfree(event_name); return ret; } @@ -436,17 +562,33 @@ name_error: * (typically, one event stream records events from one CPU) * LTTNG_KERNEL_EVENT * Returns an event file descriptor or failure. + * LTTNG_KERNEL_CONTEXT + * Prepend a context field to each event in the channel + * LTTNG_KERNEL_ENABLE + * Enable recording for events in this channel (weak enable) + * LTTNG_KERNEL_DISABLE + * Disable recording for events in this channel (strong disable) * * Channel and event file descriptors also hold a reference on the session. */ static long lttng_channel_ioctl(struct file *file, unsigned int cmd, unsigned long arg) { + struct ltt_channel *channel = file->private_data; + switch (cmd) { case LTTNG_KERNEL_STREAM: return lttng_abi_open_stream(file); case LTTNG_KERNEL_EVENT: return lttng_abi_create_event(file, (struct lttng_kernel_event __user *) arg); + case LTTNG_KERNEL_CONTEXT: + return lttng_abi_add_context(file, + (struct lttng_kernel_context __user *) arg, + &channel->ctx, channel->session); + case LTTNG_KERNEL_ENABLE: + return ltt_channel_enable(channel); + case LTTNG_KERNEL_DISABLE: + return ltt_channel_disable(channel); default: return -ENOIOCTLCMD; } @@ -476,8 +618,6 @@ long lttng_metadata_ioctl(struct file *file, unsigned int cmd, unsigned long arg } } -/* TODO: poll */ -#if 0 /** * lttng_channel_poll - lttng stream addition/removal monitoring * @@ -491,18 +631,20 @@ unsigned int lttng_channel_poll(struct file *file, poll_table *wait) if (file->f_mode & FMODE_READ) { poll_wait_set_exclusive(wait); - poll_wait(file, &channel->notify_wait, wait); + poll_wait(file, channel->ops->get_hp_wait_queue(channel->chan), + wait); - /* TODO: identify when the channel is being finalized. */ - if (finalized) + if (channel->ops->is_disabled(channel->chan)) + return POLLERR; + if (channel->ops->is_finalized(channel->chan)) return POLLHUP; - else + if (channel->ops->buffer_has_read_closed_stream(channel->chan)) return POLLIN | POLLRDNORM; + return 0; } return mask; } -#endif //0 static int lttng_channel_release(struct inode *inode, struct file *file) @@ -515,11 +657,9 @@ int lttng_channel_release(struct inode *inode, struct file *file) } static const struct file_operations lttng_channel_fops = { + .owner = THIS_MODULE, .release = lttng_channel_release, -/* TODO */ -#if 0 .poll = lttng_channel_poll, -#endif //0 .unlocked_ioctl = lttng_channel_ioctl, #ifdef CONFIG_COMPAT .compat_ioctl = lttng_channel_ioctl, @@ -527,6 +667,7 @@ static const struct file_operations lttng_channel_fops = { }; static const struct file_operations lttng_metadata_fops = { + .owner = THIS_MODULE, .release = lttng_channel_release, .unlocked_ioctl = lttng_metadata_ioctl, #ifdef CONFIG_COMPAT @@ -534,21 +675,58 @@ static const struct file_operations lttng_metadata_fops = { #endif }; +/** + * lttng_event_ioctl - lttng syscall through ioctl + * + * @file: the file + * @cmd: the command + * @arg: command arg + * + * This ioctl implements lttng commands: + * LTTNG_KERNEL_CONTEXT + * Prepend a context field to each record of this event + * LTTNG_KERNEL_ENABLE + * Enable recording for this event (weak enable) + * LTTNG_KERNEL_DISABLE + * Disable recording for this event (strong disable) + */ +static +long lttng_event_ioctl(struct file *file, unsigned int cmd, unsigned long arg) +{ + struct ltt_event *event = file->private_data; + + switch (cmd) { + case LTTNG_KERNEL_CONTEXT: + return lttng_abi_add_context(file, + (struct lttng_kernel_context __user *) arg, + &event->ctx, event->chan->session); + case LTTNG_KERNEL_ENABLE: + return ltt_event_enable(event); + case LTTNG_KERNEL_DISABLE: + return ltt_event_disable(event); + default: + return -ENOIOCTLCMD; + } +} + static int lttng_event_release(struct inode *inode, struct file *file) { struct ltt_event *event = file->private_data; - if (event) { - ltt_event_unregister(event); + if (event) fput(event->chan->file); - } return 0; } /* TODO: filter control ioctl */ static const struct file_operations lttng_event_fops = { + .owner = THIS_MODULE, .release = lttng_event_release, + .unlocked_ioctl = lttng_event_ioctl, +#ifdef CONFIG_COMPAT + .compat_ioctl = lttng_event_ioctl, +#endif }; int __init ltt_debugfs_abi_init(void)