diff options
author | Andrea Arcangeli <aarcange@redhat.com> | 2011-01-13 18:47:16 -0500 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-01-13 20:32:47 -0500 |
commit | 91600e9e592e48736e630851c83da2ad6bf0e91f (patch) | |
tree | 5b17c58699eed9c7440812f0f2f29f4c80972973 /mm/rmap.c | |
parent | 14d1a55cd26f1860f837f37ae42520c7c13b1347 (diff) |
thp: fix memory-failure hugetlbfs vs THP collision
hugetlbfs was changed to allow memory failure to migrate the hugetlbfs
pages and that broke THP as split_huge_page was then called on hugetlbfs
pages too.
compound_head/order was also run unsafe on THP pages that can be splitted
at any time.
All compound_head() invocations in memory-failure.c that are run on pages
that aren't pinned and that can be freed and reused from under us (while
compound_head is running) are buggy because compound_head can return a
dangling pointer, but I'm not fixing this as this is a generic
memory-failure bug not specific to THP but it applies to hugetlbfs too, so
I can fix it later after THP is merged upstream.
Signed-off-by: Andrea Arcangeli <aarcange@redhat.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'mm/rmap.c')
-rw-r--r-- | mm/rmap.c | 2 |
1 files changed, 1 insertions, 1 deletions
@@ -1430,7 +1430,7 @@ int try_to_unmap(struct page *page, enum ttu_flags flags) | |||
1430 | int ret; | 1430 | int ret; |
1431 | 1431 | ||
1432 | BUG_ON(!PageLocked(page)); | 1432 | BUG_ON(!PageLocked(page)); |
1433 | BUG_ON(PageTransHuge(page)); | 1433 | VM_BUG_ON(!PageHuge(page) && PageTransHuge(page)); |
1434 | 1434 | ||
1435 | if (unlikely(PageKsm(page))) | 1435 | if (unlikely(PageKsm(page))) |
1436 | ret = try_to_unmap_ksm(page, flags); | 1436 | ret = try_to_unmap_ksm(page, flags); |