summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorYang Shi <shy828301@gmail.com>2021-11-05 23:41:14 +0300
committerLinus Torvalds <torvalds@linux-foundation.org>2021-11-06 23:30:38 +0300
commit4966455d9100236fd6dd72b0cd00818435fdb25d (patch)
tree002bbeffa90feb523c6089f3528c056effd8c920
parentb9d02f1bdd98f38e6e5ecacc9786a8f58f3f8b2c (diff)
downloadlinux-4966455d9100236fd6dd72b0cd00818435fdb25d.tar.xz
mm: hwpoison: handle non-anonymous THP correctly
Currently hwpoison doesn't handle non-anonymous THP, but since v4.8 THP support for tmpfs and read-only file cache has been added. They could be offlined by split THP, just like anonymous THP. Link: https://lkml.kernel.org/r/20211020210755.23964-7-shy828301@gmail.com Signed-off-by: Yang Shi <shy828301@gmail.com> Acked-by: Naoya Horiguchi <naoya.horiguchi@nec.com> Cc: Hugh Dickins <hughd@google.com> Cc: Kirill A. Shutemov <kirill.shutemov@linux.intel.com> Cc: Matthew Wilcox <willy@infradead.org> Cc: Oscar Salvador <osalvador@suse.de> Cc: Peter Xu <peterx@redhat.com> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
-rw-r--r--mm/memory-failure.c7
1 files changed, 2 insertions, 5 deletions
diff --git a/mm/memory-failure.c b/mm/memory-failure.c
index 952a41d568c4..f38b7b42a508 100644
--- a/mm/memory-failure.c
+++ b/mm/memory-failure.c
@@ -1444,14 +1444,11 @@ static int identify_page_state(unsigned long pfn, struct page *p,
static int try_to_split_thp_page(struct page *page, const char *msg)
{
lock_page(page);
- if (!PageAnon(page) || unlikely(split_huge_page(page))) {
+ if (unlikely(split_huge_page(page))) {
unsigned long pfn = page_to_pfn(page);
unlock_page(page);
- if (!PageAnon(page))
- pr_info("%s: %#lx: non anonymous thp\n", msg, pfn);
- else
- pr_info("%s: %#lx: thp split failed\n", msg, pfn);
+ pr_info("%s: %#lx: thp split failed\n", msg, pfn);
put_page(page);
return -EBUSY;
}