page alloc wrapper: Fix get_pfnblock_flags_mask prototype
[lttng-modules.git] / lttng-statedump-impl.c
old mode 100755 (executable)
new mode 100644 (file)
index 1269a3e..a33759d
@@ -1,4 +1,5 @@
-/*
+/* SPDX-License-Identifier: (GPL-2.0 or LGPL-2.1)
+ *
  * lttng-statedump.c
  *
  * Linux Trace Toolkit Next Generation Kernel State Dump
@@ -6,20 +7,6 @@
  * Copyright 2005 Jean-Hugues Deschenes <jean-hugues.deschenes@polymtl.ca>
  * Copyright 2006-2012 Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
  *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; only
- * version 2.1 of the License.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
- *
  * Changes:
  *     Eric Clement:                   Add listing of network IP interface
  *     2006, 2007 Mathieu Desnoyers    Fix kernel threads
 #include <linux/file.h>
 #include <linux/interrupt.h>
 #include <linux/irqnr.h>
-#include <linux/cpu.h>
 #include <linux/netdevice.h>
 #include <linux/inetdevice.h>
-#include <linux/sched.h>
 #include <linux/mm.h>
-#include <linux/fdtable.h>
 #include <linux/swap.h>
 #include <linux/wait.h>
 #include <linux/mutex.h>
-
-#include "lttng-events.h"
-#include "wrapper/irqdesc.h"
-#include "wrapper/spinlock.h"
-#include "wrapper/fdtable.h"
-#include "wrapper/nsproxy.h"
-#include "wrapper/irq.h"
+#include <linux/device.h>
+
+#include <linux/blkdev.h>
+
+#include <lttng-events.h>
+#include <lttng-tracer.h>
+#include <wrapper/cpu.h>
+#include <wrapper/irqdesc.h>
+#include <wrapper/fdtable.h>
+#include <wrapper/namespace.h>
+#include <wrapper/irq.h>
+#include <wrapper/tracepoint.h>
+#include <wrapper/genhd.h>
+#include <wrapper/file.h>
+#include <wrapper/fdtable.h>
+#include <wrapper/sched.h>
 
 #ifdef CONFIG_LTTNG_HAS_LIST_IRQ
 #include <linux/irq.h>
 
 /* Define the tracepoints, but do not build the probes */
 #define CREATE_TRACE_POINTS
-#define TRACE_INCLUDE_PATH ../instrumentation/events/lttng-module
+#define TRACE_INCLUDE_PATH instrumentation/events/lttng-module
 #define TRACE_INCLUDE_FILE lttng-statedump
