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

Commit 9ff1d9ff authored by Mel Gorman's avatar Mel Gorman Committed by Ingo Molnar
Browse files

sched/numa: Check current->mm before allocating NUMA faults 



task_numa_placement checks current->mm but after buffers for faults
have already been uselessly allocated. Move the check earlier.

[peterz@infradead.org: Identified the problem]

Signed-off-by: default avatarMel Gorman <mgorman@suse.de>
Reviewed-by: default avatarRik van Riel <riel@redhat.com>
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-27-git-send-email-mgorman@suse.de


Signed-off-by: default avatarIngo Molnar <mingo@kernel.org>
parent ac8e895b

kernel/sched/fair.c

+4 −2
Original line number Original line Diff line number Diff line
@@ -930,8 +930,6 @@ static void task_numa_placement(struct task_struct *p) 
	int seq, nid, max_nid = -1;

	int seq, nid, max_nid = -1;

	unsigned long max_faults = 0;

	unsigned long max_faults = 0;





	if (!p->mm)	/* for example, ksmd faulting in a user's mm */

		return;

	seq = ACCESS_ONCE(p->mm->numa_scan_seq);

	seq = ACCESS_ONCE(p->mm->numa_scan_seq);

	if (p->numa_scan_seq == seq)

	if (p->numa_scan_seq == seq)

		return;

		return;
@@ -998,6 +996,10 @@ void task_numa_fault(int last_nid, int node, int pages, bool migrated) 
	if (!numabalancing_enabled)

	if (!numabalancing_enabled)

		return;

		return;





	/* for example, ksmd faulting in a user's mm */

	if (!p->mm)

		return;



	/* For now, do not attempt to detect private/shared accesses */

	/* For now, do not attempt to detect private/shared accesses */

	priv = 1;

	priv = 1;