diff options
| author | Mel Gorman <mgorman@suse.de> | 2014-01-07 14:00:44 +0000 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2014-01-09 12:25:14 -0800 |
| commit | 3d792d616ba408ab55a54c1bb75a9367d997acfa (patch) | |
| tree | 185b242f40ebac44cef05cd42f29b6edf94e5593 /mm | |
| parent | cefeb27999f88f9348f1c55753339535ee9016aa (diff) | |
| download | lwn-3d792d616ba408ab55a54c1bb75a9367d997acfa.tar.gz lwn-3d792d616ba408ab55a54c1bb75a9367d997acfa.zip | |
mm: numa: clear numa hinting information on mprotect
commit 1667918b6483b12a6496bf54151b827b8235d7b1 upstream.
On a protection change it is no longer clear if the page should be still
accessible. This patch clears the NUMA hinting fault bits on a
protection change.
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 'mm')
| -rw-r--r-- | mm/huge_memory.c | 2 | ||||
| -rw-r--r-- | mm/mprotect.c | 2 |
2 files changed, 4 insertions, 0 deletions
diff --git a/mm/huge_memory.c b/mm/huge_memory.c index a458517187c4..40f4ceb979fd 100644 --- a/mm/huge_memory.c +++ b/mm/huge_memory.c @@ -1483,6 +1483,8 @@ int change_huge_pmd(struct vm_area_struct *vma, pmd_t *pmd, pmd_t entry; if (!prot_numa) { entry = pmdp_get_and_clear(mm, addr, pmd); + if (pmd_numa(entry)) + entry = pmd_mknonnuma(entry); entry = pmd_modify(entry, newprot); BUG_ON(pmd_write(entry)); set_pmd_at(mm, addr, pmd, entry); diff --git a/mm/mprotect.c b/mm/mprotect.c index 3277121e032e..00edb758f7d5 100644 --- a/mm/mprotect.c +++ b/mm/mprotect.c @@ -56,6 +56,8 @@ static unsigned long change_pte_range(struct vm_area_struct *vma, pmd_t *pmd, if (!prot_numa) { ptent = ptep_modify_prot_start(mm, addr, pte); + if (pte_numa(ptent)) + ptent = pte_mknonnuma(ptent); ptent = pte_modify(ptent, newprot); updated = true; } else { |