Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit a35c8cc0 authored by Dietmar Eggemann's avatar Dietmar Eggemann Committed by Chris Redpath
Browse files

ANDROID: sched: Determine the current sched_group idle-state 



To estimate the energy consumption of a sched_group in
sched_group_energy() it is necessary to know which idle-state the group
is in when it is idle. For now, it is assumed that this is the current
idle-state (though it might be wrong). Based on the individual cpu
idle-states group_idle_state() finds the group idle-state.

cc: Ingo Molnar <mingo@redhat.com>
cc: Peter Zijlstra <peterz@infradead.org>
Signed-off-by: default avatarMorten Rasmussen <morten.rasmussen@arm.com>
Signed-off-by: default avatarDietmar Eggemann <dietmar.eggemann@arm.com>
Change-Id: I86e80ac0ef75bcb5e8d1b8db72800a9d34880467
Signed-off-by: default avatarChris Redpath <chris.redpath@arm.com>
parent a732c974

kernel/sched/fair.c

+21 −4
Original line number Diff line number Diff line
@@ -5476,6 +5476,20 @@ static int find_new_capacity(struct energy_env *eenv, 
	return eenv->cap_idx;

}



static int group_idle_state(struct sched_group *sg)

{

	int i, state = INT_MAX;



	/* Find the shallowest idle state in the sched group. */

	for_each_cpu(i, sched_group_span(sg))

		state = min(state, idle_get_state_idx(cpu_rq(i)));



	/* Take non-cpuidle idling into account (active idle/arch_cpu_idle()) */

	state++;



	return state;

}



/*

 * sched_group_energy(): Computes the absolute energy consumption of cpus

 * belonging to the sched_group including shared resources shared only by
@@ -5528,7 +5542,8 @@ static int sched_group_energy(struct energy_env *eenv) 


			do {

				unsigned long group_util;

				int sg_busy_energy, sg_idle_energy, cap_idx;

				int sg_busy_energy, sg_idle_energy;

				int cap_idx, idle_idx;



				if (sg_shared_cap && sg_shared_cap->group_weight >= sg->group_weight)

					eenv->sg_cap = sg_shared_cap;
@@ -5536,10 +5551,12 @@ static int sched_group_energy(struct energy_env *eenv) 
					eenv->sg_cap = sg;



				cap_idx = find_new_capacity(eenv, sg->sge);

				idle_idx = group_idle_state(sg);

				group_util = group_norm_util(eenv, sg);

				sg_busy_energy = (group_util * sg->sge->cap_states[cap_idx].power)

								>> SCHED_CAPACITY_SHIFT;

				sg_idle_energy = ((SCHED_CAPACITY_SCALE-group_util) * sg->sge->idle_states[0].power)

				sg_idle_energy = ((SCHED_CAPACITY_SCALE-group_util)

								* sg->sge->idle_states[idle_idx].power)

								>> SCHED_CAPACITY_SHIFT;



				total_energy += sg_busy_energy + sg_idle_energy;