Namespace kernel version macros

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

diff --git a/lttng-statedump-impl.c b/lttng-statedump-impl.c
index baa5a1efd33e56aa7ab545766e41b7fde363b458..9396e2c4b8ae40b0fb97f843de397df0b871b538 100644 (file)
--- a/lttng-statedump-impl.c
+++ b/lttng-statedump-impl.c
@@ -28,7 +28,6 @@
 #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>
@@ -43,7 +42,7 @@
 #include <wrapper/tracepoint.h>
 #include <wrapper/genhd.h>
 #include <wrapper/file.h>
-#include <wrapper/time.h>
+#include <wrapper/fdtable.h>
 
 #ifdef CONFIG_LTTNG_HAS_LIST_IRQ
 #include <linux/irq.h>
@@ -56,13 +55,42 @@
 #define LTTNG_INSTRUMENTATION
 #include <instrumentation/events/lttng-module/lttng-statedump.h>
 
-DEFINE_TRACE(lttng_statedump_block_device);
-DEFINE_TRACE(lttng_statedump_end);
-DEFINE_TRACE(lttng_statedump_interrupt);
-DEFINE_TRACE(lttng_statedump_file_descriptor);
-DEFINE_TRACE(lttng_statedump_start);
-DEFINE_TRACE(lttng_statedump_process_state);
-DEFINE_TRACE(lttng_statedump_network_interface);
+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 task_struct *p, int fd, const char *filename,
+               unsigned int flags, fmode_t fmode),
+       TP_ARGS(session, p, 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 pid_namespace *pid_ns),
+       TP_ARGS(session, p, type, mode, submode, status, pid_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));
 
 struct lttng_fd_ctx {
        char *page;
@@ -108,6 +136,61 @@ 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
+
 static
 int lttng_enumerate_block_devices(struct lttng_session *session)
 {
@@ -127,7 +210,7 @@ int lttng_enumerate_block_devices(struct lttng_session *session)
        while ((dev = class_dev_iter_next(&iter))) {
                struct disk_part_iter piter;
                struct gendisk *disk = dev_to_disk(dev);
-               struct hd_struct *part;
+               LTTNG_PART_STRUCT_TYPE *part;
 
                /*
                 * Don't show empty devices or things that have been
@@ -140,16 +223,14 @@ int lttng_enumerate_block_devices(struct lttng_session *session)
                disk_part_iter_init(&piter, disk, DISK_PITER_INCL_PART0);
                while ((part = disk_part_iter_next(&piter))) {
                        char name_buf[BDEVNAME_SIZE];
-                       char *p;
 
-                       p = wrapper_disk_name(disk, part->partno, name_buf);
-                       if (!p) {
+                       if (lttng_get_part_name(disk, part, name_buf) == -ENOSYS) {
                                disk_part_iter_exit(&piter);
                                class_dev_iter_exit(&iter);
                                return -ENOSYS;
                        }
                        trace_lttng_statedump_block_device(session,
-                                       part_devt(part), name_buf);
+                                       lttng_get_part_devt(part), name_buf);
                }
                disk_part_iter_exit(&piter);
        }
@@ -329,7 +410,7 @@ int lttng_enumerate_vm_maps(struct lttng_session *session)
 
 #ifdef CONFIG_LTTNG_HAS_LIST_IRQ
 
-#if (LINUX_VERSION_CODE < KERNEL_VERSION(2,6,39))
+#if (LTTNG_LINUX_VERSION_CODE < LTTNG_KERNEL_VERSION(2,6,39))
 #define irq_desc_get_chip(desc) get_irq_desc_chip(desc)
 #endif