From patchwork Mon Nov 6 15:49:46 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kefeng Wang X-Patchwork-Id: 13447137 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 D1B7FC41535 for ; Mon, 6 Nov 2023 15:50:11 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id A0F2C8D0024; Mon, 6 Nov 2023 10:50:10 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id 999A98D0002; Mon, 6 Nov 2023 10:50:10 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 63A3A8D0002; Mon, 6 Nov 2023 10:50:10 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0014.hostedemail.com [216.40.44.14]) by kanga.kvack.org (Postfix) with ESMTP id 4CE0F8D0024 for ; Mon, 6 Nov 2023 10:50:10 -0500 (EST) Received: from smtpin22.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay05.hostedemail.com (Postfix) with ESMTP id 169CF40807 for ; Mon, 6 Nov 2023 15:50:10 +0000 (UTC) X-FDA: 81427965780.22.1ED2CDD Received: from szxga02-in.huawei.com (szxga02-in.huawei.com [45.249.212.188]) by imf04.hostedemail.com (Postfix) with ESMTP id E9A1D40023 for ; Mon, 6 Nov 2023 15:50:05 +0000 (UTC) Authentication-Results: imf04.hostedemail.com; dkim=none; dmarc=pass (policy=quarantine) header.from=huawei.com; spf=pass (imf04.hostedemail.com: domain of wangkefeng.wang@huawei.com designates 45.249.212.188 as permitted sender) smtp.mailfrom=wangkefeng.wang@huawei.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1699285807; 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=PwuD5h4HDp7gyAC3F3z00/3MQZmSXYSpa4jfbyyWmuo=; b=zeowSVXGUTfGJ/f4oNgtWp0qeqNAo17ldAoW6vbVkojqHgUGuK8CLtQL4oj1YDJyLGuUZU C48EPsvfIuNvZPXzFlfJTzZ7rfyjGTMRCwl/nTvehJUswCY0ls6HorlrSZpctC3jzMgmtQ gMUT4i42X6RInbQrTEX5Qx4GqweWPmY= ARC-Authentication-Results: i=1; imf04.hostedemail.com; dkim=none; dmarc=pass (policy=quarantine) header.from=huawei.com; spf=pass (imf04.hostedemail.com: domain of wangkefeng.wang@huawei.com designates 45.249.212.188 as permitted sender) smtp.mailfrom=wangkefeng.wang@huawei.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1699285807; a=rsa-sha256; cv=none; b=sYB8OUoOpN/wMDDR6DTQ31holEZv72RiF5UH1JaKLkQx+wmOiXlPZ/9RcCRmLCO8VAb5F+ sxccTwcCo4NP9ZkDuED67lGBp2kVJ96GHvUu8YyX377wKSdUaszWWQaIMCceI9bRtVgaJ1 sW74nJgsAXzPBqUj7ff+1IX2ItxgKDY= Received: from dggpemm100001.china.huawei.com (unknown [172.30.72.55]) by szxga02-in.huawei.com (SkyGuard) with ESMTP id 4SPG0K1YGGzPnbL; Mon, 6 Nov 2023 23:45:53 +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.31; Mon, 6 Nov 2023 23:50:01 +0800 From: Kefeng Wang To: Andrew Morton CC: , , Matthew Wilcox , David Hildenbrand , , Kefeng Wang Subject: [PATCH 06/10] mm: memory: use a folio in zap_pte_range() Date: Mon, 6 Nov 2023 23:49:46 +0800 Message-ID: <20231106154950.3399469-7-wangkefeng.wang@huawei.com> X-Mailer: git-send-email 2.27.0 In-Reply-To: <20231106154950.3399469-1-wangkefeng.wang@huawei.com> References: <20231106154950.3399469-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-CFilter-Loop: Reflected X-Rspam-User: X-Stat-Signature: bhaxdhms9fm9giof6gkwz8rc6f7xsgi5 X-Rspamd-Server: rspam07 X-Rspamd-Queue-Id: E9A1D40023 X-HE-Tag: 1699285805-5286 X-HE-Meta: U2FsdGVkX1+l7vfZMhv8vkjGHmMOOmOMqUfjJlK5+/a50DzZSc2KerLxi5CA//l97HblTBeVYnGFfVOw2nLoXeCRK4bEd+v1z5VMbe9wMta5keKhPKqH7iEEb2mzjFky3idlVGQLoBYQy0TSkY0CELMo8fap9GEcpBcxc3BcM2OxkH2C/YE4nWmyVDriRvLpDbJugdqmdS8E3UGkDXj+UKmTwg6AYKMK5HrVQ/d0gzS/wguNBstXkBbSLhiuO2yFt4STKCV1cB3NI+/mDXouKOT2wnVYAAu+0/ck+KRBdPoTLrkzckQ/GNvRiQN2E/oE47TIcqmTOuZR5pAJBmO05a8Dd8uHBtni2FRSPJhgWECdpNJasWtEfzM2rvBlKI08h5hLAs4/VW0I0qMYOjxm3UZxm7FDgEifhQBOmquo3DIiAEJbWRR3xBl0Ya6cpOyLEKgrnSW9OwiBSZwVKM6ml6OZJNyUEaEW36F0owU/Ny/iJ+XGCouTVRR4XBqLmaZQqJY29NExw3PL+JjakZyOnQ6XSb2A3gq2pHhTFuxPwiKbpBNS0AINQbZOsePdzG0JlAmRiavOmN3TPkew/xN8Gjms3Rkrat1OGMLlNG+79hKLOjH5etqVXNb7ZHV9unX0ZZCPOsQiIYGGiR87Dfe62c5vHbDnQtNWqxIXEiNJKgFt7Sn1MRUibTckjft6fvpv8wg9cgJE+9VDINXHzc30nsYvkTTFwZdjudZoC2d9TkEMkMhTN+e6fNYwtM4vPfgWih2QkgxUxJe9n5kgMFxQTwGW1usawzy6YoallhMrJZFbi3GdD4zbCvPCPEJA3jAPUcpYTMmseZ/3evV7gtqIK+7P7cb6ySrb1levYDxvJF9U4nlZXUVk+oJsdxwpRy7qyLoFLkz498mSxx7qc9CfbqaaG61blqQhuQbX4hjM2tT87ALDiZLF89WO+lQ3FukE+i3MQ0y1Ot3JEkgRU34 dphDkHEM e1u8zGhrit2JY+sHpwSChwxm9yQicY6d0rPV2NOCxw/D3IPmK+pg1h/6ksF6TaQPvb9uZOXylO9hsXaEWIPJ3MF/GasTXqIj44vUh5b0IETYcePGSOigTbW2MNPS+MwZTTAm1TVcJrUN9JZ4laxDENWFGEXjTTQU2WUGhXDiH41s1Wsy3FAlzdEcxS/kNSLomKbK8 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 use a folio in zap_pte_range(), which save several compound_head() calls. Signed-off-by: Kefeng Wang --- mm/memory.c | 44 ++++++++++++++++++++++++++------------------ 1 file changed, 26 insertions(+), 18 deletions(-) diff --git a/mm/memory.c b/mm/memory.c index 914353d1c7f1..669f167f45cd 100644 --- a/mm/memory.c +++ b/mm/memory.c @@ -1359,19 +1359,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) @@ -1424,7 +1425,7 @@ static unsigned long zap_pte_range(struct mmu_gather *tlb, arch_enter_lazy_mmu_mode(); do { pte_t ptent = ptep_get(pte); - struct page *page; + struct folio *folio = NULL; if (pte_none(ptent)) continue; @@ -1434,9 +1435,13 @@ static unsigned long zap_pte_range(struct mmu_gather *tlb, if (pte_present(ptent)) { unsigned int delay_rmap; + struct page *page; 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); @@ -1450,16 +1455,16 @@ static unsigned long zap_pte_range(struct mmu_gather *tlb, } delay_rmap = 0; - if (!PageAnon(page)) { + if (!folio_test_anon(folio)) { if (pte_dirty(ptent)) { - set_page_dirty(page); + folio_set_dirty(folio); if (tlb_delay_rmap(tlb)) { delay_rmap = 1; force_flush = 1; } } if (pte_young(ptent) && likely(vma_has_recency(vma))) - mark_page_accessed(page); + folio_mark_accessed(folio); } rss[mm_counter(page)]--; if (!delay_rmap) { @@ -1478,9 +1483,12 @@ static unsigned long zap_pte_range(struct mmu_gather *tlb, entry = pte_to_swp_entry(ptent); if (is_device_private_entry(entry) || is_device_exclusive_entry(entry)) { - page = pfn_swap_entry_to_page(entry); - if (unlikely(!should_zap_page(details, page))) + struct page *page = pfn_swap_entry_to_page(entry); + + folio = page_folio(page); + if (unlikely(!should_zap_folio(details, folio))) continue; + /* * Both device private/exclusive mappings should only * work with anonymous page so far, so we don't need to @@ -1491,7 +1499,7 @@ static unsigned long zap_pte_range(struct mmu_gather *tlb, rss[mm_counter(page)]--; if (is_device_private_entry(entry)) page_remove_rmap(page, vma, false); - put_page(page); + folio_put(folio); } else if (!non_swap_entry(entry)) { /* Genuine swap entry, hence a private anon page */ if (!should_zap_cows(details)) @@ -1500,10 +1508,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