Drop support for kernels < 4.4 from sched instrumentation

Change-Id: I14e8ceb3ed5dedb294dbbfecce454cd05d3417b8
Signed-off-by: Michael Jeanson <mjeanson@efficios.com>
Signed-off-by: Mathieu Desnoyers <mathieu.desnoyers@efficios.com>

diff --git a/include/instrumentation/events/sched.h b/include/instrumentation/events/sched.h
index f10f94d4d8bfacf61b10f455f7f863e80a541e51..a08495e81acfd14fa1174c7cb84d41225a0d7b99 100644 (file)
--- a/include/instrumentation/events/sched.h
+++ b/include/instrumentation/events/sched.h
@@ -10,9 +10,7 @@
 #include <linux/pid_namespace.h>
 #include <linux/binfmts.h>
 #include <lttng/kernel-version.h>
-#if (LTTNG_LINUX_VERSION_CODE >= LTTNG_KERNEL_VERSION(3,9,0))
 #include <linux/sched/rt.h>
-#endif
 
 #define LTTNG_MAX_PID_NS_LEVEL 32
 
@@ -105,7 +103,7 @@ static inline long __trace_sched_switch_state(bool preempt, struct task_struct *
         return state ? (1 << (state - 1)) : state;
 }
 
-#elif (LTTNG_LINUX_VERSION_CODE >= LTTNG_KERNEL_VERSION(4,4,0))
+#else
 
 static inline long __trace_sched_switch_state(bool preempt, struct task_struct *p)
 {
@@ -118,78 +116,6 @@ static inline long __trace_sched_switch_state(bool preempt, struct task_struct *
         */
        return preempt ? TASK_RUNNING | TASK_STATE_MAX : p->state;
 }
-
-#elif (LTTNG_LINUX_VERSION_CODE >= LTTNG_KERNEL_VERSION(3,19,0))
-
-static inline long __trace_sched_switch_state(struct task_struct *p)
-{
-       long state = p->state;
-
-#ifdef CONFIG_PREEMPT
-#ifdef CONFIG_SCHED_DEBUG
-       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 (LTTNG_LINUX_VERSION_CODE >= LTTNG_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 (LTTNG_LINUX_VERSION_CODE >= LTTNG_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;
-}
-
-#else
-
-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;
-}
-
 #endif
 
 #endif /* _TRACE_SCHED_DEF_ */
@@ -208,18 +134,11 @@ LTTNG_TRACEPOINT_ENUM(task_state,
                ctf_enum_value("TASK_TRACED", __TASK_TRACED)
                ctf_enum_value("EXIT_DEAD", EXIT_DEAD)
                ctf_enum_value("EXIT_ZOMBIE", EXIT_ZOMBIE)
-
-#if (LTTNG_LINUX_VERSION_CODE >= LTTNG_KERNEL_VERSION(3,9,0))
                ctf_enum_value("TASK_PARKED", TASK_PARKED)
-#endif /* #if (LTTNG_LINUX_VERSION_CODE >= LTTNG_KERNEL_VERSION(3,9,0)) */
-
                ctf_enum_value("TASK_DEAD", TASK_DEAD)
                ctf_enum_value("TASK_WAKEKILL", TASK_WAKEKILL)
                ctf_enum_value("TASK_WAKING", TASK_WAKING)
-
-#if (LTTNG_LINUX_VERSION_CODE >= LTTNG_KERNEL_VERSION(4,2,0))
                ctf_enum_value("TASK_NOLOAD", TASK_NOLOAD)
-#endif /* #if (LTTNG_LINUX_VERSION_CODE >= LTTNG_KERNEL_VERSION(4,2,0)) */
 
 #if (LTTNG_LINUX_VERSION_CODE >= LTTNG_KERNEL_VERSION(4,8,0))
                ctf_enum_value("TASK_NEW", TASK_NEW)
@@ -262,14 +181,6 @@ LTTNG_TRACEPOINT_EVENT(sched_kthread_stop_ret,
 /*
  * Tracepoint for waking up a task:
  */
-#if (LTTNG_LINUX_VERSION_CODE >= LTTNG_KERNEL_VERSION(4,3,0) || \
-       LTTNG_RT_KERNEL_RANGE(4,1,10,11, 4,2,0,0) || \
-       LTTNG_RT_KERNEL_RANGE(3,18,27,26, 3,19,0,0) || \
-       LTTNG_RT_KERNEL_RANGE(3,14,61,63, 3,15,0,0) || \
-       LTTNG_RT_KERNEL_RANGE(3,12,54,73, 3,13,0,0) || \
-       LTTNG_RT_KERNEL_RANGE(3,10,97,106, 3,11,0,0) || \
-       LTTNG_RT_KERNEL_RANGE(3,4,110,139, 3,5,0,0) || \
-       LTTNG_RT_KERNEL_RANGE(3,2,77,111, 3,3,0,0))
 LTTNG_TRACEPOINT_EVENT_CLASS(sched_wakeup_template,
 
        TP_PROTO(struct task_struct *p),
@@ -283,31 +194,6 @@ LTTNG_TRACEPOINT_EVENT_CLASS(sched_wakeup_template,
                ctf_integer(int, target_cpu, task_cpu(p))
        )
 )
-#else /* #if (LTTNG_LINUX_VERSION_CODE >= LTTNG_KERNEL_VERSION(4,3,0)) */
-LTTNG_TRACEPOINT_EVENT_CLASS(sched_wakeup_template,
-
-       TP_PROTO(struct task_struct *p, int success),
-
-       TP_ARGS(p, success),
-
-       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 - MAX_RT_PRIO)
-               ctf_integer(int, success, success)
-               ctf_integer(int, target_cpu, task_cpu(p))
-       )
-)
-#endif /* #else #if (LTTNG_LINUX_VERSION_CODE >= LTTNG_KERNEL_VERSION(4,3,0)) */
-
-#if (LTTNG_LINUX_VERSION_CODE >= LTTNG_KERNEL_VERSION(4,3,0) || \
-       LTTNG_RT_KERNEL_RANGE(4,1,10,11, 4,2,0,0) || \
-       LTTNG_RT_KERNEL_RANGE(3,18,27,26, 3,19,0,0) || \
-       LTTNG_RT_KERNEL_RANGE(3,14,61,63, 3,15,0,0) || \
-       LTTNG_RT_KERNEL_RANGE(3,12,54,73, 3,13,0,0) || \
-       LTTNG_RT_KERNEL_RANGE(3,10,97,106, 3,11,0,0) || \
-       LTTNG_RT_KERNEL_RANGE(3,4,110,139, 3,5,0,0) || \
-       LTTNG_RT_KERNEL_RANGE(3,2,77,111, 3,3,0,0))
 
 /*
  * Tracepoint called when waking a task; this tracepoint is guaranteed to be
@@ -332,21 +218,6 @@ LTTNG_TRACEPOINT_EVENT_INSTANCE(sched_wakeup_template, sched_wakeup_new,
             TP_PROTO(struct task_struct *p),
             TP_ARGS(p))
 
-#else
-
-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))
-
-#endif /* #if (LTTNG_LINUX_VERSION_CODE >= LTTNG_KERNEL_VERSION(4,3,0)) */
-
 /*
  * Tracepoint for task switches, performed by the scheduler:
  */
