Re: [PATCH 9/7] sched,numa: remove task_h_load from task_numa_compare

From: Peter Zijlstra
Date: Wed Jun 25 2014 - 01:07:53 EST


On Tue, Jun 24, 2014 at 03:14:54PM -0400, Rik van Riel wrote:
> The function effective_load already makes the calculations that
> task_h_load makes. Making them twice can throw off the calculations,
> and is generally a bad idea.
>
> Signed-off-by: Rik van Riel <riel@xxxxxxxxxx>
> ---
> kernel/sched/fair.c | 4 ++--
> 1 file changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/kernel/sched/fair.c b/kernel/sched/fair.c
> index 1aaa3b4..318a275 100644
> --- a/kernel/sched/fair.c
> +++ b/kernel/sched/fair.c
> @@ -1227,7 +1227,7 @@ static void task_numa_compare(struct task_numa_env *env,
> dst_load = env->dst_stats.load;
>
> /* Calculate the effect of moving env->p from src to dst. */
> - load = task_h_load(env->p);
> + load = env->p->se.load.weight;
> tg = task_group(env->p);
> src_load += effective_load(tg, env->src_cpu, -load, -load);
> dst_load += effective_load(tg, env->dst_cpu, load, load);
> @@ -1251,7 +1251,7 @@ static void task_numa_compare(struct task_numa_env *env,
>
> if (cur) {
> /* Cur moves in the opposite direction. */
> - load = task_h_load(cur);
> + load = cur->se.load.weight;
> tg = task_group(cur);
> src_load += effective_load(tg, env->src_cpu, load, load);
> dst_load += effective_load(tg, env->dst_cpu, -load, -load);

Shall I merge this into patch 3?

Attachment: pgp2ON5LfGO99.pgp
Description: PGP signature