Add the typical debugging output provided by sched_deug (if enabled) also to the sched_dl class. Signed-off-by: Dario Faggioli --- kernel/sched_debug.c | 33 +++++++++++++++++++++++++++++++++ kernel/sched_dl.c | 26 ++++++++++++++++++++++++++ 2 files changed, 59 insertions(+), 0 deletions(-) diff --git a/kernel/sched_debug.c b/kernel/sched_debug.c index 67f95aa..407a761 100644 --- a/kernel/sched_debug.c +++ b/kernel/sched_debug.c @@ -246,6 +246,38 @@ void print_rt_rq(struct seq_file *m, int cpu, struct rt_rq *rt_rq) #undef P } +void print_dl_rq(struct seq_file *m, int cpu, struct dl_rq *dl_rq) +{ + s64 min_deadline = -1, max_deadline = -1; + struct rq *rq = &per_cpu(runqueues, cpu); + struct sched_dl_entity *last; + unsigned long flags; + + SEQ_printf(m, "\ndl_rq[%d]:\n", cpu); + + raw_spin_lock_irqsave(&rq->lock, flags); + if (dl_rq->rb_leftmost) + min_deadline = (rb_entry(dl_rq->rb_leftmost, + struct sched_dl_entity, + rb_node))->deadline; + last = __pick_dl_last_entity(dl_rq); + if (last) + max_deadline = last->deadline; + raw_spin_unlock_irqrestore(&rq->lock, flags); + +#define P(x) \ + SEQ_printf(m, " .%-30s: %Ld\n", #x, (long long)(x)) +#define PN(x) \ + SEQ_printf(m, " .%-30s: %Ld.%06ld\n", #x, SPLIT_NS(x)) + + P(dl_rq->dl_nr_running); + PN(min_deadline); + PN(max_deadline); + +#undef PN +#undef P +} + static void print_cpu(struct seq_file *m, int cpu) { struct rq *rq = cpu_rq(cpu); @@ -305,6 +337,7 @@ static void print_cpu(struct seq_file *m, int cpu) #endif print_cfs_stats(m, cpu); print_rt_stats(m, cpu); + print_dl_stats(m, cpu); print_rq(m, rq, cpu); } diff --git a/kernel/sched_dl.c b/kernel/sched_dl.c index a1202ac..dee2668 100644 --- a/kernel/sched_dl.c +++ b/kernel/sched_dl.c @@ -44,6 +44,9 @@ static inline int dl_time_before(u64 a, u64 b) return (s64)(a - b) < 0; } +#define for_each_leaf_dl_rq(dl_rq, rq) \ + for (dl_rq = &rq->dl; dl_rq; dl_rq = NULL) + static void enqueue_dl_entity(struct sched_dl_entity *dl_se); static void dequeue_dl_entity(struct sched_dl_entity *dl_se); static void check_dl_preempt_curr(struct task_struct *p, struct rq *rq); @@ -512,6 +515,16 @@ static void start_hrtick_dl(struct rq *rq, struct task_struct *p) } #endif +static struct sched_dl_entity *__pick_dl_last_entity(struct dl_rq *dl_rq) +{ + struct rb_node *last = rb_last(&dl_rq->rb_root); + + if (!last) + return NULL; + + return rb_entry(last, struct sched_dl_entity, rb_node); +} + static struct sched_dl_entity *pick_next_dl_entity(struct rq *rq, struct dl_rq *dl_rq) { @@ -676,3 +689,16 @@ static const struct sched_class dl_sched_class = { .switched_to = switched_to_dl, }; +#ifdef CONFIG_SCHED_DEBUG +extern void print_dl_rq(struct seq_file *m, int cpu, struct dl_rq *dl_rq); + +static void print_dl_stats(struct seq_file *m, int cpu) +{ + struct dl_rq *dl_rq = &cpu_rq(cpu)->dl; + + rcu_read_lock(); + for_each_leaf_dl_rq(dl_rq, cpu_rq(cpu)) + print_dl_rq(m, cpu, dl_rq); + rcu_read_unlock(); +} +#endif /* CONFIG_SCHED_DEBUG */ -- 1.7.0 -- <> (Raistlin Majere) ---------------------------------------------------------------------- Dario Faggioli, ReTiS Lab, Scuola Superiore Sant'Anna, Pisa (Italy) http://blog.linux.it/raistlin / raistlin@ekiga.net / dario.faggioli@jabber.org