If a task to be active balanced, which improves the numa affinity is
already chosen, then pass the task to the actual migration.
This helps in 2 ways.
- Dont have to iterate through the list of tasks and again chose a
task.
- If the chosen task has already moved out of runqueue, avoid moving
some other task that may or may not provide consolidation.
Signed-off-by: Srikar Dronamraju <sri...@linux.vnet.ibm.com>
---
kernel/sched/fair.c | 20 +++++++++++++++++++-
kernel/sched/sched.h | 3 +++
2 files changed, 22 insertions(+), 1 deletions(-)
diff --git a/kernel/sched/fair.c b/kernel/sched/fair.c
index 17027e0..e04703e 100644
--- a/kernel/sched/fair.c
+++ b/kernel/sched/fair.c
@@ -4057,6 +4057,18 @@ static int move_one_task(struct lb_env *env)
{
struct task_struct *p, *n;
+#ifdef CONFIG_NUMA_BALANCING
+ p = env->src_rq->push_task;
+ if (p) {
+ if (p->on_rq && task_cpu(p) == env->src_rq->cpu) {
+ move_task(p, env);
+ schedstat_inc(env->sd, lb_gained[env->idle]);
+ return 1;
+ }
+ return 0;
+ }
+#endif
+
again:
list_for_each_entry_safe(p, n, &env->src_rq->cfs_tasks, se.group_node) {
if (!preferred_node(p, env))
@@ -5471,6 +5483,9 @@ static int active_load_balance_cpu_stop(void *data)
double_unlock_balance(busiest_rq, target_rq);
out_unlock:
busiest_rq->active_balance = 0;
+#ifdef CONFIG_NUMA_BALANCING
+ busiest_rq->push_task = NULL;
+#endif
raw_spin_unlock_irq(&busiest_rq->lock);
return 0;
}
@@ -5621,6 +5636,8 @@ select_task_to_pull(struct mm_struct *this_mm, int
this_cpu, int nid)
rq = cpu_rq(cpu);
mm = rq->curr->mm;
+ if (rq->push_task)
+ continue;
if (mm == this_mm) {
if (cpumask_test_cpu(this_cpu,
tsk_cpus_allowed(rq->curr)))
return rq->curr;
@@ -5823,10 +5840,11 @@ static void rebalance_domains(int cpu, enum
cpu_idle_type idle)
* only after active load balance is finished.
*/
raw_spin_lock_irqsave(&this_rq->lock, flags);
- if (task_rq(p) == this_rq) {
+ if (task_rq(p) == this_rq && !this_rq->push_task) {
if (!this_rq->active_balance) {
this_rq->active_balance = 1;
this_rq->push_cpu = cpu;
+ this_rq->push_task = p;
active_balance = 1;
}
}
diff --git a/kernel/sched/sched.h b/kernel/sched/sched.h
index cc03cfd..9f60d74 100644
--- a/kernel/sched/sched.h
+++ b/kernel/sched/sched.h
@@ -484,6 +484,9 @@ struct rq {
#endif
struct sched_avg avg;
+#ifdef CONFIG_NUMA_BALANCING
+ struct task_struct *push_task;
+#endif
};
static inline int cpu_of(struct rq *rq)
--
1.7.1
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majord...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
