khugepaged-optimize-__collapse_huge_page_copy_succeeded-by-pte-batching.patch removed from -mm tree
The quilt patch titled
Subject: khugepaged: optimize __collapse_huge_page_copy_succeeded() by PTE batching
has been removed from the -mm tree. Its filename was
khugepaged-optimize-__collapse_huge_page_copy_succeeded-by-pte-batching.patch
This patch was dropped because it was merged into the mm-stable branch of git://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm
------------------------------------------------------
From: Dev Jain <[email protected]>
Subject: khugepaged: optimize __collapse_huge_page_copy_succeeded() by PTE batching
Date: Thu, 24 Jul 2025 10:53:00 +0530
Use PTE batching to batch process PTEs mapping the same large folio. An improvement is expected due to batching refcount-mapcount manipulation on the folios, and for arm64 which supports contig mappings, the number of TLB flushes is also reduced.
---
mm/khugepaged.c | 25 ++++++++++++++++++------- 1 file changed, 18 insertions(+), 7 deletions(-)
mm/khugepaged.c renamed from mm/khugepaged.c~khugepaged-optimize-__collapse_huge_page_copy_succeeded-by-pte-batching +18 -7
@@ -700,12 +700,15 @@ static void __collapse_huge_page_copy_suspinlock_t *ptl, struct list_head *compound_pagelist) { + unsigned long end = address + HPAGE_PMD_SIZE;struct folio *src, *tmp; -pte_t *_pte;pte_t pteval; +pte_t *_pte; +unsigned int nr_ptes; -for (_pte = pte; _pte < pte +HPAGE_PMD_NR ; - _pte++, address +=PAGE_SIZE ) { +for (_pte = pte; _pte < pte +HPAGE_PMD_NR ; _pte += nr_ptes, + address += nr_ptes *PAGE_SIZE ) { + nr_ptes =1 ; pteval =ptep_get (_pte);if (pte_none (pteval) ||is_zero_pfn (pte_pfn (pteval))) {add_mm_counter (vma->vm_mm,MM_ANONPAGES ,1 );
@@ -722,18 +725,26 @@ static void __collapse_huge_page_copy_sustruct page *src_page =pte_page (pteval); src =page_folio (src_page); -if (!folio_test_large (src)) + +if (folio_test_large (src)) { +unsigned int max_nr_ptes = (end - address) >>PAGE_SHIFT ; + + nr_ptes =folio_pte_batch (src, _pte, pteval, max_nr_ptes); + }else {release_pte_folio (src); + } +/* * ptl mostly unnecessary, but preempt has to * be disabled to update the per-cpu stats * inside folio_remove_rmap_pte(). */ spin_lock (ptl); -ptep_clear (vma->vm_mm, address, _pte); -folio_remove_rmap_pte (src, src_page, vma); +clear_ptes (vma->vm_mm, address, _pte, nr_ptes); +folio_remove_rmap_ptes (src, src_page, nr_ptes, vma);spin_unlock (ptl); -free_folio_and_swap_cache (src); +free_swap_cache (src); +folio_put_refs (src, nr_ptes); } }
_
Patches currently in -mm which might be from [email protected] are