mm: reinstante dropped pmd_trans_splitting() check

e53289c0 · Linus Torvalds <[email protected]> · 2013-01-09 08:36:54 -08:00

The check for a pmd being in the process of being split was dropped by
mistake by commit d10e63f29488 ("mm: numa: Create basic numa page
hinting infrastructure"). Put it back.

Reported-by: Dave Jones <[email protected]>
Debugged-by: Hillf Danton <[email protected]>
Acked-by: Andrea Arcangeli <[email protected]>
Acked-by: Mel Gorman <[email protected]>
Cc: Kirill Shutemov <[email protected]>
Signed-off-by: Linus Torvalds <[email protected]>

Commit: e53289c0c5e5a24e29e571eba7af05c845c10890
Parents: 08c097fc

Changes

1 files changed · +8 −0

File	Status	Add	Del	Content
mm/memory.c	modified	+8	−0	View file

mm/memory.c

View file

diff --git a/mm/memory.c b/mm/memory.c
index 49fb1cf..bb1369f 100644
--- a/mm/memory.c
+++ b/mm/memory.c
@@ -3711,6 +3711,14 @@ retry:
 		if (pmd_trans_huge(orig_pmd)) {
 			unsigned int dirty = flags & FAULT_FLAG_WRITE;
 
+			/*
+			 * If the pmd is splitting, return and retry the
+			 * the fault.  Alternative: wait until the split
+			 * is done, and goto retry.
+			 */
+			if (pmd_trans_splitting(orig_pmd))
+				return 0;
+
 			if (pmd_numa(orig_pmd))
 				return do_huge_pmd_numa_page(mm, vma, address,
 							     orig_pmd, pmd);