Fix: signal: Distinguish between kernel_siginfo and siginfo (v4.20)
[lttng-modules.git] / instrumentation / events / lttng-module / signal.h
index 3fa7f5b1425a72678351fb1ef924498b8173ca07..6c484ba2f50064fefde47c824a6c3f6bb2151187 100644 (file)
@@ -1,21 +1,24 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #undef TRACE_SYSTEM
 #define TRACE_SYSTEM signal
 
-#if !defined(_TRACE_SIGNAL_H) || defined(TRACE_HEADER_MULTI_READ)
-#define _TRACE_SIGNAL_H
+#if !defined(LTTNG_TRACE_SIGNAL_H) || defined(TRACE_HEADER_MULTI_READ)
+#define LTTNG_TRACE_SIGNAL_H
 
-#include <linux/tracepoint.h>
+#include <probes/lttng-tracepoint-event.h>
+#include <linux/version.h>
 
 #ifndef _TRACE_SIGNAL_DEF
 #define _TRACE_SIGNAL_DEF
 #include <linux/signal.h>
 #include <linux/sched.h>
-#define TP_STORE_SIGINFO(info)                                 \
-               tp_assign(errno,                                \
+#undef LTTNG_FIELDS_SIGINFO
+#define LTTNG_FIELDS_SIGINFO(info)                             \
+               ctf_integer(int, errno,                         \
                        (info == SEND_SIG_NOINFO || info == SEND_SIG_FORCED || info == SEND_SIG_PRIV) ? \
                        0 :                                     \
                        info->si_errno)                         \
-               tp_assign(code,                                 \
+               ctf_integer(int, code,                          \
                        (info == SEND_SIG_NOINFO || info == SEND_SIG_FORCED) ? \
                        SI_USER :                               \
                        ((info == SEND_SIG_PRIV) ? SI_KERNEL : info->si_code))
  * SEND_SIG_NOINFO means that si_code is SI_USER, and SEND_SIG_PRIV
  * means that si_code is SI_KERNEL.
  */
-TRACE_EVENT(signal_generate,
+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(4,20,0))
+LTTNG_TRACEPOINT_EVENT(signal_generate,
+
+       TP_PROTO(int sig, struct kernel_siginfo *info, struct task_struct *task,
+                       int group, int result),
+
+       TP_ARGS(sig, info, task, group, result),
+
+       TP_FIELDS(
+               ctf_integer(int, sig, sig)
+               LTTNG_FIELDS_SIGINFO(info)
+               ctf_array_text(char, comm, task->comm, TASK_COMM_LEN)
+               ctf_integer(pid_t, pid, task->pid)
+               ctf_integer(int, group, group)
+               ctf_integer(int, result, result)
+       )
+)
+#elif (LINUX_VERSION_CODE >= KERNEL_VERSION(3,4,0))
+LTTNG_TRACEPOINT_EVENT(signal_generate,
+
+       TP_PROTO(int sig, struct siginfo *info, struct task_struct *task,
+                       int group, int result),
+
+       TP_ARGS(sig, info, task, group, result),
+
+       TP_FIELDS(
+               ctf_integer(int, sig, sig)
+               LTTNG_FIELDS_SIGINFO(info)
+               ctf_array_text(char, comm, task->comm, TASK_COMM_LEN)
+               ctf_integer(pid_t, pid, task->pid)
+               ctf_integer(int, group, group)
+               ctf_integer(int, result, result)
+       )
+)
+#else
+LTTNG_TRACEPOINT_EVENT(signal_generate,
 
        TP_PROTO(int sig, struct siginfo *info, struct task_struct *task),
 
        TP_ARGS(sig, info, task),
 
-       TP_STRUCT__entry(
-               __field(        int,    sig                     )
-               __field(        int,    errno                   )
-               __field(        int,    code                    )
-               __array(        char,   comm,   TASK_COMM_LEN   )
-               __field(        pid_t,  pid                     )
-       ),
-
-       TP_fast_assign(
-               tp_assign(sig, sig)
-               TP_STORE_SIGINFO(info)
-               tp_memcpy(comm, task->comm, TASK_COMM_LEN)
-               tp_assign(pid, task->pid)
-       ),
-
-       TP_printk("sig=%d errno=%d code=%d comm=%s pid=%d",
-                 __entry->sig, __entry->errno, __entry->code,
-                 __entry->comm, __entry->pid)
+       TP_FIELDS(
+               ctf_integer(int, sig, sig)
+               LTTNG_FIELDS_SIGINFO(info)
+               ctf_array_text(char, comm, task->comm, TASK_COMM_LEN)
+               ctf_integer(pid_t, pid, task->pid)
+       )
 )
+#endif
 
 /**
  * signal_deliver - called when a signal is delivered
@@ -73,53 +100,48 @@ TRACE_EVENT(signal_generate,
  * This means, this can show which signals are actually delivered, but
  * matching generated signals and delivered signals may not be correct.
  */
-TRACE_EVENT(signal_deliver,
+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(4,20,0))
+LTTNG_TRACEPOINT_EVENT(signal_deliver,
+
+       TP_PROTO(int sig, struct kernel_siginfo *info, struct k_sigaction *ka),
+
+       TP_ARGS(sig, info, ka),
+
+       TP_FIELDS(
+               ctf_integer(int, sig, sig)
+               LTTNG_FIELDS_SIGINFO(info)
+               ctf_integer(unsigned long, sa_handler, (unsigned long) ka->sa.sa_handler)
+               ctf_integer(unsigned long, sa_flags, ka->sa.sa_flags)
+       )
+)
+#else
+LTTNG_TRACEPOINT_EVENT(signal_deliver,
 
        TP_PROTO(int sig, struct siginfo *info, struct k_sigaction *ka),
 
        TP_ARGS(sig, info, ka),
 
-       TP_STRUCT__entry(
-               __field(        int,            sig             )
-               __field(        int,            errno           )
-               __field(        int,            code            )
-               __field(        unsigned long,  sa_handler      )
-               __field(        unsigned long,  sa_flags        )
-       ),
-
-       TP_fast_assign(
-               tp_assign(sig, sig)
-               TP_STORE_SIGINFO(info)
-               tp_assign(sa_handler, (unsigned long)ka->sa.sa_handler)
-               tp_assign(sa_flags, ka->sa.sa_flags)
-       ),
-
-       TP_printk("sig=%d errno=%d code=%d sa_handler=%lx sa_flags=%lx",
-                 __entry->sig, __entry->errno, __entry->code,
-                 __entry->sa_handler, __entry->sa_flags)
+       TP_FIELDS(
+               ctf_integer(int, sig, sig)
+               LTTNG_FIELDS_SIGINFO(info)
+               ctf_integer(unsigned long, sa_handler, (unsigned long) ka->sa.sa_handler)
+               ctf_integer(unsigned long, sa_flags, ka->sa.sa_flags)
+       )
 )
+#endif
 
-DECLARE_EVENT_CLASS(signal_queue_overflow,
+#if (LINUX_VERSION_CODE < KERNEL_VERSION(3,4,0))
+LTTNG_TRACEPOINT_EVENT_CLASS(signal_queue_overflow,
 
        TP_PROTO(int sig, int group, struct siginfo *info),
 
        TP_ARGS(sig, group, info),
 
-       TP_STRUCT__entry(
-               __field(        int,    sig     )
-               __field(        int,    group   )
-               __field(        int,    errno   )
-               __field(        int,    code    )
-       ),
-
-       TP_fast_assign(
-               tp_assign(sig, sig)
-               tp_assign(group, group)
-               TP_STORE_SIGINFO(info)
-       ),
-
-       TP_printk("sig=%d group=%d errno=%d code=%d",
-                 __entry->sig, __entry->group, __entry->errno, __entry->code)
+       TP_FIELDS(
+               ctf_integer(int, sig, sig)
+               ctf_integer(int, group, group)
+               LTTNG_FIELDS_SIGINFO(info)
+       )
 )
 
 /**
@@ -133,7 +155,7 @@ DECLARE_EVENT_CLASS(signal_queue_overflow,
  * 'group' is not 0 if the signal will be sent to a process group.
  * 'sig' is always one of RT signals.
  */
-DEFINE_EVENT(signal_queue_overflow, signal_overflow_fail,
+LTTNG_TRACEPOINT_EVENT_INSTANCE(signal_queue_overflow, signal_overflow_fail,
 
        TP_PROTO(int sig, int group, struct siginfo *info),
 
@@ -151,14 +173,15 @@ DEFINE_EVENT(signal_queue_overflow, signal_overflow_fail,
  * 'group' is not 0 if the signal will be sent to a process group.
  * 'sig' is always one of non-RT signals.
  */
-DEFINE_EVENT(signal_queue_overflow, signal_lose_info,
+LTTNG_TRACEPOINT_EVENT_INSTANCE(signal_queue_overflow, signal_lose_info,
 
        TP_PROTO(int sig, int group, struct siginfo *info),
 
        TP_ARGS(sig, group, info)
 )
+#endif
 
-#endif /* _TRACE_SIGNAL_H */
+#endif /* LTTNG_TRACE_SIGNAL_H */
 
 /* This part must be outside protection */
-#include "../../../probes/define_trace.h"
+#include <probes/define_trace.h>
This page took 0.026665 seconds and 4 git commands to generate.