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 EABD8C433EF for ; Fri, 15 Apr 2022 04:18:59 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id EF2F66B0071; Fri, 15 Apr 2022 00:18:58 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id EA2C16B0073; Fri, 15 Apr 2022 00:18:58 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id D69F76B0074; Fri, 15 Apr 2022 00:18:58 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (relay.hostedemail.com [64.99.140.27]) by kanga.kvack.org (Postfix) with ESMTP id C8B4A6B0071 for ; Fri, 15 Apr 2022 00:18:58 -0400 (EDT) Received: from smtpin25.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay13.hostedemail.com (Postfix) with ESMTP id 7AE9460B98 for ; Fri, 15 Apr 2022 04:18:58 +0000 (UTC) X-FDA: 79357807956.25.5FAA62C Received: from out2.migadu.com (out2.migadu.com [188.165.223.204]) by imf15.hostedemail.com (Postfix) with ESMTP id E2A77A0003 for ; Fri, 15 Apr 2022 04:18:57 +0000 (UTC) Date: Fri, 15 Apr 2022 13:18:48 +0900 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linux.dev; s=key1; t=1649996335; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: in-reply-to:in-reply-to:references:references; bh=rl3sJ0XRlQIg8Gg43fwrBWpDvE8dJjHgrOhVyk/MSC8=; b=aM+/T+HofxzaGmEWiEGC3Ssm5s2AGIukaI8iWQrdo4qauFuK+eJtUA/3zxmLBsKx+Lvnws sW8O7sprEvwrfP5JOXbu07F1kIFPN7M8akoerStcHSwtLlOaiFvDsHeuaqVt25M5eXS4em mC02Pw/6Q//DWiO06W7ilUoSVQ6hA8M= X-Report-Abuse: Please report any abuse attempt to abuse@migadu.com and include these headers. From: Naoya Horiguchi To: Miaohe Lin , Mike Kravetz , "linux-mm@kvack.org" , Andrew Morton Cc: Yang Shi , Dan Carpenter , naoya.horiguchi@nec.com, "linux-kernel@vger.kernel.org" Subject: [PATCH 4/3] mm, hugetlb, hwpoison: separate branch for free and in-use hugepage Message-ID: <20220415041848.GA3034499@ik1-406-35019.vs.sakura.ne.jp> References: <20220408135323.1559401-1-naoya.horiguchi@linux.dev> <20220408135323.1559401-2-naoya.horiguchi@linux.dev> <5b665bcd-57f8-85ae-b0c4-c055875dbfff@oracle.com> <20e677e5-01aa-f8c0-0ce1-bf33da58b7ec@huawei.com> <20220415021233.GA3357039@hori.linux.bs1.fc.nec.co.jp> MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Disposition: inline In-Reply-To: <20220415021233.GA3357039@hori.linux.bs1.fc.nec.co.jp> X-Migadu-Flow: FLOW_OUT X-Migadu-Auth-User: linux.dev X-Rspam-User: X-Rspamd-Server: rspam11 X-Rspamd-Queue-Id: E2A77A0003 X-Stat-Signature: n83633583ps3aw81i4fkb985mn17ys7s Authentication-Results: imf15.hostedemail.com; dkim=pass header.d=linux.dev header.s=key1 header.b="aM+/T+Ho"; spf=pass (imf15.hostedemail.com: domain of naoya.horiguchi@linux.dev designates 188.165.223.204 as permitted sender) smtp.mailfrom=naoya.horiguchi@linux.dev; dmarc=pass (policy=none) header.from=linux.dev X-HE-Tag: 1649996337-38308 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 We know that HPageFreed pages should have page refcount 0, so get_page_unless_zero() always fails and returns 0. So explicitly separate the branch based on page state for minor optimization and better readability. Suggested-by: Mike Kravetz Suggested-by: Miaohe Lin Signed-off-by: Naoya Horiguchi --- mm/hugetlb.c | 4 +++- mm/memory-failure.c | 4 +++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/mm/hugetlb.c b/mm/hugetlb.c index e38cbfdf3e61..3638f166e554 100644 --- a/mm/hugetlb.c +++ b/mm/hugetlb.c @@ -6786,7 +6786,9 @@ int get_hwpoison_huge_page(struct page *page, bool *hugetlb) spin_lock_irq(&hugetlb_lock); if (PageHeadHuge(page)) { *hugetlb = true; - if (HPageFreed(page) || HPageMigratable(page)) + if (HPageFreed(page)) + ret = 0; + else if (HPageMigratable(page)) ret = get_page_unless_zero(page); else ret = -EBUSY; diff --git a/mm/memory-failure.c b/mm/memory-failure.c index 5e3ad640f5bb..661079a37f29 100644 --- a/mm/memory-failure.c +++ b/mm/memory-failure.c @@ -1517,7 +1517,9 @@ int __get_huge_page_for_hwpoison(unsigned long pfn, int flags) if (flags & MF_COUNT_INCREASED) { ret = 1; count_increased = true; - } else if (HPageFreed(head) || HPageMigratable(head)) { + } else if (HPageFreed(head)) { + ret = 0; + } else if (HPageMigratable(head)) { ret = get_page_unless_zero(head); if (ret) count_increased = true; -- 2.23.0