Commit 98fd1ef4 authored by Naoya Horiguchi's avatar Naoya Horiguchi Committed by Linus Torvalds

mm: soft-offline: exit with failure for non anonymous thp

Currently memory_failure() doesn't handle non anonymous thp case,
because we can hardly expect the error handling to be successful, and it
can just hit some corner case which results in BUG_ON or something
severe like that.  This is also the case for soft offline code, so let's
make it in the same way.

Orignal code has a MF_COUNT_INCREASED check before put_hwpoison_page(),
but it's unnecessary because get_any_page() is already called when
running on this code, which takes a refcount of the target page
regardress of the flag.  So this patch also removes it.

[akpm@linux-foundation.org: fix build]
Signed-off-by: default avatarNaoya Horiguchi <n-horiguchi@ah.jp.nec.com>
Cc: Andi Kleen <andi@firstfloor.org>
Cc: "Kirill A. Shutemov" <kirill@shutemov.name>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent acc14dc4
...@@ -1691,16 +1691,16 @@ static int soft_offline_in_use_page(struct page *page, int flags) ...@@ -1691,16 +1691,16 @@ static int soft_offline_in_use_page(struct page *page, int flags)
if (!PageHuge(page) && PageTransHuge(hpage)) { if (!PageHuge(page) && PageTransHuge(hpage)) {
lock_page(hpage); lock_page(hpage);
ret = split_huge_page(hpage); if (!PageAnon(hpage) || unlikely(split_huge_page(hpage))) {
unlock_page(hpage); unlock_page(hpage);
if (unlikely(ret || PageTransCompound(page) || if (!PageAnon(hpage))
!PageAnon(page))) { pr_info("soft offline: %#lx: non anonymous thp\n", page_to_pfn(page));
pr_info("soft offline: %#lx: failed to split THP\n", else
page_to_pfn(page)); pr_info("soft offline: %#lx: thp split failed\n", page_to_pfn(page));
if (flags & MF_COUNT_INCREASED) put_hwpoison_page(hpage);
put_hwpoison_page(hpage);
return -EBUSY; return -EBUSY;
} }
unlock_page(hpage);
get_hwpoison_page(page); get_hwpoison_page(page);
put_hwpoison_page(hpage); put_hwpoison_page(hpage);
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment