FEX-Emu/linux
1
0
Fork 0
mirror of https://github.com/FEX-Emu/linux.git synced 2024-12-28 20:37:27 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

sched/numa: Revert "Use effective_load() to balance NUMA loads"

Browse Source 
Due to divergent trees, Rik find that this patch is no longer
required.

Requested-by: Rik van Riel <riel@redhat.com>
Signed-off-by: Peter Zijlstra <peterz@infradead.org>
Cc: Linus Torvalds <torvalds@linux-foundation.org>
Link: http://lkml.kernel.org/n/tip-u6odkgkw8wz3m7orgsjfo5pi@git.kernel.org
Signed-off-by: Ingo Molnar <mingo@kernel.org>
This commit is contained in:
Peter Zijlstra 2014-07-11 16:01:53 +02:00 committed by Ingo Molnar
parent 5cd08fbfdb
commit e720fff634
1 changed files with 6 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
kernel/sched/fair.c
View File

@ -1151,7 +1151,6 @@ static void task_numa_compare(struct task_numa_env *env,
struct rq *src_rq = cpu_rq(env->src_cpu); struct rq *src_rq = cpu_rq(env->src_cpu);
struct rq *dst_rq = cpu_rq(env->dst_cpu); struct rq *dst_rq = cpu_rq(env->dst_cpu);
struct task_struct *cur; struct task_struct *cur;
struct task_group *tg;
long src_load, dst_load; long src_load, dst_load;
long load; long load;
long imp = env->p->numa_group ? groupimp : taskimp; long imp = env->p->numa_group ? groupimp : taskimp;
@ -1223,14 +1222,9 @@ static void task_numa_compare(struct task_numa_env *env,
* In the overloaded case, try and keep the load balanced. * In the overloaded case, try and keep the load balanced.
*/ */
balance: balance:
src_load = env->src_stats.load; load = task_h_load(env->p);
dst_load = env->dst_stats.load; dst_load = env->dst_stats.load + load;
src_load = env->src_stats.load - load;
/* Calculate the effect of moving env->p from src to dst. */
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);
if (moveimp > imp && moveimp > env->best_imp) { if (moveimp > imp && moveimp > env->best_imp) {
/* /*
@ -1250,11 +1244,9 @@ balance:
goto unlock; goto unlock;
if (cur) { if (cur) {
/* Cur moves in the opposite direction. */ load = task_h_load(cur);
load = cur->se.load.weight; dst_load -= load;
tg = task_group(cur); src_load += load;
src_load += effective_load(tg, env->src_cpu, load, load);
dst_load += effective_load(tg, env->dst_cpu, -load, -load);
} }
if (load_too_imbalanced(src_load, dst_load, env)) if (load_too_imbalanced(src_load, dst_load, env))