x86-pgtable-move-pagetable_dtor-to-__tlb_remove_table.patch removed from -mm tree
The quilt patch titled
Subject: x86: pgtable: move pagetable_dtor() to __tlb_remove_table()
has been removed from the -mm tree. Its filename was
x86-pgtable-move-pagetable_dtor-to-__tlb_remove_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: Qi Zheng <[email protected]>
Subject: x86: pgtable: move pagetable_dtor() to __tlb_remove_table()
Date: Wed, 8 Jan 2025 14:57:28 +0800
Move pagetable_dtor() to __tlb_remove_table(), so that ptlock and page table pages can be freed together (regardless of whether RCU is used). This prevents the use-after-free problem where the ptlock is freed immediately but the page table pages is freed later via RCU.
---
arch/x86/include/asm/tlb.h | 1 + arch/x86/kernel/paravirt.c | 1 + arch/x86/mm/pgtable.c | 16 ++++------------ 3 files changed, 6 insertions(+), 12 deletions(-)
arch/x86/include/asm/tlb.h renamed from arch/x86/include/asm/tlb.h~x86-pgtable-move-pagetable_dtor-to-__tlb_remove_table +1 -0
@@ -33,6 +33,7 @@ static inline void __tlb_remove_table(vo {struct ptdesc *ptdesc = (struct ptdesc *)table; +pagetable_dtor (ptdesc);pagetable_free (ptdesc); }
arch/x86/kernel/paravirt.c renamed from arch/x86/kernel/paravirt.c~x86-pgtable-move-pagetable_dtor-to-__tlb_remove_table +1 -0
@@ -64,6 +64,7 @@ static void native_tlb_remove_table(stru {struct ptdesc *ptdesc = (struct ptdesc *)table; +pagetable_dtor (ptdesc);tlb_remove_page (tlb,ptdesc_page (ptdesc)); }#else
arch/x86/mm/pgtable.c renamed from arch/x86/mm/pgtable.c~x86-pgtable-move-pagetable_dtor-to-__tlb_remove_table +4 -12
@@ -25,6 +25,7 @@ void paravirt_tlb_remove_table(struct mm {struct ptdesc *ptdesc = (struct ptdesc *)table; +pagetable_dtor (ptdesc);tlb_remove_page (tlb,ptdesc_page (ptdesc)); }#else
@@ -62,7 +63,6 @@ early_param("userpte", setup_userpte);void ___pte_free_tlb (struct mmu_gather *tlb,struct page *pte) { -pagetable_dtor (page_ptdesc (pte));paravirt_release_pte (page_to_pfn (pte));paravirt_tlb_remove_table (tlb,page_ptdesc (pte)); }
@@ -70,7 +70,6 @@ void ___pte_free_tlb(struct mmu_gather *#if CONFIG_PGTABLE_LEVELS >2 void ___pmd_free_tlb (struct mmu_gather *tlb,pmd_t *pmd) { -struct ptdesc *ptdesc =virt_to_ptdesc (pmd);paravirt_release_pmd (__pa (pmd) >>PAGE_SHIFT );/* * NOTE! For PAE, any changes to the top page-directory-pointer-table
@@ -79,28 +78,21 @@ void ___pmd_free_tlb(struct mmu_gather *#ifdef CONFIG_X86_PAE tlb->need_flush_all =1 ;#endif -pagetable_dtor (ptdesc); -paravirt_tlb_remove_table (tlb, ptdesc); +paravirt_tlb_remove_table (tlb,virt_to_ptdesc (pmd)); }#if CONFIG_PGTABLE_LEVELS >3 void ___pud_free_tlb (struct mmu_gather *tlb,pud_t *pud) { -struct ptdesc *ptdesc =virt_to_ptdesc (pud); - -pagetable_dtor (ptdesc);paravirt_release_pud (__pa (pud) >>PAGE_SHIFT ); -paravirt_tlb_remove_table (tlb, ptdesc); +paravirt_tlb_remove_table (tlb,virt_to_ptdesc (pud)); }#if CONFIG_PGTABLE_LEVELS >4 void ___p4d_free_tlb (struct mmu_gather *tlb,p4d_t *p4d) { -struct ptdesc *ptdesc =virt_to_ptdesc (p4d); - -pagetable_dtor (ptdesc);paravirt_release_p4d (__pa (p4d) >>PAGE_SHIFT ); -paravirt_tlb_remove_table (tlb, ptdesc); +paravirt_tlb_remove_table (tlb,virt_to_ptdesc (p4d)); }#endif /* CONFIG_PGTABLE_LEVELS > 4 */ #endif /* CONFIG_PGTABLE_LEVELS > 3 */
_
Patches currently in -mm which might be from [email protected] are