X-Git-Url: https://git.liburcu.org/?a=blobdiff_plain;f=instrumentation%2Fevents%2Flttng-module%2Fsignal.h;h=4a71d14b917aa83f86d67ef21146fd87228f2771;hb=3b4aafcbbef722c5d04f2fe06a47c47d4d23eda0;hp=d6aabd9a100344c3053dff934168b5f108051146;hpb=3bc29f0a41b3c803245b845db2e1909042e72e9c;p=lttng-modules.git diff --git a/instrumentation/events/lttng-module/signal.h b/instrumentation/events/lttng-module/signal.h index d6aabd9a..4a71d14b 100644 --- a/instrumentation/events/lttng-module/signal.h +++ b/instrumentation/events/lttng-module/signal.h @@ -1,26 +1,40 @@ +/* SPDX-License-Identifier: GPL-2.0-only */ #undef TRACE_SYSTEM #define TRACE_SYSTEM signal #if !defined(LTTNG_TRACE_SIGNAL_H) || defined(TRACE_HEADER_MULTI_READ) #define LTTNG_TRACE_SIGNAL_H -#include "../../../probes/lttng-tracepoint-event.h" +#include #include #ifndef _TRACE_SIGNAL_DEF #define _TRACE_SIGNAL_DEF #include #include -#undef TP_STORE_SIGINFO -#define TP_STORE_SIGINFO(info) \ - tp_assign(errno, \ +#undef LTTNG_FIELDS_SIGINFO +#if (LINUX_VERSION_CODE >= KERNEL_VERSION(4,20,0) || \ + LTTNG_RHEL_KERNEL_RANGE(4,18,0,147,0,0, 4,19,0,0,0,0)) +#define LTTNG_FIELDS_SIGINFO(info) \ + ctf_integer(int, errno, \ + (info == SEND_SIG_NOINFO || info == SEND_SIG_PRIV) ? \ + 0 : \ + info->si_errno) \ + ctf_integer(int, code, \ + (info == SEND_SIG_NOINFO) ? \ + SI_USER : \ + ((info == SEND_SIG_PRIV) ? SI_KERNEL : info->si_code)) +#else /* LINUX_VERSION_CODE >= KERNEL_VERSION(4,20,0) */ +#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)) +#endif /* LINUX_VERSION_CODE >= KERNEL_VERSION(4,20,0) */ #endif /* _TRACE_SIGNAL_DEF */ /** @@ -35,33 +49,25 @@ * SEND_SIG_NOINFO means that si_code is SI_USER, and SEND_SIG_PRIV * means that si_code is SI_KERNEL. */ -#if (LINUX_VERSION_CODE < KERNEL_VERSION(3,4,0)) +#if (LINUX_VERSION_CODE >= KERNEL_VERSION(4,20,0) || \ + LTTNG_RHEL_KERNEL_RANGE(4,18,0,147,0,0, 4,19,0,0,0,0)) LTTNG_TRACEPOINT_EVENT(signal_generate, - TP_PROTO(int sig, struct siginfo *info, struct task_struct *task), + TP_PROTO(int sig, struct kernel_siginfo *info, struct task_struct *task, + int group, int result), - TP_ARGS(sig, info, task), + TP_ARGS(sig, info, task, group, result), - TP_STRUCT__entry( - __field( int, sig ) - __field( int, errno ) - __field( int, code ) - __array_text( 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) + ctf_integer(int, group, group) + ctf_integer(int, result, result) + ) ) -#else +#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, @@ -69,29 +75,28 @@ LTTNG_TRACEPOINT_EVENT(signal_generate, TP_ARGS(sig, info, task, group, result), - TP_STRUCT__entry( - __field( int, sig ) - __field( int, errno ) - __field( int, code ) - __array_text( char, comm, TASK_COMM_LEN ) - __field( pid_t, pid ) - __field( int, group ) - __field( int, result ) - ), - - 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_assign(group, group) - tp_assign(result, result) - ), - - TP_printk("sig=%d errno=%d code=%d comm=%s pid=%d grp=%d res=%d", - __entry->sig, __entry->errno, __entry->code, - __entry->comm, __entry->pid, __entry->group, - __entry->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_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 @@ -109,31 +114,36 @@ LTTNG_TRACEPOINT_EVENT(signal_generate, * This means, this can show which signals are actually delivered, but * matching generated signals and delivered signals may not be correct. */ +#if (LINUX_VERSION_CODE >= KERNEL_VERSION(4,20,0) || \ + LTTNG_RHEL_KERNEL_RANGE(4,18,0,147,0,0, 4,19,0,0,0,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 #if (LINUX_VERSION_CODE < KERNEL_VERSION(3,4,0)) LTTNG_TRACEPOINT_EVENT_CLASS(signal_queue_overflow, @@ -142,21 +152,11 @@ LTTNG_TRACEPOINT_EVENT_CLASS(signal_queue_overflow, 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) + ) ) /** @@ -199,4 +199,4 @@ LTTNG_TRACEPOINT_EVENT_INSTANCE(signal_queue_overflow, signal_lose_info, #endif /* LTTNG_TRACE_SIGNAL_H */ /* This part must be outside protection */ -#include "../../../probes/define_trace.h" +#include