X-Git-Url: https://git.liburcu.org/?a=blobdiff_plain;f=instrumentation%2Fevents%2Flttng-module%2Fsched.h;h=550ce2f257589f58208a91056e4e06f11c27e4c7;hb=9f36eaed6f91d5897924b551b44d1edd8cee00e2;hp=6e42fc62d4d3c779bca162d441656aa56aff3475;hpb=7bbf55ea7a85748e02c9b3e966c1812032c48eb8;p=lttng-modules.git diff --git a/instrumentation/events/lttng-module/sched.h b/instrumentation/events/lttng-module/sched.h index 6e42fc62..550ce2f2 100644 --- a/instrumentation/events/lttng-module/sched.h +++ b/instrumentation/events/lttng-module/sched.h @@ -1,10 +1,11 @@ +/* SPDX-License-Identifier: GPL-2.0 */ #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 #include #include #include @@ -24,7 +25,21 @@ #ifndef _TRACE_SCHED_DEF_ #define _TRACE_SCHED_DEF_ -#if (LINUX_VERSION_CODE >= KERNEL_VERSION(3,19,0)) +#if (LINUX_VERSION_CODE >= KERNEL_VERSION(4,4,0)) + +static inline long __trace_sched_switch_state(bool preempt, struct task_struct *p) +{ +#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). + */ + return preempt ? TASK_RUNNING | TASK_STATE_MAX : p->state; +} + +#elif (LINUX_VERSION_CODE >= KERNEL_VERSION(3,19,0)) static inline long __trace_sched_switch_state(struct task_struct *p) { @@ -131,6 +146,28 @@ LTTNG_TRACEPOINT_EVENT(sched_kthread_stop_ret, /* * Tracepoint for waking up a task: */ +#if (LINUX_VERSION_CODE >= 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), + + TP_ARGS(p), + + 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, 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)) @@ -146,15 +183,48 @@ 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, prio, p->prio - MAX_RT_PRIO) ctf_integer(int, success, success) #if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,32)) 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(2,6,35)) +#if (LINUX_VERSION_CODE >= 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 + * called from the waking context. + */ +LTTNG_TRACEPOINT_EVENT_INSTANCE(sched_wakeup_template, sched_waking, + TP_PROTO(struct task_struct *p), + TP_ARGS(p)) + +/* + * Tracepoint called when the task is actually woken; p->state == TASK_RUNNNG. + * It it not always called from the waking context. + */ +LTTNG_TRACEPOINT_EVENT_INSTANCE(sched_wakeup_template, sched_wakeup, + TP_PROTO(struct task_struct *p), + TP_ARGS(p)) + +/* + * Tracepoint for waking up a new task: + */ +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), @@ -187,7 +257,13 @@ LTTNG_TRACEPOINT_EVENT_INSTANCE(sched_wakeup_template, sched_wakeup_new, */ LTTNG_TRACEPOINT_EVENT(sched_switch, -#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,35)) +#if (LINUX_VERSION_CODE >= KERNEL_VERSION(4,4,0)) + TP_PROTO(bool preempt, + struct task_struct *prev, + struct task_struct *next), + + TP_ARGS(preempt, prev, next), +#elif (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,35)) TP_PROTO(struct task_struct *prev, struct task_struct *next), @@ -203,7 +279,9 @@ LTTNG_TRACEPOINT_EVENT(sched_switch, 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)) +#if (LINUX_VERSION_CODE >= KERNEL_VERSION(4,4,0)) + ctf_integer(long, prev_state, __trace_sched_switch_state(preempt, prev)) +#elif (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) @@ -251,7 +329,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: @@ -308,7 +386,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; @@ -362,7 +440,9 @@ LTTNG_TRACEPOINT_EVENT_CODE(sched_process_fork, child_ns_inum; })) #endif - ) + ), + + TP_code_post() ) #if (LINUX_VERSION_CODE < KERNEL_VERSION(2,6,33)) @@ -473,7 +553,27 @@ LTTNG_TRACEPOINT_EVENT(sched_stat_runtime, ) #endif -#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,37)) +#if (LINUX_VERSION_CODE >= KERNEL_VERSION(4,12,0) || \ + LTTNG_RT_KERNEL_RANGE(4,9,27,18, 4,10,0,0) || \ + LTTNG_RT_KERNEL_RANGE(4,11,5,1, 4,12,0,0)) +/* + * Tracepoint for showing priority inheritance modifying a tasks + * priority. + */ +LTTNG_TRACEPOINT_EVENT(sched_pi_setprio, + + TP_PROTO(struct task_struct *tsk, struct task_struct *pi_task), + + 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, pi_task ? pi_task->prio - MAX_RT_PRIO : tsk->prio - MAX_RT_PRIO) + ) +) +#elif (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,37)) /* * Tracepoint for showing priority inheritance modifying a tasks * priority. @@ -496,4 +596,4 @@ LTTNG_TRACEPOINT_EVENT(sched_pi_setprio, #endif /* LTTNG_TRACE_SCHED_H */ /* This part must be outside protection */ -#include "../../../probes/define_trace.h" +#include