-#include "instrumentation/events/lttng-module/lttng-statedump.h"
+#define LTTNG_INSTRUMENTATION
+#include <instrumentation/events/lttng-module/lttng-statedump.h>
+
+LTTNG_DEFINE_TRACE(lttng_statedump_block_device,
+       TP_PROTO(struct lttng_session *session,
+               dev_t dev, const char *diskname),
+       TP_ARGS(session, dev, diskname));
+
+LTTNG_DEFINE_TRACE(lttng_statedump_end,
+       TP_PROTO(struct lttng_session *session),
+       TP_ARGS(session));
+
+LTTNG_DEFINE_TRACE(lttng_statedump_interrupt,
+       TP_PROTO(struct lttng_session *session,
+               unsigned int irq, const char *chip_name,
+               struct irqaction *action),
+       TP_ARGS(session, irq, chip_name, action));
+
+LTTNG_DEFINE_TRACE(lttng_statedump_file_descriptor,
+       TP_PROTO(struct lttng_session *session,
+               struct files_struct *files,
+               int fd, const char *filename,
+               unsigned int flags, fmode_t fmode),
+       TP_ARGS(session, files, fd, filename, flags, fmode));
+
+LTTNG_DEFINE_TRACE(lttng_statedump_start,
+       TP_PROTO(struct lttng_session *session),
+       TP_ARGS(session));
+
+LTTNG_DEFINE_TRACE(lttng_statedump_process_state,
+       TP_PROTO(struct lttng_session *session,
+               struct task_struct *p,
+               int type, int mode, int submode, int status,
+               struct files_struct *files),
+       TP_ARGS(session, p, type, mode, submode, status, files));
+
+LTTNG_DEFINE_TRACE(lttng_statedump_process_pid_ns,
+       TP_PROTO(struct lttng_session *session,
+               struct task_struct *p,
+               struct pid_namespace *pid_ns),
+       TP_ARGS(session, p, pid_ns));
+
+#if (LTTNG_LINUX_VERSION_CODE >= LTTNG_KERNEL_VERSION(4,6,0))
+LTTNG_DEFINE_TRACE(lttng_statedump_process_cgroup_ns,
+       TP_PROTO(struct lttng_session *session,
+               struct task_struct *p,
+               struct cgroup_namespace *cgroup_ns),
+       TP_ARGS(session, p, cgroup_ns));
+#endif
+
+LTTNG_DEFINE_TRACE(lttng_statedump_process_ipc_ns,
+       TP_PROTO(struct lttng_session *session,
+               struct task_struct *p,
+               struct ipc_namespace *ipc_ns),
+       TP_ARGS(session, p, ipc_ns));
+
+#ifndef LTTNG_MNT_NS_MISSING_HEADER
+LTTNG_DEFINE_TRACE(lttng_statedump_process_mnt_ns,
+       TP_PROTO(struct lttng_session *session,
+               struct task_struct *p,
+               struct mnt_namespace *mnt_ns),
+       TP_ARGS(session, p, mnt_ns));
+#endif
+
+LTTNG_DEFINE_TRACE(lttng_statedump_process_net_ns,
+       TP_PROTO(struct lttng_session *session,
+               struct task_struct *p,
+               struct net *net_ns),
+       TP_ARGS(session, p, net_ns));
+
+LTTNG_DEFINE_TRACE(lttng_statedump_process_user_ns,
+       TP_PROTO(struct lttng_session *session,
+               struct task_struct *p,
+               struct user_namespace *user_ns),
+       TP_ARGS(session, p, user_ns));
+
+LTTNG_DEFINE_TRACE(lttng_statedump_process_uts_ns,
+       TP_PROTO(struct lttng_session *session,
+               struct task_struct *p,
+               struct uts_namespace *uts_ns),
+       TP_ARGS(session, p, uts_ns));
+
+LTTNG_DEFINE_TRACE(lttng_statedump_network_interface,
+       TP_PROTO(struct lttng_session *session,
+               struct net_device *dev, struct in_ifaddr *ifa),
+       TP_ARGS(session, dev, ifa));
+
+#ifdef LTTNG_HAVE_STATEDUMP_CPU_TOPOLOGY
+LTTNG_DEFINE_TRACE(lttng_statedump_cpu_topology,
+       TP_PROTO(struct lttng_session *session, struct cpuinfo_x86 *c),
+       TP_ARGS(session, c));
+#endif
 
 struct lttng_fd_ctx {
        char *page;
        struct lttng_session *session;
-       struct task_struct *p;
+       struct files_struct *files;
 };
 
 /*
@@ -106,7 +190,156 @@ enum lttng_process_status {
        LTTNG_DEAD = 7,
 };
 
+
+#if (LTTNG_LINUX_VERSION_CODE >= LTTNG_KERNEL_VERSION(5,11,0))
+
+#define LTTNG_PART_STRUCT_TYPE struct block_device
+
+static
+int lttng_get_part_name(struct gendisk *disk, struct block_device *part, char *name_buf)
+{
+       const char *p;
+
+       p = bdevname(part, name_buf);
+       if (!p)
+               return -ENOSYS;
+
+       return 0;
+}
+
+static
+dev_t lttng_get_part_devt(struct block_device *part)
+{
+       return part->bd_dev;
+}
+
+#else
+
+#define LTTNG_PART_STRUCT_TYPE struct hd_struct
+
+static
+int lttng_get_part_name(struct gendisk *disk, struct hd_struct *part, char *name_buf)
+{
+       const char *p;
+       struct block_device bdev;
+
+       /*
+        * Create a partial 'struct blockdevice' to use
+        * 'bdevname()' which is a simple wrapper over
+        * 'disk_name()' but has the honor to be EXPORT_SYMBOL.
+        */
+       bdev.bd_disk = disk;
+       bdev.bd_part = part;
+
+       p = bdevname(&bdev, name_buf);
+       if (!p)
+               return -ENOSYS;
+
+       return 0;
+}
+
+static
+dev_t lttng_get_part_devt(struct hd_struct *part)
+{
+       return part_devt(part);
+}
+#endif
+
+#if (LTTNG_LINUX_VERSION_CODE >= LTTNG_KERNEL_VERSION(5,12,0))
+static
+int lttng_statedump_each_block_device(struct lttng_session *session, struct gendisk *disk)
+{
+       struct block_device *part;
+       unsigned long idx;
+       int ret = 0;
+
+       /* Include partition 0 */
+       idx = 0;
+
+       rcu_read_lock();
+       xa_for_each(&disk->part_tbl, idx, part) {
+               char name_buf[BDEVNAME_SIZE];
+
+               /* Exclude non-partitions bdev and empty partitions. */
+               if (bdev_is_partition(part) && !bdev_nr_sectors(part))
+                       continue;
+
+               if (lttng_get_part_name(disk, part, name_buf) == -ENOSYS) {
+                       ret = -ENOSYS;
+                       goto end;
+               }
+               trace_lttng_statedump_block_device(session, lttng_get_part_devt(part),
+                               name_buf);
+       }
+end:
+       rcu_read_unlock();
+       return ret;
+}
+#else
+static
+int lttng_statedump_each_block_device(struct lttng_session *session, struct gendisk *disk)
+{
+       struct disk_part_iter piter;
+       LTTNG_PART_STRUCT_TYPE *part;
+
+       disk_part_iter_init(&piter, disk, DISK_PITER_INCL_PART0);
+
+       while ((part = disk_part_iter_next(&piter))) {
+               char name_buf[BDEVNAME_SIZE];
+
+               if (lttng_get_part_name(disk, part, name_buf) == -ENOSYS) {
+                       disk_part_iter_exit(&piter);
+                       return -ENOSYS;
+               }
+               trace_lttng_statedump_block_device(session, lttng_get_part_devt(part),
+                               name_buf);
+       }
+       disk_part_iter_exit(&piter);
+
+       return 0;
+}
+#endif
+
+static
+int lttng_enumerate_block_devices(struct lttng_session *session)
+{
+       struct class *ptr_block_class;
+       struct device_type *ptr_disk_type;
+       struct class_dev_iter iter;
+       struct device *dev;
+       int ret = 0;
+
+       ptr_block_class = wrapper_get_block_class();
+       if (!ptr_block_class) {
+               ret = -ENOSYS;
+               goto end;
+       }
+       ptr_disk_type = wrapper_get_disk_type();
+       if (!ptr_disk_type) {
+               ret = -ENOSYS;
+               goto end;
+       }
+       class_dev_iter_init(&iter, ptr_block_class, NULL, ptr_disk_type);
+       while ((dev = class_dev_iter_next(&iter))) {
+               struct gendisk *disk = dev_to_disk(dev);
+
+               /*
+                * Don't show empty devices or things that have been
+                * suppressed
+                */
+               if (get_capacity(disk) == 0 ||
+                   (disk->flags & LTTNG_GENHD_FL_HIDDEN))
+                       continue;
+
+               ret = lttng_statedump_each_block_device(session, disk);
+       }
+       class_dev_iter_exit(&iter);
+end:
+       return ret;
+}
+
 #ifdef CONFIG_INET
