X-Git-Url: http://git.liburcu.org/?a=blobdiff_plain;f=instrumentation%2Fevents%2Flttng-module%2Fsched.h;h=10da76c9c0aaae748094ad48ccffce2451eb2252;hb=3b4aafcbbef722c5d04f2fe06a47c47d4d23eda0;hp=77d77b2aeeddbe6ac34e2228b077734721f45b18;hpb=ead65427b515780845130fe49440f9b3f22be594;p=lttng-modules.git diff --git a/instrumentation/events/lttng-module/sched.h b/instrumentation/events/lttng-module/sched.h index 77d77b2a..10da76c9 100644 --- a/instrumentation/events/lttng-module/sched.h +++ b/instrumentation/events/lttng-module/sched.h @@ -1,11 +1,11 @@ -/* SPDX-License-Identifier: GPL-2.0 */ +/* 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 +#include #include #include #include @@ -13,19 +13,70 @@ #if (LINUX_VERSION_CODE >= KERNEL_VERSION(3,9,0)) #include #endif - -#if (LINUX_VERSION_CODE >= KERNEL_VERSION(3,19,0)) -#define lttng_proc_inum ns.inum -#else -#define lttng_proc_inum proc_inum -#endif +#include #define LTTNG_MAX_PID_NS_LEVEL 32 #ifndef _TRACE_SCHED_DEF_ #define _TRACE_SCHED_DEF_ -#if (LINUX_VERSION_CODE >= KERNEL_VERSION(4,4,0)) +#if (LINUX_VERSION_CODE >= KERNEL_VERSION(4,15,0)) + +static inline long __trace_sched_switch_state(bool preempt, struct task_struct *p) +{ + unsigned int state; + +#ifdef CONFIG_SCHED_DEBUG + BUG_ON(p != current); +#endif /* CONFIG_SCHED_DEBUG */ + + /* + * 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; +} + +#elif (LINUX_VERSION_CODE >= KERNEL_VERSION(4,14,0)) + +static inline long __trace_sched_switch_state(bool preempt, struct task_struct *p) +{ + unsigned int state; + +#ifdef CONFIG_SCHED_DEBUG + BUG_ON(p != current); +#endif /* CONFIG_SCHED_DEBUG */ + + /* + * Preemption ignores task state, therefore preempted tasks are always + * RUNNING (we will not have dequeued if state != RUNNING). + */ + if (preempt) + return TASK_REPORT_MAX; + + /* + * __get_task_state() 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 = __get_task_state(p); + + return state ? (1 << (state - 1)) : state; +} + +#elif (LINUX_VERSION_CODE >= KERNEL_VERSION(4,4,0)) static inline long __trace_sched_switch_state(bool preempt, struct task_struct *p) { @@ -114,6 +165,40 @@ static inline long __trace_sched_switch_state(struct task_struct *p) #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) + +#if (LINUX_VERSION_CODE >= KERNEL_VERSION(3,9,0)) + ctf_enum_value("TASK_PARKED", TASK_PARKED) +#endif /* #if (LINUX_VERSION_CODE >= 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 (LINUX_VERSION_CODE >= KERNEL_VERSION(4,2,0)) + ctf_enum_value("TASK_NOLOAD", TASK_NOLOAD) +#endif /* #if (LINUX_VERSION_CODE >= KERNEL_VERSION(4,2,0)) */ + +#if (LINUX_VERSION_CODE >= KERNEL_VERSION(4,8,0)) + ctf_enum_value("TASK_NEW", TASK_NEW) +#endif /* #if (LINUX_VERSION_CODE >= KERNEL_VERSION(4,8,0)) */ + + ctf_enum_value("TASK_STATE_MAX", TASK_STATE_MAX) + ) +) + /* * Tracepoint for calling kthread_stop, performed to end a kthread: */ @@ -254,9 +339,9 @@ LTTNG_TRACEPOINT_EVENT(sched_switch, ctf_integer(pid_t, prev_tid, prev->pid) ctf_integer(int, prev_prio, prev->prio - MAX_RT_PRIO) #if (LINUX_VERSION_CODE >= KERNEL_VERSION(4,4,0)) - ctf_integer(long, prev_state, __trace_sched_switch_state(preempt, prev)) + ctf_enum(task_state, long, prev_state, __trace_sched_switch_state(preempt, prev)) #else - ctf_integer(long, prev_state, __trace_sched_switch_state(prev)) + ctf_enum(task_state, 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) @@ -381,7 +466,7 @@ 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->lttng_ns_inum; } parent_ns_inum; })) @@ -401,7 +486,7 @@ 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->lttng_ns_inum; } child_ns_inum; })) @@ -542,4 +627,4 @@ LTTNG_TRACEPOINT_EVENT(sched_pi_setprio, #endif /* LTTNG_TRACE_SCHED_H */ /* This part must be outside protection */ -#include +#include