From patchwork Sat Nov 4 03:55:18 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kefeng Wang X-Patchwork-Id: 13445385 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 B78A5C4332F for ; Sat, 4 Nov 2023 03:55:55 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 228C78D00D3; Fri, 3 Nov 2023 23:55:52 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 1D8FC8D00D2; Fri, 3 Nov 2023 23:55:52 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 0C8868D00D3; Fri, 3 Nov 2023 23:55:52 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0016.hostedemail.com [216.40.44.16]) by kanga.kvack.org (Postfix) with ESMTP id E90C08D00D2 for ; Fri, 3 Nov 2023 23:55:51 -0400 (EDT) Received: from smtpin24.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay07.hostedemail.com (Postfix) with ESMTP id C5F7B160E6B for ; Sat, 4 Nov 2023 03:55:51 +0000 (UTC) X-FDA: 81418908102.24.6533D47 Received: from szxga03-in.huawei.com (szxga03-in.huawei.com [45.249.212.189]) by imf18.hostedemail.com (Postfix) with ESMTP id A73EA1C0008 for ; Sat, 4 Nov 2023 03:55:48 +0000 (UTC) Authentication-Results: imf18.hostedemail.com; dkim=none; dmarc=pass (policy=quarantine) header.from=huawei.com; spf=pass (imf18.hostedemail.com: domain of wangkefeng.wang@huawei.com designates 45.249.212.189 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=1699070150; 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=JmshzJlQTZerKlylIFF6GjirPxf+6rDZ/9S5JVPwXNs=; b=BhsCtu1pKADP9tqM6+FHaIuOR+LIbTOY28cq+0YlFQZZsXTnW8IzfJv919mxgXvX/DFwBb WwPjOrokbMpqsacm8Y3nGHTh2bB0fuZLjbuxNZt91vHlXtpKlXu1qwkbAXXr+Gw1W5QIv1 20yrKkuHWLcOkD+VgBGe2F1d9TYjBDk= ARC-Authentication-Results: i=1; imf18.hostedemail.com; dkim=none; dmarc=pass (policy=quarantine) header.from=huawei.com; spf=pass (imf18.hostedemail.com: domain of wangkefeng.wang@huawei.com designates 45.249.212.189 as permitted sender) smtp.mailfrom=wangkefeng.wang@huawei.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1699070150; a=rsa-sha256; cv=none; b=mfGwSEtzflOuTsyKoDrLXLY+fN0SVdgMJrvCcd4vkHfdd42DaaqjzreaHOD3JV7UddDmMZ HBXRtWM8n4DtJaTBOLN48lMm51cv/3E5ETE1WTQDVAJ/Avinw3UBToSN6TT9BRuMyD4w3/ T4tNU7NjZylZtLX43dIEUqVRlxGxVtA= Received: from dggpemm100001.china.huawei.com (unknown [172.30.72.57]) by szxga03-in.huawei.com (SkyGuard) with ESMTP id 4SMkDl5J28zMlhj; Sat, 4 Nov 2023 11:51:19 +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; Sat, 4 Nov 2023 11:55:43 +0800 From: Kefeng Wang To: Andrew Morton CC: , , Matthew Wilcox , David Hildenbrand , , Kefeng Wang Subject: [PATCH v2 06/10] mm: memory: use a folio in zap_pte_range() Date: Sat, 4 Nov 2023 11:55:18 +0800 Message-ID: <20231104035522.2418660-7-wangkefeng.wang@huawei.com> X-Mailer: git-send-email 2.27.0 In-Reply-To: <20231104035522.2418660-1-wangkefeng.wang@huawei.com> References: <20231104035522.2418660-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-CFilter-Loop: Reflected X-Rspamd-Queue-Id: A73EA1C0008 X-Rspam-User: X-Rspamd-Server: rspam02 X-Stat-Signature: 8nd3m1wj1zfngjnjgjq94mi3xcatbwd7 X-HE-Tag: 1699070148-175622 X-HE-Meta: U2FsdGVkX19NXHCQcNJfnr2MqCVOPUuqVQRwUGLLuWwylJGgApyPT/sl1rnplFAR1qeRcPO6WGtOYBphc3CRVTcygYH4lhOxx4N4AG/Iq6ltbgCk2VcLC1zYNOxZ7kzo3HBws8JEppP9zIy36fPmQ7MFEQZsaCoItutemyZ5qpdo9X4c11dIUjF8b4CNvo7ASuCRxyp7gBGDh/6u0IZ0YlsY7lxDtTPEf1fx5bq3dBh+opRZbhWSVXcfbC4hTq/jY5SeqA154XMERAqlFNvzNxD1ejCb6Bcgtf5YuS7Z4lBZZoieQ2ZoYIQ5ivGORpgv/Ph0tc+K79q7psRCJUhSNmbCUOKg+FqGod4gbpauqqZ7SrMBGm2gyrKO5SOE39cBmj+aRrDuVriQCF7lFPW4oRUL/1FcXbp8ebqNTcgSI1sDSG9yR8ALZr9/jiKPpAmr8z4DqkpJy969B0yu8n/LvHIqsj15UMagl12uHAIPEC3i4npJn1UCwLQhgMChLUOJTGtB9vWSN9vUeTwtBzNZj59fEq9AAPlXr2rdWgp/CiZMs2Z8qOPe1l5ZL2AM/WJAFjvu+AVEdCYrsbhj7F/bvURK4GZxmQuKo/YULg/K6wEDUxVR15bvqWaQe7J8qs8TZaBh3A+VmEaskPHhMOdeHOIpYXzKoDmewD68ETdVmxSq0EKA8JdhxNp7HgnHbiao/rx8i5y5Jvmofl9lo84Bfilyf6hDR7CQ/b2V1Y0G5XA9Jxq60W+e02sUr3J4rBrAn2QtxM2vahu7AaLcxu2Hrc84t6aHVHNLmfLthJNcFyflM5ZYIva/1864tAKbeliOUZL+61SH3Tmr6l5kiss68M9JDZu9lKX2iyKK33xO2gWpCwlAttRoy2aIu0C+KtQDyicI5zZaD6nEJ+nX8/fuSVCMxZxqBz/kp9xekbjSKLw0VVoNI5W42NZUBp/YR68qPxoQztYOITuxeXW6BnW 3X+uOyjO TvFWwLsSbh+kWQRdIeXmyv++P8IH+JflP74CDgBw/LFZDmkfN9hjJiuyMwjJEhwWYulHvKkti/cmKtzYob7JLK5pZLCfJcMVPDw93pSvt9Yh/DfsrkNKiyVYVGf3ZeXlcQ0gHJqjh9y+QjFaH3kO/eRsYo8jKK9q1ENzej/D2JJCT8ZpibgT166xbmzssIPHRjS3I 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 | 45 +++++++++++++++++++++++++-------------------- 1 file changed, 25 insertions(+), 20 deletions(-) diff --git a/mm/memory.c b/mm/memory.c index d9314dee355e..806568f9605b 100644 --- a/mm/memory.c +++ b/mm/memory.c @@ -1358,19 +1358,19 @@ 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_page(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) @@ -1423,7 +1423,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; @@ -1433,9 +1433,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_page(details, folio))) continue; ptent = ptep_get_and_clear_full(mm, addr, pte, tlb->fullmm); @@ -1449,16 +1453,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) { @@ -1477,9 +1481,10 @@ 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))) + folio = pfn_swap_entry_to_folio(entry); + if (unlikely(!should_zap_page(details, folio))) continue; + /* * Both device private/exclusive mappings should only * work with anonymous page so far, so we don't need to @@ -1487,10 +1492,10 @@ static unsigned long zap_pte_range(struct mmu_gather *tlb, * see zap_install_uffd_wp_if_needed(). */ WARN_ON_ONCE(!vma_is_anonymous(vma)); - rss[mm_counter(page)]--; + rss[mm_counter(&folio->page)]--; if (is_device_private_entry(entry)) - page_remove_rmap(page, vma, false); - put_page(page); + page_remove_rmap(&folio->page, vma, false); + folio_put(folio); } else if (!non_swap_entry(entry)) { /* Genuine swap entry, hence a private anon page */ if (!should_zap_cows(details)) @@ -1499,10 +1504,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_page(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