instrumentation: sched: remove compatibility code
[lttng-modules.git] / instrumentation / events / lttng-module / sched.h
index 2efff161949556a294e72085ed2e5e7ed0ca6a60..20890ac036c9c3e4b119353cd2eeada98831f6c1 100644 (file)
+/* SPDX-License-Identifier: GPL-2.0-only */
 #undef TRACE_SYSTEM
 #define TRACE_SYSTEM sched
 
 #if !defined(LTTNG_TRACE_SCHED_H) || defined(TRACE_HEADER_MULTI_READ)
 #define LTTNG_TRACE_SCHED_H
 
-#include "../../../probes/lttng-tracepoint-event.h"
+#include <probes/lttng-tracepoint-event.h>
 #include <linux/sched.h>
 #include <linux/pid_namespace.h>
 #include <linux/binfmts.h>
-#include <linux/version.h>
-#if (LINUX_VERSION_CODE >= KERNEL_VERSION(3,9,0))
 #include <linux/sched/rt.h>
-#endif
-
-#if (LINUX_VERSION_CODE >= KERNEL_VERSION(3,19,0))
-#define lttng_proc_inum ns.inum
-#else
-#define lttng_proc_inum proc_inum
-#endif
 
 #define LTTNG_MAX_PID_NS_LEVEL 32
 
 #ifndef _TRACE_SCHED_DEF_
 #define _TRACE_SCHED_DEF_
 
-#if (LINUX_VERSION_CODE >= KERNEL_VERSION(3,19,0))
-
-static inline long __trace_sched_switch_state(struct task_struct *p)
+static inline long __trace_sched_switch_state(bool preempt, struct task_struct *p)
 {
-       long state = p->state;
+        unsigned int state;
 
-#ifdef CONFIG_PREEMPT
 #ifdef CONFIG_SCHED_DEBUG
-       BUG_ON(p != current);
+        BUG_ON(p != current);
 #endif /* CONFIG_SCHED_DEBUG */
-       /*
-        * For all intents and purposes a preempted task is a running task.
-        */
-       if (preempt_count() & PREEMPT_ACTIVE)
-               state = TASK_RUNNING | TASK_STATE_MAX;
-#endif /* CONFIG_PREEMPT */
-
-       return state;
-}
-
-#elif (LINUX_VERSION_CODE >= KERNEL_VERSION(3,13,0))
-
-static inline long __trace_sched_switch_state(struct task_struct *p)
-{
-       long state = p->state;
-
-#ifdef CONFIG_PREEMPT
-       /*
-        * For all intents and purposes a preempted task is a running task.
-        */
-       if (task_preempt_count(p) & PREEMPT_ACTIVE)
-               state = TASK_RUNNING | TASK_STATE_MAX;
-#endif
-
-       return state;
-}
-
-#elif (LINUX_VERSION_CODE >= KERNEL_VERSION(3,2,0))
-
-static inline long __trace_sched_switch_state(struct task_struct *p)
-{
-       long state = p->state;
-
-#ifdef CONFIG_PREEMPT
-       /*
-        * For all intents and purposes a preempted task is a running task.
-        */
-       if (task_thread_info(p)->preempt_count & PREEMPT_ACTIVE)
-               state = TASK_RUNNING | TASK_STATE_MAX;
-#endif
-
-       return state;
-}
-
-#elif (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,35))
-
-static inline long __trace_sched_switch_state(struct task_struct *p)
-{
-       long state = p->state;
 
-#ifdef CONFIG_PREEMPT
-       /*
-        * For all intents and purposes a preempted task is a running task.
-        */
-       if (task_thread_info(p)->preempt_count & PREEMPT_ACTIVE)
-               state = TASK_RUNNING;
-#endif
-
-       return state;
+        /*
+         * Preemption ignores task state, therefore preempted tasks are always
+         * RUNNING (we will not have dequeued if state != RUNNING).
+         */
+        if (preempt)
+                return TASK_REPORT_MAX;
+
+        /*
+         * task_state_index() uses fls() and returns a value from 0-8 range.
+         * Decrement it by 1 (except TASK_RUNNING state i.e 0) before using
+         * it for left shift operation to get the correct task->state
+         * mapping.
+         */
+        state = task_state_index(p);
+
+        return state ? (1 << (state - 1)) : state;
 }
 
-#endif
-
 #endif /* _TRACE_SCHED_DEF_ */
 