+
 static
 void lttng_enumerate_device(struct lttng_session *session,
                struct net_device *dev)
@@ -155,47 +388,75 @@ int lttng_dump_one_fd(const void *p, struct file *file, unsigned int fd)
 {
        const struct lttng_fd_ctx *ctx = p;
        const char *s = d_path(&file->f_path, ctx->page, PAGE_SIZE);
+       unsigned int flags = file->f_flags;
+       struct fdtable *fdt;
 
+       /*
+        * We don't expose kernel internal flags, only userspace-visible
+        * flags.
+        */
+       flags &= ~FMODE_NONOTIFY;
+       fdt = files_fdtable(ctx->files);
+       /*
+        * We need to check here again whether fd is within the fdt
+        * max_fds range, because we might be seeing a different
+        * files_fdtable() than iterate_fd(), assuming only RCU is
+        * protecting the read. In reality, iterate_fd() holds
+        * file_lock, which should ensure the fdt does not change while
+        * the lock is taken, but we are not aware whether this is
+        * guaranteed or not, so play safe.
+        */
+       if (fd < fdt->max_fds && lttng_close_on_exec(fd, fdt))
+               flags |= O_CLOEXEC;
        if (IS_ERR(s)) {
                struct dentry *dentry = file->f_path.dentry;
 
                /* Make sure we give at least some info */
                spin_lock(&dentry->d_lock);
-               trace_lttng_statedump_file_descriptor(ctx->session, ctx->p, fd,
-                       dentry->d_name.name);
+               trace_lttng_statedump_file_descriptor(ctx->session,
+                       ctx->files, fd, dentry->d_name.name, flags,
+                       file->f_mode);
                spin_unlock(&dentry->d_lock);
                goto end;
        }
-       trace_lttng_statedump_file_descriptor(ctx->session, ctx->p, fd, s);
+       trace_lttng_statedump_file_descriptor(ctx->session,
+               ctx->files, fd, s, flags, file->f_mode);
 end:
        return 0;
 }
 
