mm-huge_memory-deduplicate-zap-deposited-table-call.patch removed from -mm tree
The quilt patch titled
Subject: mm/huge_memory: deduplicate zap deposited table call
has been removed from the -mm tree. Its filename was
mm-huge_memory-deduplicate-zap-deposited-table-call.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_memory: deduplicate zap deposited table call
Date: Fri, 20 Mar 2026 18:07:24 +0000
Rather than having separate logic for each case determining whether to zap the deposited table, simply track this via a boolean.
We default this to whether the architecture requires it, and update it as required elsewhere.
---
mm/huge_memory.c | 22 ++++++++++------------ 1 file changed, 10 insertions(+), 12 deletions(-)
mm/huge_memory.c renamed from mm/huge_memory.c~mm-huge_memory-deduplicate-zap-deposited-table-call +10 -12
@@ -2414,6 +2414,7 @@ static inline void zap_deposited_table(sbool zap_huge_pmd (struct mmu_gather *tlb,struct vm_area_struct *vma,pmd_t *pmd,unsigned long addr) { +bool has_deposit =arch_needs_pgtable_deposit ();struct folio *folio =NULL ;bool flush_needed = false;spinlock_t *ptl;
@@ -2434,23 +2435,19 @@ bool zap_huge_pmd(struct mmu_gather *tlb tlb->fullmm);arch_check_zapped_pmd (vma, orig_pmd);tlb_remove_pmd_tlb_entry (tlb, pmd, addr); -if (vma_is_special_huge (vma)) { -if (arch_needs_pgtable_deposit ()) -zap_deposited_table (tlb->mm, pmd); +if (vma_is_special_huge (vma)) goto out; - }if (is_huge_zero_pmd (orig_pmd)) { -if (!vma_is_dax (vma) ||arch_needs_pgtable_deposit ()) -zap_deposited_table (tlb->mm, pmd); +if (!vma_is_dax (vma)) + has_deposit = true; goto out; }if (pmd_present (orig_pmd)) { -struct page *page =pmd_page (orig_pmd); + folio =pmd_folio (orig_pmd); flush_needed = true; - folio =page_folio (page); -folio_remove_rmap_pmd (folio, page, vma); +folio_remove_rmap_pmd (folio, &folio->page, vma);WARN_ON_ONCE (folio_mapcount (folio) <0 ); }else if (pmd_is_valid_softleaf (orig_pmd)) {const softleaf_t entry =softleaf_from_pmd (orig_pmd);
@@ -2465,11 +2462,9 @@ bool zap_huge_pmd(struct mmu_gather *tlb }if (folio_test_anon (folio)) { -zap_deposited_table (tlb->mm, pmd); + has_deposit = true;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 );
@@ -2489,6 +2484,9 @@ bool zap_huge_pmd(struct mmu_gather *tlb } out: +if (has_deposit) +zap_deposited_table (tlb->mm, pmd); +spin_unlock (ptl);if (flush_needed)tlb_remove_page_size (tlb, &folio->page,HPAGE_PMD_SIZE );
_
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