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

mm: pgtable: move __tlb_remove_table_one() in x86 to generic file 

The __tlb_remove_table_one() in x86 does not contain architecture-specific
content, so move it to the generic file.

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


Signed-off-by: default avatarQi Zheng <zhengqi.arch@bytedance.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 92ec7fd1

arch/x86/include/asm/tlb.h

+0 −19
Original line number Diff line number Diff line
@@ -20,25 +20,6 @@ static inline void tlb_flush(struct mmu_gather *tlb) 
	flush_tlb_mm_range(tlb->mm, start, end, stride_shift, tlb->freed_tables);

}



#ifdef CONFIG_PT_RECLAIM

static inline void __tlb_remove_table_one_rcu(struct rcu_head *head)

{

	struct ptdesc *ptdesc;



	ptdesc = container_of(head, struct ptdesc, pt_rcu_head);

	__tlb_remove_table(ptdesc);

}



static inline void __tlb_remove_table_one(void *table)

{

	struct ptdesc *ptdesc;



	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 */



static inline void invlpg(unsigned long addr)

{

	asm volatile("invlpg (%0)" ::"r" (addr) : "memory");

mm/mmu_gather.c

+18 −2
Original line number Diff line number Diff line
@@ -311,13 +311,29 @@ static inline void tlb_table_invalidate(struct mmu_gather *tlb) 
	}

}



#ifndef __tlb_remove_table_one

#ifdef CONFIG_PT_RECLAIM

static inline void __tlb_remove_table_one_rcu(struct rcu_head *head)

{

	struct ptdesc *ptdesc;



	ptdesc = container_of(head, struct ptdesc, pt_rcu_head);

	__tlb_remove_table(ptdesc);

}



static inline void __tlb_remove_table_one(void *table)

{

	struct ptdesc *ptdesc;



	ptdesc = table;

	call_rcu(&ptdesc->pt_rcu_head, __tlb_remove_table_one_rcu);

}

#else

static inline void __tlb_remove_table_one(void *table)

{

	tlb_remove_table_sync_one();

	__tlb_remove_table(table);

}

#endif

#endif /* CONFIG_PT_RECLAIM */



static void tlb_remove_table_one(void *table)

{