Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 06ea5e03 authored by Rik van Riel's avatar Rik van Riel Committed by Ingo Molnar
Browse files

sched/numa: Increment numa_migrate_seq when task runs in correct location



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.

Signed-off-by: default avatarRik van Riel <riel@redhat.com>
[ Only increment migrate_seq if migration temporarily disabled. ]
Signed-off-by: default avatarMel Gorman <mgorman@suse.de>
Cc: Andrea Arcangeli <aarcange@redhat.com>
Cc: Johannes Weiner <hannes@cmpxchg.org>
Cc: Srikar Dronamraju <srikar@linux.vnet.ibm.com>
Signed-off-by: default avatarPeter Zijlstra <peterz@infradead.org>
Link: http://lkml.kernel.org/r/1381141781-10992-35-git-send-email-mgorman@suse.de


Signed-off-by: default avatarIngo Molnar <mingo@kernel.org>
parent 6b9a7460
Loading
Loading
Loading
Loading
+9 −1
Original line number Diff line number Diff line
@@ -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;
	}

	/* This task has no NUMA fault statistics yet */
	if (unlikely(p->numa_preferred_nid == -1))