With the previous patches, we have no ambiguity on going to idle. So we can return directly the idle task instead of looking up all the domains which will in any case return the idle_task.
Cc: alex....@linaro.org Cc: pet...@infradead.org Cc: mi...@kernel.org Signed-off-by: Daniel Lezcano <daniel.lezc...@linaro.org> Signed-off-by: Peter Zijlstra <pet...@infradead.org> Link: http://lkml.kernel.org/r/1389977102-4420-2-git-send-email-daniel.lezc...@linaro.org --- kernel/sched/core.c | 39 +++++++++++++++++++++++---------------- 1 file changed, 23 insertions(+), 16 deletions(-) --- a/kernel/sched/core.c +++ b/kernel/sched/core.c @@ -2563,23 +2563,33 @@ pick_next_task(struct rq *rq, struct tas const struct sched_class *class; struct task_struct *p; +again: + if (likely(rq->nr_running)) { + /* + * Optimization: we know that if all tasks are in + * the fair class we can call that function directly: + */ + if (likely(rq->nr_running == rq->cfs.h_nr_running)) + return fair_sched_class.pick_next_task(rq, prev); + + for_each_class(class) { + p = class->pick_next_task(rq, prev); + if (p) + return p; + } + } + /* - * Optimization: we know that if all tasks are in - * the fair class we can call that function directly: + * If there is a task balanced on this cpu, pick the next task, + * otherwise fall in the optimization by picking the idle task + * directly. */ - if (likely(rq->nr_running == rq->cfs.h_nr_running)) { - p = fair_sched_class.pick_next_task(rq, prev); - if (likely(p)) - return p; - } + if (idle_balance(rq)) + goto again; - for_each_class(class) { - p = class->pick_next_task(rq, prev); - if (p) - return p; - } + rq->idle_stamp = rq_clock(rq); - BUG(); /* the idle class will always have a runnable task */ + return idle_sched_class.pick_next_task(rq, prev); } /* @@ -2672,9 +2682,6 @@ static void __sched __schedule(void) pre_schedule(rq, prev); - if (unlikely(!rq->nr_running)) - rq->idle_stamp = idle_balance(rq) ? 0 : rq_clock(rq); - if (prev->on_rq || rq->skip_clock_update < 0) update_rq_clock(rq); -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
