Revert "Fix: build against Ubuntu kernels"

[lttng-modules.git] / lttng-statedump-impl.c

diff --git a/lttng-statedump-impl.c b/lttng-statedump-impl.c
index dad51ddaa25013f1bd5453aca4352854bd1ec6eb..fcbdfa58e99427b03456af07d080bec985f2e9f2 100644 (file)
--- a/lttng-statedump-impl.c
+++ b/lttng-statedump-impl.c
@@ -56,6 +56,8 @@
 #include "wrapper/irq.h"
 #include "wrapper/tracepoint.h"
 #include "wrapper/genhd.h"
+#include "wrapper/file.h"
+#include "wrapper/time.h"
 
 #ifdef CONFIG_LTTNG_HAS_LIST_IRQ
 #include <linux/irq.h>
@@ -65,6 +67,7 @@
 #define CREATE_TRACE_POINTS
 #define TRACE_INCLUDE_PATH ../instrumentation/events/lttng-module
 #define TRACE_INCLUDE_FILE lttng-statedump
+#define LTTNG_INSTRUMENTATION
 #include "instrumentation/events/lttng-module/lttng-statedump.h"
 
 DEFINE_TRACE(lttng_statedump_block_device);
@@ -236,7 +239,7 @@ int lttng_dump_one_fd(const void *p, struct file *file, unsigned int fd)
         * the lock is taken, but we are not aware whether this is
         * guaranteed or not, so play safe.
         */
-       if (fd < fdt->max_fds && test_bit(fd, fdt->close_on_exec))
+       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;
@@ -314,7 +317,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);
@@ -378,6 +381,9 @@ int lttng_list_interrupts(struct lttng_session *session)
 }
 #endif
 
+/*
+ * Called with task lock held.
+ */
 static
 void lttng_statedump_process_ns(struct lttng_session *session,
                struct task_struct *p,
@@ -389,8 +395,20 @@ void lttng_statedump_process_ns(struct lttng_session *session,
        struct nsproxy *proxy;
        struct pid_namespace *pid_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 (LINUX_VERSION_CODE >= KERNEL_VERSION(3,17,0) || \
+               LTTNG_UBUNTU_KERNEL_RANGE(3,13,11,36, 3,14,0,0) || \
+               LTTNG_UBUNTU_KERNEL_RANGE(3,16,0,11, 3,17,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 {
@@ -402,7 +420,13 @@ void lttng_statedump_process_ns(struct lttng_session *session,
                trace_lttng_statedump_process_state(session,
                        p, type, mode, submode, status, NULL);
        }
+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(3,17,0) || \
+               LTTNG_UBUNTU_KERNEL_RANGE(3,13,11,36, 3,14,0,0) || \
+               LTTNG_UBUNTU_KERNEL_RANGE(3,16,0,11, 3,17,0,0))
+       /* (nothing) */
+#else
        rcu_read_unlock();
+#endif
 }
 
 static