TLB/I$ flush cleanups and improvements
v3 cover TLB/I$ flush cleanups and improvements
From: Gary Guo <[email protected]>
Sorry, I didn't realised that there is a for-next branch and is basing my changes on top of master/HEAD instead. I've now rebased and fix a new reference of of local_flush_tlb_page.
This patches does:
1. Move long and expensive functions aways from header files.
2. Fix missing arguments for SBI calls.
3. Performance improvements for TLB flush.
Changes since v2:
- Replace __setup with early_param
- Rebase on top of for-next
Changes since v1:
- Use kernel boot parameters instead of Kconfig
- Style fixes
Gary Guo (4):
riscv: move flush_icache_{all,mm} to cacheflush.c
riscv: move switch_mm to its own file
riscv: fix sbi_remote_sfence_vma{,_asid}.
riscv: rewrite tlb flush for performance
arch/riscv/include/asm/cacheflush.h | 2 +- arch/riscv/include/asm/mmu_context.h | 59 +------- arch/riscv/include/asm/pgtable.h | 2 +- arch/riscv/include/asm/sbi.h | 19 ++- arch/riscv/include/asm/tlbflush.h | 76 ++++------ arch/riscv/kernel/smp.c | 49 ------ arch/riscv/mm/Makefile | 2 + arch/riscv/mm/cacheflush.c | 61 ++++++++ arch/riscv/mm/context.c | 77 ++++++++++ arch/riscv/mm/init.c | 2 +- arch/riscv/mm/tlbflush.c | 216 +++++++++++++++++++++++++++ 11 files changed, 404 insertions(+), 161 deletions(-) create mode 100644 arch/riscv/mm/context.c create mode 100644 arch/riscv/mm/tlbflush.c
Signature · 7 lines
2.17.1 _______________________________________________ linux-riscv mailing list [email protected] http://lists.infradead.org/mailman/listinfo/linux-riscv
PATCH v3 1/4 riscv: move flush_icache_{all,mm} to cacheflush.c
From: Gary Guo <[email protected]>
Currently, flush_icache_all is macro-expanded into a SBI call, yet no asm/sbi.h is included in asm/cacheflush.h. This could be moved to mm/cacheflush.c instead (SBI call will dominate performance-wise and there is no worry to not have it inlined.
Currently, flush_icache_mm stays in kernel/smp.c, which looks like a hack to prevent it from being compiled when CONFIG_SMP=n. It should also be in mm/cacheflush.c.
--- arch/riscv/include/asm/cacheflush.h | 2 +- arch/riscv/kernel/smp.c | 49 ----------------------- arch/riscv/mm/cacheflush.c | 61 +++++++++++++++++++++++++++++ 3 files changed, 62 insertions(+), 50 deletions(-)
arch/riscv/include/asm/cacheflush.h +1 -1
@@ -47,7 +47,7 @@ static inline void flush_dcache_page(struct page *page)#else /* CONFIG_SMP */ -#define flush_icache_all () sbi_remote_fence_i(NULL) +void flush_icache_all (void );void flush_icache_mm (struct mm_struct *mm,bool local);#endif /* CONFIG_SMP */
arch/riscv/kernel/smp.c +0 -49
52 lines not on this page · raw message
arch/riscv/mm/cacheflush.c +61 -0
67 lines not on this page · raw message
Signature · 7 lines
2.17.1 _______________________________________________ linux-riscv mailing list [email protected] http://lists.infradead.org/mailman/listinfo/linux-riscv
PATCH v3 2/4 riscv: move switch_mm to its own file
In reply to Gary GuoFrom: Gary Guo <[email protected]>
switch_mm is an expensive operations that has two users. flush_icache_deferred is only called within switch_mm and can be moved together. The function is expected to be more complicated when ASID support is added, so clean up eagerly.
By moving them to a separate file we also removes some excessive dependency of tlbflush.h and cacheflush.h.
--- arch/riscv/include/asm/mmu_context.h | 59 +---------------------- arch/riscv/mm/Makefile | 1 + arch/riscv/mm/context.c | 71 ++++++++++++++++++++++++++++ 3 files changed, 74 insertions(+), 57 deletions(-) create mode 100644 arch/riscv/mm/context.c
arch/riscv/include/asm/mmu_context.h +2 -57
@@ -20,8 +20,6 @@#include <linux/mm.h> #include <linux/sched.h> -#include <asm/tlbflush.h> -#include <asm/cacheflush.h> static inline void enter_lazy_tlb (struct mm_struct *mm,struct task_struct *task)
@@ -39,61 +37,8 @@ static inline void destroy_context(struct mm_struct *mm) { } -/* -* When necessary, performs a deferred icache flush for the given MM context, -* on the local CPU. RISC-V has no direct mechanism for instruction cache -* shoot downs, so instead we send an IPI that informs the remote harts they -* need to flush their local instruction caches. To avoid pathologically slow -* behavior in a common case (a bunch of single-hart processes on a many-hart -* machine, ie 'make -j') we avoid the IPIs for harts that are not currently -* executing a MM context and instead schedule a deferred local instruction -* cache flush to be performed before execution resumes on each hart. This -* actually performs that local instruction cache flush, which implicitly only -* refers to the current hart. -*/ -static inline void flush_icache_deferred (struct mm_struct *mm) -{ -#ifdef CONFIG_SMP -unsigned int cpu =smp_processor_id (); -cpumask_t *mask = &mm->context.icache_stale_mask; - -if (cpumask_test_cpu (cpu, mask)) { -cpumask_clear_cpu (cpu, mask); -/* -* Ensure the remote hart's writes are visible to this hart. -* This pairs with a barrier in flush_icache_mm. -*/ -smp_mb (); -local_flush_icache_all (); - } -#endif -} - -static inline void switch_mm (struct mm_struct *prev, -struct mm_struct *next,struct task_struct *task) -{ -if (likely (prev != next)) { -/* -* Mark the current MM context as inactive, and the next as -* active. This is at least used by the icache flushing -* routines in order to determine who should -*/ -unsigned int cpu =smp_processor_id (); - -cpumask_clear_cpu (cpu,mm_cpumask (prev)); -cpumask_set_cpu (cpu,mm_cpumask (next)); - -/* -* Use the old spbtr name instead of using the current satp -* name to support binutils 2.29 which doesn't know about the -* privileged ISA 1.10 yet. -*/ -csr_write (sptbr,virt_to_pfn (next->pgd) |SATP_MODE ); -local_flush_tlb_all (); - -flush_icache_deferred (next); - } -} +void switch_mm (struct mm_struct *prev,struct mm_struct *next, +struct task_struct *task);static inline void activate_mm (struct mm_struct *prev,struct mm_struct *next)
arch/riscv/mm/Makefile +1 -0
@@ -3,3 +3,4 @@ obj-y += fault.o obj-y += extable.o obj-y += ioremap.o obj-y += cacheflush.o +obj-y += context.o
arch/riscv/mm/context.c new file +71 -0
71 lines not on this page · raw message
Signature · 7 lines
2.17.1 _______________________________________________ linux-riscv mailing list [email protected] http://lists.infradead.org/mailman/listinfo/linux-riscv
PATCH v3 3/4 riscv: fix sbi_remote_sfence_vma{,_asid}.
In reply to Gary GuoFrom: Gary Guo <[email protected]>
Currently sbi_remote_sfence_vma{,_asid} does not pass their arguments to SBI at all, which is semantically incorrect.
Neither BBL nor OpenSBI is using these arguments at the moment, and they just do a global flush instead. However we still need to provide correct arguments.
--- arch/riscv/include/asm/sbi.h | 19 ++++++++++++------- 1 file changed, 12 insertions(+), 7 deletions(-)
arch/riscv/include/asm/sbi.h +12 -7
@@ -26,22 +26,27 @@#define SBI_REMOTE_SFENCE_VMA_ASID 7#define SBI_SHUTDOWN 8 -#define SBI_CALL (which, arg0, arg1, arg2) ({ \ +#define SBI_CALL (which, arg0, arg1, arg2, arg3) ({ \ register uintptr_t a0 asm ("a0") = (uintptr_t)(arg0); \ register uintptr_t a1 asm ("a1") = (uintptr_t)(arg1); \ register uintptr_t a2 asm ("a2") = (uintptr_t)(arg2); \ + register uintptr_t a3 asm ("a3") = (uintptr_t)(arg3); \ register uintptr_t a7 asm ("a7") = (uintptr_t)(which); \ asm volatile ("ecall" \ : "+r" (a0) \ - : "r" (a1), "r" (a2), "r" (a7) \ + : "r" (a1), "r" (a2), "r" (a3), "r" (a7) \ : "memory"); \ a0; \ })/* Lazy implementations until SBI is finalized */ -#define SBI_CALL_0 (which) SBI_CALL(which, 0, 0, 0) -#define SBI_CALL_1 (which, arg0) SBI_CALL(which, arg0, 0, 0) -#define SBI_CALL_2 (which, arg0, arg1) SBI_CALL(which, arg0, arg1, 0) +#define SBI_CALL_0 (which) SBI_CALL(which, 0, 0, 0, 0) +#define SBI_CALL_1 (which, arg0) SBI_CALL(which, arg0, 0, 0, 0) +#define SBI_CALL_2 (which, arg0, arg1) SBI_CALL(which, arg0, arg1, 0, 0) +#define SBI_CALL_3 (which, arg0, arg1, arg2) \ + SBI_CALL(which, arg0, arg1, arg2, 0) +#define SBI_CALL_4 (which, arg0, arg1, arg2, arg3) \ + SBI_CALL(which, arg0, arg1, arg2, arg3)static inline void sbi_console_putchar (int ch) {
@@ -86,7 +91,7 @@ static inline void sbi_remote_sfence_vma(const unsigned long *hart_mask,unsigned long start, unsigned long size) { -SBI_CALL_1 (SBI_REMOTE_SFENCE_VMA ,hart_mask ); +SBI_CALL_3 (SBI_REMOTE_SFENCE_VMA ,hart_mask ,start ,size ); } static inline void sbi_remote_sfence_vma_asid(const unsigned long *hart_mask,
@@ -94,7 +99,7 @@ static inline void sbi_remote_sfence_vma_asid(const unsigned long *hart_mask,unsigned long size, unsigned long asid) { -SBI_CALL_1 (SBI_REMOTE_SFENCE_VMA_ASID ,hart_mask ); +SBI_CALL_4 (SBI_REMOTE_SFENCE_VMA_ASID ,hart_mask ,start ,size ,asid ); }#endif
Signature · 7 lines
2.17.1 _______________________________________________ linux-riscv mailing list [email protected] http://lists.infradead.org/mailman/listinfo/linux-riscv
PATCH v3 4/4 riscv: rewrite tlb flush for performance
In reply to Gary GuoFrom: Gary Guo <[email protected]>
This patch rewrites the logic related to TLB flushing, both to cleanup the code and to improve performance.
We now use sfence.vma variant with specified ASID and virtual address whenever possible. Even though only ASID 0 is used, it still improves performance by preventing global mappings from being flushed from TLB.
This patch also includes a IPI-based remote TLB shootdown, which is useful at this stage for testing because BBL/OpenSBI ignores operands of sbi_remote_sfence_vma_asid and always perform a global TLB flush. The SBI-based remote TLB shootdown can still be opt-in using boot cmdline "tlbi_method=sbi".
--- arch/riscv/include/asm/pgtable.h | 2 +- arch/riscv/include/asm/tlbflush.h | 76 +++++------ arch/riscv/mm/Makefile | 1 + arch/riscv/mm/context.c | 8 +- arch/riscv/mm/init.c | 2 +- arch/riscv/mm/tlbflush.c | 216 ++++++++++++++++++++++++++++++ 6 files changed, 257 insertions(+), 48 deletions(-) create mode 100644 arch/riscv/mm/tlbflush.c
arch/riscv/include/asm/pgtable.h +1 -1
@@ -279,7 +279,7 @@ static inline void update_mmu_cache(struct vm_area_struct *vma,* Relying on flush_tlb_fix_spurious_fault would suffice, but * the extra traps reduce performance. So, eagerly SFENCE.VMA. */ -local_flush_tlb_page (address); +local_flush_tlb_page (vma, address); }#define __HAVE_ARCH_PTE_SAME
arch/riscv/include/asm/tlbflush.h +31 -45
106 lines not on this page · raw message
arch/riscv/mm/Makefile +1 -0
@@ -4,3 +4,4 @@ obj-y += extable.o obj-y += ioremap.o obj-y += cacheflush.o obj-y += context.o +obj-y += tlbflush.o
arch/riscv/mm/context.c +7 -1
@@ -64,7 +64,13 @@ void switch_mm(struct mm_struct *prev, struct mm_struct *next,* privileged ISA 1.10 yet. */ csr_write (sptbr,virt_to_pfn (next->pgd) |SATP_MODE ); -local_flush_tlb_all (); + +/* +* sfence.vma after SATP write. We call it on MM context instead of +* calling local_flush_tlb_all to prevent global mappings from being +* affected. +*/ +local_flush_tlb_mm (next);flush_icache_deferred (next); }
arch/riscv/mm/init.c +1 -1
@@ -168,7 +168,7 @@ void __set_fixmap(enum fixed_addresses idx, phys_addr_t phys, pgprot_t prot)set_pte (ptep,pfn_pte (phys >>PAGE_SHIFT , prot)); }else {pte_clear (&init_mm, addr, ptep); -local_flush_tlb_page (addr); +local_flush_tlb_kernel_page (addr); } }
arch/riscv/mm/tlbflush.c new file +216 -0
216 lines not on this page · raw message
Signature · 7 lines
2.17.1 _______________________________________________ linux-riscv mailing list [email protected] http://lists.infradead.org/mailman/listinfo/linux-riscv
Re: [PATCH v3 4/4] riscv: rewrite tlb flush for performance
Quoted 9 lines · Gary Guo
From: Gary Guo <[email protected]>
This patch rewrites the logic related to TLB flushing, both to cleanup the code and to improve performance.
We now use sfence.vma variant with specified ASID and virtual address whenever possible. Even though only ASID 0 is used, it still improves performance by preventing global mappings from being flushed from TLB.
Quoted 6 lines
This patch also includes a IPI-based remote TLB shootdown, which is useful at this stage for testing because BBL/OpenSBI ignores operands of
sbi_remote_sfence_vma_asidand always perform a global TLB flush. The SBI-based remote TLB shootdown can still be opt-in using boot cmdline "tlbi_method=sbi".
Thank you for bringing this up. I have fixed it in OpenSBI.
https://github.com/riscv/opensbi/pull/89
I have also tested your patch series in HiFive Unleashed as well.
FWIW: Tested-by : Atish Patra <[email protected]>
Quoted 77 lines
Signed-off-by Gary Guo <[email protected]>--- arch/riscv/include/asm/pgtable.h | 2 +- arch/riscv/include/asm/tlbflush.h | 76 +++++------ arch/riscv/mm/Makefile | 1 + arch/riscv/mm/context.c | 8 +- arch/riscv/mm/init.c | 2 +- arch/riscv/mm/tlbflush.c | 216 ++++++++++++++++++++++++++++++ 6 files changed, 257 insertions(+), 48 deletions(-)create mode 100644
arch/riscv/mm/tlbflush.carch/riscv/include/asm/pgtable.h +1
-1@@ -279,7 +279,7 @@ static inline void update_mmu_cache(struct vm_area_struct *vma,* Relying on flush_tlb_fix_spurious_fault would suffice, but * the extra traps reduce performance. So, eagerly SFENCE.VMA. */ -local_flush_tlb_page (address); +local_flush_tlb_page (vma, address); }#define __HAVE_ARCH_PTE_SAMEarch/riscv/include/asm/tlbflush.h +7
-21@@ -1,22 +1,14 @@ +/* SPDX-License-Identifier: GPL-2.0 */ /* * Copyright (C) 2009 Chen Liqin <[email protected]> * Copyright (C) 2012 Regents of the University of California -* -* This program is free software; you can redistribute it and/or -* modify it under the terms of the GNU General Public License -* as published by the Free Software Foundation, version 2. -* -* This program is distributed in the hope that it will be useful, -* but WITHOUT ANY WARRANTY; without even the implied warranty of -* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -* GNU General Public License for more details. +* Copyright (C) 2019 Gary Guo, University of Cambridge */ #ifndef _ASM_RISCV_TLBFLUSH_H#define _ASM_RISCV_TLBFLUSH_H#include <linux/mm_types.h> -#include <asm/smp.h> /* * Flush entire local TLB. 'sfence.vma' implicitly fences with the instruction @@ -27,53 +19,47 @@ static inline void local_flush_tlb_all(void) __asm__ __volatile__ ("sfence.vma" : : :"memory" ); } -/* Flush one page from local TLB */ -static inline void local_flush_tlb_page (unsigned long addr) +static inline void local_flush_tlb_mm (struct mm_struct *mm) { - __asm__ __volatile__ ("sfence.vma %0" : :"r" (addr) :"memory" ); +/* Flush ASID 0 so that global mappings are not affected */ + __asm__ __volatile__ ("sfence.vma x0, %0" : :"r" (0 ) :"memory" ); } -#ifndef CONFIG_SMP - -#define flush_tlb_all () local_flush_tlb_all() -#define flush_tlb_page (vma, addr) local_flush_tlb_page(addr) - -static inline void flush_tlb_range (struct vm_area_struct *vma, -unsigned long start,unsigned long end) +static inline void local_flush_tlb_page (struct vm_area_struct *vma, +unsigned long addr) { -local_flush_tlb_all ();
arch/riscv/include/asm/tlbflush.h static inline void local_flush_tlb_all(void) · line 39
Quoted 10 lines
arch/riscv/include/asm/tlbflush.h +7
-1+ __asm__ __volatile__ ("sfence.vma %0, %1" + : :"r" (addr),"r" (0 ) + :"memory" ); } -#define flush_tlb_mm (mm) flush_tlb_all() +static inline void local_flush_tlb_kernel_page (unsigned long addr) +{ + __asm__ __volatile ("sfence.vma %0" : : "r" (addr) : "memory"); +}
__volatile__
Quoted 127 lines
arch/riscv/include/asm/tlbflush.h +17
-23-#else /* CONFIG_SMP */ +void local_flush_tlb_range (struct vm_area_struct *vma,unsigned long start, +unsigned long end); +void local_flush_tlb_kernel_range (unsigned long start,unsigned long end); -#include <asm/sbi.h> +#ifdef CONFIG_SMP -static inline void remote_sfence_vma (struct cpumask *cmask,unsigned long start, -unsigned long size) -{ -struct cpumask hmask; +void flush_tlb_all (void ); +void flush_tlb_mm (struct mm_struct *mm); +void flush_tlb_page (struct vm_area_struct *vma,unsigned long addr); +void flush_tlb_range (struct vm_area_struct *vma,unsigned long start, +unsigned long end); +void flush_tlb_kernel_range (unsigned long start,unsigned long end); -cpumask_clear (&hmask); -riscv_cpuid_to_hartid_mask (cmask, &hmask); -sbi_remote_sfence_vma (hmask.bits, start, size); -} +#else /* CONFIG_SMP */ -#define flush_tlb_all () sbi_remote_sfence_vma(NULL, 0, -1) -#define flush_tlb_page (vma, addr) flush_tlb_range(vma, addr, 0) -#define flush_tlb_range (vma, start, end) \ - remote_sfence_vma(mm_cpumask((vma)->vm_mm), start, (end) - (start)) -#define flush_tlb_mm (mm) \ - remote_sfence_vma(mm_cpumask(mm), 0, -1) +#define flush_tlb_all () local_flush_tlb_all() +#define flush_tlb_mm (mm) local_flush_tlb_mm(mm) +#define flush_tlb_page (vma, addr) local_flush_tlb_page(vma, addr) +#define flush_tlb_range (vma, start, end) local_flush_tlb_range(vma, start, end) +#define flush_tlb_kernel_range (start, end) \ + local_flush_tlb_kernel_range(start, end)#endif /* CONFIG_SMP */ -/* Flush a range of kernel pages */ -static inline void flush_tlb_kernel_range (unsigned long start, -unsigned long end) -{ -flush_tlb_all (); -} -#endif /* _ASM_RISCV_TLBFLUSH_H */ arch/riscv/mm/Makefile +1
-0@@ -4,3 +4,4 @@ obj-y += extable.o obj-y += ioremap.o obj-y += cacheflush.o obj-y += context.o +obj-y += tlbflush.oarch/riscv/mm/context.c +7
-1@@ -64,7 +64,13 @@ void switch_mm(struct mm_struct *prev, struct mm_struct *next,* privileged ISA 1.10 yet. */ csr_write (sptbr,virt_to_pfn (next->pgd) |SATP_MODE ); -local_flush_tlb_all (); + +/* +* sfence.vma after SATP write. We call it on MM context instead of +* calling local_flush_tlb_all to prevent global mappings from being +* affected. +*/ +local_flush_tlb_mm (next);flush_icache_deferred (next); }arch/riscv/mm/init.c +1
-1@@ -168,7 +168,7 @@ void __set_fixmap(enum fixed_addresses idx, phys_addr_t phys, pgprot_t prot)set_pte (ptep,pfn_pte (phys >>PAGE_SHIFT , prot)); }else {pte_clear (&init_mm, addr, ptep); -local_flush_tlb_page (addr); +local_flush_tlb_kernel_page (addr); } }arch/riscv/mm/tlbflush.c new file +31
-0@@ -0,0 +1,216 @@ +// SPDX-License-Identifier: GPL-2.0 +/* +* Copyright (C) 2019 Gary Guo, University of Cambridge +*/ + +#include <linux/mm.h> +#include <asm/sbi.h> + +#define SFENCE_VMA_FLUSH_ALL ((unsigned long) -1) + +/* +* This controls the maximum amount of page-level sfence.vma that the kernel +* can issue when the kernel needs to flush a range from the TLB. If the size +* of range goes beyond this threshold, a full sfence.vma is issued. +* +* Increase this number can negatively impact performance on implementations +* where sfence.vma's address operand is ignored and always perform a global +* TLB flush. On the other hand, implementations with page-level TLB flush +* support can benefit from a larger number. +*/ +static unsigned long tlbi_range_threshold =PAGE_SIZE ; + +static int __init setup_tlbi_max_ops (char *str) +{ +int value =0 ; + +get_option (&str, &value); + +/* +* This value cannot be greater or equal to PTRS_PER_PTE, as we need +* to full flush for any non-leaf page table change. The value has also
arch/riscv/mm/tlbflush.c line 41
Quoted 10 lines
arch/riscv/mm/tlbflush.c new file +10
-0+* be at least 1. +*/ +if (value >=PTRS_PER_PTE || value <1 ) +return -EINVAL ; + + tlbi_range_threshold = value *PAGE_SIZE ; +return 0 ; +} +early_param ("tlbi_max_ops" , setup_tlbi_max_ops); +
Please document it in admin-guide/kernel-parameters.txt as well.
Quoted 38 lines
arch/riscv/mm/tlbflush.c new file +38
-0+void local_flush_tlb_range (struct vm_area_struct *vma,unsigned long start, +unsigned long end) +{ +if (end - start > tlbi_range_threshold) { +local_flush_tlb_mm (vma->vm_mm); +return ; + } + +while (start < end) { + __asm__ __volatile__ ("sfence.vma %0, %1" + : :"r" (start),"r" (0 ) + :"memory" ); + start +=PAGE_SIZE ; + } +} + +void local_flush_tlb_kernel_range (unsigned long start,unsigned long end) +{ +if (end - start > tlbi_range_threshold) { +local_flush_tlb_all (); +return ; + } + +while (start < end) { + __asm__ __volatile__ ("sfence.vma %0" + : :"r" (start) + :"memory" ); + start +=PAGE_SIZE ; + } +} + +#ifdef CONFIG_SMP + +/* +* BBL/OpenSBI are currently ignoring ASID and address range provided +* by SBI call argument, and do a full TLB flush instead. This may +* negatively impact performance on implementations with page-level +* sfence.vma support.
arch/riscv/mm/tlbflush.c line 89
Quoted 10 lines
arch/riscv/mm/tlbflush.c new file +10
-0+* +* We provide an IPI-based remote shootdown implementation to improve +* performance on implementations with page-level sfence.vma, and also to +* allow testing of these implementations. +* +* This parameter allows the approach (IPI/SBI) to be specified using boot +* cmdline. +*/ +static bool tlbi_ipi = true; +
Since OpenSBI support has been added and IPI goes through SBI anyways, I think keeping sbi option by default makes more sense to me.
arch/riscv/mm/tlbflush.c line 101
Quoted 12 lines
arch/riscv/mm/tlbflush.c new file +12
-0+static int __init setup_tlbi_method (char *str) +{ +if (strcmp (str,"ipi" ) ==0 ) + tlbi_ipi = true; +else if (strcmp (str,"sbi" ) ==0 ) + tlbi_ipi = false; +else +return -EINVAL ; + +return 0 ; +} +early_param ("tlbi_method" , setup_tlbi_method);
Please document it in admin-guide/kernel-parameters.txt as well.
Quoted 49 lines
arch/riscv/mm/tlbflush.c new file +49
-0+ + +struct tlbi { +unsigned long start; +unsigned long size; +unsigned long asid; +}; + +static void ipi_remote_sfence_vma (void *info) +{ +struct tlbi *data = info; +unsigned long start = data->start; +unsigned long size = data->size; +unsigned long i; + +for (i =0 ; i < size; i +=PAGE_SIZE ) { + __asm__ __volatile__ ("sfence.vma %0" + : :"r" (start + i) + :"memory" ); + } +} + +static void ipi_remote_sfence_vma_asid (void *info) +{ +struct tlbi *data = info; +unsigned long asid = data->asid; +unsigned long start = data->start; +unsigned long size = data->size; +unsigned long i; + +/* Flush entire MM context */ +if (size ==SFENCE_VMA_FLUSH_ALL ) { + __asm__ __volatile__ ("sfence.vma x0, %0" + : :"r" (asid) + :"memory" ); +return ; + } + +for (i =0 ; i < size; i +=PAGE_SIZE ) { + __asm__ __volatile__ ("sfence.vma %0, %1" + : :"r" (start + i),"r" (asid) + :"memory" ); + } +} + +static void remote_sfence_vma (unsigned long start,unsigned long size) +{ +if (tlbi_ipi) { + struct tlbi info = {
arch/riscv/mm/tlbflush.c line 160
Quoted 10 lines
arch/riscv/mm/tlbflush.c new file +10
-0+ .start = start, + .size = size, + }; +on_each_cpu (ipi_remote_sfence_vma, &info,1 ); + }else +sbi_remote_sfence_vma (NULL , start, size); +} + +static void remote_sfence_vma_asid (cpumask_t *mask,unsigned long start, +unsigned long size,unsigned long asid)
I think the next line should be aligned with function beginning.
Quoted 26 lines
arch/riscv/mm/tlbflush.c new file +26
-0+{ +if (tlbi_ipi) { +struct tlbi info = { + .start = start, + .size = size, + .asid = asid, + }; +on_each_cpu_mask (mask, ipi_remote_sfence_vma_asid, &info,1 ); + }else { +cpumask_t hmask; + +cpumask_clear (&hmask); +riscv_cpuid_to_hartid_mask (mask, &hmask); +sbi_remote_sfence_vma_asid (hmask.bits, start, size, asid); + } +} + + +void flush_tlb_all (void ) +{ +sbi_remote_sfence_vma (NULL ,0 ,SFENCE_VMA_FLUSH_ALL ); +} + +void flush_tlb_mm (struct mm_struct *mm) +{ +remote_sfence_vma_asid (mm_cpumask (mm),0 ,SFENCE_VMA_FLUSH_ALL ,0 );
arch/riscv/mm/tlbflush.c line 196
Quoted 10 lines
arch/riscv/mm/tlbflush.c new file +10
-0+} + +void flush_tlb_page (struct vm_area_struct *vma,unsigned long addr) +{ +remote_sfence_vma_asid (mm_cpumask (vma->vm_mm), addr,PAGE_SIZE ,0 ); +} + + +void flush_tlb_range (struct vm_area_struct *vma,unsigned long start, +unsigned long end)
same as previous about the next line alignment.
Quoted 11 lines
arch/riscv/mm/tlbflush.c new file +10
-0+{ +if (end - start > tlbi_range_threshold) { +flush_tlb_mm (vma->vm_mm); +return ; + } + +remote_sfence_vma_asid (mm_cpumask (vma->vm_mm), start, end - start,0 ); +} + +void flush_tlb_kernel_range (unsigned long start,unsigned long end)
arch/riscv/mm/tlbflush.c line 216
Quoted 10 lines
arch/riscv/mm/tlbflush.c new file +10
-0+{ +if (end - start > tlbi_range_threshold) { +flush_tlb_all (); +return ; + } + +remote_sfence_vma (start, end - start); +} + +#endif /* CONFIG_SMP */
_______________________________________________
linux-riscv mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/linux-riscv
Re: [PATCH v3 4/4] riscv: rewrite tlb flush for performance
In reply to Gary GuoQuoted 5 lines · Gary Guo
This patch also includes a IPI-based remote TLB shootdown, which is useful at this stage for testing because BBL/OpenSBI ignores operands of
sbi_remote_sfence_vma_asidand always perform a global TLB flush. The SBI-based remote TLB shootdown can still be opt-in using boot cmdline "tlbi_method=sbi".
I think that part should be split into a separate patch, as it is a logically separate change.
_______________________________________________
linux-riscv mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/linux-riscv
Re: [PATCH v3 4/4] riscv: rewrite tlb flush for performance
In reply to Gary GuoQuoted 9 lines · On Sat, 09 Mar 2019 06:52:04 PST (-0800), [email protected] wrote:
From: Gary Guo <[email protected]>
This patch rewrites the logic related to TLB flushing, both to cleanup the code and to improve performance.
We now use sfence.vma variant with specified ASID and virtual address whenever possible. Even though only ASID 0 is used, it still improves performance by preventing global mappings from being flushed from TLB.
Quoted 5 lines
This patch also includes a IPI-based remote TLB shootdown, which is useful at this stage for testing because BBL/OpenSBI ignores operands of
sbi_remote_sfence_vma_asidand always perform a global TLB flush. The SBI-based remote TLB shootdown can still be opt-in using boot cmdline "tlbi_method=sbi".
Thanks for doing so much work here, but I don't think this actually the right way to go. I'd rather fix the firmware than put all this code in the kernel, particularly as we're putting this in the firmware under an assumption that there will be implementation-specific mechanism in the future.
Quoted 401 lines
Signed-off-by Gary Guo <[email protected]>--- arch/riscv/include/asm/pgtable.h | 2 +- arch/riscv/include/asm/tlbflush.h | 76 +++++------ arch/riscv/mm/Makefile | 1 + arch/riscv/mm/context.c | 8 +- arch/riscv/mm/init.c | 2 +- arch/riscv/mm/tlbflush.c | 216 ++++++++++++++++++++++++++++++ 6 files changed, 257 insertions(+), 48 deletions(-) create mode 100644 arch/riscv/mm/tlbflush.carch/riscv/include/asm/pgtable.h +1
-1@@ -279,7 +279,7 @@ static inline void update_mmu_cache(struct vm_area_struct *vma,* Relying on flush_tlb_fix_spurious_fault would suffice, but * the extra traps reduce performance. So, eagerly SFENCE.VMA. */ -local_flush_tlb_page (address); +local_flush_tlb_page (vma, address); }#define __HAVE_ARCH_PTE_SAMEarch/riscv/include/asm/tlbflush.h +31
-45@@ -1,22 +1,14 @@ +/* SPDX-License-Identifier: GPL-2.0 */ /* * Copyright (C) 2009 Chen Liqin <[email protected]> * Copyright (C) 2012 Regents of the University of California -* -* This program is free software; you can redistribute it and/or -* modify it under the terms of the GNU General Public License -* as published by the Free Software Foundation, version 2. -* -* This program is distributed in the hope that it will be useful, -* but WITHOUT ANY WARRANTY; without even the implied warranty of -* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -* GNU General Public License for more details. +* Copyright (C) 2019 Gary Guo, University of Cambridge */ #ifndef _ASM_RISCV_TLBFLUSH_H#define _ASM_RISCV_TLBFLUSH_H#include <linux/mm_types.h> -#include <asm/smp.h> /* * Flush entire local TLB. 'sfence.vma' implicitly fences with the instruction @@ -27,53 +19,47 @@ static inline void local_flush_tlb_all(void) __asm__ __volatile__ ("sfence.vma" : : :"memory" ); } -/* Flush one page from local TLB */ -static inline void local_flush_tlb_page (unsigned long addr) +static inline void local_flush_tlb_mm (struct mm_struct *mm) { - __asm__ __volatile__ ("sfence.vma %0" : :"r" (addr) :"memory" ); +/* Flush ASID 0 so that global mappings are not affected */ + __asm__ __volatile__ ("sfence.vma x0, %0" : :"r" (0 ) :"memory" ); } -#ifndef CONFIG_SMP - -#define flush_tlb_all () local_flush_tlb_all() -#define flush_tlb_page (vma, addr) local_flush_tlb_page(addr) - -static inline void flush_tlb_range (struct vm_area_struct *vma, -unsigned long start,unsigned long end) +static inline void local_flush_tlb_page (struct vm_area_struct *vma, +unsigned long addr) { -local_flush_tlb_all (); + __asm__ __volatile__ ("sfence.vma %0, %1" + : :"r" (addr),"r" (0 ) + :"memory" ); } -#define flush_tlb_mm (mm) flush_tlb_all() +static inline void local_flush_tlb_kernel_page (unsigned long addr) +{ + __asm__ __volatile ("sfence.vma %0" : : "r" (addr) : "memory"); +} -#else /* CONFIG_SMP */ +void local_flush_tlb_range (struct vm_area_struct *vma,unsigned long start, +unsigned long end); +void local_flush_tlb_kernel_range (unsigned long start,unsigned long end); -#include <asm/sbi.h> +#ifdef CONFIG_SMP -static inline void remote_sfence_vma (struct cpumask *cmask,unsigned long start, -unsigned long size) -{ -struct cpumask hmask; +void flush_tlb_all (void ); +void flush_tlb_mm (struct mm_struct *mm); +void flush_tlb_page (struct vm_area_struct *vma,unsigned long addr); +void flush_tlb_range (struct vm_area_struct *vma,unsigned long start, +unsigned long end); +void flush_tlb_kernel_range (unsigned long start,unsigned long end); -cpumask_clear (&hmask); -riscv_cpuid_to_hartid_mask (cmask, &hmask); -sbi_remote_sfence_vma (hmask.bits, start, size); -} +#else /* CONFIG_SMP */ -#define flush_tlb_all () sbi_remote_sfence_vma(NULL, 0, -1) -#define flush_tlb_page (vma, addr) flush_tlb_range(vma, addr, 0) -#define flush_tlb_range (vma, start, end) \ - remote_sfence_vma(mm_cpumask((vma)->vm_mm), start, (end) - (start)) -#define flush_tlb_mm (mm) \ - remote_sfence_vma(mm_cpumask(mm), 0, -1) +#define flush_tlb_all () local_flush_tlb_all() +#define flush_tlb_mm (mm) local_flush_tlb_mm(mm) +#define flush_tlb_page (vma, addr) local_flush_tlb_page(vma, addr) +#define flush_tlb_range (vma, start, end) local_flush_tlb_range(vma, start, end) +#define flush_tlb_kernel_range (start, end) \ + local_flush_tlb_kernel_range(start, end)#endif /* CONFIG_SMP */ -/* Flush a range of kernel pages */ -static inline void flush_tlb_kernel_range (unsigned long start, -unsigned long end) -{ -flush_tlb_all (); -} -#endif /* _ASM_RISCV_TLBFLUSH_H */ arch/riscv/mm/Makefile +1
-0@@ -4,3 +4,4 @@ obj-y += extable.o obj-y += ioremap.o obj-y += cacheflush.o obj-y += context.o +obj-y += tlbflush.oarch/riscv/mm/context.c +7
-1@@ -64,7 +64,13 @@ void switch_mm(struct mm_struct *prev, struct mm_struct *next,* privileged ISA 1.10 yet. */ csr_write (sptbr,virt_to_pfn (next->pgd) |SATP_MODE ); -local_flush_tlb_all (); + +/* +* sfence.vma after SATP write. We call it on MM context instead of +* calling local_flush_tlb_all to prevent global mappings from being +* affected. +*/ +local_flush_tlb_mm (next);flush_icache_deferred (next); }arch/riscv/mm/init.c +1
-1@@ -168,7 +168,7 @@ void __set_fixmap(enum fixed_addresses idx, phys_addr_t phys, pgprot_t prot)set_pte (ptep,pfn_pte (phys >>PAGE_SHIFT , prot)); }else {pte_clear (&init_mm, addr, ptep); -local_flush_tlb_page (addr); +local_flush_tlb_kernel_page (addr); } }arch/riscv/mm/tlbflush.c new file +216
-0@@ -0,0 +1,216 @@ +// SPDX-License-Identifier: GPL-2.0 +/* +* Copyright (C) 2019 Gary Guo, University of Cambridge +*/ + +#include <linux/mm.h> +#include <asm/sbi.h> + +#define SFENCE_VMA_FLUSH_ALL ((unsigned long) -1) + +/* +* This controls the maximum amount of page-level sfence.vma that the kernel +* can issue when the kernel needs to flush a range from the TLB. If the size +* of range goes beyond this threshold, a full sfence.vma is issued. +* +* Increase this number can negatively impact performance on implementations +* where sfence.vma's address operand is ignored and always perform a global +* TLB flush. On the other hand, implementations with page-level TLB flush +* support can benefit from a larger number. +*/ +static unsigned long tlbi_range_threshold =PAGE_SIZE ; + +static int __init setup_tlbi_max_ops (char *str) +{ +int value =0 ; + +get_option (&str, &value); + +/* +* This value cannot be greater or equal to PTRS_PER_PTE, as we need +* to full flush for any non-leaf page table change. The value has also +* be at least 1. +*/ +if (value >=PTRS_PER_PTE || value <1 ) +return -EINVAL ; + + tlbi_range_threshold = value *PAGE_SIZE ; +return 0 ; +} +early_param ("tlbi_max_ops" , setup_tlbi_max_ops); + +void local_flush_tlb_range (struct vm_area_struct *vma,unsigned long start, +unsigned long end) +{ +if (end - start > tlbi_range_threshold) { +local_flush_tlb_mm (vma->vm_mm); +return ; + } + +while (start < end) { + __asm__ __volatile__ ("sfence.vma %0, %1" + : :"r" (start),"r" (0 ) + :"memory" ); + start +=PAGE_SIZE ; + } +} + +void local_flush_tlb_kernel_range (unsigned long start,unsigned long end) +{ +if (end - start > tlbi_range_threshold) { +local_flush_tlb_all (); +return ; + } + +while (start < end) { + __asm__ __volatile__ ("sfence.vma %0" + : :"r" (start) + :"memory" ); + start +=PAGE_SIZE ; + } +} + +#ifdef CONFIG_SMP + +/* +* BBL/OpenSBI are currently ignoring ASID and address range provided +* by SBI call argument, and do a full TLB flush instead. This may +* negatively impact performance on implementations with page-level +* sfence.vma support. +* +* We provide an IPI-based remote shootdown implementation to improve +* performance on implementations with page-level sfence.vma, and also to +* allow testing of these implementations. +* +* This parameter allows the approach (IPI/SBI) to be specified using boot +* cmdline. +*/ +static bool tlbi_ipi = true; + +static int __init setup_tlbi_method (char *str) +{ +if (strcmp (str,"ipi" ) ==0 ) + tlbi_ipi = true; +else if (strcmp (str,"sbi" ) ==0 ) + tlbi_ipi = false; +else +return -EINVAL ; + +return 0 ; +} +early_param ("tlbi_method" , setup_tlbi_method); + + +struct tlbi { +unsigned long start; +unsigned long size; +unsigned long asid; +}; + +static void ipi_remote_sfence_vma (void *info) +{ +struct tlbi *data = info; +unsigned long start = data->start; +unsigned long size = data->size; +unsigned long i; + +for (i =0 ; i < size; i +=PAGE_SIZE ) { + __asm__ __volatile__ ("sfence.vma %0" + : :"r" (start + i) + :"memory" ); + } +} + +static void ipi_remote_sfence_vma_asid (void *info) +{ +struct tlbi *data = info; +unsigned long asid = data->asid; +unsigned long start = data->start; +unsigned long size = data->size; +unsigned long i; + +/* Flush entire MM context */ +if (size ==SFENCE_VMA_FLUSH_ALL ) { + __asm__ __volatile__ ("sfence.vma x0, %0" + : :"r" (asid) + :"memory" ); +return ; + } + +for (i =0 ; i < size; i +=PAGE_SIZE ) { + __asm__ __volatile__ ("sfence.vma %0, %1" + : :"r" (start + i),"r" (asid) + :"memory" ); + } +} + +static void remote_sfence_vma (unsigned long start,unsigned long size) +{ +if (tlbi_ipi) { +struct tlbi info = { + .start = start, + .size = size, + }; +on_each_cpu (ipi_remote_sfence_vma, &info,1 ); + }else +sbi_remote_sfence_vma (NULL , start, size); +} + +static void remote_sfence_vma_asid (cpumask_t *mask,unsigned long start, +unsigned long size,unsigned long asid) +{ +if (tlbi_ipi) { +struct tlbi info = { + .start = start, + .size = size, + .asid = asid, + }; +on_each_cpu_mask (mask, ipi_remote_sfence_vma_asid, &info,1 ); + }else { +cpumask_t hmask; + +cpumask_clear (&hmask); +riscv_cpuid_to_hartid_mask (mask, &hmask); +sbi_remote_sfence_vma_asid (hmask.bits, start, size, asid); + } +} + + +void flush_tlb_all (void ) +{ +sbi_remote_sfence_vma (NULL ,0 ,SFENCE_VMA_FLUSH_ALL ); +} + +void flush_tlb_mm (struct mm_struct *mm) +{ +remote_sfence_vma_asid (mm_cpumask (mm),0 ,SFENCE_VMA_FLUSH_ALL ,0 ); +} + +void flush_tlb_page (struct vm_area_struct *vma,unsigned long addr) +{ +remote_sfence_vma_asid (mm_cpumask (vma->vm_mm), addr,PAGE_SIZE ,0 ); +} + + +void flush_tlb_range (struct vm_area_struct *vma,unsigned long start, +unsigned long end) +{ +if (end - start > tlbi_range_threshold) { +flush_tlb_mm (vma->vm_mm); +return ; + } + +remote_sfence_vma_asid (mm_cpumask (vma->vm_mm), start, end - start,0 ); +} + +void flush_tlb_kernel_range (unsigned long start,unsigned long end) +{ +if (end - start > tlbi_range_threshold) { +flush_tlb_all (); +return ; + } + +remote_sfence_vma (start, end - start); +} + +#endif /* CONFIG_SMP */ Signature · 1 line
2.17.1
_______________________________________________
linux-riscv mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/linux-riscv