+/* Called with task lock held. */
 static
-void lttng_enumerate_task_fd(struct lttng_session *session,
-               struct task_struct *p, char *tmp)
+void lttng_enumerate_files(struct lttng_session *session,
+               struct files_struct *files,
+               char *tmp)
 {
-       struct lttng_fd_ctx ctx = { .page = tmp, .session = session, .p = p };
+       struct lttng_fd_ctx ctx = { .page = tmp, .session = session, .files = files, };
 
-       task_lock(p);
-       lttng_iterate_fd(p->files, 0, lttng_dump_one_fd, &ctx);
-       task_unlock(p);
+       lttng_iterate_fd(files, 0, lttng_dump_one_fd, &ctx);
 }
 
+#ifdef LTTNG_HAVE_STATEDUMP_CPU_TOPOLOGY
 static
-int lttng_enumerate_file_descriptors(struct lttng_session *session)
+int lttng_enumerate_cpu_topology(struct lttng_session *session)
 {
-       struct task_struct *p;
-       char *tmp = (char *) __get_free_page(GFP_KERNEL);
+       int cpu;
+       const cpumask_t *cpumask = cpu_possible_mask;
 
-       /* Enumerate active file descriptors */
-       rcu_read_lock();
-       for_each_process(p)
-               lttng_enumerate_task_fd(session, p, tmp);
-       rcu_read_unlock();
-       free_page((unsigned long) tmp);
+       for (cpu = cpumask_first(cpumask); cpu < nr_cpu_ids;
+                       cpu = cpumask_next(cpu, cpumask)) {
+               trace_lttng_statedump_cpu_topology(session, &cpu_data(cpu));
+       }
+
+       return 0;
+}
+#else
+static
+int lttng_enumerate_cpu_topology(struct lttng_session *session)
+{
        return 0;
 }
