sched/fair: Remove "power" from 'struct numa_stats'
It is better not to think about compute capacity as being equivalent to "CPU power". The upcoming "power aware" scheduler work may create confusion with the notion of energy consumption if "power" is used too liberally. To make things explicit and not create more confusion with the existing "capacity" member, let's rename things as follows: power -> compute_capacity capacity -> task_capacity Note: none of those fields are actually used outside update_numa_stats(). Signed-off-by: Nicolas Pitre <nico@linaro.org> Signed-off-by: Peter Zijlstra <peterz@infradead.org> Cc: Vincent Guittot <vincent.guittot@linaro.org> Cc: Daniel Lezcano <daniel.lezcano@linaro.org> Cc: Morten Rasmussen <morten.rasmussen@arm.com> Cc: "Rafael J. Wysocki" <rjw@rjwysocki.net> Cc: linaro-kernel@lists.linaro.org Cc: Linus Torvalds <torvalds@linux-foundation.org> Cc: linux-kernel@vger.kernel.org Link: http://lkml.kernel.org/n/tip-2e2ndymj5gyshyjq8am79f20@git.kernel.org Signed-off-by: Ingo Molnar <mingo@kernel.org>
This commit is contained in:
parent
fa93384f40
commit
5ef20ca181
|
@ -1026,10 +1026,10 @@ struct numa_stats {
|
||||||
unsigned long load;
|
unsigned long load;
|
||||||
|
|
||||||
/* Total compute capacity of CPUs on a node */
|
/* Total compute capacity of CPUs on a node */
|
||||||
unsigned long power;
|
unsigned long compute_capacity;
|
||||||
|
|
||||||
/* Approximate capacity in terms of runnable tasks on a node */
|
/* Approximate capacity in terms of runnable tasks on a node */
|
||||||
unsigned long capacity;
|
unsigned long task_capacity;
|
||||||
int has_capacity;
|
int has_capacity;
|
||||||
};
|
};
|
||||||
|
|
||||||
|
@ -1046,7 +1046,7 @@ static void update_numa_stats(struct numa_stats *ns, int nid)
|
||||||
|
|
||||||
ns->nr_running += rq->nr_running;
|
ns->nr_running += rq->nr_running;
|
||||||
ns->load += weighted_cpuload(cpu);
|
ns->load += weighted_cpuload(cpu);
|
||||||
ns->power += power_of(cpu);
|
ns->compute_capacity += power_of(cpu);
|
||||||
|
|
||||||
cpus++;
|
cpus++;
|
||||||
}
|
}
|
||||||
|
@ -1062,9 +1062,10 @@ static void update_numa_stats(struct numa_stats *ns, int nid)
|
||||||
if (!cpus)
|
if (!cpus)
|
||||||
return;
|
return;
|
||||||
|
|
||||||
ns->load = (ns->load * SCHED_POWER_SCALE) / ns->power;
|
ns->load = (ns->load * SCHED_POWER_SCALE) / ns->compute_capacity;
|
||||||
ns->capacity = DIV_ROUND_CLOSEST(ns->power, SCHED_POWER_SCALE);
|
ns->task_capacity =
|
||||||
ns->has_capacity = (ns->nr_running < ns->capacity);
|
DIV_ROUND_CLOSEST(ns->compute_capacity, SCHED_POWER_SCALE);
|
||||||
|
ns->has_capacity = (ns->nr_running < ns->task_capacity);
|
||||||
}
|
}
|
||||||
|
|
||||||
struct task_numa_env {
|
struct task_numa_env {
|
||||||
|
|
Loading…
Reference in New Issue