mirror of
https://github.com/FEX-Emu/linux.git
synced 2024-12-16 14:02:10 +00:00
sched/fair: Fix the group_capacity computation
Do away with 'phantom' cores due to N*frac(smt_power) >= 1 by limiting the capacity to the actual number of cores. The assumption of 1 < smt_power < 2 is an actual requirement because of what SMT is so this should work regardless of the SMT implementation. It can still be defeated by creative use of cpu hotplug, but if you're one of those freaks, you get to live with it. Signed-off-by: Peter Zijlstra <peterz@infradead.org> Acked-by: Vincent Guittot <vincent.guitto@linaro.org> Link: http://lkml.kernel.org/n/tip-dczmbi8tfgixacg1ji2av1un@git.kernel.org Signed-off-by: Ingo Molnar <mingo@kernel.org>
This commit is contained in:
parent
b37d931685
commit
c61037e905
@ -4556,18 +4556,24 @@ static inline int sg_imbalanced(struct sched_group *group)
|
||||
/*
|
||||
* Compute the group capacity.
|
||||
*
|
||||
* For now the capacity is simply the number of power units in the group_power.
|
||||
* A power unit represents a full core.
|
||||
*
|
||||
* This has an issue where N*frac(smt_power) >= 1, in that case we'll see extra
|
||||
* 'cores' that aren't actually there.
|
||||
* Avoid the issue where N*frac(smt_power) >= 1 creates 'phantom' cores by
|
||||
* first dividing out the smt factor and computing the actual number of cores
|
||||
* and limit power unit capacity with that.
|
||||
*/
|
||||
static inline int sg_capacity(struct lb_env *env, struct sched_group *group)
|
||||
{
|
||||
unsigned int capacity, smt, cpus;
|
||||
unsigned int power, power_orig;
|
||||
|
||||
unsigned int power = group->sgp->power;
|
||||
unsigned int capacity = DIV_ROUND_CLOSEST(power, SCHED_POWER_SCALE);
|
||||
power = group->sgp->power;
|
||||
power_orig = group->sgp->power_orig;
|
||||
cpus = group->group_weight;
|
||||
|
||||
/* smt := ceil(cpus / power), assumes: 1 < smt_power < 2 */
|
||||
smt = DIV_ROUND_UP(SCHED_POWER_SCALE * cpus, power_orig);
|
||||
capacity = cpus / smt; /* cores */
|
||||
|
||||
capacity = min_t(unsigned, capacity, DIV_ROUND_CLOSEST(power, SCHED_POWER_SCALE));
|
||||
if (!capacity)
|
||||
capacity = fix_small_capacity(env->sd, group);
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user