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)
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_PERF_COUNTER:
+ return -ENOSYS;
+ case LTTNG_KERNEL_CONTEXT_COMM:
+ return lttng_add_comm_to_ctx(ctx);
+ default:
+ return -EINVAL;
+ }
+}
+
/**
* lttng_ioctl - lttng syscall through ioctl
*
* 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
*
* The returned session will be deleted when its file descriptor is closed.
*/
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();
default:
return -ENOIOCTLCMD;
}
{
struct ltt_channel *channel = channel_file->private_data;
static struct lttng_kernel_event metadata_params = {
- .instrumentation = LTTNG_KERNEL_TRACEPOINTS,
+ .instrumentation = LTTNG_KERNEL_TRACEPOINT,
.name = "lttng_metadata",
};
- char *event_name = "lttng_metadata";
struct ltt_event *event;
int ret;
* 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, &metadata_params, NULL);
+ event = ltt_event_create(channel, &metadata_params, NULL);
if (!event) {
+ ret = -EINVAL;
goto create_error;
- ret = -EEXIST;
}
return;
* This ioctl implements lttng commands:
* LTTNG_KERNEL_CHANNEL
* Returns a LTTng channel file descriptor
+ * LTTNG_KERNEL_SESSION_START
+ * Starts tracing session
+ * LTTNG_KERNEL_SESSION_STOP
+ * Stops tracing session
+ * LTTNG_KERNEL_METADATA
+ * Returns a LTTng metadata file descriptor
*
* The returned channel will be deleted when its file descriptor is closed.
*/
{
struct ltt_channel *channel = channel_file->private_data;
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_param.name[LTTNG_SYM_NAME_LEN - 1] = '\0';
switch (event_param.instrumentation) {
- case LTTNG_KERNEL_KPROBES:
+ case LTTNG_KERNEL_KPROBE:
event_param.u.kprobe.symbol_name[LTTNG_SYM_NAME_LEN - 1] = '\0';
break;
- case LTTNG_KERNEL_FUNCTION_TRACER:
+ case LTTNG_KERNEL_FUNCTION:
event_param.u.ftrace.symbol_name[LTTNG_SYM_NAME_LEN - 1] = '\0';
break;
default:
* 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, 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:
file_error:
put_unused_fd(event_fd);
fd_error:
-name_error:
- kfree(event_name);
return ret;
}
* (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
*
* 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);
default:
return -ENOIOCTLCMD;
}
#endif
};
+/**
+ * lttng_event_ioctl - lttng syscall through ioctl
+ *
+ * @file: the file
+ * @cmd: the command
+ * @arg: command arg
+ *
+ * This ioctl implements lttng commands:
+ * LTTNG_KERNEL_STREAM
+ * Returns an event stream file descriptor or failure.
+ * (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 record of this event
+ */
+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);
+ 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 = {
.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)
projects / lttng-modules.git / blobdiff