diff mbox series

[07/18] mm: huge_memory: use a folio in zap_huge_pmd()

Message ID	20231103140119.2306578-8-wangkefeng.wang@huawei.com
State	New
Headers	Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:3 as permitted sender) client-ip=2620:137:e000::3:3; From: Kefeng Wang <wangkefeng.wang@huawei.com> To: Andrew Morton <akpm@linux-foundation.org> CC: <linux-kernel@vger.kernel.org>, <linux-mm@kvack.org>, Matthew Wilcox <willy@infradead.org>, David Hildenbrand <david@redhat.com>, <linux-s390@vger.kernel.org>, Kefeng Wang <wangkefeng.wang@huawei.com> Subject: [PATCH 07/18] mm: huge_memory: use a folio in zap_huge_pmd() Date: Fri, 3 Nov 2023 22:01:08 +0800 Message-ID: <20231103140119.2306578-8-wangkefeng.wang@huawei.com> In-Reply-To: <20231103140119.2306578-1-wangkefeng.wang@huawei.com> References: <20231103140119.2306578-1-wangkefeng.wang@huawei.com> MIME-Version: 1.0 Content-Transfer-Encoding: 7BIT Content-Type: text/plain; charset=US-ASCII Precedence: bulk
Series	mm: convert to use folio mm counter \| [rfc,00/18] mm: convert to use folio mm counter [01/18] mm: add mm_counter_folio() and mm_counter_file_folio() [02/18] uprobes: use mm_counter_file_folio() [03/18] mm: userfaultfd: use mm_counter_folio() [04/18] mm: rmap: use mm_counter_[file]_folio() [06/18] mm: huge_memory: use a folio in __split_huge_pmd_locked() [07/18] mm: huge_memory: use a folio in zap_huge_pmd() [08/18] mm: khugepaged: use mm_counter_file_folio() in collapse_pte_mapped_thp() [09/18] mm: memory: use a folio in do_set_pmd() [10/18] mm: memory: use mm_counter_file_folio() in copy_present_pte() [11/18] mm: memory: use mm_counter_file_folio() in wp_page_copy() [12/18] mm: memory: use mm_counter_file_folio() in set_pte_range() [13/18] mm: memory: use a folio in insert_page_into_pte_locked() [14/18] mm: remove mm_counter_file() [15/18] mm: memory: use a folio in copy_nonpresent_pte() [16/18] mm: use a folio in zap_pte_range() [17/18] s390: pgtable: use mm_counter_folio() in ptep_zap_swap_entry() [18/18] mm: remove mm_counter()

Commit Message

Kefeng Wang Nov. 3, 2023, 2:01 p.m. UTC

  Use a folio in zap_huge_pmd() which replaces two compound_head()
call with one page_folio() call.

Signed-off-by: Kefeng Wang <wangkefeng.wang@huawei.com>
---
 mm/huge_memory.c | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff mbox series

Patch

diff --git a/mm/huge_memory.c b/mm/huge_memory.c
index 054336ecab0a..2dba4d3aa2d3 100644
--- a/mm/huge_memory.c
+++ b/mm/huge_memory.c
@@ -1717,6 +1717,7 @@  int zap_huge_pmd(struct mmu_gather *tlb, struct vm_area_struct *vma,
 		spin_unlock(ptl);
 	} else {
 		struct page *page = NULL;
+		struct folio *folio = NULL;
 		int flush_needed = 1;
 
 		if (pmd_present(orig_pmd)) {
@@ -1734,13 +1735,14 @@  int zap_huge_pmd(struct mmu_gather *tlb, struct vm_area_struct *vma,
 		} else
 			WARN_ONCE(1, "Non present huge pmd without pmd migration enabled!");
 
-		if (PageAnon(page)) {
+		folio = page_folio(page);
+		if (folio_test_anon(folio)) {
 			zap_deposited_table(tlb->mm, pmd);
 			add_mm_counter(tlb->mm, MM_ANONPAGES, -HPAGE_PMD_NR);
 		} 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(folio), -HPAGE_PMD_NR);
 		}
 
 		spin_unlock(ptl);