+/*
+ * Enumeration of the task state bitmask.
+ * Only bit flags are enumerated here, not composition of states.
+ */
+LTTNG_TRACEPOINT_ENUM(task_state,
+       TP_ENUM_VALUES(
+               ctf_enum_value("TASK_RUNNING", TASK_RUNNING)
+               ctf_enum_value("TASK_INTERRUPTIBLE", TASK_INTERRUPTIBLE)
+               ctf_enum_value("TASK_UNINTERRUPTIBLE", TASK_UNINTERRUPTIBLE)
+               ctf_enum_value("TASK_STOPPED", __TASK_STOPPED)
+               ctf_enum_value("TASK_TRACED", __TASK_TRACED)
+               ctf_enum_value("EXIT_DEAD", EXIT_DEAD)
+               ctf_enum_value("EXIT_ZOMBIE", EXIT_ZOMBIE)
+               ctf_enum_value("TASK_PARKED", TASK_PARKED)
+               ctf_enum_value("TASK_DEAD", TASK_DEAD)
+               ctf_enum_value("TASK_WAKEKILL", TASK_WAKEKILL)
+               ctf_enum_value("TASK_WAKING", TASK_WAKING)
+               ctf_enum_value("TASK_NOLOAD", TASK_NOLOAD)
+               ctf_enum_value("TASK_NEW", TASK_NEW)
+               ctf_enum_value("TASK_STATE_MAX", TASK_STATE_MAX)
+       )
+)
+
 /*
  * Tracepoint for calling kthread_stop, performed to end a kthread:
  */
