Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
1
fork

Configure Feed

Select the types of activity you want to include in your feed.

riscv: Factor out page table TLB synchronization

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

Signed-off-by: Samuel Holland <samuel.holland@sifive.com>
Reviewed-by: Alexandre Ghiti <alexghiti@rivosinc.com>
Link: https://lore.kernel.org/r/20240327045035.368512-3-samuel.holland@sifive.com
Signed-off-by: Palmer Dabbelt <palmer@rivosinc.com>

authored by

Samuel Holland and committed by
Palmer Dabbelt
aaa56c8f 58661a30

+13 -18
+13 -18
arch/riscv/include/asm/pgalloc.h
··· 15 15 #define __HAVE_ARCH_PUD_FREE 16 16 #include <asm-generic/pgalloc.h> 17 17 18 + static inline void riscv_tlb_remove_ptdesc(struct mmu_gather *tlb, void *pt) 19 + { 20 + if (riscv_use_ipi_for_rfence()) 21 + tlb_remove_page_ptdesc(tlb, pt); 22 + else 23 + tlb_remove_ptdesc(tlb, pt); 24 + } 25 + 18 26 static inline void pmd_populate_kernel(struct mm_struct *mm, 19 27 pmd_t *pmd, pte_t *pte) 20 28 { ··· 110 102 struct ptdesc *ptdesc = virt_to_ptdesc(pud); 111 103 112 104 pagetable_pud_dtor(ptdesc); 113 - if (riscv_use_ipi_for_rfence()) 114 - tlb_remove_page_ptdesc(tlb, ptdesc); 115 - else 116 - tlb_remove_ptdesc(tlb, ptdesc); 105 + riscv_tlb_remove_ptdesc(tlb, ptdesc); 117 106 } 118 107 } 119 108 ··· 144 139 static inline void __p4d_free_tlb(struct mmu_gather *tlb, p4d_t *p4d, 145 140 unsigned long addr) 146 141 { 147 - if (pgtable_l5_enabled) { 148 - if (riscv_use_ipi_for_rfence()) 149 - tlb_remove_page_ptdesc(tlb, virt_to_ptdesc(p4d)); 150 - else 151 - tlb_remove_ptdesc(tlb, virt_to_ptdesc(p4d)); 152 - } 142 + if (pgtable_l5_enabled) 143 + riscv_tlb_remove_ptdesc(tlb, virt_to_ptdesc(p4d)); 153 144 } 154 145 #endif /* __PAGETABLE_PMD_FOLDED */ 155 146 ··· 177 176 struct ptdesc *ptdesc = virt_to_ptdesc(pmd); 178 177 179 178 pagetable_pmd_dtor(ptdesc); 180 - if (riscv_use_ipi_for_rfence()) 181 - tlb_remove_page_ptdesc(tlb, ptdesc); 182 - else 183 - tlb_remove_ptdesc(tlb, ptdesc); 179 + riscv_tlb_remove_ptdesc(tlb, ptdesc); 184 180 } 185 181 186 182 #endif /* __PAGETABLE_PMD_FOLDED */ ··· 188 190 struct ptdesc *ptdesc = page_ptdesc(pte); 189 191 190 192 pagetable_pte_dtor(ptdesc); 191 - if (riscv_use_ipi_for_rfence()) 192 - tlb_remove_page_ptdesc(tlb, ptdesc); 193 - else 194 - tlb_remove_ptdesc(tlb, ptdesc); 193 + riscv_tlb_remove_ptdesc(tlb, ptdesc); 195 194 } 196 195 #endif /* CONFIG_MMU */ 197 196