x86-pgtable-convert-__tlb_remove_table-to-use-struct-ptdesc.patch removed from -mm tree
The quilt patch titled
Subject: x86: pgtable: convert __tlb_remove_table() to use struct ptdesc
has been removed from the -mm tree. Its filename was
x86-pgtable-convert-__tlb_remove_table-to-use-struct-ptdesc.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: convert __tlb_remove_table() to use struct ptdesc
Date: Wed, 8 Jan 2025 14:57:27 +0800
Convert __tlb_remove_table() to use struct ptdesc, which will help to move pagetable_dtor() to __tlb_remove_table().
And page tables shouldn't have swap cache, so use pagetable_free() instead of free_page_and_swap_cache() to free page table pages.
---
arch/x86/include/asm/tlb.h | 16 +++++++++------- arch/x86/kernel/paravirt.c | 4 +++- arch/x86/mm/pgtable.c | 12 +++++++----- 3 files changed, 19 insertions(+), 13 deletions(-)
arch/x86/include/asm/tlb.h renamed from arch/x86/include/asm/tlb.h~x86-pgtable-convert-__tlb_remove_table-to-use-struct-ptdesc +9 -7
@@ -31,24 +31,26 @@ static inline void tlb_flush(struct mmu_*/ static inline void __tlb_remove_table (void *table) { -free_page_and_swap_cache (table); +struct ptdesc *ptdesc = (struct ptdesc *)table; + +pagetable_free (ptdesc); }#ifdef CONFIG_PT_RECLAIM static inline void __tlb_remove_table_one_rcu (struct rcu_head *head) { -struct page *page; +struct ptdesc *ptdesc; - page = container_of(head, struct page, rcu_head); -put_page (page); + ptdesc = container_of(head, struct ptdesc, pt_rcu_head); +__tlb_remove_table (ptdesc); }static inline void __tlb_remove_table_one (void *table) { -struct page *page; +struct ptdesc *ptdesc; - page = table; -call_rcu (&page->rcu_head, __tlb_remove_table_one_rcu); + ptdesc = table; +call_rcu (&ptdesc->pt_rcu_head, __tlb_remove_table_one_rcu); }#define __tlb_remove_table_one __tlb_remove_table_one#endif /* CONFIG_PT_RECLAIM */
arch/x86/kernel/paravirt.c renamed from arch/x86/kernel/paravirt.c~x86-pgtable-convert-__tlb_remove_table-to-use-struct-ptdesc +3 -1
@@ -62,7 +62,9 @@ void __init native_pv_lock_init(void)#ifndef CONFIG_PT_RECLAIM static void native_tlb_remove_table (struct mmu_gather *tlb,void *table) { -tlb_remove_page (tlb, table); +struct ptdesc *ptdesc = (struct ptdesc *)table; + +tlb_remove_page (tlb,ptdesc_page (ptdesc)); }#else static void native_tlb_remove_table (struct mmu_gather *tlb,void *table)
arch/x86/mm/pgtable.c renamed from arch/x86/mm/pgtable.c~x86-pgtable-convert-__tlb_remove_table-to-use-struct-ptdesc +7 -5
@@ -23,7 +23,9 @@ EXPORT_SYMBOL(physical_mask);static inline void paravirt_tlb_remove_table (struct mmu_gather *tlb,void *table) { -tlb_remove_page (tlb, table); +struct ptdesc *ptdesc = (struct ptdesc *)table; + +tlb_remove_page (tlb,ptdesc_page (ptdesc)); }#else static inline
@@ -62,7 +64,7 @@ void ___pte_free_tlb(struct mmu_gather * {pagetable_dtor (page_ptdesc (pte));paravirt_release_pte (page_to_pfn (pte)); -paravirt_tlb_remove_table (tlb, pte); +paravirt_tlb_remove_table (tlb,page_ptdesc (pte)); }#if CONFIG_PGTABLE_LEVELS >2
@@ -78,7 +80,7 @@ void ___pmd_free_tlb(struct mmu_gather * tlb->need_flush_all =1 ;#endif pagetable_dtor (ptdesc); -paravirt_tlb_remove_table (tlb,ptdesc_page (ptdesc)); +paravirt_tlb_remove_table (tlb, ptdesc); }#if CONFIG_PGTABLE_LEVELS >3
@@ -88,7 +90,7 @@ void ___pud_free_tlb(struct mmu_gather *pagetable_dtor (ptdesc);paravirt_release_pud (__pa (pud) >>PAGE_SHIFT ); -paravirt_tlb_remove_table (tlb,virt_to_page (pud)); +paravirt_tlb_remove_table (tlb, ptdesc); }#if CONFIG_PGTABLE_LEVELS >4
@@ -98,7 +100,7 @@ void ___p4d_free_tlb(struct mmu_gather *pagetable_dtor (ptdesc);paravirt_release_p4d (__pa (p4d) >>PAGE_SHIFT ); -paravirt_tlb_remove_table (tlb,virt_to_page (p4d)); +paravirt_tlb_remove_table (tlb, ptdesc); }#endif /* CONFIG_PGTABLE_LEVELS > 4 */ #endif /* CONFIG_PGTABLE_LEVELS > 3 */
_
Patches currently in -mm which might be from [email protected] are