Rename "tsc" to "timestamp"

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

diff --git a/src/lttng-statedump-impl.c b/src/lttng-statedump-impl.c
index 65efc54b2741e7dc6f2e9230e7a0760edc2929aa..4a228ce41a577422b6ac4c4c50abc0620d808c8c 100644 (file)
--- a/src/lttng-statedump-impl.c
+++ b/src/lttng-statedump-impl.c
@@ -191,7 +191,8 @@ enum lttng_process_status {
 };
 
 
-#if (LTTNG_LINUX_VERSION_CODE >= LTTNG_KERNEL_VERSION(6,0,0))
+#if (LTTNG_LINUX_VERSION_CODE >= LTTNG_KERNEL_VERSION(6,0,0) || \
+    LTTNG_RHEL_KERNEL_RANGE(5,14,0,163,0,0, 5,15,0,0,0,0))
 
 #define LTTNG_PART_STRUCT_TYPE struct block_device
 
@@ -385,6 +386,20 @@ void lttng_enumerate_device(struct lttng_kernel_session *session,
        }
 }
 
+#if (LTTNG_LINUX_VERSION_CODE >= LTTNG_KERNEL_VERSION(6,9,0))
+static
+int lttng_enumerate_network_ip_interface(struct lttng_kernel_session *session)
+{
+       struct net_device *dev;
+
+       rtnl_lock();
+       for_each_netdev(&init_net, dev)
+               lttng_enumerate_device(session, dev);
+       rtnl_unlock();
+
+       return 0;
+}
+#else
 static
 int lttng_enumerate_network_ip_interface(struct lttng_kernel_session *session)
 {
@@ -397,6 +412,7 @@ int lttng_enumerate_network_ip_interface(struct lttng_kernel_session *session)
 
        return 0;
 }
+#endif /* (LTTNG_LINUX_VERSION_CODE >= LTTNG_KERNEL_VERSION(6,9,0)) */
 #else /* CONFIG_INET */
 static inline
 int lttng_enumerate_network_ip_interface(struct lttng_kernel_session *session)
@@ -428,7 +444,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 && lttng_close_on_exec(fd, fdt))
+       if (fd < fdt->max_fds && close_on_exec(fd, fdt))
                flags |= O_CLOEXEC;
        if (IS_ERR(s)) {
                struct dentry *dentry = file->f_path.dentry;
@@ -455,7 +471,7 @@ void lttng_enumerate_files(struct lttng_kernel_session *session,
 {
        struct lttng_fd_ctx ctx = { .page = tmp, .session = session, .files = files, };
 
-       lttng_iterate_fd(files, 0, lttng_dump_one_fd, &ctx);
+       iterate_fd(files, 0, lttng_dump_one_fd, &ctx);
 }
 
 #ifdef LTTNG_HAVE_STATEDUMP_CPU_TOPOLOGY
@@ -601,21 +617,8 @@ void lttng_statedump_process_ns(struct lttng_kernel_session *session,
                user_ns = user_ns ? 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) {
 #if (LTTNG_LINUX_VERSION_CODE >= LTTNG_KERNEL_VERSION(4,6,0))
                trace_lttng_statedump_process_cgroup_ns(session, p, proxy->cgroup_ns);
@@ -631,14 +634,6 @@ void lttng_statedump_process_ns(struct lttng_kernel_session *session,
                trace_lttng_statedump_process_time_ns(session, p, proxy->time_ns);
 #endif
        }
-#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
@@ -805,13 +800,6 @@ 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;
 }