Commit 92ec7fd1 authored by Qi Zheng's avatar Qi Zheng Committed by Andrew Morton
Browse files

mm: pgtable: completely move pagetable_dtor() to generic tlb_remove_table() 

For the generic tlb_remove_table(), it is implemented in the following two
forms:

1) CONFIG_MMU_GATHER_TABLE_FREE is enabled

tlb_remove_table
--> generic __tlb_remove_table()

2) CONFIG_MMU_GATHER_TABLE_FREE is disabled

tlb_remove_table
--> tlb_remove_page

For case 1), the pagetable_dtor() has already been moved to generic
__tlb_remove_table().

For case 2), now only arm will call tlb_remove_table()/tlb_remove_ptdesc()
when CONFIG_MMU_GATHER_TABLE_FREE is disabled.  Let's move
pagetable_dtor() completely to generic tlb_remove_table(), so that the
architectures can follow more easily.

Link: https://lkml.kernel.org/r/0c733ac867b287ec08190676496d1decebf49da2.1736317725.git.zhengqi.arch@bytedance.com


Signed-off-by: default avatarQi Zheng <zhengqi.arch@bytedance.com>
Suggested-by: default avatarKevin Brodsky <kevin.brodsky@arm.com>
Reviewed-by: default avatarKevin Brodsky <kevin.brodsky@arm.com>
Cc: Alexander Gordeev <agordeev@linux.ibm.com>
Cc: Alexandre Ghiti <alex@ghiti.fr>
Cc: Alexandre Ghiti <alexghiti@rivosinc.com>
Cc: Andreas Larsson <andreas@gaisler.com>
Cc: Aneesh Kumar K.V (Arm) <aneesh.kumar@kernel.org>
Cc: Arnd Bergmann <arnd@arndb.de>
Cc: Dave Hansen <dave.hansen@linux.intel.com>
Cc: David Hildenbrand <david@redhat.com>
Cc: David Rientjes <rientjes@google.com>
Cc: Hugh Dickins <hughd@google.com>
Cc: Jann Horn <jannh@google.com>
Cc: Lorenzo Stoakes <lorenzo.stoakes@oracle.com>
Cc: Matthew Wilcox (Oracle) <willy@infradead.org>
Cc: Mike Rapoport (Microsoft) <rppt@kernel.org>
Cc: Muchun Song <muchun.song@linux.dev>
Cc: Nicholas Piggin <npiggin@gmail.com>
Cc: Palmer Dabbelt <palmer@dabbelt.com>
Cc: Peter Zijlstra (Intel) <peterz@infradead.org>
Cc: Ryan Roberts <ryan.roberts@arm.com>
Cc: Thomas Gleixner <tglx@linutronix.de>
Cc: Vishal Moola (Oracle) <vishal.moola@gmail.com>
Cc: Will Deacon <will@kernel.org>
Cc: Yu Zhao <yuzhao@google.com>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
parent 2dccdf70

arch/arm/include/asm/tlb.h

+0 −4
Original line number Diff line number Diff line
@@ -34,10 +34,6 @@ __pte_free_tlb(struct mmu_gather *tlb, pgtable_t pte, unsigned long addr) 
{

	struct ptdesc *ptdesc = page_ptdesc(pte);



#ifndef CONFIG_MMU_GATHER_TABLE_FREE

	pagetable_dtor(ptdesc);

#endif



#ifndef CONFIG_ARM_LPAE

	/*

	 * With the classic ARM MMU, a pte page has two corresponding pmd

include/asm-generic/tlb.h

+8 −2
Original line number Diff line number Diff line
@@ -220,14 +220,20 @@ static inline void __tlb_remove_table(void *table) 


extern void tlb_remove_table(struct mmu_gather *tlb, void *table);



#else /* !CONFIG_MMU_GATHER_HAVE_TABLE_FREE */

#else /* !CONFIG_MMU_GATHER_TABLE_FREE */



static inline void tlb_remove_page(struct mmu_gather *tlb, struct page *page);

/*

 * Without MMU_GATHER_TABLE_FREE the architecture is assumed to have page based

 * page directories and we can use the normal page batching to free them.

 */

#define tlb_remove_table(tlb, page) tlb_remove_page((tlb), (page))

static inline void tlb_remove_table(struct mmu_gather *tlb, void *table)

{

	struct page *page = (struct page *)table;



	pagetable_dtor(page_ptdesc(page));

	tlb_remove_page(tlb, page);

}

#endif /* CONFIG_MMU_GATHER_TABLE_FREE */



#ifdef CONFIG_MMU_GATHER_RCU_TABLE_FREE