Use lttng-modules ABI version ioctl

[lttng-tools.git] / src / bin / lttng-sessiond / kernel.c

diff --git a/src/bin/lttng-sessiond/kernel.c b/src/bin/lttng-sessiond/kernel.c
index b997a4aeab6b7ac0aac7208fa82bacd6e964ce28..00bfbbc2be5400d460e2c7dd7c273335f7d444b4 100644 (file)
--- a/src/bin/lttng-sessiond/kernel.c
+++ b/src/bin/lttng-sessiond/kernel.c
@@ -26,12 +26,14 @@
 
 #include <common/common.h>
 #include <common/kernel-ctl/kernel-ctl.h>
+#include <common/kernel-ctl/kernel-ioctl.h>
 #include <common/sessiond-comm/sessiond-comm.h>
 
 #include "consumer.h"
 #include "kernel.h"
 #include "kernel-consumer.h"
 #include "kern-modules.h"
+#include "utils.h"
 
 /*
  * Add context on a kernel channel.
@@ -351,6 +353,18 @@ error:
        return ret;
 }
 
+int kernel_enable_syscall(const char *syscall_name,
+               struct ltt_kernel_channel *channel)
+{
+       return kernctl_enable_syscall(channel->fd, syscall_name);
+}
+
+int kernel_disable_syscall(const char *syscall_name,
+               struct ltt_kernel_channel *channel)
+{
+       return kernctl_disable_syscall(channel->fd, syscall_name);
+}
+
 /*
  * Create kernel metadata, open from the kernel tracer and add it to the
  * kernel session.
@@ -685,6 +699,7 @@ int kernel_validate_version(int tracer_fd)
 {
        int ret;
        struct lttng_kernel_tracer_version version;
+       struct lttng_kernel_tracer_abi_version abi_version;
 
        ret = kernctl_tracer_version(tracer_fd, &version);
        if (ret < 0) {
@@ -693,17 +708,28 @@ int kernel_validate_version(int tracer_fd)
        }
 
        /* Validate version */
-       if (version.major != KERN_MODULES_PRE_MAJOR
-               && version.major != KERN_MODULES_MAJOR) {
+       if (version.major != VERSION_MAJOR) {
+               ERR("Kernel tracer major version (%d) is not compatible with lttng-tools major version (%d)",
+                       version.major, VERSION_MAJOR);
                goto error_version;
        }
-
-       DBG2("Kernel tracer version validated (major version %d)", version.major);
+       ret = kernctl_tracer_abi_version(tracer_fd, &abi_version);
+       if (ret < 0) {
+               ERR("Failed at getting lttng-modules ABI version");
+               goto error;
+       }
+       if (abi_version.major != LTTNG_MODULES_ABI_MAJOR_VERSION) {
+               ERR("Kernel tracer ABI version (%d.%d) is not compatible with expected ABI major version (%d.*)",
+                       abi_version.major, abi_version.minor,
+                       LTTNG_MODULES_ABI_MAJOR_VERSION);
+               goto error;
+       }
+       DBG2("Kernel tracer version validated (%d.%d, ABI %d.%d)",
+                       version.major, version.minor,
+                       abi_version.major, abi_version.minor);
        return 0;
 
 error_version:
-       ERR("Kernel major version %d is not compatible (supporting <= %d)",
-                       version.major, KERN_MODULES_MAJOR)
        ret = -1;
 
 error:
@@ -823,13 +849,12 @@ void kernel_destroy_channel(struct ltt_kernel_channel *kchan)
  * Return 0 on success or else return a LTTNG_ERR code.
  */
 int kernel_snapshot_record(struct ltt_kernel_session *ksess,
-               struct snapshot_output *output, int wait, unsigned int nb_streams)
+               struct snapshot_output *output, int wait, uint64_t max_size_per_stream)
 {
        int err, ret, saved_metadata_fd;
        struct consumer_socket *socket;
        struct lttng_ht_iter iter;
        struct ltt_kernel_metadata *saved_metadata;
-       uint64_t max_size_per_stream = 0;
 
        assert(ksess);
        assert(ksess->consumer);
@@ -855,10 +880,6 @@ int kernel_snapshot_record(struct ltt_kernel_session *ksess,
                goto error_open_stream;
        }
 
-       if (output->max_size > 0 && nb_streams > 0) {
-               max_size_per_stream = output->max_size / nb_streams;
-       }
-
        /* Send metadata to consumer and snapshot everything. */
        cds_lfht_for_each_entry(ksess->consumer->socks->ht, &iter.iter,
                        socket, node.node) {
@@ -885,17 +906,6 @@ int kernel_snapshot_record(struct ltt_kernel_session *ksess,
 
                /* For each channel, ask the consumer to snapshot it. */
                cds_list_for_each_entry(chan, &ksess->channel_list.head, list) {
-                       if (max_size_per_stream &&
-                                       chan->channel->attr.subbuf_size > max_size_per_stream) {
-                               ret = LTTNG_ERR_INVALID;
-                               DBG3("Kernel snapshot record maximum stream size %" PRIu64
-                                               " is smaller than subbuffer size of %" PRIu64,
-                                               max_size_per_stream, chan->channel->attr.subbuf_size);
-                               (void) kernel_consumer_destroy_metadata(socket,
-                                               ksess->metadata);
-                               goto error_consumer;
-                       }
-
                        pthread_mutex_lock(socket->lock);
                        ret = consumer_snapshot_channel(socket, chan->fd, output, 0,
                                        ksess->uid, ksess->gid,
@@ -947,3 +957,17 @@ error:
        rcu_read_unlock();
        return ret;
 }
+
+/*
+ * Get the syscall mask array from the kernel tracer.
+ *
+ * Return 0 on success else a negative value. In both case, syscall_mask should
+ * be freed.
+ */
+int kernel_syscall_mask(int chan_fd, char **syscall_mask, uint32_t *nr_bits)
+{
+       assert(syscall_mask);
+       assert(nr_bits);
+
+       return kernctl_syscall_mask(chan_fd, syscall_mask, nr_bits);
+}