From patchwork Mon Apr 8 19:42:27 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Matthew Wilcox X-Patchwork-Id: 13621545 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 9C27ACD1296 for ; Mon, 8 Apr 2024 19:42:45 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 1D7046B0088; Mon, 8 Apr 2024 15:42:42 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 187646B0089; Mon, 8 Apr 2024 15:42:42 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 027286B008A; Mon, 8 Apr 2024 15:42:41 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0015.hostedemail.com [216.40.44.15]) by kanga.kvack.org (Postfix) with ESMTP id DBA066B0088 for ; Mon, 8 Apr 2024 15:42:41 -0400 (EDT) Received: from smtpin29.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay07.hostedemail.com (Postfix) with ESMTP id 9216816015B for ; Mon, 8 Apr 2024 19:42:41 +0000 (UTC) X-FDA: 81987386922.29.62C6815 Received: from casper.infradead.org (casper.infradead.org [90.155.50.34]) by imf11.hostedemail.com (Postfix) with ESMTP id F292740007 for ; Mon, 8 Apr 2024 19:42:39 +0000 (UTC) Authentication-Results: imf11.hostedemail.com; dkim=pass header.d=infradead.org header.s=casper.20170209 header.b=SpAARLpc; spf=none (imf11.hostedemail.com: domain of willy@infradead.org has no SPF policy when checking 90.155.50.34) smtp.mailfrom=willy@infradead.org; dmarc=none ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1712605360; a=rsa-sha256; cv=none; b=eBzc2Y+TrRvcHEqUJaLJi2jMp6pPZSlYXSpjTH4UcRZ5ZCrBu40ZRZuVGsb4A+Y+AdCszy ybA/S5pOOoxUMUhQbx+jgHrnX+DJGWfoUFet8Civ82mNvJuK+YTW45WjWiO9CAaXX7z98M wW81GTAAwEoWrcGAnv9kgywTUDCOK4E= ARC-Authentication-Results: i=1; imf11.hostedemail.com; dkim=pass header.d=infradead.org header.s=casper.20170209 header.b=SpAARLpc; spf=none (imf11.hostedemail.com: domain of willy@infradead.org has no SPF policy when checking 90.155.50.34) smtp.mailfrom=willy@infradead.org; dmarc=none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1712605360; 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=soTpfP0xkNpciy3Ek6DOYl0uO4o6L2fyg9jDZSMeenM=; b=Kt6GTWT9j0ShQWQGdBeaZd+IAvrj0alt8DBFDXw4EuiIy28p5pEVchs/L8ooHW8ybVZY+S wVvCC1Xsis7tTIMq3LS/YKIvbxDzj0ZkSoOq7OdKaAFBtAaBiN0088NtjI+O4r6JyFW5JX 4MYaveUh5/BrCHPqFr3IiQuf2d5/7C8= DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=infradead.org; s=casper.20170209; h=Content-Transfer-Encoding:MIME-Version: References:In-Reply-To:Message-ID:Date:Subject:Cc:To:From:Sender:Reply-To: Content-Type:Content-ID:Content-Description; bh=soTpfP0xkNpciy3Ek6DOYl0uO4o6L2fyg9jDZSMeenM=; b=SpAARLpc/f08d8/D+xVo8vDLt/ tvxVrtQRDXkBaQ1yhlnODi+G+xiVj08BVa/hCabrAf9Ho2AQh30XGPXmxJqqK1EV9vRlc+NunMb74 VVl5XMI1sGMWp8CsOcx2KbPCXkd+ktGxd3Q64ZZQxVvN9WhliN5YmUDj7Ejc3ROgHQcrO8Wttw4JN mIt48rIdyRKxQSnslXjJIfvs+2lq6Ee0EPRdtcF65PqH1Gw1gpXcWNTogKYtYvpdCx2gu+E81zOP6 82ChieCnx9n/Qe8ggXdHgkZD8QBRDzYqhRUt4Xdc7Qp/2sU4oKGUxISY8ooUUMcHBSM08p5FBr7zH nC79S8yg==; Received: from willy by casper.infradead.org with local (Exim 4.97.1 #2 (Red Hat Linux)) id 1rtut1-00000000UqP-1ivd; Mon, 08 Apr 2024 19:42:35 +0000 From: "Matthew Wilcox (Oracle)" To: Miaohe Lin Cc: "Matthew Wilcox (Oracle)" , linux-mm@kvack.org Subject: [PATCH v2 09/11] mm/memory-failure: Add some folio conversions to unpoison_memory Date: Mon, 8 Apr 2024 20:42:27 +0100 Message-ID: <20240408194232.118537-10-willy@infradead.org> X-Mailer: git-send-email 2.44.0 In-Reply-To: <20240408194232.118537-1-willy@infradead.org> References: <20240408194232.118537-1-willy@infradead.org> MIME-Version: 1.0 X-Rspamd-Server: rspam08 X-Rspamd-Queue-Id: F292740007 X-Stat-Signature: 55szng94a855ramk5xxdjp7xg8ayj919 X-Rspam-User: X-HE-Tag: 1712605359-171805 X-HE-Meta: U2FsdGVkX19KLnOr6IFae7eJrk869tOk2ZQrXpLV8EdYyKOuH3sHt5jZtZy+n+AJqrS+Hf7OY31VNG1VOqXESvhs94Lukqe7TNgk9ZZ1MMMvJmKue+cWWa2sNIkZVCUMrSG69muVMrDvX4h1pnC1sO6m4WfkSxnOyCwxJ+473xTvQWWuUKjeQipjsydBYqLPtgCfcytr3n02IvXECzL1vqOdaLyWyEBQQSuMj3Sj6ensc6j0lQ+CEsRVvnFivkBkJXDkGRotZiVFb3EpHDKJztyDfUCAoLz4adJ0TW9uNkevdq56oI+57Jez4ZhGt8h0F7zajMq7OZtHLgRJ58r2k4Dz8BF/vs3GWvWt41rhjmErpoPJColrGM2XASgn8Ox1d9rHbLqfMxVgpSvFT8ZSUQNJ7ki6prFLxN0ZygVtNL/mJnMKKDUtEpsKHzyu937kOE93A+K967dbiM5Bl+KFlB9827nDzIa8+jpph6Rezdwk8TdgZlFdAJJKpiV3fDVCgx51mYJDuSDr5sRqZjXlXavx6tWGncTgoyH8HquYpyc46+8hxLjQ+h+6DRfrWEveGoCm07hHUomQaDS5yPkHwQmT3MuWZD7F673Gy8gdayOnNeunv+I583WgXNbxNf7HpjuNvDpZ7dy+3LI7kcnOqoHBmJyIjXB7o2XG4qqpuT1JdOUFT01e7seVlKGx1sk3Bl+RO9qVgwdQn3KPFUdTqFYdT59UgG4Q2j9EDVqZKwhPO0/P1XZMmyQqE8mA+iq5sdTwN15uvzGWiG/2hWdR25NVpwhiLLic7iqfc0dxht9B3Bh8qSBA/IzppLjHp5nf/qjAoLbbeBmxSC9hBjhsCo+qkh28qTd8hJNxtBQ4uHUHyw7/eEube+SySK1ygApwFhiFc3m7V8tHXPiF3P41kr9kO5GF/mzA4JKlHUqSqBWk5HX39QkiLmmaNL44UhbrRisEhiuhi9wU/O0iUnC ItVTvvnB Lr+bNqly2MQTbKbmDvbKntCI71dC6BcZ5/TvhWS3ntmCaa3G93Zr245F5ugb/II+WETrUCGJkNYLdYfpJInwDNuNoGFZfa1rHchewVC5sgcF4ObJXEZZFXZnWGyKZ5xX5/novy0fAnRdaZG0nzMw8ry3LbfqOOBUwl+POg8KGzfAUnTl32Bagz7EKGv59bVZrQmpGXfGPbeztXQx2/mHfP+eGJ1yBIivMg+pRHPjGkl/4Y79gnt91jQHZ4A== 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: Some of these folio APIs didn't exist when the unpoison_memory() conversion was done originally. Acked-by: Miaohe Lin Signed-off-by: Matthew Wilcox (Oracle) Reviewed-by: Jane Chu --- 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 fae0b42f0aaf..7caec2fc3327 100644 --- a/mm/memory-failure.c +++ b/mm/memory-failure.c @@ -2540,8 +2540,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; /* @@ -2562,7 +2562,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) @@ -2578,7 +2578,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) {