From: Nam Cao <[email protected]> Add trace points into enqueue_task() and dequeue_task().
Signed-off-by: Nam Cao <[email protected]> Suggested-by: Peter Zijlstra <[email protected]> Reviewed-by: K Prateek Nayak <[email protected]> Co-developed-by: Gabriele Monaco <[email protected]> Signed-off-by: Gabriele Monaco <[email protected]> --- include/trace/events/sched.h | 8 ++++++++ kernel/sched/core.c | 12 +++++++++++- kernel/sched/sched.h | 2 ++ 3 files changed, 21 insertions(+), 1 deletion(-) diff --git a/include/trace/events/sched.h b/include/trace/events/sched.h index 535860581f15..d6e41edc25d2 100644 --- a/include/trace/events/sched.h +++ b/include/trace/events/sched.h @@ -896,6 +896,14 @@ DECLARE_TRACE(sched_set_need_resched, TP_PROTO(struct task_struct *tsk, int cpu, int tif), TP_ARGS(tsk, cpu, tif)); +DECLARE_TRACE(sched_enqueue, + TP_PROTO(struct task_struct *tsk, int cpu), + TP_ARGS(tsk, cpu)); + +DECLARE_TRACE(sched_dequeue, + TP_PROTO(struct task_struct *tsk, int cpu), + TP_ARGS(tsk, cpu)); + #define DL_OTHER 0 #define DL_TASK 1 #define DL_SERVER_FAIR 2 diff --git a/kernel/sched/core.c b/kernel/sched/core.c index f78275192036..8561ca324943 100644 --- a/kernel/sched/core.c +++ b/kernel/sched/core.c @@ -121,6 +121,8 @@ EXPORT_TRACEPOINT_SYMBOL_GPL(sched_compute_energy_tp); EXPORT_TRACEPOINT_SYMBOL_GPL(sched_entry_tp); EXPORT_TRACEPOINT_SYMBOL_GPL(sched_exit_tp); EXPORT_TRACEPOINT_SYMBOL_GPL(sched_set_need_resched_tp); +EXPORT_TRACEPOINT_SYMBOL_GPL(sched_enqueue_tp); +EXPORT_TRACEPOINT_SYMBOL_GPL(sched_dequeue_tp); EXPORT_TRACEPOINT_SYMBOL_GPL(sched_dl_throttle_tp); EXPORT_TRACEPOINT_SYMBOL_GPL(sched_dl_replenish_tp); EXPORT_TRACEPOINT_SYMBOL_GPL(sched_dl_update_tp); @@ -2181,6 +2183,9 @@ unsigned long get_wchan(struct task_struct *p) void enqueue_task(struct rq *rq, struct task_struct *p, int flags) { + if (trace_sched_enqueue_tp_enabled() && !(flags & ENQUEUE_DELAYED)) + trace_sched_enqueue_tp(p, cpu_of(rq)); + if (!(flags & ENQUEUE_NOCLOCK)) update_rq_clock(rq); @@ -2207,6 +2212,8 @@ void enqueue_task(struct rq *rq, struct task_struct *p, int flags) */ inline bool dequeue_task(struct rq *rq, struct task_struct *p, int flags) { + bool ret; + if (sched_core_enabled(rq)) sched_core_dequeue(rq, p, flags); @@ -2223,7 +2230,10 @@ inline bool dequeue_task(struct rq *rq, struct task_struct *p, int flags) * and mark the task ->sched_delayed. */ uclamp_rq_dec(rq, p); - return p->sched_class->dequeue_task(rq, p, flags); + ret = p->sched_class->dequeue_task(rq, p, flags); + if (trace_sched_dequeue_tp_enabled() && !(flags & DEQUEUE_SLEEP)) + trace_sched_dequeue_tp(p, cpu_of(rq)); + return ret; } void activate_task(struct rq *rq, struct task_struct *p, int flags) diff --git a/kernel/sched/sched.h b/kernel/sched/sched.h index e656c7059bf8..a2cb06beafe6 100644 --- a/kernel/sched/sched.h +++ b/kernel/sched/sched.h @@ -3070,6 +3070,8 @@ static inline void sub_nr_running(struct rq *rq, unsigned count) static inline void __block_task(struct rq *rq, struct task_struct *p) { + trace_sched_dequeue_tp(p, cpu_of(rq)); + if (p->sched_contributes_to_load) rq->nr_uninterruptible++; -- 2.55.0
