#include "wrapper/ringbuffer/vfs.h"
#include "ltt-debugfs-abi.h"
#include "ltt-events.h"
+#include "ltt-tracer.h"
/*
* This is LTTng's own personal way to create a system call as an external
return ret;
}
+static
+long lttng_abi_tracer_version(struct file *file,
+ struct lttng_kernel_tracer_version __user *uversion_param)
+{
+ struct lttng_kernel_tracer_version v;
+
+ v.version = LTTNG_VERSION;
+ v.patchlevel = LTTNG_PATCHLEVEL;
+ v.sublevel = LTTNG_SUBLEVEL;
+
+ if (copy_to_user(uversion_param, &v, sizeof(v)))
+ return -EFAULT;
+ return 0;
+}
+
/**
* lttng_ioctl - lttng syscall through ioctl
*
* @arg: command arg
*
* This ioctl implements lttng commands:
- * LTTNG_SESSION
+ * LTTNG_KERNEL_SESSION
* Returns a LTTng trace session file descriptor
*
* The returned session will be deleted when its file descriptor is closed.
long lttng_ioctl(struct file *file, unsigned int cmd, unsigned long arg)
{
switch (cmd) {
- case LTTNG_SESSION:
+ case LTTNG_KERNEL_SESSION:
return lttng_abi_create_session();
+ case LTTNG_KERNEL_TRACER_VERSION:
+ return lttng_abi_tracer_version(file,
+ (struct lttng_kernel_tracer_version __user *) arg);
default:
return -ENOIOCTLCMD;
}
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_TRACEPOINTS,
+ .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, INSTRUM_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 */
}
static
int lttng_abi_create_channel(struct file *session_file,
- struct lttng_channel __user *uchan_param,
+ struct lttng_kernel_channel __user *uchan_param,
enum channel_type channel_type)
{
struct ltt_session *session = session_file->private_data;
const char *transport_name;
struct ltt_channel *chan;
struct file *chan_file;
- struct lttng_channel chan_param;
+ struct lttng_kernel_channel chan_param;
int chan_fd;
int ret = 0;
chan->file = chan_file;
chan_file->private_data = chan;
fd_install(chan_fd, chan_file);
- if (channel_type == METADATA_CHANNEL)
+ if (channel_type == METADATA_CHANNEL) {
+ session->metadata = chan;
lttng_metadata_create_events(chan_file);
+ }
/* The channel created holds a reference on the session */
atomic_long_inc(&session_file->f_count);
* @arg: command arg
*
* This ioctl implements lttng commands:
- * LTTNG_CHANNEL
+ * LTTNG_KERNEL_CHANNEL
* Returns a LTTng channel file descriptor
*
* The returned channel will be deleted when its file descriptor is closed.
struct ltt_session *session = file->private_data;
switch (cmd) {
- case LTTNG_CHANNEL:
+ case LTTNG_KERNEL_CHANNEL:
return lttng_abi_create_channel(file,
- (struct lttng_channel __user *)arg,
+ (struct lttng_kernel_channel __user *) arg,
PER_CPU_CHANNEL);
- case LTTNG_SESSION_START:
+ case LTTNG_KERNEL_SESSION_START:
return ltt_session_start(session);
- case LTTNG_SESSION_STOP:
+ case LTTNG_KERNEL_SESSION_STOP:
return ltt_session_stop(session);
- case LTTNG_METADATA:
+ case LTTNG_KERNEL_METADATA:
return lttng_abi_create_channel(file,
- (struct lttng_channel __user *)arg,
+ (struct lttng_kernel_channel __user *) arg,
METADATA_CHANNEL);
default:
return -ENOIOCTLCMD;
static
int lttng_abi_create_event(struct file *channel_file,
- struct lttng_event __user *uevent_param)
+ 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_event event_param;
+ 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_KPROBES:
+ event_param.u.kprobe.symbol_name[LTTNG_SYM_NAME_LEN - 1] = '\0';
+ break;
+ case LTTNG_KERNEL_FUNCTION_TRACER:
+ event_param.u.ftrace.symbol_name[LTTNG_SYM_NAME_LEN - 1] = '\0';
+ break;
+ default:
+ break;
}
event_fd = get_unused_fd();
if (event_fd < 0) {
* 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.itype,
- event_desc, NULL);
+ event = ltt_event_create(channel, &event_param, NULL);
if (!event) {
- goto event_error;
ret = -EEXIST;
+ 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:
- ltt_event_put(event_desc);
-get_error:
-name_error:
- kfree(event_name);
return ret;
}
* @arg: command arg
*
* This ioctl implements lttng commands:
- * LTTNG_STREAM
+ * LTTNG_KERNEL_STREAM
* Returns an event stream file descriptor or failure.
* (typically, one event stream records events from one CPU)
- * LTTNG_EVENT
+ * LTTNG_KERNEL_EVENT
* Returns an event file descriptor or failure.
*
* Channel and event file descriptors also hold a reference on the session.
long lttng_channel_ioctl(struct file *file, unsigned int cmd, unsigned long arg)
{
switch (cmd) {
- case LTTNG_STREAM:
+ case LTTNG_KERNEL_STREAM:
return lttng_abi_open_stream(file);
- case LTTNG_EVENT:
- return lttng_abi_create_event(file, (struct lttng_event __user *)arg);
+ case LTTNG_KERNEL_EVENT:
+ return lttng_abi_create_event(file, (struct lttng_kernel_event __user *) arg);
default:
return -ENOIOCTLCMD;
}
* @arg: command arg
*
* This ioctl implements lttng commands:
- * LTTNG_STREAM
+ * LTTNG_KERNEL_STREAM
* Returns an event stream file descriptor or failure.
*
* Channel and event file descriptors also hold a reference on the session.
long lttng_metadata_ioctl(struct file *file, unsigned int cmd, unsigned long arg)
{
switch (cmd) {
- case LTTNG_STREAM:
+ case LTTNG_KERNEL_STREAM:
return lttng_abi_open_stream(file);
default:
return -ENOIOCTLCMD;
projects / lttng-modules.git / blobdiff