Fix: older kernels (3.2.x) don't undefine TRACE_SYSTEM

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

diff --git a/lttng-abi.c b/lttng-abi.c
index 64af55fb24938db7491a39483dd2071d0c7ede3d..8073e9880ff109b1efdc27dd835b82b19b8f3c47 100644 (file)
--- a/lttng-abi.c
+++ b/lttng-abi.c
@@ -118,7 +118,7 @@ int lttng_abi_tracepoint_list(void)
                goto fd_error;
        }
 
-       tracepoint_list_file = anon_inode_getfile("[lttng_session]",
+       tracepoint_list_file = anon_inode_getfile("[lttng_tracepoint_list]",
                                          &lttng_tracepoint_list_fops,
                                          NULL, O_RDWR);
        if (IS_ERR(tracepoint_list_file)) {
@@ -143,6 +143,43 @@ fd_error:
        return ret;
 }
 
+static
+int lttng_abi_syscall_list(void)
+{
+       struct file *syscall_list_file;
+       int file_fd, ret;
+
+       file_fd = get_unused_fd();
+       if (file_fd < 0) {
+               ret = file_fd;
+               goto fd_error;
+       }
+
+       syscall_list_file = anon_inode_getfile("[lttng_syscall_list]",
+                                         &lttng_syscall_list_fops,
+                                         NULL, O_RDWR);
+       if (IS_ERR(syscall_list_file)) {
+               ret = PTR_ERR(syscall_list_file);
+               goto file_error;
+       }
+       ret = lttng_syscall_list_fops.open(NULL, syscall_list_file);
+       if (ret < 0)
+               goto open_error;
+       fd_install(file_fd, syscall_list_file);
+       if (file_fd < 0) {
+               ret = file_fd;
+               goto fd_error;
+       }
+       return file_fd;
+
+open_error:
+       fput(syscall_list_file);
+file_error:
+       put_unused_fd(file_fd);
+fd_error:
+       return ret;
+}
+
 static
 void lttng_abi_tracer_version(struct lttng_kernel_tracer_version *v)
 {
@@ -249,6 +286,8 @@ long lttng_ioctl(struct file *file, unsigned int cmd, unsigned long arg)
        case LTTNG_KERNEL_OLD_TRACEPOINT_LIST:
        case LTTNG_KERNEL_TRACEPOINT_LIST:
                return lttng_abi_tracepoint_list();
+       case LTTNG_KERNEL_SYSCALL_LIST:
+               return lttng_abi_syscall_list();
        case LTTNG_KERNEL_OLD_WAIT_QUIESCENT:
        case LTTNG_KERNEL_WAIT_QUIESCENT:
                synchronize_trace();
@@ -841,6 +880,7 @@ int lttng_abi_open_metadata_stream(struct file *channel_file)
        metadata_stream->priv = buf;
        stream_priv = metadata_stream;
        metadata_stream->transport = channel->transport;
+       mutex_init(&metadata_stream->lock);
 
        /*
         * Since life-time of metadata cache differs from that of
@@ -924,15 +964,24 @@ int lttng_abi_create_event(struct file *channel_file,
                atomic_long_inc(&channel_file->f_count);
                break;
        case LTTNG_KERNEL_SYSCALL:
-               /*
-                * Only all-syscall tracing supported for now.
-                */
-               if (event_param->name[0] != '\0')
-                       return -EINVAL;
                ret = lttng_syscalls_register(channel, NULL);
                if (ret)
                        goto fd_error;
                event_fd = 0;
+               if (event_param->u.syscall.enable) {
+                       ret = lttng_syscall_filter_enable(channel,
+                               event_param->name[0] == '\0' ?
+                                       NULL : event_param->name);
+                       if (ret)
+                               goto fd_error;
+
+               } else {
+                       ret = lttng_syscall_filter_disable(channel,
+                               event_param->name[0] == '\0' ?
+                                       NULL : event_param->name);
+                       if (ret)
+                               goto fd_error;
+               }
                break;
        }
        return event_fd;
@@ -1121,6 +1170,9 @@ old_ctx_end:
        case LTTNG_KERNEL_OLD_DISABLE:
        case LTTNG_KERNEL_DISABLE:
                return lttng_channel_disable(channel);
+       case LTTNG_KERNEL_SYSCALL_MASK:
+               return lttng_channel_syscall_mask(channel,
+                       (struct lttng_kernel_syscall_mask __user *) arg);
        default:
                return -ENOIOCTLCMD;
        }