diff options
author | Mel Gorman <mgorman@suse.de> | 2013-10-07 06:29:04 -0400 |
---|---|---|
committer | Ingo Molnar <mingo@kernel.org> | 2013-10-09 06:40:31 -0400 |
commit | 9ff1d9ff3c2c8ab3feaeb2e8056a07ca293f7bde (patch) | |
tree | 678236662d8e0eb734dc7aeb011e50f81b7e9a06 | |
parent | ac8e895bd260cb8bb19ade6a3abd44e7abe9a01d (diff) |
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: Mel Gorman <mgorman@suse.de>
Reviewed-by: Rik 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: Peter Zijlstra <peterz@infradead.org>
Link: http://lkml.kernel.org/r/1381141781-10992-27-git-send-email-mgorman@suse.de
Signed-off-by: Ingo Molnar <mingo@kernel.org>
-rw-r--r-- | kernel/sched/fair.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/kernel/sched/fair.c b/kernel/sched/fair.c index 89eeb89fd99a..3383079b1508 100644 --- a/kernel/sched/fair.c +++ b/kernel/sched/fair.c | |||
@@ -930,8 +930,6 @@ static void task_numa_placement(struct task_struct *p) | |||
930 | int seq, nid, max_nid = -1; | 930 | int seq, nid, max_nid = -1; |
931 | unsigned long max_faults = 0; | 931 | unsigned long max_faults = 0; |
932 | 932 | ||
933 | if (!p->mm) /* for example, ksmd faulting in a user's mm */ | ||
934 | return; | ||
935 | seq = ACCESS_ONCE(p->mm->numa_scan_seq); | 933 | seq = ACCESS_ONCE(p->mm->numa_scan_seq); |
936 | if (p->numa_scan_seq == seq) | 934 | if (p->numa_scan_seq == seq) |
937 | return; | 935 | return; |
@@ -998,6 +996,10 @@ void task_numa_fault(int last_nid, int node, int pages, bool migrated) | |||
998 | if (!numabalancing_enabled) | 996 | if (!numabalancing_enabled) |
999 | return; | 997 | return; |
1000 | 998 | ||
999 | /* for example, ksmd faulting in a user's mm */ | ||
1000 | if (!p->mm) | ||
1001 | return; | ||
1002 | |||
1001 | /* For now, do not attempt to detect private/shared accesses */ | 1003 | /* For now, do not attempt to detect private/shared accesses */ |
1002 | priv = 1; | 1004 | priv = 1; |
1003 | 1005 | ||