Messages in this thread Patch in this message | | | Date | Tue, 02 Mar 2021 09:01:54 -0000 | From | "tip-bot2 for Vincent Guittot" <> | Subject | [tip: sched/core] sched/fair: Reorder newidle_balance pulled_task tests |
| |
The following commit has been merged into the sched/core branch of tip:
Commit-ID: 0c067f38e1b9640e9121fb7e0bb38fa8f867a248 Gitweb: https://git.kernel.org/tip/0c067f38e1b9640e9121fb7e0bb38fa8f867a248 Author: Vincent Guittot <vincent.guittot@linaro.org> AuthorDate: Wed, 24 Feb 2021 14:30:05 +01:00 Committer: Peter Zijlstra <peterz@infradead.org> CommitterDate: Mon, 01 Mar 2021 18:17:24 +01:00
sched/fair: Reorder newidle_balance pulled_task tests
Reorder the tests and skip useless ones when no load balance has been performed and rq lock has not been released.
Signed-off-by: Vincent Guittot <vincent.guittot@linaro.org> Signed-off-by: Peter Zijlstra (Intel) <peterz@infradead.org> Reviewed-by: Valentin Schneider <valentin.schneider@arm.com> Link: https://lkml.kernel.org/r/20210224133007.28644-6-vincent.guittot@linaro.org --- kernel/sched/fair.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/kernel/sched/fair.c b/kernel/sched/fair.c index 3c00918..356a245 100644 --- a/kernel/sched/fair.c +++ b/kernel/sched/fair.c @@ -10584,7 +10584,6 @@ static int newidle_balance(struct rq *this_rq, struct rq_flags *rf) if (curr_cost > this_rq->max_idle_balance_cost) this_rq->max_idle_balance_cost = curr_cost; -out: /* * While browsing the domains, we released the rq lock, a task could * have been enqueued in the meantime. Since we're not going idle, @@ -10593,14 +10592,15 @@ out: if (this_rq->cfs.h_nr_running && !pulled_task) pulled_task = 1; - /* Move the next balance forward */ - if (time_after(this_rq->next_balance, next_balance)) - this_rq->next_balance = next_balance; - /* Is there a task of a high priority class? */ if (this_rq->nr_running != this_rq->cfs.h_nr_running) pulled_task = -1; +out: + /* Move the next balance forward */ + if (time_after(this_rq->next_balance, next_balance)) + this_rq->next_balance = next_balance; + if (pulled_task) this_rq->idle_stamp = 0; else
| |