From patchwork Tue Jul 12 03:28:55 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Naoya Horiguchi X-Patchwork-Id: 12914503 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 kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by smtp.lore.kernel.org (Postfix) with ESMTP id 19BA2CCA47C for ; Tue, 12 Jul 2022 03:29:33 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id AFD4D94003F; Mon, 11 Jul 2022 23:29:32 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id AACDE940033; Mon, 11 Jul 2022 23:29:32 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 9748E94003F; Mon, 11 Jul 2022 23:29:32 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0013.hostedemail.com [216.40.44.13]) by kanga.kvack.org (Postfix) with ESMTP id 87628940033 for ; Mon, 11 Jul 2022 23:29:32 -0400 (EDT) Received: from smtpin06.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay06.hostedemail.com (Postfix) with ESMTP id 5486C31476 for ; Tue, 12 Jul 2022 03:29:32 +0000 (UTC) X-FDA: 79677017784.06.C6A1BA6 Received: from out1.migadu.com (out1.migadu.com [91.121.223.63]) by imf08.hostedemail.com (Postfix) with ESMTP id E5DFD16004F for ; Tue, 12 Jul 2022 03:29:31 +0000 (UTC) X-Report-Abuse: Please report any abuse attempt to abuse@migadu.com and include these headers. DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linux.dev; s=key1; t=1657596570; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=mngS+kTiovbtsXB//b2QGzKXTYrp5LAhgFn7ZgogYqU=; b=KgYQFXSaKNPJG4sXxfYE3cjsRSVX/oFa7DAYQEF4HwMJpqxK880mZUofW40RnzfSqtt/cK pS9yy2L61v7qC5Mu3ggD6YbW0dY8t17xiOoK9Qd89nehH4PQYBqH6GJY7v4dWixB3zkA9y oy/2x7dfdgvyxRKTHa6QHIhOiJKqlBI= From: Naoya Horiguchi To: linux-mm@kvack.org Cc: Andrew Morton , David Hildenbrand , Mike Kravetz , Miaohe Lin , Liu Shixin , Yang Shi , Oscar Salvador , Muchun Song , Naoya Horiguchi , linux-kernel@vger.kernel.org Subject: [mm-unstable PATCH v6 5/8] mm, hwpoison: set PG_hwpoison for busy hugetlb pages Date: Tue, 12 Jul 2022 12:28:55 +0900 Message-Id: <20220712032858.170414-6-naoya.horiguchi@linux.dev> In-Reply-To: <20220712032858.170414-1-naoya.horiguchi@linux.dev> References: <20220712032858.170414-1-naoya.horiguchi@linux.dev> MIME-Version: 1.0 X-Migadu-Flow: FLOW_OUT X-Migadu-Auth-User: linux.dev ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1657596572; a=rsa-sha256; cv=none; b=IO3gncuC1l3/KA7pbdlQt0axf2D27m3mlxcYDm1ppHnWlWP2QyPl4N2Uj+fQlIL4W8M1iz tFXW4P6k0C4yoBg+VJWD+jfSfjZ27UD4W45g1Xno3NoSvwD9iGcUXexA5QX9YpOXCrXCma u34m3zcGO3BzZQhYyOSVUT1gdx2Pfoc= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1657596572; h=from:from:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:dkim-signature; bh=mngS+kTiovbtsXB//b2QGzKXTYrp5LAhgFn7ZgogYqU=; b=VRpF9mYWcrjn5TtfjlP4zBa2zcYfKaD4tQpNkmcl+m+jlaVX3lpQ61TddQeXF519jJrXlW ml5ILnrDSw7T4bVsCNhnbZ+gGDPaFcnjRHI0aWIXYy22ALoc4RuNWxOAiwyf84ThEB8mOo 2LfbLGUh91C5Z1Becv6IDjjbo1IpuDE= ARC-Authentication-Results: i=1; imf08.hostedemail.com; dkim=pass header.d=linux.dev header.s=key1 header.b=KgYQFXSa; dmarc=pass (policy=none) header.from=linux.dev; spf=pass (imf08.hostedemail.com: domain of naoya.horiguchi@linux.dev designates 91.121.223.63 as permitted sender) smtp.mailfrom=naoya.horiguchi@linux.dev Authentication-Results: imf08.hostedemail.com; dkim=pass header.d=linux.dev header.s=key1 header.b=KgYQFXSa; dmarc=pass (policy=none) header.from=linux.dev; spf=pass (imf08.hostedemail.com: domain of naoya.horiguchi@linux.dev designates 91.121.223.63 as permitted sender) smtp.mailfrom=naoya.horiguchi@linux.dev X-Rspamd-Server: rspam03 X-Stat-Signature: sto7wig5k7hefymnyq6ioq9ieubp9pxj X-Rspamd-Queue-Id: E5DFD16004F X-Rspam-User: X-HE-Tag: 1657596571-560868 X-Bogosity: Ham, tests=bogofilter, spamicity=0.000000, version=1.2.4 Sender: owner-linux-mm@kvack.org Precedence: bulk X-Loop: owner-majordomo@kvack.org List-ID: From: Naoya Horiguchi 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. Fixes: 405ce051236c ("mm/hwpoison: fix race between hugetlb free/demotion and memory_failure_hugetlb()") Signed-off-by: Naoya Horiguchi Reviewed-by: Miaohe Lin --- include/linux/mm.h | 1 + mm/memory-failure.c | 8 ++++---- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/include/linux/mm.h b/include/linux/mm.h index 4287bec50c28..7668831c919f 100644 --- a/include/linux/mm.h +++ b/include/linux/mm.h @@ -3188,6 +3188,7 @@ enum mf_flags { MF_SOFT_OFFLINE = 1 << 3, MF_UNPOISON = 1 << 4, MF_SW_SIMULATED = 1 << 5, + MF_NO_RETRY = 1 << 6, }; int mf_dax_kill_procs(struct address_space *mapping, pgoff_t index, unsigned long count, int mf_flags); diff --git a/mm/memory-failure.c b/mm/memory-failure.c index 56fd9d809013..e90a685e326b 100644 --- a/mm/memory-failure.c +++ b/mm/memory-failure.c @@ -1785,7 +1785,8 @@ int __get_huge_page_for_hwpoison(unsigned long pfn, int flags) count_increased = true; } else { ret = -EBUSY; - goto out; + if (!(flags & MF_NO_RETRY)) + goto out; } if (hugetlb_set_page_hwpoison(head, page)) { @@ -1812,7 +1813,6 @@ static int try_memory_failure_hugetlb(unsigned long pfn, int flags, int *hugetlb struct page *p = pfn_to_page(pfn); struct page *head; unsigned long page_flags; - bool retry = true; *hugetlb = 1; retry: @@ -1828,8 +1828,8 @@ static int try_memory_failure_hugetlb(unsigned long pfn, int flags, int *hugetlb } 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);