Commit 556061b0 authored by Peter Zijlstra's avatar Peter Zijlstra Committed by Ingo Molnar
Browse files

sched/nohz: Fix rq->cpu_load[] calculations 



While investigating why the load-balancer did funny I found that the
rq->cpu_load[] tables were completely screwy.. a bit more digging
revealed that the updates that got through were missing ticks followed
by a catchup of 2 ticks.

The catchup assumes the cpu was idle during that time (since only nohz
can cause missed ticks and the machine is idle etc..) this means that
esp. the higher indices were significantly lower than they ought to
be.

The reason for this is that its not correct to compare against jiffies
on every jiffy on any other cpu than the cpu that updates jiffies.

This patch cludges around it by only doing the catch-up stuff from
nohz_idle_balance() and doing the regular stuff unconditionally from
the tick.

Signed-off-by: default avatarPeter Zijlstra <a.p.zijlstra@chello.nl>
Cc: pjt@google.com
Cc: Venkatesh Pallipadi <venki@google.com>
Link: http://lkml.kernel.org/n/tip-tp4kj18xdd5aj4vvj0qg55s2@git.kernel.org


Signed-off-by: default avatarIngo Molnar <mingo@kernel.org>
parent 870a0bb5

kernel/sched/core.c

+39 −14
Original line number Diff line number Diff line
@@ -692,8 +692,6 @@ int tg_nop(struct task_group *tg, void *data) 
}

#endif



void update_cpu_load(struct rq *this_rq);



static void set_load_weight(struct task_struct *p)

{

	int prio = p->static_prio - MAX_RT_PRIO;
@@ -2486,22 +2484,13 @@ decay_load_missed(unsigned long load, unsigned long missed_updates, int idx) 
 * scheduler tick (TICK_NSEC). With tickless idle this will not be called

 * every tick. We fix it up based on jiffies.

 */

void update_cpu_load(struct rq *this_rq)

static void __update_cpu_load(struct rq *this_rq, unsigned long this_load,

			      unsigned long pending_updates)

{

	unsigned long this_load = this_rq->load.weight;

	unsigned long curr_jiffies = jiffies;

	unsigned long pending_updates;

	int i, scale;



	this_rq->nr_load_updates++;



	/* Avoid repeated calls on same jiffy, when moving in and out of idle */

	if (curr_jiffies == this_rq->last_load_update_tick)

		return;



	pending_updates = curr_jiffies - this_rq->last_load_update_tick;

	this_rq->last_load_update_tick = curr_jiffies;



	/* Update our load: */

	this_rq->cpu_load[0] = this_load; /* Fasttrack for idx 0 */

	for (i = 1, scale = 2; i < CPU_LOAD_IDX_MAX; i++, scale += scale) {
@@ -2526,9 +2515,45 @@ void update_cpu_load(struct rq *this_rq) 
	sched_avg_update(this_rq);

}



/*

 * Called from nohz_idle_balance() to update the load ratings before doing the

 * idle balance.

 */

void update_idle_cpu_load(struct rq *this_rq)

{

	unsigned long curr_jiffies = jiffies;

	unsigned long load = this_rq->load.weight;

	unsigned long pending_updates;



	/*

	 * Bloody broken means of dealing with nohz, but better than nothing..

	 * jiffies is updated by one cpu, another cpu can drift wrt the jiffy

	 * update and see 0 difference the one time and 2 the next, even though

	 * we ticked at roughtly the same rate.

	 *

	 * Hence we only use this from nohz_idle_balance() and skip this

	 * nonsense when called from the scheduler_tick() since that's

	 * guaranteed a stable rate.

	 */

	if (load || curr_jiffies == this_rq->last_load_update_tick)

		return;



	pending_updates = curr_jiffies - this_rq->last_load_update_tick;

	this_rq->last_load_update_tick = curr_jiffies;



	__update_cpu_load(this_rq, load, pending_updates);

}



/*

 * Called from scheduler_tick()

 */

static void update_cpu_load_active(struct rq *this_rq)

{

	update_cpu_load(this_rq);

	/*

	 * See the mess in update_idle_cpu_load().

	 */

	this_rq->last_load_update_tick = jiffies;

	__update_cpu_load(this_rq, this_rq->load.weight, 1);



	calc_load_account_active(this_rq);

}

kernel/sched/fair.c

+1 −1
Original line number Diff line number Diff line
@@ -5012,7 +5012,7 @@ static void nohz_idle_balance(int this_cpu, enum cpu_idle_type idle) 


		raw_spin_lock_irq(&this_rq->lock);

		update_rq_clock(this_rq);

		update_cpu_load(this_rq);

		update_idle_cpu_load(this_rq);

		raw_spin_unlock_irq(&this_rq->lock);



		rebalance_domains(balance_cpu, CPU_IDLE);

kernel/sched/sched.h

+1 −1
Original line number Diff line number Diff line
@@ -876,7 +876,7 @@ extern void resched_cpu(int cpu); 
extern struct rt_bandwidth def_rt_bandwidth;

extern void init_rt_bandwidth(struct rt_bandwidth *rt_b, u64 period, u64 runtime);



extern void update_cpu_load(struct rq *this_rq);

extern void update_idle_cpu_load(struct rq *this_rq);



#ifdef CONFIG_CGROUP_CPUACCT

#include <linux/cgroup.h>

CRA Git | Maintained and supported by SUSTech CRA and CCSE