@@ -376,7 +247,7 @@ LTTNG_TRACEPOINT_EVENT(sched_switch,
        )
 )
 
-#elif (LTTNG_LINUX_VERSION_CODE >= LTTNG_KERNEL_VERSION(4,4,0))
+#else
 
 LTTNG_TRACEPOINT_EVENT(sched_switch,
 
@@ -400,30 +271,6 @@ LTTNG_TRACEPOINT_EVENT(sched_switch,
                ctf_integer(int, next_prio, next->prio - MAX_RT_PRIO)
        )
 )
-
-#else
-
-LTTNG_TRACEPOINT_EVENT(sched_switch,
-
-       TP_PROTO(struct task_struct *prev,
-                struct task_struct *next),
-
-       TP_ARGS(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)
-#ifdef CONFIG_LTTNG_EXPERIMENTAL_BITWISE_ENUM
-               ctf_enum(task_state, long, prev_state, __trace_sched_switch_state(prev))
-#else
-               ctf_integer(long, prev_state, __trace_sched_switch_state(prev))
-#endif
-               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)
-       )
-)
 #endif
 
 /*
@@ -532,7 +379,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 (LTTNG_LINUX_VERSION_CODE >= LTTNG_KERNEL_VERSION(3,8,0))
                ctf_integer(unsigned int, parent_ns_inum,
                        ({
                                unsigned int parent_ns_inum = 0;
@@ -547,12 +393,10 @@ LTTNG_TRACEPOINT_EVENT_CODE(sched_process_fork,
                                }
                                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 (LTTNG_LINUX_VERSION_CODE >= LTTNG_KERNEL_VERSION(3,8,0))
                ctf_integer(unsigned int, child_ns_inum,
                        ({
                                unsigned int child_ns_inum = 0;
@@ -567,13 +411,11 @@ LTTNG_TRACEPOINT_EVENT_CODE(sched_process_fork,
                                }
                                child_ns_inum;
                        }))
-#endif
        ),
 
        TP_code_post()
 )
 
-#if (LTTNG_LINUX_VERSION_CODE >= LTTNG_KERNEL_VERSION(3,4,0))
 /*
  * Tracepoint for exec:
  */
@@ -590,7 +432,6 @@ LTTNG_TRACEPOINT_EVENT(sched_process_exec,
                ctf_integer(pid_t, old_tid, old_pid)
        )
 )
-#endif
 
 /*
  * XXX the below sched_stat tracepoints only apply to SCHED_OTHER/BATCH/IDLE
@@ -634,14 +475,12 @@ LTTNG_TRACEPOINT_EVENT_INSTANCE(sched_stat_template, sched_stat_iowait,
             TP_PROTO(struct task_struct *tsk, u64 delay),
             TP_ARGS(tsk, delay))
 
-#if (LTTNG_LINUX_VERSION_CODE >= LTTNG_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