mm-memory-handle-non-split-locks-correctly-in-zap_empty_pte_table.patch removed from -mm tree
The quilt patch titled
Subject: mm/memory: handle non-split locks correctly in zap_empty_pte_table()
has been removed from the -mm tree. Its filename was
mm-memory-handle-non-split-locks-correctly-in-zap_empty_pte_table.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: "David Hildenbrand (Red Hat)" <[email protected]>
Subject: mm/memory: handle non-split locks correctly in zap_empty_pte_table()
Date: Mon, 19 Jan 2026 23:07:08 +0100
While we handle pte_lockptr() == pmd_lockptr() correctly in zap_pte_table_if_empty(), we don't handle it in zap_empty_pte_table(), making the spin_trylock() always fail and forcing us onto the slow path.
So let's handle the scenario where pte_lockptr() == pmd_lockptr() better, which can only happen if CONFIG_SPLIT_PTE_PTLOCKS is not set.
This is only relevant once we unlock CONFIG_PT_RECLAIM on architectures that are not x86-64.
---
mm/memory.c | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-)
mm/memory.c renamed from mm/memory.c~mm-memory-handle-non-split-locks-correctly-in-zap_empty_pte_table +6 -4
@@ -1830,16 +1830,18 @@ static bool pte_table_reclaim_possible(ureturn details && details->reclaim_pt && (end - start >=PMD_SIZE ); } -static bool zap_empty_pte_table (struct mm_struct *mm,pmd_t *pmd,pmd_t *pmdval) +static bool zap_empty_pte_table (struct mm_struct *mm,pmd_t *pmd, +spinlock_t *ptl,pmd_t *pmdval) {spinlock_t *pml =pmd_lockptr (mm, pmd); -if (!spin_trylock (pml)) +if (ptl != pml && !spin_trylock (pml))return false; *pmdval =pmdp_get (pmd);pmd_clear (pmd); -spin_unlock (pml); +if (ptl != pml) +spin_unlock (pml);return true; }
@@ -1931,7 +1933,7 @@ retry:* from being repopulated by another thread. */ if (can_reclaim_pt && direct_reclaim && addr == end) - direct_reclaim =zap_empty_pte_table (mm, pmd, &pmdval); + direct_reclaim =zap_empty_pte_table (mm, pmd, ptl, &pmdval);add_mm_rss_vec (mm, rss);lazy_mmu_mode_disable ();
_
Patches currently in -mm which might be from [email protected] are