diff options
author | Andrea Arcangeli <aarcange@redhat.com> | 2011-01-13 18:46:55 -0500 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-01-13 20:32:42 -0500 |
commit | 500d65d471018d9a13b0d51b7e141ed2a3555c1d (patch) | |
tree | 046dc2337f87a1a365fde126fab7f4ac9ae82793 /mm/memory.c | |
parent | 0af4e98b6b095c74588af04872f83d333c958c32 (diff) |
thp: pmd_trans_huge migrate bugcheck
No pmd_trans_huge should ever materialize in migration ptes areas, because
we split the hugepage before migration ptes are instantiated.
Signed-off-by: Andrea Arcangeli <aarcange@redhat.com>
Acked-by: Rik van Riel <riel@redhat.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'mm/memory.c')
-rw-r--r-- | mm/memory.c | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/mm/memory.c b/mm/memory.c index c1a80e00458d..12ee1ea237f5 100644 --- a/mm/memory.c +++ b/mm/memory.c | |||
@@ -1305,6 +1305,10 @@ struct page *follow_page(struct vm_area_struct *vma, unsigned long address, | |||
1305 | goto out; | 1305 | goto out; |
1306 | } | 1306 | } |
1307 | if (pmd_trans_huge(*pmd)) { | 1307 | if (pmd_trans_huge(*pmd)) { |
1308 | if (flags & FOLL_SPLIT) { | ||
1309 | split_huge_page_pmd(mm, pmd); | ||
1310 | goto split_fallthrough; | ||
1311 | } | ||
1308 | spin_lock(&mm->page_table_lock); | 1312 | spin_lock(&mm->page_table_lock); |
1309 | if (likely(pmd_trans_huge(*pmd))) { | 1313 | if (likely(pmd_trans_huge(*pmd))) { |
1310 | if (unlikely(pmd_trans_splitting(*pmd))) { | 1314 | if (unlikely(pmd_trans_splitting(*pmd))) { |
@@ -1320,6 +1324,7 @@ struct page *follow_page(struct vm_area_struct *vma, unsigned long address, | |||
1320 | spin_unlock(&mm->page_table_lock); | 1324 | spin_unlock(&mm->page_table_lock); |
1321 | /* fall through */ | 1325 | /* fall through */ |
1322 | } | 1326 | } |
1327 | split_fallthrough: | ||
1323 | if (unlikely(pmd_bad(*pmd))) | 1328 | if (unlikely(pmd_bad(*pmd))) |
1324 | goto no_page_table; | 1329 | goto no_page_table; |
1325 | 1330 | ||