Commit 72a4cf20 authored by Alex Shi's avatar Alex Shi Committed by Ingo Molnar
Browse files

sched: Change cfs_rq load avg to unsigned long 



Since the 'u64 runnable_load_avg, blocked_load_avg' in cfs_rq struct are
smaller than 'unsigned long' cfs_rq->load.weight. We don't need u64
vaiables to describe them. unsigned long is more efficient and convenience.

Signed-off-by: default avatarAlex Shi <alex.shi@intel.com>
Reviewed-by: default avatarPaul Turner <pjt@google.com>
Tested-by: default avatarVincent Guittot <vincent.guittot@linaro.org>
Signed-off-by: default avatarPeter Zijlstra <peterz@infradead.org>
Link: http://lkml.kernel.org/r/1371694737-29336-10-git-send-email-alex.shi@intel.com


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

kernel/sched/debug.c

+2 −2
Original line number Diff line number Diff line
@@ -211,9 +211,9 @@ void print_cfs_rq(struct seq_file *m, int cpu, struct cfs_rq *cfs_rq) 
	SEQ_printf(m, "  .%-30s: %ld\n", "load", cfs_rq->load.weight);

#ifdef CONFIG_FAIR_GROUP_SCHED

#ifdef CONFIG_SMP

	SEQ_printf(m, "  .%-30s: %lld\n", "runnable_load_avg",

	SEQ_printf(m, "  .%-30s: %ld\n", "runnable_load_avg",

			cfs_rq->runnable_load_avg);

	SEQ_printf(m, "  .%-30s: %lld\n", "blocked_load_avg",

	SEQ_printf(m, "  .%-30s: %ld\n", "blocked_load_avg",

			cfs_rq->blocked_load_avg);

	SEQ_printf(m, "  .%-30s: %lld\n", "tg_load_avg",

			(unsigned long long)atomic64_read(&cfs_rq->tg->load_avg));

kernel/sched/fair.c

+2 −5
Original line number Diff line number Diff line
@@ -4181,12 +4181,9 @@ static int tg_load_down(struct task_group *tg, void *data) 
	if (!tg->parent) {

		load = cpu_rq(cpu)->avg.load_avg_contrib;

	} else {

		unsigned long tmp_rla;

		tmp_rla = tg->parent->cfs_rq[cpu]->runnable_load_avg + 1;



		load = tg->parent->cfs_rq[cpu]->h_load;

		load *= tg->se[cpu]->avg.load_avg_contrib;

		load /= tmp_rla;

		load = div64_ul(load * tg->se[cpu]->avg.load_avg_contrib,

				tg->parent->cfs_rq[cpu]->runnable_load_avg + 1);

	}



	tg->cfs_rq[cpu]->h_load = load;

kernel/sched/sched.h

+1 −1
Original line number Diff line number Diff line
@@ -277,7 +277,7 @@ struct cfs_rq { 
	 * This allows for the description of both thread and group usage (in

	 * the FAIR_GROUP_SCHED case).

	 */

	u64 runnable_load_avg, blocked_load_avg;

	unsigned long runnable_load_avg, blocked_load_avg;

	atomic64_t decay_counter, removed_load;

	u64 last_decay;

CRA Git | Maintained and supported by SUSTech CRA and CCSE