Skip to content

Commit

Permalink
sched/nohz: Optimize nohz_idle_balance()
Browse files Browse the repository at this point in the history
Avoid calling update_blocked_averages() when it does not in fact have
any by re-using/extending update_nohz_stats().

Signed-off-by: Peter Zijlstra (Intel) <peterz@infradead.org>
Cc: Frederic Weisbecker <fweisbec@gmail.com>
Cc: Linus Torvalds <torvalds@linux-foundation.org>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Thomas Gleixner <tglx@linutronix.de>
Cc: linux-kernel@vger.kernel.org
Signed-off-by: Ingo Molnar <mingo@kernel.org>
  • Loading branch information
Peter Zijlstra authored and Ingo Molnar committed Mar 9, 2018
1 parent 1936c53 commit 6392838
Showing 1 changed file with 4 additions and 5 deletions.
9 changes: 4 additions & 5 deletions kernel/sched/fair.c
Original file line number Diff line number Diff line change
Expand Up @@ -7898,7 +7898,7 @@ group_type group_classify(struct sched_group *group,
return group_other;
}

static bool update_nohz_stats(struct rq *rq)
static bool update_nohz_stats(struct rq *rq, bool force)
{
#ifdef CONFIG_NO_HZ_COMMON
unsigned int cpu = rq->cpu;
Expand All @@ -7909,7 +7909,7 @@ static bool update_nohz_stats(struct rq *rq)
if (!cpumask_test_cpu(cpu, nohz.idle_cpus_mask))
return false;

if (!time_after(jiffies, rq->last_blocked_load_update_tick))
if (!force && !time_after(jiffies, rq->last_blocked_load_update_tick))
return true;

update_blocked_averages(cpu);
Expand Down Expand Up @@ -7942,7 +7942,7 @@ static inline void update_sg_lb_stats(struct lb_env *env,
for_each_cpu_and(i, sched_group_span(group), env->cpus) {
struct rq *rq = cpu_rq(i);

if ((env->flags & LBF_NOHZ_STATS) && update_nohz_stats(rq))
if ((env->flags & LBF_NOHZ_STATS) && update_nohz_stats(rq, false))
env->flags |= LBF_NOHZ_AGAIN;

/* Bias balancing toward CPUs of our domain: */
Expand Down Expand Up @@ -9552,8 +9552,7 @@ static bool nohz_idle_balance(struct rq *this_rq, enum cpu_idle_type idle)

rq = cpu_rq(balance_cpu);

update_blocked_averages(rq->cpu);
has_blocked_load |= rq->has_blocked_load;
has_blocked_load |= update_nohz_stats(rq, true);

/*
* If time for next balance is due,
Expand Down

0 comments on commit 6392838

Please sign in to comment.