From patchwork Thu Jan 11 11:12:37 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kefeng Wang X-Patchwork-Id: 13517214 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 15947C4707B for ; Thu, 11 Jan 2024 11:13:46 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 92B916B0099; Thu, 11 Jan 2024 06:13:41 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id 867A66B009A; Thu, 11 Jan 2024 06:13:41 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 706786B009B; Thu, 11 Jan 2024 06:13:41 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0017.hostedemail.com [216.40.44.17]) by kanga.kvack.org (Postfix) with ESMTP id 618626B0099 for ; Thu, 11 Jan 2024 06:13:41 -0500 (EST) Received: from smtpin17.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay01.hostedemail.com (Postfix) with ESMTP id 3DC681C0821 for ; Thu, 11 Jan 2024 11:13:41 +0000 (UTC) X-FDA: 81666769842.17.4CEEC48 Received: from szxga03-in.huawei.com (szxga03-in.huawei.com [45.249.212.189]) by imf30.hostedemail.com (Postfix) with ESMTP id 76D0C8001A for ; Thu, 11 Jan 2024 11:13:38 +0000 (UTC) Authentication-Results: imf30.hostedemail.com; dkim=none; spf=pass (imf30.hostedemail.com: domain of wangkefeng.wang@huawei.com designates 45.249.212.189 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=1704971619; 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=28kchYy61pOQgaqPuhwZoLEfvtIaQZbp4tv//nLxINU=; b=y4YsueK4OQkEFYgxWftSZBFOy3aJfSfsZZgbUo5/0YhDVGJsaXN6rk3ilWQuWfXUlbpE7n PHrL8agni0vGFn625tO+BVL66ygHrS3zRWGeQBkYkRmeGTHQmDKReo628Cly6NcxajukGk ctG+txzX7XyWgN2sOgF5sSeH0m4GjUw= ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1704971619; a=rsa-sha256; cv=none; b=Yw9n9kJ/JrcE8IyPpWnJyvOBBGJqFwg2cO44NC79kbsovstIni1vX39SWiNwfcjtdIgkUy BjBa5/DW64qMChF/bCS4hjCpGIzzau02eEUBtQCQmKPXs/RlGi1BpO3Ma2AGIkxHyc31+5 PUSgkz73p7P2cI/Zb5L2/HXMHaN2/zw= ARC-Authentication-Results: i=1; imf30.hostedemail.com; dkim=none; spf=pass (imf30.hostedemail.com: domain of wangkefeng.wang@huawei.com designates 45.249.212.189 as permitted sender) smtp.mailfrom=wangkefeng.wang@huawei.com; dmarc=pass (policy=quarantine) header.from=huawei.com Received: from mail.maildlp.com (unknown [172.19.88.194]) by szxga03-in.huawei.com (SkyGuard) with ESMTP id 4T9hpt1TpfzNkrX; Thu, 11 Jan 2024 19:12:54 +0800 (CST) Received: from dggpemm100001.china.huawei.com (unknown [7.185.36.93]) by mail.maildlp.com (Postfix) with ESMTPS id 1346914040D; Thu, 11 Jan 2024 19:13:33 +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_128_GCM_SHA256) id 15.1.2507.35; Thu, 11 Jan 2024 19:13:32 +0800 From: Kefeng Wang To: Andrew Morton , CC: , , , , Kefeng Wang Subject: [PATCH v2 6/8] mm: memory: convert to should_zap_folio() Date: Thu, 11 Jan 2024 19:12:37 +0800 Message-ID: <20240111111239.2453282-7-wangkefeng.wang@huawei.com> X-Mailer: git-send-email 2.27.0 In-Reply-To: <20240111111239.2453282-1-wangkefeng.wang@huawei.com> References: <20240111111239.2453282-1-wangkefeng.wang@huawei.com> MIME-Version: 1.0 X-Originating-IP: [10.175.112.125] X-ClientProxiedBy: dggems703-chm.china.huawei.com (10.3.19.180) To dggpemm100001.china.huawei.com (7.185.36.93) X-Rspamd-Queue-Id: 76D0C8001A X-Rspam-User: X-Rspamd-Server: rspam11 X-Stat-Signature: kq5ysueyt6y8fcke1aricur81zosd1jm X-HE-Tag: 1704971618-429550 X-HE-Meta: U2FsdGVkX185ev9osgszxbLLI5zK5szpeHe4fTuBx37VHr2Ul5yNgs0cjOWA03E5gcWiOJiq5BoYv1+xVKMNJ6kqSknEW0QibwmgvVwHSmq7neefdN9NRkSkNlMklwSeVOZxFTD5etA26ski4mKSIXCPFvCdEpfp82mdFzkbTdnm5thaumu5baRHb3Ubx9+a1hxUS4Cfab+4AppETLKQIV+/2BMntQhP43sZ6l2BAUNC1qnRZTti16Ubkdb0pDREkyHza4Mw+5UAqDu7AWIemV0NUDUJb4/LvS0Z2U5deue3SyhNn0pfiyC0FCw2LwI6zhpYd3zszasmmC4HGl5OpBQ5pZ4mPpC7jfVScjeH4bh+mBImQem5MzgOX2uASv9FbDgCy7dKRPd28IdY1iBhGzSoR5B15bH2SadUtq7NOPEEz4QyUzTPPn0e8mm9QEGCVZb77Uo2rYSvSkOv13P+EtKUXkvA35K7oiwv6R/TW2ILjjZ/XdgHwfxx80Wca1KPERvCM0BoxwzXmWNiTu+I9tKFZY4qUNh1YlpZWN6FoxhRmEPacs118I4IFGnI573DHPVAUdyCbfK5zyeJt1lROm2i8DFZ83dGm1QIZIq9eyYLEqd18rC+XFLaGL27kVpAMHlygJZOt8ODmO3BHh5S47fovXzFPtoanxoeyCouifH42SgEw0453txL7Ff44C+F6X+dpO6a2NrRRzXry8tf/ZUQ+9Vne5eQB30LhLEJT5C04y20XzZQx4dQePApjk1kF2gmVvdHXtDeoZA2kYipVd8Wj4Fz8bQLkPZ8ovmUIXye4XZtvImK2Fd54YfK1Q9CdUIdGTJOyfCcYoPr/7BLkQP6AwF4YQZbewg+GbEDO8L75+cpWpRl8Mx/FprDxGOByKyrwoC2S2oL+AdQgYuiACuJTnytwajB2rAPuGtfI1Y1r/6hKMsW8tusVR3/xzM1bErOklqfVuG+rqqYtEw 85BCSXxE 2OE80pqh8PKRQ2VzW3bk+B/ol2jngP9oxpcg9x9MDi4kZTbVH8anIi3tT/42rNBMpG87BXe6Pva6/uONKiWcUrf2ilsqk9DMOFsbVK8/0epQ2rNvF6vzxh58N9+ksbMTHI8hQVt7qiJ5y0gpw/eQ5laurkyvcqKOIo+P423tVOpg6GnQKcSvmNMFsYuc3BfZ0xyGL 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: Make should_zap_page() to take a folio and convert it to should_zap_folio() which is preparetion for converting mm counter functions to take a folio. Signed-off-by: Kefeng Wang --- mm/memory.c | 29 ++++++++++++++++------------- 1 file changed, 16 insertions(+), 13 deletions(-) diff --git a/mm/memory.c b/mm/memory.c index 7b3fbeb21534..afba8b156457 100644 --- a/mm/memory.c +++ b/mm/memory.c @@ -1369,19 +1369,20 @@ static inline bool should_zap_cows(struct zap_details *details) return details->even_cows; } -/* Decides whether we should zap this page with the page pointer specified */ -static inline bool should_zap_page(struct zap_details *details, struct page *page) +/* Decides whether we should zap this folio with the folio pointer specified */ +static inline bool should_zap_folio(struct zap_details *details, + struct folio *folio) { - /* If we can make a decision without *page.. */ + /* If we can make a decision without *folio.. */ if (should_zap_cows(details)) return true; - /* E.g. the caller passes NULL for the case of a zero page */ - if (!page) + /* E.g. the caller passes NULL for the case of a zero folio */ + if (!folio) return true; - /* Otherwise we should only zap non-anon pages */ - return !PageAnon(page); + /* Otherwise we should only zap non-anon folios */ + return !folio_test_anon(folio); } static inline bool zap_drop_file_uffd_wp(struct zap_details *details) @@ -1447,7 +1448,10 @@ static unsigned long zap_pte_range(struct mmu_gather *tlb, unsigned int delay_rmap; page = vm_normal_page(vma, addr, ptent); - if (unlikely(!should_zap_page(details, page))) + if (page) + folio = page_folio(page); + + if (unlikely(!should_zap_folio(details, folio))) continue; ptent = ptep_get_and_clear_full(mm, addr, pte, tlb->fullmm); @@ -1460,7 +1464,6 @@ static unsigned long zap_pte_range(struct mmu_gather *tlb, continue; } - folio = page_folio(page); delay_rmap = 0; if (!folio_test_anon(folio)) { if (pte_dirty(ptent)) { @@ -1492,7 +1495,7 @@ static unsigned long zap_pte_range(struct mmu_gather *tlb, is_device_exclusive_entry(entry)) { page = pfn_swap_entry_to_page(entry); folio = page_folio(page); - if (unlikely(!should_zap_page(details, page))) + if (unlikely(!should_zap_folio(details, folio))) continue; /* * Both device private/exclusive mappings should only @@ -1513,10 +1516,10 @@ static unsigned long zap_pte_range(struct mmu_gather *tlb, if (unlikely(!free_swap_and_cache(entry))) print_bad_pte(vma, addr, ptent, NULL); } else if (is_migration_entry(entry)) { - page = pfn_swap_entry_to_page(entry); - if (!should_zap_page(details, page)) + folio = pfn_swap_entry_to_folio(entry); + if (!should_zap_folio(details, folio)) continue; - rss[mm_counter(page)]--; + rss[mm_counter(&folio->page)]--; } else if (pte_marker_entry_uffd_wp(entry)) { /* * For anon: always drop the marker; for file: only