leandrof/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

sched/fair: Avoid checking cfs_rq->nr_running twice

Browse Source 
Rearrange pick_next_task_fair() a bit to avoid checking
cfs_rq->nr_running twice for the case where FAIR_GROUP_SCHED is enabled
and the previous task doesn't belong to the fair class.

Signed-off-by: Viresh Kumar <viresh.kumar@linaro.org>
Signed-off-by: Peter Zijlstra (Intel) <peterz@infradead.org>
Cc: Linus Torvalds <torvalds@linux-foundation.org>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Thomas Gleixner <tglx@linutronix.de>
Cc: Vincent Guittot <vincent.guittot@linaro.org>
Cc: linaro-kernel@lists.linaro.org
Link: http://lkml.kernel.org/r/000903ab3df3350943d3271c53615893a230dc95.1495603536.git.viresh.kumar@linaro.org
Signed-off-by: Ingo Molnar <mingo@kernel.org>
This commit is contained in:
Viresh Kumar 2017-05-24 10:59:55 +05:30 committed by Ingo Molnar
parent c7132dd6f0
commit 9674f5cad2
1 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
kernel/sched/fair.c
View File

@ -6187,10 +6187,10 @@ pick_next_task_fair(struct rq *rq, struct task_struct *prev, struct rq_flags *rf
int new_tasks; int new_tasks;
again: again:
#ifdef CONFIG_FAIR_GROUP_SCHED
if (!cfs_rq->nr_running) if (!cfs_rq->nr_running)
goto idle; goto idle;
#ifdef CONFIG_FAIR_GROUP_SCHED
if (prev->sched_class != &fair_sched_class) if (prev->sched_class != &fair_sched_class)
goto simple; goto simple;
@ -6220,12 +6220,18 @@ again:
/* /*
* This call to check_cfs_rq_runtime() will do the * This call to check_cfs_rq_runtime() will do the
* throttle and dequeue its entity in the parent(s). * throttle and dequeue its entity in the parent(s).
* Therefore the 'simple' nr_running test will indeed * Therefore the nr_running test will indeed
* be correct. * be correct.
*/ */
if (unlikely(check_cfs_rq_runtime(cfs_rq))) if (unlikely(check_cfs_rq_runtime(cfs_rq))) {
cfs_rq = &rq->cfs;
if (!cfs_rq->nr_running)
goto idle;
goto simple; goto simple;
} }
}
se = pick_next_entity(cfs_rq, curr); se = pick_next_entity(cfs_rq, curr);
cfs_rq = group_cfs_rq(se); cfs_rq = group_cfs_rq(se);
@ -6264,12 +6270,8 @@ again:
return p; return p;
simple: simple:
cfs_rq = &rq->cfs;
#endif #endif
if (!cfs_rq->nr_running)
goto idle;
put_prev_task(rq, prev); put_prev_task(rq, prev);
do { do {