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

x86: pgtable: convert __tlb_remove_table() to use struct ptdesc 

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.

Link: https://lkml.kernel.org/r/39f60f93143ff77cf5d6b3c3e75af0ffc1480adb.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 deab5a35

arch/x86/include/asm/tlb.h

+9 −7
Original line number Diff line number Diff line
@@ -31,24 +31,26 @@ static inline void tlb_flush(struct mmu_gather *tlb) 
 */

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

+3 −1
Original line number Diff line number Diff line
@@ -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

+7 −5
Original line number Diff line number Diff line
@@ -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 *tlb, struct page *pte) 
{

	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, pmd_t *pmd) 
	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 *tlb, pud_t *pud) 


	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 *tlb, p4d_t *p4d) 


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