@@ -131,7 +99,6 @@ LTTNG_TRACEPOINT_EVENT(sched_kthread_stop_ret,
 /*
  * Tracepoint for waking up a task:
  */
-#if (LINUX_VERSION_CODE >= KERNEL_VERSION(4,3,0))
 LTTNG_TRACEPOINT_EVENT_CLASS(sched_wakeup_template,
 
        TP_PROTO(struct task_struct *p),
@@ -141,36 +108,10 @@ LTTNG_TRACEPOINT_EVENT_CLASS(sched_wakeup_template,
        TP_FIELDS(
                ctf_array_text(char, comm, p->comm, TASK_COMM_LEN)
                ctf_integer(pid_t, tid, p->pid)
-               ctf_integer(int, prio, p->prio)
-               ctf_integer(int, target_cpu, task_cpu(p))
-       )
-)
-#else /* #if (LINUX_VERSION_CODE >= KERNEL_VERSION(4,3,0)) */
-LTTNG_TRACEPOINT_EVENT_CLASS(sched_wakeup_template,
-
-#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,35))
-       TP_PROTO(struct task_struct *p, int success),
-
-       TP_ARGS(p, success),
-#else
-       TP_PROTO(struct rq *rq, struct task_struct *p, int success),
-
-       TP_ARGS(rq, p, success),
-#endif
-
-       TP_FIELDS(
-               ctf_array_text(char, comm, p->comm, TASK_COMM_LEN)
-               ctf_integer(pid_t, tid, p->pid)
-               ctf_integer(int, prio, p->prio)
-               ctf_integer(int, success, success)
-#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,32))
+               ctf_integer(int, prio, p->prio - MAX_RT_PRIO)
                ctf_integer(int, target_cpu, task_cpu(p))
-#endif
        )
 )
-#endif /* #else #if (LINUX_VERSION_CODE >= KERNEL_VERSION(4,3,0)) */
-
-#if (LINUX_VERSION_CODE >= KERNEL_VERSION(4,3,0))
 
 /*
  * Tracepoint called when waking a task; this tracepoint is guaranteed to be
@@ -195,60 +136,22 @@ LTTNG_TRACEPOINT_EVENT_INSTANCE(sched_wakeup_template, sched_wakeup_new,
             TP_PROTO(struct task_struct *p),
             TP_ARGS(p))
 
-#elif (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,35))
-
-LTTNG_TRACEPOINT_EVENT_INSTANCE(sched_wakeup_template, sched_wakeup,
-            TP_PROTO(struct task_struct *p, int success),
-            TP_ARGS(p, success))
-
-/*
- * Tracepoint for waking up a new task:
- */
-LTTNG_TRACEPOINT_EVENT_INSTANCE(sched_wakeup_template, sched_wakeup_new,
-            TP_PROTO(struct task_struct *p, int success),
-            TP_ARGS(p, success))
-
-#else /* #if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,35)) */
-
-LTTNG_TRACEPOINT_EVENT_INSTANCE(sched_wakeup_template, sched_wakeup,
-            TP_PROTO(struct rq *rq, struct task_struct *p, int success),
-            TP_ARGS(rq, p, success))
-
-/*
- * Tracepoint for waking up a new task:
- */
-LTTNG_TRACEPOINT_EVENT_INSTANCE(sched_wakeup_template, sched_wakeup_new,
-            TP_PROTO(struct rq *rq, struct task_struct *p, int success),
-            TP_ARGS(rq, p, success))
-
-#endif /* #if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,35)) */
-
 /*
  * Tracepoint for task switches, performed by the scheduler:
  */
 LTTNG_TRACEPOINT_EVENT(sched_switch,
 
-#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,35))
-       TP_PROTO(struct task_struct *prev,
-                struct task_struct *next),
-
-       TP_ARGS(prev, next),
-#else /* #if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,35)) */
-       TP_PROTO(struct rq *rq, struct task_struct *prev,
+       TP_PROTO(bool preempt,
+                struct task_struct *prev,
                 struct task_struct *next),
 
-       TP_ARGS(rq, prev, next),
-#endif /* #if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,35)) */
+       TP_ARGS(preempt, prev, next),
 
        TP_FIELDS(
                ctf_array_text(char, prev_comm, prev->comm, TASK_COMM_LEN)
                ctf_integer(pid_t, prev_tid, prev->pid)
                ctf_integer(int, prev_prio, prev->prio - MAX_RT_PRIO)
-#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,35))
-               ctf_integer(long, prev_state, __trace_sched_switch_state(prev))
-#else
-               ctf_integer(long, prev_state, prev->state)
-#endif
+               ctf_enum(task_state, long, prev_state, __trace_sched_switch_state(preempt, prev))
                ctf_array_text(char, next_comm, next->comm, TASK_COMM_LEN)
                ctf_integer(pid_t, next_tid, next->pid)
                ctf_integer(int, next_prio, next->prio - MAX_RT_PRIO)
@@ -292,7 +195,7 @@ LTTNG_TRACEPOINT_EVENT_CLASS(sched_process_template,
 LTTNG_TRACEPOINT_EVENT_INSTANCE(sched_process_template, sched_process_free,
             TP_PROTO(struct task_struct *p),
             TP_ARGS(p))
-            
+
 
 /*
  * Tracepoint for a task exiting:
@@ -304,15 +207,9 @@ LTTNG_TRACEPOINT_EVENT_INSTANCE(sched_process_template, sched_process_exit,
 /*
  * Tracepoint for waiting on task to unschedule:
  */
-#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,35))
 LTTNG_TRACEPOINT_EVENT_INSTANCE(sched_process_template, sched_wait_task,
        TP_PROTO(struct task_struct *p),
        TP_ARGS(p))
-#else /* #if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,35)) */
-LTTNG_TRACEPOINT_EVENT_INSTANCE(sched_process_template, sched_wait_task,
-       TP_PROTO(struct rq *rq, struct task_struct *p),
-       TP_ARGS(rq, p))
-#endif /* #if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,35)) */
 
 /*
  * Tracepoint for a waiting task:
@@ -349,7 +246,7 @@ LTTNG_TRACEPOINT_EVENT_CODE(sched_process_fork,
                unsigned int ns_level;
        ),
 
-       TP_code(
+       TP_code_pre(
                if (child) {
                        struct pid *child_pid;
                        unsigned int i;
@@ -367,7 +264,6 @@ LTTNG_TRACEPOINT_EVENT_CODE(sched_process_fork,
                ctf_array_text(char, parent_comm, parent->comm, TASK_COMM_LEN)
                ctf_integer(pid_t, parent_tid, parent->pid)
                ctf_integer(pid_t, parent_pid, parent->tgid)
-#if (LINUX_VERSION_CODE >= KERNEL_VERSION(3,8,0))
                ctf_integer(unsigned int, parent_ns_inum,
                        ({
                                unsigned int parent_ns_inum = 0;
@@ -378,16 +274,14 @@ LTTNG_TRACEPOINT_EVENT_CODE(sched_process_fork,
                                        pid_ns = task_active_pid_ns(parent);
                                        if (pid_ns)
                                                parent_ns_inum =
-                                                       pid_ns->lttng_proc_inum;
+                                                       pid_ns->ns.inum;
                                }
                                parent_ns_inum;
                        }))
-#endif
                ctf_array_text(char, child_comm, child->comm, TASK_COMM_LEN)
                ctf_integer(pid_t, child_tid, child->pid)
                ctf_sequence(pid_t, vtids, tp_locvar->vtids, u8, tp_locvar->ns_level)
                ctf_integer(pid_t, child_pid, child->tgid)
-#if (LINUX_VERSION_CODE >= KERNEL_VERSION(3,8,0))
                ctf_integer(unsigned int, child_ns_inum,
                        ({
                                unsigned int child_ns_inum = 0;
@@ -398,33 +292,15 @@ LTTNG_TRACEPOINT_EVENT_CODE(sched_process_fork,
                                        pid_ns = task_active_pid_ns(child);
                                        if (pid_ns)
                                                child_ns_inum =
-                                                       pid_ns->lttng_proc_inum;
+                                                       pid_ns->ns.inum;
                                }
                                child_ns_inum;
                        }))
-#endif
-       )
-)
-
-#if (LINUX_VERSION_CODE < KERNEL_VERSION(2,6,33))
-/*
- * Tracepoint for sending a signal:
- */
-LTTNG_TRACEPOINT_EVENT(sched_signal_send,
-
-       TP_PROTO(int sig, struct task_struct *p),
-
-       TP_ARGS(sig, p),
+       ),
 
-       TP_FIELDS(
-               ctf_integer(int, sig, sig)
-               ctf_array_text(char, comm, p->comm, TASK_COMM_LEN)
-               ctf_integer(pid_t, tid, p->pid)
-       )
+       TP_code_post()
 )
-#endif
 
-#if (LINUX_VERSION_CODE >= KERNEL_VERSION(3,4,0))
 /*
  * Tracepoint for exec:
  */
@@ -441,9 +317,7 @@ LTTNG_TRACEPOINT_EVENT(sched_process_exec,
                ctf_integer(pid_t, old_tid, old_pid)
        )
 )
-#endif
 
-#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,32))
 /*
  * XXX the below sched_stat tracepoints only apply to SCHED_OTHER/BATCH/IDLE
  *     adding sched_stat support to SCHED_FIFO/RR would be welcome.
@@ -486,14 +360,12 @@ LTTNG_TRACEPOINT_EVENT_INSTANCE(sched_stat_template, sched_stat_iowait,
             TP_PROTO(struct task_struct *tsk, u64 delay),
             TP_ARGS(tsk, delay))
 
-#if (LINUX_VERSION_CODE >= KERNEL_VERSION(3,3,0))
 /*
  * Tracepoint for accounting blocked time (time the task is in uninterruptible).
  */
 LTTNG_TRACEPOINT_EVENT_INSTANCE(sched_stat_template, sched_stat_blocked,
             TP_PROTO(struct task_struct *tsk, u64 delay),
             TP_ARGS(tsk, delay))
-#endif
 
 /*
  * Tracepoint for accounting runtime (time the task is executing
@@ -512,29 +384,26 @@ LTTNG_TRACEPOINT_EVENT(sched_stat_runtime,
                ctf_integer(u64, vruntime, vruntime)
        )
 )
-#endif
 
-#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,37))
 /*
  * Tracepoint for showing priority inheritance modifying a tasks
  * priority.
  */
 LTTNG_TRACEPOINT_EVENT(sched_pi_setprio,
 
-       TP_PROTO(struct task_struct *tsk, int newprio),
+       TP_PROTO(struct task_struct *tsk, struct task_struct *pi_task),
 
-       TP_ARGS(tsk, newprio),
+       TP_ARGS(tsk, pi_task),
 
        TP_FIELDS(
                ctf_array_text(char, comm, tsk->comm, TASK_COMM_LEN)
                ctf_integer(pid_t, tid, tsk->pid)
                ctf_integer(int, oldprio, tsk->prio - MAX_RT_PRIO)
-               ctf_integer(int, newprio, newprio - MAX_RT_PRIO)
+               ctf_integer(int, newprio, pi_task ? pi_task->prio - MAX_RT_PRIO : tsk->prio - MAX_RT_PRIO)
        )
 )
-#endif
 
 #endif /* LTTNG_TRACE_SCHED_H */
 
 /* This part must be outside protection */
-#include "../../../probes/define_trace.h"
+#include <probes/define_trace.h>
This page took 0.032157 seconds and 4 git commands to generate.