From patchwork Tue Jun 4 11:48:19 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kefeng Wang X-Patchwork-Id: 13685096 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 12F58C25B78 for ; Tue, 4 Jun 2024 11:49:12 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id F34896B00B6; Tue, 4 Jun 2024 07:49:06 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id C0F256B00BE; Tue, 4 Jun 2024 07:49:06 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 9DE026B00B6; Tue, 4 Jun 2024 07:49:06 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0011.hostedemail.com [216.40.44.11]) by kanga.kvack.org (Postfix) with ESMTP id 4B0CB6B00B9 for ; Tue, 4 Jun 2024 07:49:06 -0400 (EDT) Received: from smtpin06.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay08.hostedemail.com (Postfix) with ESMTP id BFB5C140659 for ; Tue, 4 Jun 2024 11:49:05 +0000 (UTC) X-FDA: 82193035050.06.938F9E9 Received: from szxga05-in.huawei.com (szxga05-in.huawei.com [45.249.212.191]) by imf23.hostedemail.com (Postfix) with ESMTP id 32DA4140021 for ; Tue, 4 Jun 2024 11:49:02 +0000 (UTC) Authentication-Results: imf23.hostedemail.com; dkim=none; spf=pass (imf23.hostedemail.com: domain of wangkefeng.wang@huawei.com designates 45.249.212.191 as permitted sender) smtp.mailfrom=wangkefeng.wang@huawei.com; dmarc=pass (policy=quarantine) header.from=huawei.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1717501744; a=rsa-sha256; cv=none; b=szlu6OZETLE68qBwoT6okB1eIVLFRREP4UjHeVZ8R0VANeRISUSyAmItU03rOjC58/UIbg lrn8lX5Lg2JA2bd/fmKR1xCOWyvWsUy6P8CW8a2i8EqetSdu9TuJWnwvL8rY2PKot8jkyt nOlW5rqtl+EtdjyU1r2x6EVYb9HqV+c= ARC-Authentication-Results: i=1; imf23.hostedemail.com; dkim=none; spf=pass (imf23.hostedemail.com: domain of wangkefeng.wang@huawei.com designates 45.249.212.191 as permitted sender) smtp.mailfrom=wangkefeng.wang@huawei.com; dmarc=pass (policy=quarantine) header.from=huawei.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1717501744; 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=Lh/cS7g9VuXtaH447d2bRpEPYDCi7h2AOF4bTzwnJGs=; b=hTzW6OfvGGTKG6DNWVhtJyyWIO0MAH+fiaKSCNgxy1rTMlrs2ec5tHd/TsBSKYOmCOO4yU WU2n4tjoK9xnq+mXRnH4pJBlX4drtkGSqm6dULCjyIphvxULm+dP+SNxI4bj7h/I46VP+e ZIyUYYIIdI10pk0MebIwzdZRh15Jcmk= Received: from mail.maildlp.com (unknown [172.19.162.112]) by szxga05-in.huawei.com (SkyGuard) with ESMTP id 4VtpjX39l3z1HD5M; Tue, 4 Jun 2024 19:47:12 +0800 (CST) Received: from dggpemm100001.china.huawei.com (unknown [7.185.36.93]) by mail.maildlp.com (Postfix) with ESMTPS id C1051140155; Tue, 4 Jun 2024 19:48:58 +0800 (CST) Received: from localhost.localdomain (10.175.112.125) by dggpemm100001.china.huawei.com (7.185.36.93) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.1.2507.39; Tue, 4 Jun 2024 19:48:58 +0800 From: Kefeng Wang To: Andrew Morton CC: Helge Deller , Daniel Vetter , David Hildenbrand , Matthew Wilcox , , Jonathan Corbet , Kefeng Wang Subject: [PATCH 1/4] fs/proc/task_mmu: use folio API in pte_is_pinned() Date: Tue, 4 Jun 2024 19:48:19 +0800 Message-ID: <20240604114822.2089819-2-wangkefeng.wang@huawei.com> X-Mailer: git-send-email 2.27.0 In-Reply-To: <20240604114822.2089819-1-wangkefeng.wang@huawei.com> References: <20240604114822.2089819-1-wangkefeng.wang@huawei.com> MIME-Version: 1.0 X-Originating-IP: [10.175.112.125] X-ClientProxiedBy: dggems705-chm.china.huawei.com (10.3.19.182) To dggpemm100001.china.huawei.com (7.185.36.93) X-Rspam-User: X-Rspamd-Server: rspam06 X-Rspamd-Queue-Id: 32DA4140021 X-Stat-Signature: uo1p8ibnixaumcwuhhj4kkpgsp7znxdk X-HE-Tag: 1717501742-702777 X-HE-Meta: U2FsdGVkX19Jw+cY+eccQUUUbV2JIEbAtKsvQk+IMBiW4tjoEpvGDvTMJohgQpDewSGBItnAwp8Ot14a74OVGiHrDYoqw8/PAN/6rA5GoE7bPpHq2jEYPcOb/USVx+m+l9Qhv66DoDGzGUyD6Zjd+tC47ijwxzYJx0UsazPZN4ttoXaIK1BJUKxpd4z2KYxlBEXIuo8Qgn2FaZ3rLVWAbOmlGrLzCHQwmjZayJZyCZj7mj/bFyYqzbedzH9gy9nMxV/Ck7kb7Zp6JIdp0Jj4UbzRbrZ/E1i3kFv8Trj59K3BnJFq/n5OL/WJz8PMgt/LIV0pozDI3rUtAWA+/QZBKEKYcEWQwSU9Tp7KlrtnlmikPDVYEQAb2MlXdONNMWD8tyYXXWX3omyW3nHw4ef2cmLWLprilUUOaIRdX8M+eIn+l9OKDq9DCZG/TMbWvcxXa9BCsTov/FF+Z7E3KnegvBQJuFDIVIPFSmknmKSBKvnijkfwQzkkG9rvw6BqR6dfNlNZLnH1UM4hEAgpvWp/yV036EgkJE9RUe2TYfg6Usq0HyD9D/r/bi0xR/YFHU3oZ9WXECM6p5CciHy6LiyZ0DkT/v0wHl1m2fn03bKMwVUCdbrPqVZx6kVB1aKU7c3ndhbQ1ZKREzA1qcjIUCLVeuW2Mk+UNFBy5nJP8clsDdBUZSyCKsHvPn1LlGGiJg2sc5gVhVHbtFDFd+exAQJkEgzjBoSF32GlFvCZD3I7fpHpyLdCVo7Sj7s3WRhCLeNlIFtBnHXcICK5ADQ8eBljBRngZM1smGN+ELlacR3XpDhJ3iHq66kaBi+Esx0dZy+ErE9Q1uNsY6+gziuGvM4x7t+rDGlMq8MEFsa73OGKbzf+gxrnyvKwoVQ2528H8JWZyTl32AyIbhfxHHpJyMZJnEZsK0+3EPNaiz+Euxxmd1oT2xk/EyzBG+9rWiZUOEzLx/InOfiBN5A5JZ2BbiE sIp6aSLv aDefuCz3AbECojbpzBqVhia6edofd7et/SKzt++YXHiBijJmRiOpgEs8+SG4NBikjea9j8lwK6AToOO9iKFWESin3k3ykJoUU2eq0ySF3q6+UIZaTim26WwyeNb7SGOddFcYB7+H/Y/vv7AwvwqfKxwgRfXBnbilh1tGBzZ7Am5zJSHQIT73+FfRkSGFWVtXO41tJ 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: Convert to use vm_normal_folio() and folio_maybe_dma_pinned() API, which helps to remove page_maybe_dma_pinned() in the subsequent change. Signed-off-by: Kefeng Wang --- fs/proc/task_mmu.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/fs/proc/task_mmu.c b/fs/proc/task_mmu.c index f8d35f993fe5..5aceb3db7565 100644 --- a/fs/proc/task_mmu.c +++ b/fs/proc/task_mmu.c @@ -1088,7 +1088,7 @@ struct clear_refs_private { static inline bool pte_is_pinned(struct vm_area_struct *vma, unsigned long addr, pte_t pte) { - struct page *page; + struct folio *folio; if (!pte_write(pte)) return false; @@ -1096,10 +1096,10 @@ static inline bool pte_is_pinned(struct vm_area_struct *vma, unsigned long addr, return false; if (likely(!test_bit(MMF_HAS_PINNED, &vma->vm_mm->flags))) return false; - page = vm_normal_page(vma, addr, pte); - if (!page) + folio = vm_normal_folio(vma, addr, pte); + if (!folio) return false; - return page_maybe_dma_pinned(page); + return folio_maybe_dma_pinned(folio); } static inline void clear_soft_dirty(struct vm_area_struct *vma,