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 579DCC5475B for ; Mon, 11 Mar 2024 11:29:29 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id D55CC6B0085; Mon, 11 Mar 2024 07:29:28 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id D06CF6B0087; Mon, 11 Mar 2024 07:29:28 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id BF4996B0088; Mon, 11 Mar 2024 07:29:28 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0010.hostedemail.com [216.40.44.10]) by kanga.kvack.org (Postfix) with ESMTP id AD1B86B0085 for ; Mon, 11 Mar 2024 07:29:28 -0400 (EDT) Received: from smtpin02.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay09.hostedemail.com (Postfix) with ESMTP id 60499801FE for ; Mon, 11 Mar 2024 11:29:28 +0000 (UTC) X-FDA: 81884537616.02.40BFD99 Received: from szxga01-in.huawei.com (szxga01-in.huawei.com [45.249.212.187]) by imf24.hostedemail.com (Postfix) with ESMTP id 15ADA18001D for ; Mon, 11 Mar 2024 11:29:24 +0000 (UTC) Authentication-Results: imf24.hostedemail.com; dkim=none; dmarc=pass (policy=quarantine) header.from=huawei.com; spf=pass (imf24.hostedemail.com: domain of linmiaohe@huawei.com designates 45.249.212.187 as permitted sender) smtp.mailfrom=linmiaohe@huawei.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1710156565; 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-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=CuGsYLq5BG8UwkyV1U2JwCDC+KFzJAYSQicT5QwOUqw=; b=Aq6DGVN0SQJnXEXLsf8QRSbZf621xOfxY4bJwatssI/zc9/h8PFK5HfKSyEIr4uKDXyAM1 lZV/xers9wUE9aBebx2N4YeEtE+8udqMZsqrlDoEf2LdthLUVbYNE3tUq6p7TrR70hAu9D dpAl7U28bbmfRONkypqb+DPpbeMcTFc= ARC-Authentication-Results: i=1; imf24.hostedemail.com; dkim=none; dmarc=pass (policy=quarantine) header.from=huawei.com; spf=pass (imf24.hostedemail.com: domain of linmiaohe@huawei.com designates 45.249.212.187 as permitted sender) smtp.mailfrom=linmiaohe@huawei.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1710156565; a=rsa-sha256; cv=none; b=FKLT4YHTrHHtcZhWgcjdNpH3QgJv3CFKdrjlUG95eu71ib7qU/MjLRH+RcNtzdGjSVlba6 td1H+gEOFAZapzifSGqUDN+tnYNsG+9ZY4HCF/GGh31e5TfwJKd9uE6JA1pYzl+QHWmurq cV5UHmOQWnvEFsZgwObtD9RuTCUTF90= Received: from mail.maildlp.com (unknown [172.19.163.174]) by szxga01-in.huawei.com (SkyGuard) with ESMTP id 4TtZHP3JTQzwPM3; Mon, 11 Mar 2024 19:26:57 +0800 (CST) Received: from canpemm500002.china.huawei.com (unknown [7.192.104.244]) by mail.maildlp.com (Postfix) with ESMTPS id 6836D1400D1; Mon, 11 Mar 2024 19:29:20 +0800 (CST) Received: from [10.173.135.154] (10.173.135.154) by canpemm500002.china.huawei.com (7.192.104.244) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.1.2507.35; Mon, 11 Mar 2024 19:29:20 +0800 Subject: Re: [PATCH 8/8] mm/memory-failure: Add some folio conversions to unpoison_memory To: "Matthew Wilcox (Oracle)" CC: , Naoya Horiguchi , Andrew Morton References: <20240229212036.2160900-1-willy@infradead.org> <20240229212036.2160900-9-willy@infradead.org> From: Miaohe Lin Message-ID: Date: Mon, 11 Mar 2024 19:29:19 +0800 User-Agent: Mozilla/5.0 (Windows NT 10.0; Win64; x64; rv:78.0) Gecko/20100101 Thunderbird/78.6.0 MIME-Version: 1.0 In-Reply-To: <20240229212036.2160900-9-willy@infradead.org> Content-Type: text/plain; charset="utf-8" Content-Language: en-US Content-Transfer-Encoding: 7bit X-Originating-IP: [10.173.135.154] X-ClientProxiedBy: dggems703-chm.china.huawei.com (10.3.19.180) To canpemm500002.china.huawei.com (7.192.104.244) X-Rspamd-Queue-Id: 15ADA18001D X-Rspam-User: X-Rspamd-Server: rspam05 X-Stat-Signature: s3iwt7eiopkauz6gmmmpg17mobhxketq X-HE-Tag: 1710156564-991443 X-HE-Meta: U2FsdGVkX190j4avCDOTL++ieAf8OTFcGJV3HoHExkVljDwkLBZjhphQ+b8R2D+XJGTM8q5KM42E6sxFnkAUrztoOkAICDDKV8LbEyQ9k046Cw8vFaVHVbWN7F02f/IqfEVW/jsq9DW5wJdsFeXRosC6kTffdiBuPqjuywXgq7h6MwLqovplQaojgLTddgVnktCzExJw3a7mYZ+ixUj1ykbT7sOMHiMzInT6+8amXJWLKWMIQl+Y4/NJkypAU6H6ZdJ8AdrCw3cpcL+Qj4niCvES6/K2i8v0ehV2OJ64kZbdRcr0JWXv/wyqGDrLqowOH3hHdNm+nvCc3QhuYEdy2W93O668kip42ip5IAlVpzJH3sLUnH/BgQqUILHg9LJERwmXZ9w2I6WMW5xvXIju37B03fzdQJYPuY5ANA+dhXztq4Qaa2tV77EXuuEzrVD1UNr1cQQn2SXXksRJvpTRuTsvEWz1l6CbkRG0z3DXogeRUfOq8zT/mUlNH26itDR/V28N5hS5uPZUXzokNpV0WPDLrfOFDDMwE8LvCrxKnacl4Dy4/8DUUOD1Bmv0TeaJze0Ys/yYcUNvZvu1OIpX2BycxT+UaxFbkV1qfFgFOpFsDF1LY7/FtSv/+Nk7EYeX/TP4HBh/n4GIHxfSGGjzZreP3lWR/BYYr1Rni9CndqH82CICsyPWx5HDyigtt34uxhtKmJq9A7dx1EFosd+L8XiwaYY/AUY3Z78mvVF4QkICbRQfWYueLvC2cmkYQP+tWZzKWakAGQNlTPYLPg26cvJkVtG9Fytdiys/k4NbLNs9+ygHjBnlhjj0tOCwzXs2FnfVDA5u1Q1XmMmSA4vGTM+7E3AosZr23O8TAn490AYHoJAvu1igWkkREUmTiFElo1CYEm0Rn4P1szgzsX+orEd+27KGwvP1wYaqocN3o0FXI8u29C1+ELRaxqmZvBg+7RdxOl8Dj+bvA2pLjUv XLsqFVQG Bsee346954ghroRsfhrO7Yc/HfZDcm5bWhejr8bctBU57Z7mOFxOB9UeunmtHuP/XnEbiwj40wC+K599I0pgbSjeyLEQSdyIHCfEsUWdOfW5eB4e6DN+B7wlqmAB5d8g5WtxlK5YE+ri/RPgmvFtfjnbvOs0q4dI/efUSXrSBoStFPmF293lIi/0iXV0TNRRCfa/PQtg5+6UebXyz8xxB85macY3DcGeqgTMSxxxW7ea07rprGMq65Iexv8CjLkZkDiec66HDTEaDe9U= 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: List-Subscribe: List-Unsubscribe: On 2024/3/1 5:20, Matthew Wilcox (Oracle) wrote: > Some of these folio APIs didn't exist when the unpoison_memory() > conversion was done originally. > > Signed-off-by: Matthew Wilcox (Oracle) LGTM. Thanks. Acked-by: Miaohe Lin > --- > mm/memory-failure.c | 8 ++++---- > 1 file changed, 4 insertions(+), 4 deletions(-) > > diff --git a/mm/memory-failure.c b/mm/memory-failure.c > index 56bc83372e30..0806edb48b61 100644 > --- a/mm/memory-failure.c > +++ b/mm/memory-failure.c > @@ -2556,8 +2556,8 @@ int unpoison_memory(unsigned long pfn) > goto unlock_mutex; > } > > - if (folio_test_slab(folio) || PageTable(&folio->page) || > - folio_test_reserved(folio) || PageOffline(&folio->page)) > + if (folio_test_slab(folio) || folio_test_pgtable(folio) || > + folio_test_reserved(folio) || folio_test_offline(folio)) > goto unlock_mutex; > > /* > @@ -2578,7 +2578,7 @@ int unpoison_memory(unsigned long pfn) > > ghp = get_hwpoison_page(p, MF_UNPOISON); > if (!ghp) { > - if (PageHuge(p)) { > + if (folio_test_hugetlb(folio)) { > huge = true; > count = folio_free_raw_hwp(folio, false); > if (count == 0) > @@ -2594,7 +2594,7 @@ int unpoison_memory(unsigned long pfn) > pfn, &unpoison_rs); > } > } else { > - if (PageHuge(p)) { > + if (folio_test_hugetlb(folio)) { > huge = true; > count = folio_free_raw_hwp(folio, false); > if (count == 0) { >