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;
+ }
+ fd_install(file_fd, tracepoint_list_file);
+ return file_fd;
+
+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)
* 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;
}
void lttng_metadata_create_events(struct file *channel_file)
{
struct ltt_channel *channel = channel_file->private_data;
- char *event_name = "lttng_metadata";
+ static struct lttng_kernel_event metadata_params = {
+ .instrumentation = LTTNG_KERNEL_TRACEPOINT,
+ .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, LTTNG_KERNEL_TRACEPOINTS,
- NULL);
+ event = ltt_event_create(channel, &metadata_params, NULL);
if (!event) {
+ ret = -EINVAL;
goto create_error;
- ret = -EEXIST;
}
return;
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 */
{
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_param.name[LTTNG_SYM_NAME_LEN - 1] = '\0';
+ switch (event_param.instrumentation) {
+ 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_name[PATH_MAX - 1] = '\0';
- event_param.u.kprobe.symbol_name[LTTNG_KPROBE_SYM_NAME_LEN - 1] = '\0';
-
event_fd = get_unused_fd();
if (event_fd < 0) {
ret = event_fd;
* 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;
}
{
struct ltt_event *event = file->private_data;
- if (event) {
- ltt_event_unregister(event);
+ if (event)
fput(event->chan->file);
- }
return 0;
}