From: Rik van Riel <[email protected]>

When a task is already running on its preferred node, increment
numa_migrate_seq to indicate that the task is settled if migration is
temporarily disabled, and memory should migrate towards it.

[[email protected]: Only increment migrate_seq if migration temporarily disabled]
Signed-off-by: Rik van Riel <[email protected]>
---
 kernel/sched/fair.c | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/kernel/sched/fair.c b/kernel/sched/fair.c
index 5b4d94e..fd724bc 100644
--- a/kernel/sched/fair.c
+++ b/kernel/sched/fair.c
@@ -1016,8 +1016,16 @@ static void numa_migrate_preferred(struct task_struct *p)
 {
        /* Success if task is already running on preferred CPU */
        p->numa_migrate_retry = 0;
-       if (cpu_to_node(task_cpu(p)) == p->numa_preferred_nid)
+       if (cpu_to_node(task_cpu(p)) == p->numa_preferred_nid) {
+               /*
+                * If migration is temporarily disabled due to a task migration
+                * then re-enable it now as the task is running on its
+                * preferred node and memory should migrate locally
+                */
+               if (!p->numa_migrate_seq)
+                       p->numa_migrate_seq++;
                return;
+       }
 
        /* Otherwise, try migrate to a CPU on the preferred node */
        if (task_numa_migrate(p) != 0)
-- 
1.8.1.4

--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to [email protected]
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/

Reply via email to