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 vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 6337FC43334 for ; Mon, 27 Jun 2022 19:32:02 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S236307AbiF0Tb7 (ORCPT ); Mon, 27 Jun 2022 15:31:59 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:50286 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S235627AbiF0Tb6 (ORCPT ); Mon, 27 Jun 2022 15:31:58 -0400 Received: from dfw.source.kernel.org (dfw.source.kernel.org [IPv6:2604:1380:4641:c500::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 4C91722C for ; Mon, 27 Jun 2022 12:31:57 -0700 (PDT) Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by dfw.source.kernel.org (Postfix) with ESMTPS id DF42F615FF for ; Mon, 27 Jun 2022 19:31:56 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 4156FC341CB; Mon, 27 Jun 2022 19:31:56 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linux-foundation.org; s=korg; t=1656358316; bh=kRkcYTKIg/sjkIydHEHQSjpfAIgKJz9ePFsS4CrEhzE=; h=Date:To:From:Subject:From; b=Jen75BeMNI3siC1Br27Ge02gkotVB3lLVrvqPXc6Y4gWGSU602opvOwi36N7ajpNH ylcFMbgG+u15wDsVpWsYkiktaFOK4xxrbED8ZZICcUQL4S/8rS7NqYOnXFnDyrd1Hx ja179LUcqrl/wMyQdiDFfN9atnIrxKyC0wROGSdo= Date: Mon, 27 Jun 2022 12:31:55 -0700 To: mm-commits@vger.kernel.org, songmuchun@bytedance.com, shy828301@gmail.com, osalvador@suse.de, mike.kravetz@oracle.com, liushixin2@huawei.com, linmiaohe@huawei.com, david@redhat.com, naoya.horiguchi@nec.com, akpm@linux-foundation.org From: Andrew Morton Subject: [to-be-updated] mmhwpoison-set-pg_hwpoison-for-busy-hugetlb-pages.patch removed from -mm tree Message-Id: <20220627193156.4156FC341CB@smtp.kernel.org> Precedence: bulk Reply-To: linux-kernel@vger.kernel.org List-ID: X-Mailing-List: mm-commits@vger.kernel.org The quilt patch titled Subject: mm,hwpoison: set PG_hwpoison for busy hugetlb pages has been removed from the -mm tree. Its filename was mmhwpoison-set-pg_hwpoison-for-busy-hugetlb-pages.patch This patch was dropped because an updated version will be merged ------------------------------------------------------ From: Naoya Horiguchi Subject: mm,hwpoison: set PG_hwpoison for busy hugetlb pages Date: Thu, 2 Jun 2022 14:06:28 +0900 If memory_failure() fails to grab page refcount on a hugetlb page because it's busy, it returns without setting PG_hwpoison on it. This not only loses a chance of error containment, but breaks the rule that action_result() should be called only when memory_failure() do any of handling work (even if that's just setting PG_hwpoison). This inconsistency could harm code maintainability. So set PG_hwpoison and call hugetlb_set_page_hwpoison() for such a case. Link: https://lkml.kernel.org/r/20220602050631.771414-3-naoya.horiguchi@linux.dev Fixes: 405ce051236c ("mm/hwpoison: fix race between hugetlb free/demotion and memory_failure_hugetlb()") Signed-off-by: Naoya Horiguchi Reviewed-by: Miaohe Lin Cc: David Hildenbrand Cc: Liu Shixin Cc: Mike Kravetz Cc: Muchun Song Cc: Oscar Salvador Cc: Yang Shi Signed-off-by: Andrew Morton --- include/linux/mm.h | 1 + mm/memory-failure.c | 8 ++++---- 2 files changed, 5 insertions(+), 4 deletions(-) --- a/include/linux/mm.h~mmhwpoison-set-pg_hwpoison-for-busy-hugetlb-pages +++ a/include/linux/mm.h @@ -3249,6 +3249,7 @@ enum mf_flags { MF_SOFT_OFFLINE = 1 << 3, MF_UNPOISON = 1 << 4, MF_SW_SIMULATED = 1 << 5, + MF_NO_RETRY = 1 << 6, }; extern int memory_failure(unsigned long pfn, int flags); extern void memory_failure_queue(unsigned long pfn, int flags); --- a/mm/memory-failure.c~mmhwpoison-set-pg_hwpoison-for-busy-hugetlb-pages +++ a/mm/memory-failure.c @@ -1530,7 +1530,8 @@ int __get_huge_page_for_hwpoison(unsigne count_increased = true; } else { ret = -EBUSY; - goto out; + if (!(flags & MF_NO_RETRY)) + goto out; } if (TestSetPageHWPoison(head)) { @@ -1559,7 +1560,6 @@ static int try_memory_failure_hugetlb(un struct page *p = pfn_to_page(pfn); struct page *head; unsigned long page_flags; - bool retry = true; *hugetlb = 1; retry: @@ -1575,8 +1575,8 @@ retry: } return res; } else if (res == -EBUSY) { - if (retry) { - retry = false; + if (!(flags & MF_NO_RETRY)) { + flags |= MF_NO_RETRY; goto retry; } action_result(pfn, MF_MSG_UNKNOWN, MF_IGNORED); _ Patches currently in -mm which might be from naoya.horiguchi@nec.com are mm-hwpoison-make-__page_handle_poison-returns-int.patch mm-hwpoison-skip-raw-hwpoison-page-in-freeing-1gb-hugepage.patch mm-hwpoison-enable-memory-error-handling-on-1gb-hugepage.patch