From patchwork Sat Nov 4 03:55:22 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kefeng Wang X-Patchwork-Id: 13445384 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 5D5BBC4167D for ; Sat, 4 Nov 2023 03:55:53 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 3ADD68D000C; Fri, 3 Nov 2023 23:55:51 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 35E7F8D00D2; Fri, 3 Nov 2023 23:55:51 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 226478D000C; Fri, 3 Nov 2023 23:55:51 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0012.hostedemail.com [216.40.44.12]) by kanga.kvack.org (Postfix) with ESMTP id 13D898D00D2 for ; Fri, 3 Nov 2023 23:55:51 -0400 (EDT) Received: from smtpin25.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay05.hostedemail.com (Postfix) with ESMTP id BDDAA40521 for ; Sat, 4 Nov 2023 03:55:50 +0000 (UTC) X-FDA: 81418908060.25.F7E1D2A Received: from szxga01-in.huawei.com (szxga01-in.huawei.com [45.249.212.187]) by imf20.hostedemail.com (Postfix) with ESMTP id 3D3211C000A for ; Sat, 4 Nov 2023 03:55:47 +0000 (UTC) Authentication-Results: imf20.hostedemail.com; dkim=none; dmarc=pass (policy=quarantine) header.from=huawei.com; spf=pass (imf20.hostedemail.com: domain of wangkefeng.wang@huawei.com designates 45.249.212.187 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=1699070149; 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=GazSDJbamK21W3qr6H03idb2J/BUC8P02Cqa+Ldgz9o=; b=H56tYPoVB3bDSYQlRwYXH9zx0vtsReJ3AaM6PxOg4NOoy3kgbbGwfORGb583sEFaCfaXae MU5eusF1F+TRci7JiKr+IwUkQciBsZbImxhmQu52X+9SP/SPbZotRz4oRvgI0eDTfU3B17 KLO+PRab85QHeadqq9rrVVPZsfYvV9s= ARC-Authentication-Results: i=1; imf20.hostedemail.com; dkim=none; dmarc=pass (policy=quarantine) header.from=huawei.com; spf=pass (imf20.hostedemail.com: domain of wangkefeng.wang@huawei.com designates 45.249.212.187 as permitted sender) smtp.mailfrom=wangkefeng.wang@huawei.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1699070149; a=rsa-sha256; cv=none; b=nF+PRXG5Z+c6h5YOzfHt08o5AEWw5mRz0PxwIqe+5iwdV0Mx7ltv8skhlLvmjPcjTndcmo aNVsH0fVvl/FzbS6eTnkv6rzJuNQMMPqCH/ggRfDS5Cf6AQn0cf0yrEqQHWhY2WLMxRGO0 X8Cl1iZFLaw5iPXdmc8MMdSPD3Yfb2Q= Received: from dggpemm100001.china.huawei.com (unknown [172.30.72.53]) by szxga01-in.huawei.com (SkyGuard) with ESMTP id 4SMkGH51DZzrTXs; Sat, 4 Nov 2023 11:52:39 +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:44 +0800 From: Kefeng Wang To: Andrew Morton CC: , , Matthew Wilcox , David Hildenbrand , , Kefeng Wang Subject: [PATCH v2 10/10] mm: convert mm_counter_file() to take a folio Date: Sat, 4 Nov 2023 11:55:22 +0800 Message-ID: <20231104035522.2418660-11-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-Server: rspam09 X-Rspamd-Queue-Id: 3D3211C000A X-Stat-Signature: bqc8pb5kc8gbd3bttticy8gndyhsua71 X-Rspam-User: X-HE-Tag: 1699070147-539739 X-HE-Meta: U2FsdGVkX1+Fwl7Cjh+dBTyQ9wdfhpf+TqFGlufDO627DHNDNO4Jevx16ScGV4gPXeadN1+/8DGOsDCJi6ivSkpEiSvoQrTCyZhyhYF4M47c1jg7Tr80IHKlUUDmQQ1CRlxFwmNrWAQCwcYhvR9CYNMZDuvR4Y5B+52oCu2RzdWWyQ090VKJbmGTyqWdhRDTekKVHsiWlzWUXNY705CLA8/+DoIhC3i12zCc0y6zW9BSIVRT2IVchImDIaXJ1Hm+fYgN08G4+vbqVfdQB08aYFL4Kr/AX3VqXblvSqCiH9yXAtITr246XC+mWff9lLkIXuXkBG9m3+OL32HwPDkAMm4tOj/V3lCqdto3yTcsHer2uc0mvq2QBsn3CfhWRbX8D/Vy7YaNDny7QhLIocVJulWYXf0X2/0e31+bVsfx3nWss+zAmBTnOFkVnBbn/FNEnHee96pCb6NZsIaBH0gtudvDl3VgSz+CSBklLXmQsZmtY8zd9vZTg4jqqC4tzOXEh18RHx/vNJiWg5aPrAr/fUNlMtyfhwcIFyB03g+vRSuoINPeSFxNllxksC8g+N10XWuUdmsAdGqIQpd9i6ib5knYcfzcPIqubeV/EHdVS5MtNlziuCkPFCelH/Xh2fDGn2LjdCqw4FHWZGBwyXEzd1t4og22Lx7TSFW82P1dk2YxF6PjZku3JhPzqqw4xfqsKXo8HE7Gjp1K/MDrqLQH3hMDBaS2emAgVKqJDlVAV4MCVHWqG/6zHrVrYwj7AEGeQ6Qw0q9UFHMg+vKYE2kkWNqW1QwPw9qd1oOnyGK1sM0KLmc+38iXm08JtD9WfuYouVMj7bkfJq6Th1UG1dnaRyyKtY16vvYe7Ag9Tn9LNwcItgakgockRM2suKtkz3yYQ8ka51xddicc5IJHtsCrwmNRZ8mNg2usoLg2yrTllaoqAuOX/qGagHk/75s9QsVl9n4cDYM69R6DqY4SSRE HuIgNQ1s j8t/2S1aq0hFMCcqB4WREFM+u8pYj7ZJfui2yFsciFkjRoPPCuOvOrhCRaF8iPxeYIe3ZpcsjNwIfMc+WFDt4PuRk13MPTcJdgqOnoM+S2WVUx9vHfAF68bSSvJOnI8/95ix+sUGZT83uJljQ68Shu7R6yq9vLzR7QShLC+409Qqic3HN7hmzGCHCcgwNOB1tmMj7 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: Since all mm_counter_file() callers with a folio, let's convert mm_counter_file() to take a folio. Signed-off-by: Kefeng Wang --- include/linux/mm.h | 8 ++++---- kernel/events/uprobes.c | 2 +- mm/huge_memory.c | 5 +++-- mm/khugepaged.c | 4 ++-- mm/memory.c | 10 +++++----- mm/rmap.c | 2 +- 6 files changed, 16 insertions(+), 15 deletions(-) diff --git a/include/linux/mm.h b/include/linux/mm.h index fea78900bf84..95573065a46b 100644 --- a/include/linux/mm.h +++ b/include/linux/mm.h @@ -2583,10 +2583,10 @@ static inline void dec_mm_counter(struct mm_struct *mm, int member) mm_trace_rss_stat(mm, member); } -/* Optimized variant when page is already known not to be PageAnon */ -static inline int mm_counter_file(struct page *page) +/* Optimized variant when folio is already known not to be anon */ +static inline int mm_counter_file(struct folio *folio) { - if (PageSwapBacked(page)) + if (folio_test_swapbacked(folio)) return MM_SHMEMPAGES; return MM_FILEPAGES; } @@ -2595,7 +2595,7 @@ static inline int mm_counter(struct folio *folio) { if (folio_test_anon(folio)) return MM_ANONPAGES; - return mm_counter_file(&folio->page); + return mm_counter_file(folio); } static inline unsigned long get_mm_rss(struct mm_struct *mm) diff --git a/kernel/events/uprobes.c b/kernel/events/uprobes.c index 435aac1d8c27..ce251e3a4ae6 100644 --- a/kernel/events/uprobes.c +++ b/kernel/events/uprobes.c @@ -188,7 +188,7 @@ static int __replace_page(struct vm_area_struct *vma, unsigned long addr, dec_mm_counter(mm, MM_ANONPAGES); if (!folio_test_anon(old_folio)) { - dec_mm_counter(mm, mm_counter_file(old_page)); + dec_mm_counter(mm, mm_counter_file(old_folio)); inc_mm_counter(mm, MM_ANONPAGES); } diff --git a/mm/huge_memory.c b/mm/huge_memory.c index 78a00fe22c2d..88420d067477 100644 --- a/mm/huge_memory.c +++ b/mm/huge_memory.c @@ -1742,7 +1742,8 @@ int zap_huge_pmd(struct mmu_gather *tlb, struct vm_area_struct *vma, } else { if (arch_needs_pgtable_deposit()) zap_deposited_table(tlb->mm, pmd); - add_mm_counter(tlb->mm, mm_counter_file(page), -HPAGE_PMD_NR); + add_mm_counter(tlb->mm, mm_counter_file(folio), + -HPAGE_PMD_NR); } spin_unlock(ptl); @@ -2143,7 +2144,7 @@ static void __split_huge_pmd_locked(struct vm_area_struct *vma, pmd_t *pmd, page_remove_rmap(&folio->page, vma, true); folio_put(folio); } - add_mm_counter(mm, mm_counter_file(&folio->page), -HPAGE_PMD_NR); + add_mm_counter(mm, mm_counter_file(folio), -HPAGE_PMD_NR); return; } diff --git a/mm/khugepaged.c b/mm/khugepaged.c index 064654717843..39393f4262b2 100644 --- a/mm/khugepaged.c +++ b/mm/khugepaged.c @@ -1630,7 +1630,7 @@ int collapse_pte_mapped_thp(struct mm_struct *mm, unsigned long addr, /* step 3: set proper refcount and mm_counters. */ if (nr_ptes) { folio_ref_sub(folio, nr_ptes); - add_mm_counter(mm, mm_counter_file(&folio->page), -nr_ptes); + add_mm_counter(mm, mm_counter_file(folio), -nr_ptes); } /* step 4: remove empty page table */ @@ -1661,7 +1661,7 @@ int collapse_pte_mapped_thp(struct mm_struct *mm, unsigned long addr, if (nr_ptes) { flush_tlb_mm(mm); folio_ref_sub(folio, nr_ptes); - add_mm_counter(mm, mm_counter_file(&folio->page), -nr_ptes); + add_mm_counter(mm, mm_counter_file(folio), -nr_ptes); } if (start_pte) pte_unmap_unlock(start_pte, ptl); diff --git a/mm/memory.c b/mm/memory.c index ad30d4ad2223..3418ace5e0ad 100644 --- a/mm/memory.c +++ b/mm/memory.c @@ -960,7 +960,7 @@ copy_present_pte(struct vm_area_struct *dst_vma, struct vm_area_struct *src_vma, } else if (page) { folio_get(folio); page_dup_file_rmap(page, false); - rss[mm_counter_file(page)]++; + rss[mm_counter_file(folio)]++; } /* @@ -1857,7 +1857,7 @@ static int insert_page_into_pte_locked(struct vm_area_struct *vma, pte_t *pte, folio = page_folio(page); /* Ok, finally just insert the thing.. */ folio_get(folio); - inc_mm_counter(vma->vm_mm, mm_counter_file(page)); + inc_mm_counter(vma->vm_mm, mm_counter_file(folio)); page_add_file_rmap(page, vma, false); set_pte_at(vma->vm_mm, addr, pte, mk_pte(page, prot)); return 0; @@ -3166,7 +3166,7 @@ static vm_fault_t wp_page_copy(struct vm_fault *vmf) if (likely(vmf->pte && pte_same(ptep_get(vmf->pte), vmf->orig_pte))) { if (old_folio) { if (!folio_test_anon(old_folio)) { - dec_mm_counter(mm, mm_counter_file(&old_folio->page)); + dec_mm_counter(mm, mm_counter_file(old_folio)); inc_mm_counter(mm, MM_ANONPAGES); } } else { @@ -4359,7 +4359,7 @@ vm_fault_t do_set_pmd(struct vm_fault *vmf, struct page *page) if (write) entry = maybe_pmd_mkwrite(pmd_mkdirty(entry), vma); - add_mm_counter(vma->vm_mm, mm_counter_file(page), HPAGE_PMD_NR); + add_mm_counter(vma->vm_mm, mm_counter_file(folio), HPAGE_PMD_NR); page_add_file_rmap(page, vma, true); /* @@ -4422,7 +4422,7 @@ void set_pte_range(struct vm_fault *vmf, struct folio *folio, folio_add_new_anon_rmap(folio, vma, addr); folio_add_lru_vma(folio, vma); } else { - add_mm_counter(vma->vm_mm, mm_counter_file(page), nr); + add_mm_counter(vma->vm_mm, mm_counter_file(folio), nr); folio_add_file_rmap_range(folio, page, nr, vma, false); } set_ptes(vma->vm_mm, addr, vmf->pte, entry, nr); diff --git a/mm/rmap.c b/mm/rmap.c index 7a563490ce08..9e3d0eff8b05 100644 --- a/mm/rmap.c +++ b/mm/rmap.c @@ -1801,7 +1801,7 @@ static bool try_to_unmap_one(struct folio *folio, struct vm_area_struct *vma, * * See Documentation/mm/mmu_notifier.rst */ - dec_mm_counter(mm, mm_counter_file(&folio->page)); + dec_mm_counter(mm, mm_counter_file(folio)); } discard: page_remove_rmap(subpage, vma, folio_test_hugetlb(folio));