[1/6] mm: hwpoison: remove the unnecessary THP check

Commit Message

Mike Kravetz Nov. 23, 2022, 7:54 p.m. UTC

From: Yang Shi <[e-mail]>

commit c7cb42e94473aafe553c0f2a3d8ca904599399ed upstream

When handling THP hwpoison checked if the THP is in allocation or free
stage since hwpoison may mistreat it as hugetlb page.  After commit
415c64c1453a ("mm/memory-failure: split thp earlier in memory error
handling") the problem has been fixed, so this check is no longer
needed.  Remove it.  The side effect of the removal is hwpoison may
report unsplit THP instead of unknown error for shmem THP.  It seems not
like a big deal.

The following patch "mm: filemap: check if THP has hwpoisoned subpage
for PMD page fault" depends on this, which fixes shmem THP with
hwpoisoned subpage(s) are mapped PMD wrongly.  So this patch needs to be
backported to -stable as well.

Link: https://lkml.kernel.org/r/[e-mail]
Signed-off-by: Yang Shi <[e-mail]>
Suggested-by: Naoya Horiguchi <[e-mail]>
Acked-by: Naoya Horiguchi <[e-mail]>
Cc: Hugh Dickins <[e-mail]>
Cc: Kirill A. Shutemov <[e-mail]>
Cc: Matthew Wilcox <[e-mail]>
Cc: Oscar Salvador <[e-mail]>
Cc: Peter Xu <[e-mail]>
Cc: <[e-mail]>
Signed-off-by: Andrew Morton <[e-mail]>
Signed-off-by: Linus Torvalds <[e-mail]>
Signed-off-by: Mike Kravetz <[e-mail]>
---
 mm/memory-failure.c | 14 --------------
 1 file changed, 14 deletions(-)

Patch

diff --git a/mm/memory-failure.c b/mm/memory-failure.c
index aef267c6a724..ae8b60e5f939 100644
--- a/mm/memory-failure.c
+++ b/mm/memory-failure.c
@@ -956,20 +956,6 @@  static int get_hwpoison_page(struct page *page)
 {
 	struct page *head = compound_head(page);
 
-	if (!PageHuge(head) && PageTransHuge(head)) {
-		/*
-		 * Non anonymous thp exists only in allocation/free time. We
-		 * can't handle such a case correctly, so let's give it up.
-		 * This should be better than triggering BUG_ON when kernel
-		 * tries to touch the "partially handled" page.
-		 */
-		if (!PageAnon(head)) {
-			pr_err("Memory failure: %#lx: non anonymous thp\n",
-				page_to_pfn(page));
-			return 0;
-		}
-	}
-
 	if (get_page_unless_zero(head)) {
 		if (head == compound_head(page))
 			return 1;