aboutsummaryrefslogtreecommitdiffstats
path: root/mm
diff options
context:
space:
mode:
authorMel Gorman <mgorman@suse.de>2013-12-18 20:08:38 -0500
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2014-01-09 15:24:23 -0500
commit4455c567b8a231d6aa8bf077facfa559d2605357 (patch)
tree3641bff83d0512ff16c0d52161c15baa240c6201 /mm
parent0b92137e5f67921fef752f55af7efe35a15d2923 (diff)
mm: numa: ensure anon_vma is locked to prevent parallel THP splits
commit c3a489cac38d43ea6dc4ac240473b44b46deecf7 upstream. The anon_vma lock prevents parallel THP splits and any associated complexity that arises when handling splits during THP migration. This patch checks if the lock was successfully acquired and bails from THP migration if it failed for any reason. 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.c7
1 files changed, 7 insertions, 0 deletions
diff --git a/mm/huge_memory.c b/mm/huge_memory.c
index c403a74e4bee..b2e803e14ea9 100644
--- a/mm/huge_memory.c
+++ b/mm/huge_memory.c
@@ -1344,6 +1344,13 @@ int do_huge_pmd_numa_page(struct mm_struct *mm, struct vm_area_struct *vma,
1344 goto out_unlock; 1344 goto out_unlock;
1345 } 1345 }
1346 1346
1347 /* Bail if we fail to protect against THP splits for any reason */
1348 if (unlikely(!anon_vma)) {
1349 put_page(page);
1350 page_nid = -1;
1351 goto clear_pmdnuma;
1352 }
1353
1347 /* 1354 /*
1348 * Migrate the THP to the requested node, returns with page unlocked 1355 * Migrate the THP to the requested node, returns with page unlocked
1349 * and pmd_numa cleared. 1356 * and pmd_numa cleared.