Check if interrupt action name is not null in statedump

[lttng-modules.git] / instrumentation / events / lttng-module / lttng-statedump.h

diff --git a/instrumentation/events/lttng-module/lttng-statedump.h b/instrumentation/events/lttng-module/lttng-statedump.h
index 504118805da67063d6b25f4de362b4b5e9c8f98a..e4c86d659373307b232216be42f85efc590a7e65 100644 (file)
--- a/instrumentation/events/lttng-module/lttng-statedump.h
+++ b/instrumentation/events/lttng-module/lttng-statedump.h
@@ -5,11 +5,8 @@
 #define _TRACE_LTTNG_STATEDUMP_H
 
 #include <linux/tracepoint.h>
-#include <linux/netlink.h>
-#include <linux/inet.h>
-#include <linux/ip.h>
-#include <linux/netdevice.h>
-#include <linux/inetdevice.h>
+#include <linux/nsproxy.h>
+#include <linux/pid_namespace.h>
 
 TRACE_EVENT(lttng_statedump_start,
        TP_PROTO(struct lttng_session *session),
@@ -34,8 +31,9 @@ TRACE_EVENT(lttng_statedump_end,
 TRACE_EVENT(lttng_statedump_process_state,
        TP_PROTO(struct lttng_session *session,
                struct task_struct *p,
-               int type, int mode, int submode, int status),
-       TP_ARGS(session, p, type, mode, submode, status),
+               int type, int mode, int submode, int status,
+               struct pid_namespace *pid_ns),
+       TP_ARGS(session, p, type, mode, submode, status, pid_ns),
        TP_STRUCT__entry(
                __field(pid_t, tid)
                __field(pid_t, vtid)
@@ -48,12 +46,13 @@ TRACE_EVENT(lttng_statedump_process_state,
                __field(int, mode)
                __field(int, submode)
                __field(int, status)
+               __field(int, ns_level)
        ),
        TP_fast_assign(
                tp_assign(tid, p->pid)
-               tp_assign(vtid, !p->nsproxy ? 0 : task_pid_vnr(p))
+               tp_assign(vtid, pid_ns ? task_pid_nr_ns(p, pid_ns) : 0)
                tp_assign(pid, p->tgid)
-               tp_assign(vpid, !p->nsproxy ? 0 : task_tgid_vnr(p))
+               tp_assign(vpid, pid_ns ? task_tgid_nr_ns(p, pid_ns) : 0)
                tp_assign(ppid,
                        ({
                                pid_t ret;
@@ -66,15 +65,14 @@ TRACE_EVENT(lttng_statedump_process_state,
                tp_assign(vppid,
                        ({
                                struct task_struct *parent;
-                               pid_t ret;
+                               pid_t ret = 0;
 
-                               rcu_read_lock();
-                               parent = rcu_dereference(current->real_parent);
-                               if (!parent->nsproxy)
-                                       ret = 0;
-                               else
-                                       ret = task_tgid_nr(parent);
-                               rcu_read_unlock();
+                               if (pid_ns) {
+                                       rcu_read_lock();
+                                       parent = rcu_dereference(p->real_parent);
+                                       ret = task_tgid_nr_ns(parent, pid_ns);
+                                       rcu_read_unlock();
+                               }
                                ret;
                        }))
                tp_memcpy(name, p->comm, TASK_COMM_LEN)
@@ -82,6 +80,7 @@ TRACE_EVENT(lttng_statedump_process_state,
                tp_assign(mode, mode)
                tp_assign(submode, submode)
                tp_assign(status, status)
+               tp_assign(ns_level, pid_ns ? pid_ns->level : 0)
        ),
        TP_printk("")
 )
@@ -97,7 +96,7 @@ TRACE_EVENT(lttng_statedump_file_descriptor,
        ),
        TP_fast_assign(
                tp_assign(pid, p->tgid)
-               tp_assign(fd, p->tgid)
+               tp_assign(fd, fd)
                tp_strcpy(filename, filename)
        ),
        TP_printk("")
@@ -151,12 +150,12 @@ TRACE_EVENT(lttng_statedump_interrupt,
        TP_STRUCT__entry(
                __field(unsigned int, irq)
                __string(name, chip_name)
-               __string(action, action->name)
+               __string(action, action->name ? : "")
        ),
        TP_fast_assign(
                tp_assign(irq, irq)
                tp_strcpy(name, chip_name)
-               tp_strcpy(action, action->name)
+               tp_strcpy(action, action->name ? : "")
        ),
        TP_printk("")
 )