mm-huge-avoid-big-else-branch-in-zap_huge_pmd.patch removed from -mm tree
The quilt patch titled
Subject: mm/huge: avoid big else branch in zap_huge_pmd()
has been removed from the -mm tree. Its filename was
mm-huge-avoid-big-else-branch-in-zap_huge_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: "Lorenzo Stoakes (Oracle)" <[email protected]>
Subject: mm/huge: avoid big else branch in zap_huge_pmd()
Date: Fri, 20 Mar 2026 18:07:19 +0000
We don't need to have an extra level of indentation, we can simply exit early in the first two branches.
No functional change intended.
---
mm/huge_memory.c | 93 +++++++++++++++++++++++---------------------- 1 file changed, 48 insertions(+), 45 deletions(-)
mm/huge_memory.c renamed from mm/huge_memory.c~mm-huge-avoid-big-else-branch-in-zap_huge_pmd +48 -45
@@ -2405,8 +2405,10 @@ static inline void zap_deposited_table(sint zap_huge_pmd (struct mmu_gather *tlb,struct vm_area_struct *vma,pmd_t *pmd,unsigned long addr) { -pmd_t orig_pmd; +struct folio *folio =NULL ; +int flush_needed =1 ;spinlock_t *ptl; +pmd_t orig_pmd;tlb_change_page_size (tlb,HPAGE_PMD_SIZE );
@@ -2427,59 +2429,60 @@ int zap_huge_pmd(struct mmu_gather *tlb,if (arch_needs_pgtable_deposit ())zap_deposited_table (tlb->mm, pmd);spin_unlock (ptl); - }else if (is_huge_zero_pmd (orig_pmd)) { +return 1 ; + } +if (is_huge_zero_pmd (orig_pmd)) {if (!vma_is_dax (vma) ||arch_needs_pgtable_deposit ())zap_deposited_table (tlb->mm, pmd);spin_unlock (ptl); - }else { -struct folio *folio =NULL ; -int flush_needed =1 ; +return 1 ; + } + +if (pmd_present (orig_pmd)) { +struct page *page =pmd_page (orig_pmd); -if (pmd_present (orig_pmd)) { -struct page *page =pmd_page (orig_pmd); + folio =page_folio (page); +folio_remove_rmap_pmd (folio, page, vma); +WARN_ON_ONCE (folio_mapcount (folio) <0 ); +VM_BUG_ON_PAGE (!PageHead (page), page); + }else if (pmd_is_valid_softleaf (orig_pmd)) { +const softleaf_t entry =softleaf_from_pmd (orig_pmd); - folio =page_folio (page); -folio_remove_rmap_pmd (folio, page, vma); -WARN_ON_ONCE (folio_mapcount (folio) <0 ); -VM_BUG_ON_PAGE (!PageHead (page), page); - }else if (pmd_is_valid_softleaf (orig_pmd)) { -const softleaf_t entry =softleaf_from_pmd (orig_pmd); - - folio =softleaf_to_folio (entry); - flush_needed =0 ; - -if (!thp_migration_supported ()) -WARN_ONCE (1 ,"Non present huge pmd without pmd migration enabled!" ); - } + folio =softleaf_to_folio (entry); + flush_needed =0 ; + +if (!thp_migration_supported ()) +WARN_ONCE (1 ,"Non present huge pmd without pmd migration enabled!" ); + } -if (folio_test_anon (folio)) { +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_ANONPAGES , -HPAGE_PMD_NR ); - }else { -if (arch_needs_pgtable_deposit ()) -zap_deposited_table (tlb->mm, pmd); -add_mm_counter (tlb->mm,mm_counter_file (folio), - -HPAGE_PMD_NR ); - -/* -* Use flush_needed to indicate whether the PMD entry -* is present, instead of checking pmd_present() again. -*/ -if (flush_needed &&pmd_young (orig_pmd) && -likely (vma_has_recency (vma))) -folio_mark_accessed (folio); - } - -if (folio_is_device_private (folio)) { -folio_remove_rmap_pmd (folio, &folio->page, vma); -WARN_ON_ONCE (folio_mapcount (folio) <0 ); -folio_put (folio); - } +add_mm_counter (tlb->mm,mm_counter_file (folio), + -HPAGE_PMD_NR ); -spin_unlock (ptl); -if (flush_needed) -tlb_remove_page_size (tlb, &folio->page,HPAGE_PMD_SIZE ); +/* +* Use flush_needed to indicate whether the PMD entry +* is present, instead of checking pmd_present() again. +*/ +if (flush_needed &&pmd_young (orig_pmd) && +likely (vma_has_recency (vma))) +folio_mark_accessed (folio); } + +if (folio_is_device_private (folio)) { +folio_remove_rmap_pmd (folio, &folio->page, vma); +WARN_ON_ONCE (folio_mapcount (folio) <0 ); +folio_put (folio); + } + +spin_unlock (ptl); +if (flush_needed) +tlb_remove_page_size (tlb, &folio->page,HPAGE_PMD_SIZE ); +return 1 ; }
_
Patches currently in -mm which might be from [email protected] are
maintainers-update-mglru-entry-to-reflect-current-status.patch selftests-mm-add-merge-test-for-partial-msealed-range.patch