+#endif
 
 #if 0
 /*
@@ -221,7 +482,7 @@ void lttng_enumerate_task_vm_maps(struct lttng_session *session,
                down_read(&mm->mmap_sem);
                while (map) {
                        if (map->vm_file)
-                               ino = map->vm_file->f_dentry->d_inode->i_ino;
+                               ino = map->vm_file->lttng_f_dentry->d_inode->i_ino;
                        else
                                ino = 0;
                        trace_lttng_statedump_vm_map(session, p, map, ino);
@@ -247,12 +508,8 @@ int lttng_enumerate_vm_maps(struct lttng_session *session)
 
 #ifdef CONFIG_LTTNG_HAS_LIST_IRQ
 
-#if (LINUX_VERSION_CODE < KERNEL_VERSION(2,6,39))
-#define irq_desc_get_chip(desc) get_irq_desc_chip(desc)
-#endif
-
 static
-void lttng_list_interrupts(struct lttng_session *session)
+int lttng_list_interrupts(struct lttng_session *session)
 {
        unsigned int irq;
        unsigned long flags = 0;
@@ -266,23 +523,32 @@ void lttng_list_interrupts(struct lttng_session *session)
                        irq_desc_get_chip(desc)->name ? : "unnamed_irq_chip";
 
                local_irq_save(flags);
-               wrapper_desc_spin_lock(&desc->lock);
+               raw_spin_lock(&desc->lock);
                for (action = desc->action; action; action = action->next) {
                        trace_lttng_statedump_interrupt(session,
                                irq, irq_chip_name, action);
                }
-               wrapper_desc_spin_unlock(&desc->lock);
+               raw_spin_unlock(&desc->lock);
                local_irq_restore(flags);
        }
+       return 0;
 #undef irq_to_desc
 }
 #else
 static inline
-void lttng_list_interrupts(struct lttng_session *session)
+int lttng_list_interrupts(struct lttng_session *session)
 {
+       return 0;
 }
 #endif
 
+/*
+ * Statedump the task's namespaces using the proc filesystem inode number as
+ * the unique identifier. The user and pid ns are nested and will be dumped
+ * recursively.
+ *
+ * Called with task lock held.
+ */
 static
 void lttng_statedump_process_ns(struct lttng_session *session,
                struct task_struct *p,
@@ -293,30 +559,85 @@ void lttng_statedump_process_ns(struct lttng_session *session,
 {
        struct nsproxy *proxy;
        struct pid_namespace *pid_ns;
+       struct user_namespace *user_ns;
 
+       /*
+        * The pid and user namespaces are special, they are nested and
+        * accessed with specific functions instead of the nsproxy struct
+        * like the other namespaces.
+        */
+       pid_ns = task_active_pid_ns(p);
+       do {
+               trace_lttng_statedump_process_pid_ns(session, p, pid_ns);
+               pid_ns = pid_ns ? pid_ns->parent : NULL;
+       } while (pid_ns);
+
+
+       user_ns = task_cred_xxx(p, user_ns);
+       do {
+               trace_lttng_statedump_process_user_ns(session, p, user_ns);
+               /*
+                * trace_lttng_statedump_process_user_ns() internally
+                * checks whether user_ns is NULL. While this does not
+                * appear to be a possible return value for
+                * task_cred_xxx(), err on the safe side and check
+                * for NULL here as well to be consistent with the
+                * paranoid behavior of
+                * trace_lttng_statedump_process_user_ns().
+                */
+               user_ns = user_ns ? user_ns->lttng_user_ns_parent : NULL;
+       } while (user_ns);
+
+       /*
+        * Back and forth on locking strategy within Linux upstream for nsproxy.
+        * See Linux upstream commit 728dba3a39c66b3d8ac889ddbe38b5b1c264aec3
+        * "namespaces: Use task_lock and not rcu to protect nsproxy"
+        * for details.
+        */
+#if (LTTNG_LINUX_VERSION_CODE >= LTTNG_KERNEL_VERSION(3,17,0) || \
+               LTTNG_UBUNTU_KERNEL_RANGE(3,13,11,36, 3,14,0,0) || \
+               LTTNG_UBUNTU_KERNEL_RANGE(3,16,1,11, 3,17,0,0) || \
+               LTTNG_RHEL_KERNEL_RANGE(3,10,0,229,13,0, 3,11,0,0,0,0))
+       proxy = p->nsproxy;
+#else
        rcu_read_lock();
        proxy = task_nsproxy(p);
+#endif
        if (proxy) {
-               pid_ns = lttng_get_proxy_pid_ns(proxy);
-               do {
-                       trace_lttng_statedump_process_state(session,
-                               p, type, mode, submode, status, pid_ns);
-                       pid_ns = pid_ns->parent;
-               } while (pid_ns);
-       } else {
-               trace_lttng_statedump_process_state(session,
-                       p, type, mode, submode, status, NULL);
+#if (LTTNG_LINUX_VERSION_CODE >= LTTNG_KERNEL_VERSION(4,6,0))
+               trace_lttng_statedump_process_cgroup_ns(session, p, proxy->cgroup_ns);
+#endif
+               trace_lttng_statedump_process_ipc_ns(session, p, proxy->ipc_ns);
+#ifndef LTTNG_MNT_NS_MISSING_HEADER
+               trace_lttng_statedump_process_mnt_ns(session, p, proxy->mnt_ns);
+#endif
+               trace_lttng_statedump_process_net_ns(session, p, proxy->net_ns);
+               trace_lttng_statedump_process_uts_ns(session, p, proxy->uts_ns);
        }
+#if (LTTNG_LINUX_VERSION_CODE >= LTTNG_KERNEL_VERSION(3,17,0) || \
+               LTTNG_UBUNTU_KERNEL_RANGE(3,13,11,36, 3,14,0,0) || \
+               LTTNG_UBUNTU_KERNEL_RANGE(3,16,1,11, 3,17,0,0) || \
+               LTTNG_RHEL_KERNEL_RANGE(3,10,0,229,13,0, 3,11,0,0,0,0))
+       /* (nothing) */
+#else
        rcu_read_unlock();
+#endif
 }
 
 static
 int lttng_enumerate_process_states(struct lttng_session *session)
 {
        struct task_struct *g, *p;
+       char *tmp;
+
+       tmp = (char *) __get_free_page(GFP_KERNEL);
+       if (!tmp)
+               return -ENOMEM;
 
        rcu_read_lock();
        for_each_process(g) {
+               struct files_struct *prev_files = NULL;
+
                p = g;
                do {
                        enum lttng_execution_mode mode =
@@ -325,13 +646,14 @@ int lttng_enumerate_process_states(struct lttng_session *session)
                                LTTNG_UNKNOWN;
                        enum lttng_process_status status;
                        enum lttng_thread_type type;
+                       struct files_struct *files;
 
                        task_lock(p);
                        if (p->exit_state == EXIT_ZOMBIE)
                                status = LTTNG_ZOMBIE;
                        else if (p->exit_state == EXIT_DEAD)
                                status = LTTNG_DEAD;
-                       else if (p->state == TASK_RUNNING) {
+                       else if (lttng_task_is_running(p)) {
                                /* Is this a forked child that has not run yet? */
                                if (list_empty(&p->rt.run_list))
                                        status = LTTNG_WAIT_FORK;
@@ -342,7 +664,7 @@ int lttng_enumerate_process_states(struct lttng_session *session)
                                         * was really running at this time.
                                         */
                                        status = LTTNG_WAIT_CPU;
-                       } else if (p->state &
+                       } else if (lttng_get_task_state(p) &
                                (TASK_INTERRUPTIBLE | TASK_UNINTERRUPTIBLE)) {
                                /* Task is waiting for something to complete */
                                status = LTTNG_WAIT;
@@ -359,13 +681,31 @@ int lttng_enumerate_process_states(struct lttng_session *session)
                                type = LTTNG_USER_THREAD;
                        else
                                type = LTTNG_KERNEL_THREAD;
+                       files = p->files;
+
+                       trace_lttng_statedump_process_state(session,
+                               p, type, mode, submode, status, files);
                        lttng_statedump_process_ns(session,
                                p, type, mode, submode, status);
+                       /*
+                        * As an optimisation for the common case, do not
+                        * repeat information for the same files_struct in
+                        * two consecutive threads. This is the common case
+                        * for threads sharing the same fd table. RCU guarantees
+                        * that the same files_struct pointer is not re-used
+                        * throughout processes/threads iteration.
+                        */
+                       if (files && files != prev_files) {
+                               lttng_enumerate_files(session, files, tmp);
+                               prev_files = files;
+                       }
                        task_unlock(p);
                } while_each_thread(g, p);
        }
        rcu_read_unlock();
 
+       free_page((unsigned long) tmp);
+
        return 0;
 }
 
@@ -380,14 +720,37 @@ void lttng_statedump_work_func(struct work_struct *work)
 static
 int do_lttng_statedump(struct lttng_session *session)
 {
-       int cpu;
+       int cpu, ret;
 
        trace_lttng_statedump_start(session);
-       lttng_enumerate_process_states(session);
-       lttng_enumerate_file_descriptors(session);
-       /* FIXME lttng_enumerate_vm_maps(session); */
-       lttng_list_interrupts(session);
-       lttng_enumerate_network_ip_interface(session);
+       ret = lttng_enumerate_process_states(session);
+       if (ret)
+               return ret;
+       /*
+        * FIXME
+        * ret = lttng_enumerate_vm_maps(session);
+        * if (ret)
+        *      return ret;
+        */
+       ret = lttng_list_interrupts(session);
+       if (ret)
+               return ret;
+       ret = lttng_enumerate_network_ip_interface(session);
+       if (ret)
+               return ret;
+       ret = lttng_enumerate_block_devices(session);
+       switch (ret) {
+       case 0:
+               break;
+       case -ENOSYS:
+               printk(KERN_WARNING "LTTng: block device enumeration is not supported by kernel\n");
+               break;
+       default:
+               return ret;
+       }
+       ret = lttng_enumerate_cpu_topology(session);
+       if (ret)
+               return ret;
 
        /* TODO lttng_dump_idt_table(session); */
        /* TODO lttng_dump_softirq_vec(session); */
@@ -399,7 +762,7 @@ int do_lttng_statedump(struct lttng_session *session)
         * is to guarantee that each CPU has been in a state where is was in
         * syscall mode (i.e. not in a trap, an IRQ or a soft IRQ).
         */
-       get_online_cpus();
+       lttng_cpus_read_lock();
        atomic_set(&kernel_threads_to_run, num_online_cpus());
        for_each_online_cpu(cpu) {
                INIT_DELAYED_WORK(&cpu_work[cpu], lttng_statedump_work_func);
@@ -407,7 +770,7 @@ int do_lttng_statedump(struct lttng_session *session)
        }
        /* Wait for all threads to run */
        __wait_event(statedump_wq, (atomic_read(&kernel_threads_to_run) == 0));
-       put_online_cpus();
+       lttng_cpus_read_unlock();
        /* Our work is done */
        trace_lttng_statedump_end(session);
        return 0;
@@ -422,6 +785,32 @@ int lttng_statedump_start(struct lttng_session *session)
 }
 EXPORT_SYMBOL_GPL(lttng_statedump_start);
 
+static
+int __init lttng_statedump_init(void)
+{
+       /*
+        * Allow module to load even if the fixup cannot be done. This
+        * will allow seemless transition when the underlying issue fix
+        * is merged into the Linux kernel, and when tracepoint.c
+        * "tracepoint_module_notify" is turned into a static function.
+        */
+       (void) wrapper_lttng_fixup_sig(THIS_MODULE);
+       return 0;
+}
+
+module_init(lttng_statedump_init);
+
+static
+void __exit lttng_statedump_exit(void)
+{
+}
+
+module_exit(lttng_statedump_exit);
+
 MODULE_LICENSE("GPL and additional rights");
 MODULE_AUTHOR("Jean-Hugues Deschenes");
-MODULE_DESCRIPTION("Linux Trace Toolkit Next Generation Statedump");
+MODULE_DESCRIPTION("LTTng statedump provider");
+MODULE_VERSION(__stringify(LTTNG_MODULES_MAJOR_VERSION) "."
+       __stringify(LTTNG_MODULES_MINOR_VERSION) "."
+       __stringify(LTTNG_MODULES_PATCHLEVEL_VERSION)
+       LTTNG_MODULES_EXTRAVERSION);
This page took 0.030565 seconds and 4 git commands to generate.