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 kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by smtp.lore.kernel.org (Postfix) with ESMTP id 70F6FC433EF for ; Mon, 4 Jul 2022 01:33:51 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id DEF8D900003; Sun, 3 Jul 2022 21:33:50 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id D76336B0078; Sun, 3 Jul 2022 21:33:50 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id C1752900003; Sun, 3 Jul 2022 21:33:50 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0012.hostedemail.com [216.40.44.12]) by kanga.kvack.org (Postfix) with ESMTP id B0DB76B0075 for ; Sun, 3 Jul 2022 21:33:50 -0400 (EDT) Received: from smtpin15.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay12.hostedemail.com (Postfix) with ESMTP id 9421B12169C for ; Mon, 4 Jul 2022 01:33:50 +0000 (UTC) X-FDA: 79647695820.15.BB72414 Received: from out0.migadu.com (out0.migadu.com [94.23.1.103]) by imf17.hostedemail.com (Postfix) with ESMTP id 40F2740041 for ; Mon, 4 Jul 2022 01:33:50 +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=1656898429; 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=yJVEgY4/4yJl1Y2+SArIxCvna3tlPP28HNqV598KtU4=; b=WBxTII6WEoRduxL3kOq3kc4q4wZin7G8GjrVCT1IptMO/2v36sWMM2DpdP6JyTgrfEseum 7avwkUmKrY/FKt2jfn+EaVzA0KYbN4x549Tyhf5RQvQeeobTMbuthIHrFUSLKeLrk3UJEA bpDrbbZYN3TCLHHtHRGZl4L5trY5cVo= 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 v4 6/9] mm, hwpoison: set PG_hwpoison for busy hugetlb pages Date: Mon, 4 Jul 2022 10:33:09 +0900 Message-Id: <20220704013312.2415700-7-naoya.horiguchi@linux.dev> In-Reply-To: <20220704013312.2415700-1-naoya.horiguchi@linux.dev> References: <20220704013312.2415700-1-naoya.horiguchi@linux.dev> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Migadu-Flow: FLOW_OUT X-Migadu-Auth-User: linux.dev ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1656898430; 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=yJVEgY4/4yJl1Y2+SArIxCvna3tlPP28HNqV598KtU4=; b=l4QdioMKHNXOcIuQnCdH4zcNMFS7jXdlNIJd6bqRGWUL3gUi24rKMjBMqwUdIv+2ao3a8X NSrOmiCAyoPpBFYXLw4vUpD5SYf9Xf9DbefZYKUsuVgU6Ru5RcGctD7ixxaTzH9kYojkGD qvFHvwDw7xh0+ZqgGmTmx8F49jSGmPU= ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1656898430; a=rsa-sha256; cv=none; b=LgswWW6+D0stmRJUWeCB2lpzFUgAlmuIP3fabwrb8JboKicpZ5sAEovzdOTfgLPYr5cBKD fBQrE0RsZUtQX9LzN4It5s0bUqYhESL1y5skY3tz30Mjv6CTXu0erMU4Jsn5g0rueVpCaK tjUrX4vEWkdvIkuLVkjrl7K6jwINLuM= ARC-Authentication-Results: i=1; imf17.hostedemail.com; dkim=pass header.d=linux.dev header.s=key1 header.b=WBxTII6W; dmarc=pass (policy=none) header.from=linux.dev; spf=pass (imf17.hostedemail.com: domain of naoya.horiguchi@linux.dev designates 94.23.1.103 as permitted sender) smtp.mailfrom=naoya.horiguchi@linux.dev X-Stat-Signature: 4zfgp1pcbyfie7u1mm1jwzrjzjw5yusq X-Rspamd-Queue-Id: 40F2740041 X-Rspam-User: Authentication-Results: imf17.hostedemail.com; dkim=pass header.d=linux.dev header.s=key1 header.b=WBxTII6W; dmarc=pass (policy=none) header.from=linux.dev; spf=pass (imf17.hostedemail.com: domain of naoya.horiguchi@linux.dev designates 94.23.1.103 as permitted sender) smtp.mailfrom=naoya.horiguchi@linux.dev X-Rspamd-Server: rspam06 X-HE-Tag: 1656898430-144711 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 433bde7dcbf2..22f2dfe41c99 100644 --- a/include/linux/mm.h +++ b/include/linux/mm.h @@ -3235,6 +3235,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 6af2096d8ea0..4233b21328a5 100644 --- a/mm/memory-failure.c +++ b/mm/memory-failure.c @@ -1782,7 +1782,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)) { @@ -1810,7 +1811,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: @@ -1826,8 +1826,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); -- 2.25.1