Unverified Commit aaa56c8f authored by Samuel Holland's avatar Samuel Holland Committed by Palmer Dabbelt
Browse files

riscv: Factor out page table TLB synchronization 



The logic is the same for all page table levels. See commit 69be3fb1
("riscv: enable MMU_GATHER_RCU_TABLE_FREE for SMP && MMU").

Signed-off-by: default avatarSamuel Holland <samuel.holland@sifive.com>
Reviewed-by: default avatarAlexandre Ghiti <alexghiti@rivosinc.com>
Link: https://lore.kernel.org/r/20240327045035.368512-3-samuel.holland@sifive.com


Signed-off-by: default avatarPalmer Dabbelt <palmer@rivosinc.com>
parent 58661a30

arch/riscv/include/asm/pgalloc.h

+13 −18
Original line number Diff line number Diff line
@@ -15,6 +15,14 @@ 
#define __HAVE_ARCH_PUD_FREE

#include <asm-generic/pgalloc.h>



static inline void riscv_tlb_remove_ptdesc(struct mmu_gather *tlb, void *pt)

{

	if (riscv_use_ipi_for_rfence())

		tlb_remove_page_ptdesc(tlb, pt);

	else

		tlb_remove_ptdesc(tlb, pt);

}



static inline void pmd_populate_kernel(struct mm_struct *mm,

	pmd_t *pmd, pte_t *pte)

{
@@ -102,10 +110,7 @@ static inline void __pud_free_tlb(struct mmu_gather *tlb, pud_t *pud, 
		struct ptdesc *ptdesc = virt_to_ptdesc(pud);



		pagetable_pud_dtor(ptdesc);

		if (riscv_use_ipi_for_rfence())

			tlb_remove_page_ptdesc(tlb, ptdesc);

		else

			tlb_remove_ptdesc(tlb, ptdesc);

		riscv_tlb_remove_ptdesc(tlb, ptdesc);

	}

}
@@ -139,12 +144,8 @@ static inline void p4d_free(struct mm_struct *mm, p4d_t *p4d) 
static inline void __p4d_free_tlb(struct mmu_gather *tlb, p4d_t *p4d,

				  unsigned long addr)

{

	if (pgtable_l5_enabled) {

		if (riscv_use_ipi_for_rfence())

			tlb_remove_page_ptdesc(tlb, virt_to_ptdesc(p4d));

		else

			tlb_remove_ptdesc(tlb, virt_to_ptdesc(p4d));

	}

	if (pgtable_l5_enabled)

		riscv_tlb_remove_ptdesc(tlb, virt_to_ptdesc(p4d));

}

#endif /* __PAGETABLE_PMD_FOLDED */
@@ -176,10 +177,7 @@ static inline void __pmd_free_tlb(struct mmu_gather *tlb, pmd_t *pmd, 
	struct ptdesc *ptdesc = virt_to_ptdesc(pmd);



	pagetable_pmd_dtor(ptdesc);

	if (riscv_use_ipi_for_rfence())

		tlb_remove_page_ptdesc(tlb, ptdesc);

	else

		tlb_remove_ptdesc(tlb, ptdesc);

	riscv_tlb_remove_ptdesc(tlb, ptdesc);

}



#endif /* __PAGETABLE_PMD_FOLDED */
@@ -190,10 +188,7 @@ static inline void __pte_free_tlb(struct mmu_gather *tlb, pgtable_t pte, 
	struct ptdesc *ptdesc = page_ptdesc(pte);



	pagetable_pte_dtor(ptdesc);

	if (riscv_use_ipi_for_rfence())

		tlb_remove_page_ptdesc(tlb, ptdesc);

	else

		tlb_remove_ptdesc(tlb, ptdesc);

	riscv_tlb_remove_ptdesc(tlb, ptdesc);

}

#endif /* CONFIG_MMU */