mm-khugepaged-unify-pmd-folio-installation-with-map_anon_folio_pmd.patch removed from -mm tree
The quilt patch titled
Subject: mm/khugepaged: unify pmd folio installation with map_anon_folio_pmd()
has been removed from the -mm tree. Its filename was
mm-khugepaged-unify-pmd-folio-installation-with-map_anon_folio_pmd.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: Wei Yang <[email protected]>
Subject: mm/khugepaged: unify pmd folio installation with map_anon_folio_pmd()
Date: Wed, 8 Oct 2025 09:54:53 +0000
Currently we install pmd folio with map_anon_folio_pmd() in __do_huge_pmd_anonymous_page() and do_huge_zero_wp_pmd(). While in collapse_huge_page(), it is done with identical code except statistics adjustment.
Unify the process with map_anon_folio_pmd() to install pmd folio. Split it to map_anon_folio_pmd_pf() and map_anon_folio_pmd_nopf() to be used in page fault or not respectively.
No functional change is intended.
---
include/linux/huge_mm.h | 2 ++ mm/huge_memory.c | 14 ++++++++++---- mm/khugepaged.c | 9 +-------- 3 files changed, 13 insertions(+), 12 deletions(-)
include/linux/huge_mm.h renamed from include/linux/huge_mm.h~mm-khugepaged-unify-pmd-folio-installation-with-map_anon_folio_pmd +2 -0
@@ -533,6 +533,8 @@ void split_huge_pmd_locked(struct vm_are pmd_t *pmd, bool freeze);bool unmap_huge_pmd_locked (struct vm_area_struct *vma,unsigned long addr,pmd_t *pmdp,struct folio *folio); +void map_anon_folio_pmd_nopf (struct folio *folio,pmd_t *pmd, +struct vm_area_struct *vma,unsigned long haddr);#else /* CONFIG_TRANSPARENT_HUGEPAGE */
mm/huge_memory.c renamed from mm/huge_memory.c~mm-khugepaged-unify-pmd-folio-installation-with-map_anon_folio_pmd +10 -4
@@ -1218,7 +1218,7 @@ static struct folio *vma_alloc_anon_folireturn folio; } -static void map_anon_folio_pmd (struct folio *folio,pmd_t *pmd, +void map_anon_folio_pmd_nopf (struct folio *folio,pmd_t *pmd,struct vm_area_struct *vma,unsigned long haddr) {pmd_t entry;
@@ -1229,11 +1229,17 @@ static void map_anon_folio_pmd(struct fofolio_add_lru_vma (folio, vma);set_pmd_at (vma->vm_mm, haddr, pmd, entry);update_mmu_cache_pmd (vma, haddr, pmd); +deferred_split_folio (folio, false); +} + +static void map_anon_folio_pmd_pf (struct folio *folio,pmd_t *pmd, +struct vm_area_struct *vma,unsigned long haddr) +{ +map_anon_folio_pmd_nopf (folio, pmd, vma, haddr);add_mm_counter (vma->vm_mm,MM_ANONPAGES ,HPAGE_PMD_NR );count_vm_event (THP_FAULT_ALLOC );count_mthp_stat (HPAGE_PMD_ORDER ,MTHP_STAT_ANON_FAULT_ALLOC );count_memcg_event_mm (vma->vm_mm,THP_FAULT_ALLOC ); -deferred_split_folio (folio, false); }static vm_fault_t __do_huge_pmd_anonymous_page (struct vm_fault *vmf)
@@ -1272,7 +1278,7 @@ static vm_fault_t __do_huge_pmd_anonymoureturn ret; }pgtable_trans_huge_deposit (vma->vm_mm, vmf->pmd, pgtable); -map_anon_folio_pmd (folio, vmf->pmd, vma, haddr); +map_anon_folio_pmd_pf (folio, vmf->pmd, vma, haddr);mm_inc_nr_ptes (vma->vm_mm);spin_unlock (vmf->ptl); }
@@ -1944,7 +1950,7 @@ static vm_fault_t do_huge_zero_wp_pmd(stif (ret) goto release; (void )pmdp_huge_clear_flush (vma, haddr, vmf->pmd); -map_anon_folio_pmd (folio, vmf->pmd, vma, haddr); +map_anon_folio_pmd_pf (folio, vmf->pmd, vma, haddr); goto unlock; release:folio_put (folio);
mm/khugepaged.c renamed from mm/khugepaged.c~mm-khugepaged-unify-pmd-folio-installation-with-map_anon_folio_pmd +1 -8
@@ -1226,17 +1226,10 @@ static int collapse_huge_page(struct mm___folio_mark_uptodate (folio); pgtable =pmd_pgtable (_pmd); - _pmd =folio_mk_pmd (folio, vma->vm_page_prot); - _pmd =maybe_pmd_mkwrite (pmd_mkdirty (_pmd), vma); -spin_lock (pmd_ptl);BUG_ON (!pmd_none (*pmd)); -folio_add_new_anon_rmap (folio, vma, address,RMAP_EXCLUSIVE ); -folio_add_lru_vma (folio, vma);pgtable_trans_huge_deposit (mm, pmd, pgtable); -set_pmd_at (mm, address, pmd, _pmd); -update_mmu_cache_pmd (vma, address, pmd); -deferred_split_folio (folio, false); +map_anon_folio_pmd_nopf (folio, pmd, vma, address);spin_unlock (pmd_ptl); folio =NULL ;
_
Patches currently in -mm which might be from [email protected] are