From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id DF06AC4332F for ; Mon, 1 Nov 2021 09:42:27 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id CC06E60C4B for ; Mon, 1 Nov 2021 09:42:27 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232892AbhKAJo6 (ORCPT ); Mon, 1 Nov 2021 05:44:58 -0400 Received: from mail.kernel.org ([198.145.29.99]:47846 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S233954AbhKAJnn (ORCPT ); Mon, 1 Nov 2021 05:43:43 -0400 Received: by mail.kernel.org (Postfix) with ESMTPSA id EA7206139E; Mon, 1 Nov 2021 09:28:45 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1635758926; bh=A+vRW6uGBTBvfMaB6V71xoib4P8Xe9TCi0nPJJo0FFk=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=v+sHxCrQzPdqz50IAjfwV5z+8dQl5qgTpB0vnQg6R3+Y7TDA8VsWI1TxZgeRaREFg 4l8jUxC2Gq/C5Pb6ga9rF4d1TjuF0erSZI0S7HlY2LLUKyK8Nd4SMAnFaRsGoeTa24 2xk8q66J0Qv5jKrz2WPrmtZN6jkJWFH2yA3zlwdI= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Yang Shi , Naoya Horiguchi , Hugh Dickins , "Kirill A. Shutemov" , Matthew Wilcox , Oscar Salvador , Peter Xu , Andrew Morton , Linus Torvalds Subject: [PATCH 5.14 033/125] mm: hwpoison: remove the unnecessary THP check Date: Mon, 1 Nov 2021 10:16:46 +0100 Message-Id: <20211101082539.483801556@linuxfoundation.org> X-Mailer: git-send-email 2.33.1 In-Reply-To: <20211101082533.618411490@linuxfoundation.org> References: <20211101082533.618411490@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org From: Yang Shi 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/20211020210755.23964-2-shy828301@gmail.com Signed-off-by: Yang Shi Suggested-by: Naoya Horiguchi Acked-by: Naoya Horiguchi Cc: Hugh Dickins Cc: Kirill A. Shutemov Cc: Matthew Wilcox Cc: Oscar Salvador Cc: Peter Xu Cc: Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds Signed-off-by: Greg Kroah-Hartman --- mm/memory-failure.c | 14 -------------- 1 file changed, 14 deletions(-) --- a/mm/memory-failure.c +++ b/mm/memory-failure.c @@ -1148,20 +1148,6 @@ static int __get_hwpoison_page(struct pa if (!HWPoisonHandlable(head)) return -EBUSY; - if (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;