diff options
author | Mel Gorman <mgorman@suse.de> | 2013-12-18 20:08:40 -0500 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2014-01-09 15:24:21 -0500 |
commit | 13ea54872ad94976129d88a6e7d841bf689a180b (patch) | |
tree | 0a02d1677b680b1c0229ed9516ef6a8575f2cf4e /kernel/sched/fair.c | |
parent | 8164ddf1f6f9fca6020143a259a9f9667d53c1e4 (diff) |
sched: numa: skip inaccessible VMAs
commit 3c67f474558748b604e247d92b55dfe89654c81d upstream.
Inaccessible VMA should not be trapping NUMA hint faults. Skip them.
Signed-off-by: Mel Gorman <mgorman@suse.de>
Reviewed-by: Rik van Riel <riel@redhat.com>
Cc: Alex Thorlton <athorlton@sgi.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'kernel/sched/fair.c')
-rw-r--r-- | kernel/sched/fair.c | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/kernel/sched/fair.c b/kernel/sched/fair.c index da7eebb22b06..ce60006132b1 100644 --- a/kernel/sched/fair.c +++ b/kernel/sched/fair.c | |||
@@ -936,6 +936,13 @@ void task_numa_work(struct callback_head *work) | |||
936 | if (vma->vm_end - vma->vm_start < HPAGE_SIZE) | 936 | if (vma->vm_end - vma->vm_start < HPAGE_SIZE) |
937 | continue; | 937 | continue; |
938 | 938 | ||
939 | /* | ||
940 | * Skip inaccessible VMAs to avoid any confusion between | ||
941 | * PROT_NONE and NUMA hinting ptes | ||
942 | */ | ||
943 | if (!(vma->vm_flags & (VM_READ | VM_EXEC | VM_WRITE))) | ||
944 | continue; | ||
945 | |||
939 | do { | 946 | do { |
940 | start = max(start, vma->vm_start); | 947 | start = max(start, vma->vm_start); |
941 | end = ALIGN(start + (pages << PAGE_SHIFT), HPAGE_SIZE); | 948 | end = ALIGN(start + (pages << PAGE_SHIFT), HPAGE_SIZE); |