From patchwork Fri Apr 12 19:35:06 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Matthew Wilcox X-Patchwork-Id: 13628291 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 09E73C4345F for ; Fri, 12 Apr 2024 19:51:43 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 84A6B6B0089; Fri, 12 Apr 2024 15:51:43 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 7FAB86B0092; Fri, 12 Apr 2024 15:51:43 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 6E9816B0093; Fri, 12 Apr 2024 15:51:43 -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 53A2C6B0089 for ; Fri, 12 Apr 2024 15:51:43 -0400 (EDT) Received: from smtpin03.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay06.hostedemail.com (Postfix) with ESMTP id 13641A1C61 for ; Fri, 12 Apr 2024 19:51:43 +0000 (UTC) X-FDA: 82001924886.03.B22E343 Received: from casper.infradead.org (casper.infradead.org [90.155.50.34]) by imf30.hostedemail.com (Postfix) with ESMTP id 7498E8000A for ; Fri, 12 Apr 2024 19:51:41 +0000 (UTC) Authentication-Results: imf30.hostedemail.com; dkim=pass header.d=infradead.org header.s=casper.20170209 header.b=e0tewlhF; dmarc=none; spf=none (imf30.hostedemail.com: domain of willy@infradead.org has no SPF policy when checking 90.155.50.34) smtp.mailfrom=willy@infradead.org ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1712951501; 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=IB2XrvAmdyir6mAiFqIplfWy3iAJvoVZcjxvTKJjc/A=; b=gqM1OSktd8gV9VPZkamPa5N5uq/axhaygkeb0c05J/Y1yM7DBnhnKJXeboNYAYPEyoQZXI As4fz6PtBtkaX37ouLZrGYSLgKQ8ePk/phDBrYRD4J/4Ph+iKOQbXEK9QGmI8IjPe/xH1N tN8dh1aIkLg3grnLKaswmT4NZzLqJdI= ARC-Authentication-Results: i=1; imf30.hostedemail.com; dkim=pass header.d=infradead.org header.s=casper.20170209 header.b=e0tewlhF; dmarc=none; spf=none (imf30.hostedemail.com: domain of willy@infradead.org has no SPF policy when checking 90.155.50.34) smtp.mailfrom=willy@infradead.org ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1712951501; a=rsa-sha256; cv=none; b=cGYLkjI7XojA2/itsi9IT6Kd46qF4hfQFSddWt0wf5EwErVAwChHq3YgeJW9TG23lOJhs6 jIpJ05NVGN4MhsvpFMN5/9fCAO262i64TrbTUaH1d5NgeJrc5r3u2NLXtHbbhFKBgqs++X uKieF2oYCEOw1X6hX5engNLJCvtT3+Q= 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=IB2XrvAmdyir6mAiFqIplfWy3iAJvoVZcjxvTKJjc/A=; b=e0tewlhFqY5h2IsuvBTV4dmgLr XrNSrza6pexf0xEeJm/qiyWzsg8CQtPrgFl4JBlyyY+I4YQU3u3tVPsvFR0qJVQcHaEG2YOiInP7s 5MvDRpqa4KwQcHFRwnoRezgBn1JL1O/oNNX5JrunrPiiNgZezJnniN/gebqKi/b3zWCkPK6c0eUOF 6rGnZEA7iw1PSqIxCy5jck2ud41TstY2CCq4D2Hj6N3qxOcqTvalglPPpiN3fgHSq3ut9p9RmaJ9u NWwgLU2i9LLZBVrGcQwEYWXoickDqExXHXH1m8IbDbQ4YURsgUbc3LHbl76I6YSrs+kqfbMMz96QD FXRhrESA==; Received: from willy by casper.infradead.org with local (Exim 4.97.1 #2 (Red Hat Linux)) id 1rvMg4-00000009t9u-10gO; Fri, 12 Apr 2024 19:35:12 +0000 From: "Matthew Wilcox (Oracle)" To: Miaohe Lin Cc: "Matthew Wilcox (Oracle)" , linux-mm@kvack.org, Jane Chu Subject: [PATCH v3 09/11] mm/memory-failure: Add some folio conversions to unpoison_memory Date: Fri, 12 Apr 2024 20:35:06 +0100 Message-ID: <20240412193510.2356957-10-willy@infradead.org> X-Mailer: git-send-email 2.44.0 In-Reply-To: <20240412193510.2356957-1-willy@infradead.org> References: <20240412193510.2356957-1-willy@infradead.org> MIME-Version: 1.0 X-Rspamd-Queue-Id: 7498E8000A X-Rspam-User: X-Rspamd-Server: rspam02 X-Stat-Signature: 7kxzdnbtncu7h4fo8bsitnemhhapn518 X-HE-Tag: 1712951501-527763 X-HE-Meta: U2FsdGVkX1+5jIBV2ELX+dL67hJW7ycb2r1cqy17TzMVVnKtcQksWRAJEF3ZUlQcejEXBtPIKInV6ZSl5uHBdrdt7Uqlz4jvgjpOGlV6An/XB18AFdURyoohhgt02sS975YzJQTTnJ4heIFM9Rm6xPG3A3T4a7glkeavR0yitFIoq5ZbX/X8P7rP41x82IfDmzV1qezYOycXSDhr1whubKJ04xoZrUHVfiNsKaMkv51mZqW1y/nsEanWIuEcIvyQpIQ8ix8Idjoef0Td72sDwWySOBqcChJ6SxC8jeyllm5fztQ9YGVSB6MV+bNC+Oqnw/rSjQrRnnCyFq9ocU9iw3jglHeZmOYRyC1zQCFWmPp3310vblePovOkM2m8a1JDNR6c269U3EE55kVjOKQXql6iBhvor8Alh/p5odKmA9m/t6p8PXihYhXfsXeC0CcZl+i9KnVtHd/rQ3+dadKuBHV0B2CssW21qfrt+76VRLQAHIISYJDDhI35Ou7BnkLHkzs3kG3vdDSLec8e7YRDrG6m0GNfj9y2GaMXn5W5bdQOavlmExkW+A/QIjDM6fFx88GjJs8FJ2Zg20qLKo5ItUEzTfdagac+m7Wuspw+T3gcyKhN/VjQ7K6JgC5vhO1uSfXVcKEuNrj+TfWLpoRAGiK9iByhTtdIvwMXcTBllTHWhRPewzw6BzhtswDodOHjWFbeg9qbb2n/6Qd6Di4tU4uFAiVoUHHkKEkzHbQb6Vhfg24a1dG1sW7ceLed5h4ARStX78GHcZ9eDhOet5TWI3Rk1wlJ+OCP0z9Kv0YdHl9vLH8/X2dtBaVI49x6cOfIriez+zEEdRPkb0fVwmGiCHi5aRuS3LoWsMPi9LVmWxrL8wS1ZDp6MpKel6LPsadt30jlkue8hcHlKC5k0mKRPIWLReGPwGK+5klm+cwI4eEP7uJAIJxvOLn3EvjhNhTef8/PQTqVMxLSGM4yo3t udcOL51I Zh1htLhpr0msAtrtydfg61Bml1I9qq5a9z72mU/gRhlplCQEl7qwtK4s2Om26ocnjxoY18it13eu0M6mWJVvHi5ZBZnIF190SqOxP0YOg6tX2Z9aZ/xF3CTn3L7hMv6mRal7aa9Wz28E6qi0HEwZuixi42VQcB/rlyLp4F3CaGrKg0WMYBaMJ+lZn4iqCVmn5WRgcr31moSHl+nybe/PIG51YhDCsMvh5vhMGfchpCt0z2ah9TkU2+LxM7kmEKJCAlftV1gLlSl1Ll5QQ+55gq9mJjQ== 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 Reviewed-by: Jane Chu Signed-off-by: Matthew Wilcox (Oracle) --- 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 0fcf749682ab..e42c5f2179dc 100644 --- a/mm/memory-failure.c +++ b/mm/memory-failure.c @@ -2550,8 +2550,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; /* @@ -2572,7 +2572,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) @@ -2588,7 +2588,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) {