Update ftrace wrapper

[lttng-modules.git] / ltt-debugfs-abi.c

diff --git a/ltt-debugfs-abi.c b/ltt-debugfs-abi.c
index 53cc35d673c5e65a943e2dfea6ccbec96918ba8d..fe5f5b1b354310ea0c083cb53c3504aae7c875c9 100644 (file)
--- a/ltt-debugfs-abi.c
+++ b/ltt-debugfs-abi.c
@@ -49,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,
@@ -159,6 +164,16 @@ long lttng_abi_add_context(struct file *file,
                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,
@@ -186,6 +201,8 @@ long lttng_abi_add_context(struct file *file,
  *             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.
  */
@@ -200,12 +217,16 @@ long lttng_ioctl(struct file *file, unsigned int cmd, unsigned long arg)
                                (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;
        default:
                return -ENOIOCTLCMD;
        }
 }
 
 static const struct file_operations lttng_fops = {
+       .owner = THIS_MODULE,
        .unlocked_ioctl = lttng_ioctl,
 #ifdef CONFIG_COMPAT
        .compat_ioctl = lttng_ioctl,
@@ -226,7 +247,6 @@ void lttng_metadata_create_events(struct file *channel_file)
                .name = "lttng_metadata",
        };
        struct ltt_event *event;
-       int ret;
 
        /*
         * We tolerate no failure path after event creation. It will stay
@@ -234,7 +254,6 @@ void lttng_metadata_create_events(struct file *channel_file)
         */
        event = ltt_event_create(channel, &metadata_params, NULL);
        if (!event) {
-               ret = -EINVAL;
                goto create_error;
        }
        return;
@@ -250,7 +269,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;
@@ -265,8 +284,17 @@ int lttng_abi_create_channel(struct file *session_file,
                ret = chan_fd;
                goto fd_error;
        }
+       switch (channel_type) {
+       case PER_CPU_CHANNEL:
+               fops = &lttng_channel_fops;
+               break;
+       case METADATA_CHANNEL:
+               fops = &lttng_metadata_fops;
+               break;
+       }
+               
        chan_file = anon_inode_getfile("[lttng_channel]",
-                                      &lttng_channel_fops,
+                                      fops,
                                       NULL, O_RDWR);
        if (IS_ERR(chan_file)) {
                ret = PTR_ERR(chan_file);
@@ -274,13 +302,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 = &lttng_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 = &lttng_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 = "<unknown>";
@@ -383,6 +421,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
@@ -582,8 +621,9 @@ unsigned int lttng_channel_poll(struct file *file, poll_table *wait)
                        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;
 
@@ -600,6 +640,7 @@ 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,
        .poll = lttng_channel_poll,
        .unlocked_ioctl = lttng_channel_ioctl,
@@ -609,6 +650,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
@@ -662,6 +704,7 @@ int lttng_event_release(struct inode *inode, struct file *file)
 
 /* 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