RISC-V IPI Improvements
v18 cover RISC-V IPI Improvements
This series aims to improve IPI support in Linux RISC-V in following ways:
1) Treat IPIs as normal per-CPU interrupts instead of having custom RISC-V specific hooks. This also makes Linux RISC-V IPI support aligned with other architectures.
2) Remote TLB flushes and icache flushes should prefer local IPIs instead of SBI calls whenever we have specialized hardware (such as RISC-V AIA IMSIC and RISC-V SWI) which allows S-mode software to directly inject IPIs without any assistance from M-mode runtime firmware.
These patches were originally part of the "Linux RISC-V ACLINT Support" series but this now a separate series so that it can be merged independently of the "Linux RISC-V ACLINT Support" series.
(Refer, https://lore.kernel.org/lkml/[email protected]/)
These patches are also a preparatory patches for the up-coming:
1) Linux RISC-V AIA support
2) Linux RISC-V SWI support
These patches can also be found in riscv_ipi_imp_v18 branch at:
https://github.com/avpatel/linux.git
Changes since v17:
- Resolved merge conflicts and rebased on Linux-6.3-rc4
Changes since v16:
- Rebased on Linux-6.3-rc1
- Dropped PATCH3 and PATCH9 since these patches are already merged
- Added Palmer's Acked-by
Changes since v15:
- Rebased on Linux-6.2-rc2
- Added Reviewed-by and Tested-by tags to some of the patches.
Changes since v14:
- Minor fixes in commit description of PATCH3 (as suggested by tglx)
- Don't disable parent IPI when CPU goes offline for SBI IPI driver and CLINT driver in PATCH4.
- Include Apple AIC driver changes from Marc Z as PATCH9
Changes since v13:
- Included changes suggested by Marc Z in PATCH3
- Use chained handlers in PATCH4
- Added new PATCH8 to have empty irq_eoi() in RISC-V INTC driver. This avoids the unnecessary mask/unmask dance at time of handling interrupts.
Changes since v12:
- Rebased on Linux-6.1-rc7
- Bring-back the IPI optimization in ipi_mux_send_mask() for PATCH3
- Call ipi_mux_send() for one target CPU at a time in PATCH3
Changes since v11:
- Removed ipi_mux_pre/post_handle() callbacks in PATCH3
- Removed sturct ipi_mux_ops in PATCH3
- Removed parent_virq and data pointer from everywhere in PATCH3
- Removed struct ipi_mux_control in PATCH3
- Improved function signature of ipi_mux_send() callback in PATCH3
- Used unsigned type with atomic operation in PATCH3
Changes since v10:
- Rebased on Linux-6.1-rc5
- Drop the "!(pending & ibit)" check in ipi_mux_send_mask() of PATCH3
- Disable local interrupts in ipi_mux_send_mask() of PATCH3 because we can be preempted while using a per-CPU temporary variable.
Changes since v9:
- Rebased on Linux-6.1-rc3
- Updated header comment block of ipi-mux.c in PATCH3
- Use a struct for global data of ipi-mux.c in PATCH3
- Add per-CPU temp cpumask for sending IPIs in PATCH3
- Drop the use of fwspec in PATCH3
- Use static key for ipi_mux_pre_handle() and ipi_mux_post_handle() in PATCH3
- Remove redundant pr_warn_ratelimited() called by ipi_mux_process() in PATCH3
- Remove CPUHP thingy from ipi_mux_create() in PATCH3
Changes since v8:
- Rebased on Linux-6.0-rc3
- Use dummy percpu data as parameter for request_percpu_irq() in PATCH4.
Changes since v7:
- Rebased on Linux-6.0-rc1
- Use atomic operations to track per-CPU pending and enabled IPIs in PATCH3. (Note: this is inspired from IPI muxing implemented in drivers/irqchip/irq-apple-aic.c)
- Made "struct ipi_mux_ops" (added by PATCH3) flexible so that drivers/irqchip/irq-apple-aic.c can adopt it in future.
Changes since v6:
- Rebased on Linux-5.19-rc7
- Added documentation for struct ipi_mux_ops in PATCH3
- Dropped dummy irq_mask()/unmask() in PATCH3
- Added const for "ipi_mux_chip" in PATCH3
- Removed "type" initialization from ipi_mux_domain_alloc() in PATCH3
- Dropped translate() from "ipi_mux_domain_ops" in PATCH3
- Improved barrier documentation in ipi_mux_process() of PATCH3
- Added percpu check in ipi_mux_create() for parent_virq of PATCH3
- Added nr_ipi parameter in ipi_mux_create() of PATCH3
Changes since v5:
- Rebased on Linux-5.18-rc3
- Used kernel doc style in PATCH3
- Removed redundant loop in ipi_mux_process() of PATCH3
- Removed "RISC-V" prefix form ipi_mux_chip.name of PATCH3
- Removed use of "this patch" in PATCH3 commit description
- Addressed few other nit comments in PATCH3
Changes since v4:
- Rebased on Linux-5.17
- Includes new PATCH3 which adds mechanism to multiplex a single HW IPI
Changes since v3:
- Rebased on Linux-5.17-rc6
- Updated PATCH2 to not export riscv_set_intc_hwnode_fn()
- Simplified riscv_intc_hwnode() in PATCH2
Changes since v2:
- Rebased on Linux-5.17-rc4
- Updated PATCH2 to not create synthetic INTC fwnode and instead provide a function which allows drivers to directly discover INTC fwnode
Changes since v1:
- Use synthetic fwnode for INTC instead of irq_set_default_host() in PATCH2
Anup Patel (7):
RISC-V: Clear SIP bit only when using SBI IPI operations irqchip/riscv-intc: Allow drivers to directly discover INTC hwnode
RISC-V: Treat IPIs as normal Linux IRQs
RISC-V: Allow marking IPIs as suitable for remote FENCEs
RISC-V: Use IPIs for remote TLB flush when possible
RISC-V: Use IPIs for remote icache flush when possible irqchip/riscv-intc: Add empty irq_eoi() for chained irq handlers
arch/riscv/Kconfig | 2 + arch/riscv/include/asm/irq.h | 4 + arch/riscv/include/asm/sbi.h | 9 +- arch/riscv/include/asm/smp.h | 49 ++++++--- arch/riscv/kernel/Makefile | 1 + arch/riscv/kernel/cpu-hotplug.c | 3 +- arch/riscv/kernel/irq.c | 21 +++- arch/riscv/kernel/sbi-ipi.c | 77 ++++++++++++++ arch/riscv/kernel/sbi.c | 100 +++-------------- arch/riscv/kernel/smp.c | 171 +++++++++++++++--------------- arch/riscv/kernel/smpboot.c | 5 +- arch/riscv/mm/cacheflush.c | 5 +- arch/riscv/mm/tlbflush.c | 93 +++++++++++++--- drivers/clocksource/timer-clint.c | 65 +++++++++--- drivers/irqchip/Kconfig | 1 + drivers/irqchip/irq-riscv-intc.c | 71 ++++++++----- 16 files changed, 429 insertions(+), 248 deletions(-) create mode 100644 arch/riscv/kernel/sbi-ipi.c
Signature · 1 line
2.34.1
PATCH v18 1/7 RISC-V: Clear SIP bit only when using SBI IPI operations
The software interrupt pending (i.e. [M|S]SIP) bit is writeable for S-mode but read-only for M-mode so we clear this bit only when using SBI IPI operations.
--- arch/riscv/kernel/sbi.c | 8 +++++++- arch/riscv/kernel/smp.c | 2 -- 2 files changed, 7 insertions(+), 3 deletions(-)
arch/riscv/kernel/sbi.c +7 -1
@@ -646,8 +646,14 @@ static void sbi_send_cpumask_ipi(const struct cpumask *target)sbi_send_ipi (target); } +static void sbi_ipi_clear (void ) +{ +csr_clear (CSR_IP ,IE_SIE ); +} +static const struct riscv_ipi_ops sbi_ipi_ops = { - .ipi_inject = sbi_send_cpumask_ipi + .ipi_inject = sbi_send_cpumask_ipi, + .ipi_clear = sbi_ipi_clear };void __init sbi_init (void )
arch/riscv/kernel/smp.c +0 -2
@@ -112,8 +112,6 @@ void riscv_clear_ipi(void) {if (ipi_ops && ipi_ops->ipi_clear) ipi_ops->ipi_clear (); - -csr_clear (CSR_IP ,IE_SIE ); }EXPORT_SYMBOL_GPL (riscv_clear_ipi);
Signature · 1 line
2.34.1
[irqchip: irq/irqchip-next] RISC-V: Clear SIP bit only when using SBI IPI operations
The following commit has been merged into the irq/irqchip-next branch of irqchip:
The following commit has been merged into the irq/irqchip-next branch of irqchip:
Commit-ID: 3ee92565b83ecc08e5b0c878dd87a2973eaca2ea Gitweb: https://git.kernel.org/pub/scm/linux/kernel/git/maz/arm-platforms/3ee92565b83ecc08e5b0c878dd87a2973eaca2ea Author: Anup Patel <[email protected]> AuthorDate: Tue, 28 Mar 2023 09:22:17 +05:30 Committer: Marc Zyngier <[email protected]> CommitterDate: Sat, 08 Apr 2023 11:26:23 +01:00
RISC-V: Clear SIP bit only when using SBI IPI operations
The software interrupt pending (i.e. [M|S]SIP) bit is writeable for S-mode but read-only for M-mode so we clear this bit only when using SBI IPI operations.
--- arch/riscv/kernel/sbi.c | 8 +++++++- arch/riscv/kernel/smp.c | 2 -- 2 files changed, 7 insertions(+), 3 deletions(-)
arch/riscv/kernel/sbi.c +7 -1
@@ -646,8 +646,14 @@ static void sbi_send_cpumask_ipi(const struct cpumask *target)sbi_send_ipi (target); } +static void sbi_ipi_clear (void ) +{ +csr_clear (CSR_IP ,IE_SIE ); +} +static const struct riscv_ipi_ops sbi_ipi_ops = { - .ipi_inject = sbi_send_cpumask_ipi + .ipi_inject = sbi_send_cpumask_ipi, + .ipi_clear = sbi_ipi_clear };void __init sbi_init (void )
arch/riscv/kernel/smp.c +0 -2
@@ -112,8 +112,6 @@ void riscv_clear_ipi(void) {if (ipi_ops && ipi_ops->ipi_clear) ipi_ops->ipi_clear (); - -csr_clear (CSR_IP ,IE_SIE ); }EXPORT_SYMBOL_GPL (riscv_clear_ipi);
PATCH v18 2/7 irqchip/riscv-intc: Allow drivers to directly discover INTC hwnode
In reply to Anup PatelVarious RISC-V drivers (such as SBI IPI, SBI Timer, SBI PMU, and KVM RISC-V) don't have associated DT node but these drivers need standard per-CPU (local) interrupts defined by the RISC-V privileged specification.
We add riscv_get_intc_hwnode() in arch/riscv which allows RISC-V drivers not having DT node to discover INTC hwnode which in-turn helps these drivers to map per-CPU (local) interrupts provided by the INTC driver.
--- arch/riscv/include/asm/irq.h | 4 ++++ arch/riscv/kernel/irq.c | 18 ++++++++++++++++++ drivers/irqchip/irq-riscv-intc.c | 7 +++++++ 3 files changed, 29 insertions(+)
arch/riscv/include/asm/irq.h +4 -0
@@ -12,6 +12,10 @@#include <asm-generic/irq.h> +void riscv_set_intc_hwnode_fn (struct fwnode_handle *(*fn)(void )); + +struct fwnode_handle *riscv_get_intc_hwnode (void ); +extern void __init init_IRQ (void );#endif /* _ASM_RISCV_IRQ_H */
arch/riscv/kernel/irq.c +18 -0
@@ -7,9 +7,27 @@#include <linux/interrupt.h> #include <linux/irqchip.h> +#include <linux/irqdomain.h> +#include <linux/module.h> #include <linux/seq_file.h> #include <asm/smp.h> +static struct fwnode_handle *(*__get_intc_node)(void ); + +void riscv_set_intc_hwnode_fn (struct fwnode_handle *(*fn)(void )) +{ + __get_intc_node = fn; +} + +struct fwnode_handle *riscv_get_intc_hwnode (void ) +{ +if (__get_intc_node) +return __get_intc_node (); + +return NULL ; +} +EXPORT_SYMBOL_GPL (riscv_get_intc_hwnode); +int arch_show_interrupts (struct seq_file *p,int prec) {show_ipi_stats (p, prec);
drivers/irqchip/irq-riscv-intc.c +7 -0
@@ -92,6 +92,11 @@ static const struct irq_domain_ops riscv_intc_domain_ops = { .xlate = irq_domain_xlate_onecell, }; +static struct fwnode_handle *riscv_intc_hwnode (void ) +{ +return intc_domain->fwnode; +} +static int __init riscv_intc_init (struct device_node *node,struct device_node *parent) {
@@ -126,6 +131,8 @@ static int __init riscv_intc_init(struct device_node *node,return rc; } +riscv_set_intc_hwnode_fn (riscv_intc_hwnode); + cpuhp_setup_state(CPUHP_AP_IRQ_RISCV_STARTING, "irqchip/riscv/intc:starting", riscv_intc_cpu_starting,
Signature · 1 line
2.34.1
[irqchip: irq/irqchip-next] irqchip/riscv-intc: Allow drivers to directly discover INTC hwnode
The following commit has been merged into the irq/irqchip-next branch of irqchip:
The following commit has been merged into the irq/irqchip-next branch of irqchip:
Commit-ID: 0c60a31ce62ca3e93550868fd699dfc4dfc4e795 Gitweb: https://git.kernel.org/pub/scm/linux/kernel/git/maz/arm-platforms/0c60a31ce62ca3e93550868fd699dfc4dfc4e795 Author: Anup Patel <[email protected]> AuthorDate: Tue, 28 Mar 2023 09:22:18 +05:30 Committer: Marc Zyngier <[email protected]> CommitterDate: Sat, 08 Apr 2023 11:26:24 +01:00
irqchip/riscv-intc: Allow drivers to directly discover INTC hwnode
Various RISC-V drivers (such as SBI IPI, SBI Timer, SBI PMU, and KVM RISC-V) don't have associated DT node but these drivers need standard per-CPU (local) interrupts defined by the RISC-V privileged specification.
We add riscv_get_intc_hwnode() in arch/riscv which allows RISC-V drivers not having DT node to discover INTC hwnode which in-turn helps these drivers to map per-CPU (local) interrupts provided by the INTC driver.
--- arch/riscv/include/asm/irq.h | 4 ++++ arch/riscv/kernel/irq.c | 18 ++++++++++++++++++ drivers/irqchip/irq-riscv-intc.c | 7 +++++++ 3 files changed, 29 insertions(+)
arch/riscv/include/asm/irq.h +4 -0
@@ -12,6 +12,10 @@#include <asm-generic/irq.h> +void riscv_set_intc_hwnode_fn (struct fwnode_handle *(*fn)(void )); + +struct fwnode_handle *riscv_get_intc_hwnode (void ); +extern void __init init_IRQ (void );#endif /* _ASM_RISCV_IRQ_H */
arch/riscv/kernel/irq.c +18 -0
@@ -7,9 +7,27 @@#include <linux/interrupt.h> #include <linux/irqchip.h> +#include <linux/irqdomain.h> +#include <linux/module.h> #include <linux/seq_file.h> #include <asm/smp.h> +static struct fwnode_handle *(*__get_intc_node)(void ); + +void riscv_set_intc_hwnode_fn (struct fwnode_handle *(*fn)(void )) +{ + __get_intc_node = fn; +} + +struct fwnode_handle *riscv_get_intc_hwnode (void ) +{ +if (__get_intc_node) +return __get_intc_node (); + +return NULL ; +} +EXPORT_SYMBOL_GPL (riscv_get_intc_hwnode); +int arch_show_interrupts (struct seq_file *p,int prec) {show_ipi_stats (p, prec);
drivers/irqchip/irq-riscv-intc.c +7 -0
@@ -92,6 +92,11 @@ static const struct irq_domain_ops riscv_intc_domain_ops = { .xlate = irq_domain_xlate_onecell, }; +static struct fwnode_handle *riscv_intc_hwnode (void ) +{ +return intc_domain->fwnode; +} +static int __init riscv_intc_init (struct device_node *node,struct device_node *parent) {
@@ -126,6 +131,8 @@ static int __init riscv_intc_init(struct device_node *node,return rc; } +riscv_set_intc_hwnode_fn (riscv_intc_hwnode); + cpuhp_setup_state(CPUHP_AP_IRQ_RISCV_STARTING, "irqchip/riscv/intc:starting", riscv_intc_cpu_starting,
PATCH v18 3/7 RISC-V: Treat IPIs as normal Linux IRQs
In reply to Anup PatelCurrently, the RISC-V kernel provides arch specific hooks (i.e. struct riscv_ipi_ops) to register IPI handling methods. The stats gathering of IPIs is also arch specific in the RISC-V kernel.
Other architectures (such as ARM, ARM64, and MIPS) have moved away from custom arch specific IPI handling methods. Currently, these architectures have Linux irqchip drivers providing a range of Linux IRQ numbers to be used as IPIs and IPI triggering is done using generic IPI APIs. This approach allows architectures to treat IPIs as normal Linux IRQs and IPI stats gathering is done by the generic Linux IRQ subsystem.
We extend the RISC-V IPI handling as-per above approach so that arch specific IPI handling methods (struct riscv_ipi_ops) can be removed and the IPI handling is done through the Linux IRQ subsystem.
--- arch/riscv/Kconfig | 2 + arch/riscv/include/asm/sbi.h | 9 +- arch/riscv/include/asm/smp.h | 35 ++++--- arch/riscv/kernel/Makefile | 1 + arch/riscv/kernel/cpu-hotplug.c | 3 +- arch/riscv/kernel/irq.c | 3 +- arch/riscv/kernel/sbi-ipi.c | 77 ++++++++++++++ arch/riscv/kernel/sbi.c | 106 +++----------------- arch/riscv/kernel/smp.c | 160 +++++++++++++++--------------- arch/riscv/kernel/smpboot.c | 5 +- drivers/clocksource/timer-clint.c | 65 +++++++++--- drivers/irqchip/Kconfig | 1 + drivers/irqchip/irq-riscv-intc.c | 55 +++++----- 13 files changed, 283 insertions(+), 239 deletions(-) create mode 100644 arch/riscv/kernel/sbi-ipi.c
arch/riscv/Kconfig +2 -0
@@ -63,6 +63,8 @@ config RISCV select GENERIC_GETTIMEOFDAY if HAVE_GENERIC_VDSO select GENERIC_IDLE_POLL_SETUP select GENERIC_IOREMAP if MMU + select GENERIC_IRQ_IPI if SMP + select GENERIC_IRQ_IPI_MUX if SMP select GENERIC_IRQ_MULTI_HANDLER select GENERIC_IRQ_SHOW select GENERIC_IRQ_SHOW_LEVEL
arch/riscv/include/asm/sbi.h +7 -2
@@ -271,8 +271,7 @@ long sbi_get_marchid(void);long sbi_get_mimpid (void );void sbi_set_timer (uint64_t stime_value);void sbi_shutdown (void ); -void sbi_clear_ipi (void ); -int sbi_send_ipi (const struct cpumask *cpu_mask); +void sbi_send_ipi (unsigned int cpu);int sbi_remote_fence_i (const struct cpumask *cpu_mask); int sbi_remote_sfence_vma(const struct cpumask *cpu_mask, unsigned long start,
@@ -335,4 +334,10 @@ unsigned long riscv_cached_mvendorid(unsigned int cpu_id);unsigned long riscv_cached_marchid (unsigned int cpu_id);unsigned long riscv_cached_mimpid (unsigned int cpu_id); +#if IS_ENABLED (CONFIG_SMP ) &&IS_ENABLED (CONFIG_RISCV_SBI ) +void sbi_ipi_init (void ); +#else +static inline void sbi_ipi_init (void ) { } +#endif +#endif /* _ASM_RISCV_SBI_H */
arch/riscv/include/asm/smp.h +21 -14
@@ -15,11 +15,6 @@struct seq_file ;extern unsigned long boot_cpu_hartid; -struct riscv_ipi_ops { -void (*ipi_inject)(const struct cpumask *target); -void (*ipi_clear)(void ); -}; -#ifdef CONFIG_SMP /* * Mapping between linux logical cpu index and hartid.
@@ -33,9 +28,6 @@ void show_ipi_stats(struct seq_file *p, int prec);/* SMP initialization hook for setup_arch */ void __init setup_smp (void ); -/* Called from C code, this handles an IPI. */ -void handle_IPI (struct pt_regs *regs); -/* Hook for the generic smp_call_function_many() routine. */ void arch_send_call_function_ipi_mask (struct cpumask *mask);
@@ -44,11 +36,17 @@ void arch_send_call_function_single_ipi(int cpu);int riscv_hartid_to_cpuid (unsigned long hartid); -/* Set custom IPI operations */ -void riscv_set_ipi_ops (const struct riscv_ipi_ops *ops); +/* Enable IPI for CPU hotplug */ +void riscv_ipi_enable (void ); + +/* Disable IPI for CPU hotplug */ +void riscv_ipi_disable (void ); -/* Clear IPI for current CPU */ -void riscv_clear_ipi (void ); +/* Check if IPI interrupt numbers are available */ +bool riscv_ipi_have_virq_range (void ); + +/* Set the IPI interrupt numbers for arch (called by irqchip drivers) */ +void riscv_ipi_set_virq_range (int virq,int nr);/* Check other CPUs stop or not */ bool smp_crash_stop_failed (void );
@@ -85,11 +83,20 @@ static inline unsigned long cpuid_to_hartid_map(int cpu)return boot_cpu_hartid; } -static inline void riscv_set_ipi_ops (const struct riscv_ipi_ops *ops) +static inline void riscv_ipi_enable (void ) { } -static inline void riscv_clear_ipi (void ) +static inline void riscv_ipi_disable (void ) +{ +} + +static inline bool riscv_ipi_have_virq_range (void ) +{ +return false; +} + +static inline void riscv_ipi_set_virq_range (int virq,int nr) { }
arch/riscv/kernel/Makefile +1 -0
@@ -74,6 +74,7 @@ obj-$(CONFIG_PERF_EVENTS) += perf_callchain.o obj-$(CONFIG_HAVE_PERF_REGS) += perf_regs.o obj-$(CONFIG_RISCV_SBI) += sbi.o ifeq ($(CONFIG_RISCV_SBI), y) +obj-$(CONFIG_SMP) += sbi-ipi.o obj-$(CONFIG_SMP) += cpu_ops_sbi.o endif obj-$(CONFIG_HOTPLUG_CPU) += cpu-hotplug.o
arch/riscv/kernel/cpu-hotplug.c +2 -1
@@ -13,7 +13,7 @@#include <asm/irq.h> #include <asm/cpu_ops.h> #include <asm/numa.h> -#include <asm/sbi.h> +#include <asm/smp.h> bool cpu_has_hotplug (unsigned int cpu) {
@@ -43,6 +43,7 @@ int __cpu_disable(void)remove_cpu_topology (cpu);numa_remove_cpu (cpu);set_cpu_online (cpu, false); +riscv_ipi_disable ();irq_migrate_all_off_this_cpu ();return ret;
arch/riscv/kernel/irq.c +2 -1
@@ -10,7 +10,7 @@#include <linux/irqdomain.h> #include <linux/module.h> #include <linux/seq_file.h> -#include <asm/smp.h> +#include <asm/sbi.h> static struct fwnode_handle *(*__get_intc_node)(void );
@@ -39,4 +39,5 @@ void __init init_IRQ(void)irqchip_init ();if (!handle_arch_irq)panic ("No interrupt controller found." ); +sbi_ipi_init (); }
arch/riscv/kernel/sbi-ipi.c new file +77 -0
77 lines not on this page · raw message
arch/riscv/kernel/sbi.c +16 -90
164 lines not on this page · raw message
arch/riscv/kernel/smp.c +79 -81
216 lines not on this page · raw message
arch/riscv/kernel/smpboot.c +2 -3
@@ -30,7 +30,6 @@#include <asm/numa.h> #include <asm/tlbflush.h> #include <asm/sections.h> -#include <asm/sbi.h> #include <asm/smp.h> #include "head.h"
@@ -158,12 +157,12 @@ asmlinkage __visible void smp_callin(void)struct mm_struct *mm = &init_mm;unsigned int curr_cpuid =smp_processor_id (); -riscv_clear_ipi (); -/* All kernel threads share the same mm context. */ mmgrab (mm); current->active_mm = mm; +riscv_ipi_enable (); +store_cpu_topology (curr_cpuid);notify_cpu_starting (curr_cpuid);numa_add_cpu (curr_cpuid);
drivers/clocksource/timer-clint.c +49 -16
129 lines not on this page · raw message
drivers/irqchip/Kconfig +1 -0
@@ -535,6 +535,7 @@ config TI_PRUSS_INTC config RISCV_INTC bool depends on RISCV + select IRQ_DOMAIN_HIERARCHY config SIFIVE_PLIC bool
drivers/irqchip/irq-riscv-intc.c +24 -31
82 lines not on this page · raw message
Signature · 7 lines
2.34.1 _______________________________________________ linux-riscv mailing list [email protected] http://lists.infradead.org/mailman/listinfo/linux-riscv
[irqchip: irq/irqchip-next] RISC-V: Treat IPIs as normal Linux IRQs
The following commit has been merged into the irq/irqchip-next branch of irqchip:
The following commit has been merged into the irq/irqchip-next branch of irqchip:
Commit-ID: 832f15f42646812b096bc67c0eac439291a0db1f Gitweb: https://git.kernel.org/pub/scm/linux/kernel/git/maz/arm-platforms/832f15f42646812b096bc67c0eac439291a0db1f Author: Anup Patel <[email protected]> AuthorDate: Tue, 28 Mar 2023 09:22:19 +05:30 Committer: Marc Zyngier <[email protected]> CommitterDate: Sat, 08 Apr 2023 11:26:24 +01:00
RISC-V: Treat IPIs as normal Linux IRQs
Currently, the RISC-V kernel provides arch specific hooks (i.e. struct riscv_ipi_ops) to register IPI handling methods. The stats gathering of IPIs is also arch specific in the RISC-V kernel.
Other architectures (such as ARM, ARM64, and MIPS) have moved away from custom arch specific IPI handling methods. Currently, these architectures have Linux irqchip drivers providing a range of Linux IRQ numbers to be used as IPIs and IPI triggering is done using generic IPI APIs. This approach allows architectures to treat IPIs as normal Linux IRQs and IPI stats gathering is done by the generic Linux IRQ subsystem.
We extend the RISC-V IPI handling as-per above approach so that arch specific IPI handling methods (struct riscv_ipi_ops) can be removed and the IPI handling is done through the Linux IRQ subsystem.
--- arch/riscv/Kconfig | 2 +- arch/riscv/include/asm/sbi.h | 9 +- arch/riscv/include/asm/smp.h | 35 +++--- arch/riscv/kernel/Makefile | 1 +- arch/riscv/kernel/cpu-hotplug.c | 3 +- arch/riscv/kernel/irq.c | 3 +- arch/riscv/kernel/sbi-ipi.c | 77 ++++++++++++++- arch/riscv/kernel/sbi.c | 106 ++----------------- arch/riscv/kernel/smp.c | 160 ++++++++++++++--------------- arch/riscv/kernel/smpboot.c | 5 +- drivers/clocksource/timer-clint.c | 65 +++++++++--- drivers/irqchip/Kconfig | 1 +- drivers/irqchip/irq-riscv-intc.c | 55 ++++------ 13 files changed, 283 insertions(+), 239 deletions(-) create mode 100644 arch/riscv/kernel/sbi-ipi.c
arch/riscv/Kconfig +2 -0
@@ -63,6 +63,8 @@ config RISCV select GENERIC_GETTIMEOFDAY if HAVE_GENERIC_VDSO select GENERIC_IDLE_POLL_SETUP select GENERIC_IOREMAP if MMU + select GENERIC_IRQ_IPI if SMP + select GENERIC_IRQ_IPI_MUX if SMP select GENERIC_IRQ_MULTI_HANDLER select GENERIC_IRQ_SHOW select GENERIC_IRQ_SHOW_LEVEL
arch/riscv/include/asm/sbi.h +7 -2
@@ -271,8 +271,7 @@ long sbi_get_marchid(void);long sbi_get_mimpid (void );void sbi_set_timer (uint64_t stime_value);void sbi_shutdown (void ); -void sbi_clear_ipi (void ); -int sbi_send_ipi (const struct cpumask *cpu_mask); +void sbi_send_ipi (unsigned int cpu);int sbi_remote_fence_i (const struct cpumask *cpu_mask); int sbi_remote_sfence_vma(const struct cpumask *cpu_mask, unsigned long start,
@@ -335,4 +334,10 @@ unsigned long riscv_cached_mvendorid(unsigned int cpu_id);unsigned long riscv_cached_marchid (unsigned int cpu_id);unsigned long riscv_cached_mimpid (unsigned int cpu_id); +#if IS_ENABLED (CONFIG_SMP ) &&IS_ENABLED (CONFIG_RISCV_SBI ) +void sbi_ipi_init (void ); +#else +static inline void sbi_ipi_init (void ) { } +#endif +#endif /* _ASM_RISCV_SBI_H */
arch/riscv/include/asm/smp.h +21 -14
@@ -15,11 +15,6 @@struct seq_file ;extern unsigned long boot_cpu_hartid; -struct riscv_ipi_ops { -void (*ipi_inject)(const struct cpumask *target); -void (*ipi_clear)(void ); -}; -#ifdef CONFIG_SMP /* * Mapping between linux logical cpu index and hartid.
@@ -33,9 +28,6 @@ void show_ipi_stats(struct seq_file *p, int prec);/* SMP initialization hook for setup_arch */ void __init setup_smp (void ); -/* Called from C code, this handles an IPI. */ -void handle_IPI (struct pt_regs *regs); -/* Hook for the generic smp_call_function_many() routine. */ void arch_send_call_function_ipi_mask (struct cpumask *mask);
@@ -44,11 +36,17 @@ void arch_send_call_function_single_ipi(int cpu);int riscv_hartid_to_cpuid (unsigned long hartid); -/* Set custom IPI operations */ -void riscv_set_ipi_ops (const struct riscv_ipi_ops *ops); +/* Enable IPI for CPU hotplug */ +void riscv_ipi_enable (void ); + +/* Disable IPI for CPU hotplug */ +void riscv_ipi_disable (void ); -/* Clear IPI for current CPU */ -void riscv_clear_ipi (void ); +/* Check if IPI interrupt numbers are available */ +bool riscv_ipi_have_virq_range (void ); + +/* Set the IPI interrupt numbers for arch (called by irqchip drivers) */ +void riscv_ipi_set_virq_range (int virq,int nr);/* Check other CPUs stop or not */ bool smp_crash_stop_failed (void );
@@ -85,11 +83,20 @@ static inline unsigned long cpuid_to_hartid_map(int cpu)return boot_cpu_hartid; } -static inline void riscv_set_ipi_ops (const struct riscv_ipi_ops *ops) +static inline void riscv_ipi_enable (void ) { } -static inline void riscv_clear_ipi (void ) +static inline void riscv_ipi_disable (void ) +{ +} + +static inline bool riscv_ipi_have_virq_range (void ) +{ +return false; +} + +static inline void riscv_ipi_set_virq_range (int virq,int nr) { }
arch/riscv/kernel/Makefile +1 -0
@@ -74,6 +74,7 @@ obj-$(CONFIG_PERF_EVENTS) += perf_callchain.o obj-$(CONFIG_HAVE_PERF_REGS) += perf_regs.o obj-$(CONFIG_RISCV_SBI) += sbi.o ifeq ($(CONFIG_RISCV_SBI), y) +obj-$(CONFIG_SMP) += sbi-ipi.o obj-$(CONFIG_SMP) += cpu_ops_sbi.o endif obj-$(CONFIG_HOTPLUG_CPU) += cpu-hotplug.o
arch/riscv/kernel/cpu-hotplug.c +2 -1
@@ -13,7 +13,7 @@#include <asm/irq.h> #include <asm/cpu_ops.h> #include <asm/numa.h> -#include <asm/sbi.h> +#include <asm/smp.h> bool cpu_has_hotplug (unsigned int cpu) {
@@ -43,6 +43,7 @@ int __cpu_disable(void)remove_cpu_topology (cpu);numa_remove_cpu (cpu);set_cpu_online (cpu, false); +riscv_ipi_disable ();irq_migrate_all_off_this_cpu ();return ret;
arch/riscv/kernel/irq.c +2 -1
@@ -10,7 +10,7 @@#include <linux/irqdomain.h> #include <linux/module.h> #include <linux/seq_file.h> -#include <asm/smp.h> +#include <asm/sbi.h> static struct fwnode_handle *(*__get_intc_node)(void );
@@ -39,4 +39,5 @@ void __init init_IRQ(void)irqchip_init ();if (!handle_arch_irq)panic ("No interrupt controller found." ); +sbi_ipi_init (); }
arch/riscv/kernel/sbi-ipi.c new file +77 -0
77 lines not on this page · raw message
arch/riscv/kernel/sbi.c +16 -90
164 lines not on this page · raw message
arch/riscv/kernel/smp.c +79 -81
216 lines not on this page · raw message
arch/riscv/kernel/smpboot.c +2 -3
@@ -30,7 +30,6 @@#include <asm/numa.h> #include <asm/tlbflush.h> #include <asm/sections.h> -#include <asm/sbi.h> #include <asm/smp.h> #include "head.h"
@@ -158,12 +157,12 @@ asmlinkage __visible void smp_callin(void)struct mm_struct *mm = &init_mm;unsigned int curr_cpuid =smp_processor_id (); -riscv_clear_ipi (); -/* All kernel threads share the same mm context. */ mmgrab (mm); current->active_mm = mm; +riscv_ipi_enable (); +store_cpu_topology (curr_cpuid);notify_cpu_starting (curr_cpuid);numa_add_cpu (curr_cpuid);
drivers/clocksource/timer-clint.c +49 -16
129 lines not on this page · raw message
drivers/irqchip/Kconfig +1 -0
@@ -535,6 +535,7 @@ config TI_PRUSS_INTC config RISCV_INTC bool depends on RISCV + select IRQ_DOMAIN_HIERARCHY config SIFIVE_PLIC bool
drivers/irqchip/irq-riscv-intc.c +24 -31
82 lines not on this page · raw message
PATCH v18 4/7 RISC-V: Allow marking IPIs as suitable for remote FENCEs
In reply to Anup PatelTo do remote FENCEs (i.e. remote TLB flushes) using IPI calls on the RISC-V kernel, we need hardware mechanism to directly inject IPI from the supervisor mode (i.e. RISC-V kernel) instead of using SBI calls.
The upcoming AIA IMSIC devices allow direct IPI injection from the supervisor mode (i.e. RISC-V kernel). To support this, we extend the riscv_ipi_set_virq_range() function so that IPI provider (i.e. irqchip drivers can mark IPIs as suitable for remote FENCEs.
--- arch/riscv/include/asm/smp.h | 18 ++++++++++++++++-- arch/riscv/kernel/sbi-ipi.c | 2 +- arch/riscv/kernel/smp.c | 11 ++++++++++- drivers/clocksource/timer-clint.c | 2 +- 4 files changed, 28 insertions(+), 5 deletions(-)
arch/riscv/include/asm/smp.h +16 -2
@@ -16,6 +16,9 @@ struct seq_file;extern unsigned long boot_cpu_hartid;#ifdef CONFIG_SMP + +#include <linux/jump_label.h> +/* * Mapping between linux logical cpu index and hartid. */
@@ -46,7 +49,12 @@ void riscv_ipi_disable(void);bool riscv_ipi_have_virq_range (void );/* Set the IPI interrupt numbers for arch (called by irqchip drivers) */ -void riscv_ipi_set_virq_range (int virq,int nr); +void riscv_ipi_set_virq_range (int virq,int nr,bool use_for_rfence); + +/* Check if we can use IPIs for remote FENCEs */ +DECLARE_STATIC_KEY_FALSE (riscv_ipi_for_rfence); +#define riscv_use_ipi_for_rfence () \ + static_branch_unlikely(&riscv_ipi_for_rfence)/* Check other CPUs stop or not */ bool smp_crash_stop_failed (void );
@@ -96,10 +104,16 @@ static inline bool riscv_ipi_have_virq_range(void) return false; } -static inline void riscv_ipi_set_virq_range (int virq,int nr) +static inline void riscv_ipi_set_virq_range (int virq,int nr, +bool use_for_rfence) { } +static inline bool riscv_use_ipi_for_rfence (void ) +{ +return false; +} +#endif /* CONFIG_SMP */ #if defined(CONFIG_HOTPLUG_CPU ) && (CONFIG_SMP )
arch/riscv/kernel/sbi-ipi.c +1 -1
@@ -72,6 +72,6 @@ void __init sbi_ipi_init(void)"irqchip/sbi-ipi:starting" , sbi_ipi_starting_cpu, NULL); -riscv_ipi_set_virq_range (virq,BITS_PER_BYTE ); +riscv_ipi_set_virq_range (virq,BITS_PER_BYTE , false);pr_info ("providing IPIs using SBI IPI extension\n" ); }
arch/riscv/kernel/smp.c +10 -1
@@ -177,7 +177,10 @@ bool riscv_ipi_have_virq_range(void)return (ipi_virq_base) ? true : false; } -void riscv_ipi_set_virq_range (int virq,int nr) +DEFINE_STATIC_KEY_FALSE (riscv_ipi_for_rfence); +EXPORT_SYMBOL_GPL (riscv_ipi_for_rfence); + +void riscv_ipi_set_virq_range (int virq,int nr,bool use_for_rfence) {int i, err;
@@ -200,6 +203,12 @@ void riscv_ipi_set_virq_range(int virq, int nr)/* Enabled IPIs for boot CPU immediately */ riscv_ipi_enable (); + +/* Update RFENCE static key */ +if (use_for_rfence) +static_branch_enable (&riscv_ipi_for_rfence); +else +static_branch_disable (&riscv_ipi_for_rfence); }static const char *const ipi_names[] = {
drivers/clocksource/timer-clint.c +1 -1
@@ -251,7 +251,7 @@ static int __init clint_timer_init_dt(struct device_node *np) }irq_set_chained_handler (clint_ipi_irq, clint_ipi_interrupt); -riscv_ipi_set_virq_range (rc,BITS_PER_BYTE ); +riscv_ipi_set_virq_range (rc,BITS_PER_BYTE , true);clint_clear_ipi ();#endif
Signature · 7 lines
2.34.1 _______________________________________________ linux-riscv mailing list [email protected] http://lists.infradead.org/mailman/listinfo/linux-riscv
[irqchip: irq/irqchip-next] RISC-V: Allow marking IPIs as suitable for remote FENCEs
The following commit has been merged into the irq/irqchip-next branch of irqchip:
The following commit has been merged into the irq/irqchip-next branch of irqchip:
Commit-ID: fb0f3d281b7f81a11e210783940f3798c4744179 Gitweb: https://git.kernel.org/pub/scm/linux/kernel/git/maz/arm-platforms/fb0f3d281b7f81a11e210783940f3798c4744179 Author: Anup Patel <[email protected]> AuthorDate: Tue, 28 Mar 2023 09:22:20 +05:30 Committer: Marc Zyngier <[email protected]> CommitterDate: Sat, 08 Apr 2023 11:26:24 +01:00
RISC-V: Allow marking IPIs as suitable for remote FENCEs
To do remote FENCEs (i.e. remote TLB flushes) using IPI calls on the RISC-V kernel, we need hardware mechanism to directly inject IPI from the supervisor mode (i.e. RISC-V kernel) instead of using SBI calls.
The upcoming AIA IMSIC devices allow direct IPI injection from the supervisor mode (i.e. RISC-V kernel). To support this, we extend the riscv_ipi_set_virq_range() function so that IPI provider (i.e. irqchip drivers can mark IPIs as suitable for remote FENCEs.
--- arch/riscv/include/asm/smp.h | 18 ++++++++++++++++-- arch/riscv/kernel/sbi-ipi.c | 2 +- arch/riscv/kernel/smp.c | 11 ++++++++++- drivers/clocksource/timer-clint.c | 2 +- 4 files changed, 28 insertions(+), 5 deletions(-)
arch/riscv/include/asm/smp.h +16 -2
@@ -16,6 +16,9 @@ struct seq_file;extern unsigned long boot_cpu_hartid;#ifdef CONFIG_SMP + +#include <linux/jump_label.h> +/* * Mapping between linux logical cpu index and hartid. */
@@ -46,7 +49,12 @@ void riscv_ipi_disable(void);bool riscv_ipi_have_virq_range (void );/* Set the IPI interrupt numbers for arch (called by irqchip drivers) */ -void riscv_ipi_set_virq_range (int virq,int nr); +void riscv_ipi_set_virq_range (int virq,int nr,bool use_for_rfence); + +/* Check if we can use IPIs for remote FENCEs */ +DECLARE_STATIC_KEY_FALSE (riscv_ipi_for_rfence); +#define riscv_use_ipi_for_rfence () \ + static_branch_unlikely(&riscv_ipi_for_rfence)/* Check other CPUs stop or not */ bool smp_crash_stop_failed (void );
@@ -96,10 +104,16 @@ static inline bool riscv_ipi_have_virq_range(void) return false; } -static inline void riscv_ipi_set_virq_range (int virq,int nr) +static inline void riscv_ipi_set_virq_range (int virq,int nr, +bool use_for_rfence) { } +static inline bool riscv_use_ipi_for_rfence (void ) +{ +return false; +} +#endif /* CONFIG_SMP */ #if defined(CONFIG_HOTPLUG_CPU ) && (CONFIG_SMP )
arch/riscv/kernel/sbi-ipi.c +1 -1
@@ -72,6 +72,6 @@ void __init sbi_ipi_init(void)"irqchip/sbi-ipi:starting" , sbi_ipi_starting_cpu, NULL); -riscv_ipi_set_virq_range (virq,BITS_PER_BYTE ); +riscv_ipi_set_virq_range (virq,BITS_PER_BYTE , false);pr_info ("providing IPIs using SBI IPI extension\n" ); }
arch/riscv/kernel/smp.c +10 -1
@@ -177,7 +177,10 @@ bool riscv_ipi_have_virq_range(void)return (ipi_virq_base) ? true : false; } -void riscv_ipi_set_virq_range (int virq,int nr) +DEFINE_STATIC_KEY_FALSE (riscv_ipi_for_rfence); +EXPORT_SYMBOL_GPL (riscv_ipi_for_rfence); + +void riscv_ipi_set_virq_range (int virq,int nr,bool use_for_rfence) {int i, err;
@@ -200,6 +203,12 @@ void riscv_ipi_set_virq_range(int virq, int nr)/* Enabled IPIs for boot CPU immediately */ riscv_ipi_enable (); + +/* Update RFENCE static key */ +if (use_for_rfence) +static_branch_enable (&riscv_ipi_for_rfence); +else +static_branch_disable (&riscv_ipi_for_rfence); }static const char *const ipi_names[] = {
drivers/clocksource/timer-clint.c +1 -1
@@ -251,7 +251,7 @@ static int __init clint_timer_init_dt(struct device_node *np) }irq_set_chained_handler (clint_ipi_irq, clint_ipi_interrupt); -riscv_ipi_set_virq_range (rc,BITS_PER_BYTE ); +riscv_ipi_set_virq_range (rc,BITS_PER_BYTE , true);clint_clear_ipi ();#endif
PATCH v18 5/7 RISC-V: Use IPIs for remote TLB flush when possible
In reply to Anup PatelIf we have specialized interrupt controller (such as AIA IMSIC) which allows supervisor mode to directly inject IPIs without any assistance from M-mode or HS-mode then using such specialized interrupt controller, we can do remote TLB flushes directly from supervisor mode instead of using the SBI RFENCE calls.
This patch extends remote TLB flush functions to use supervisor mode IPIs whenever direct supervisor mode IPIs.are supported by interrupt controller.
--- arch/riscv/mm/tlbflush.c | 93 +++++++++++++++++++++++++++++++++------- 1 file changed, 78 insertions(+), 15 deletions(-)
arch/riscv/mm/tlbflush.c +78 -15
@@ -23,14 +23,62 @@ static inline void local_flush_tlb_page_asid(unsigned long addr, : "memory"); } +static inline void local_flush_tlb_range (unsigned long start, +unsigned long size,unsigned long stride) +{ +if (size <= stride) +local_flush_tlb_page (start); +else +local_flush_tlb_all (); +} + +static inline void local_flush_tlb_range_asid (unsigned long start, +unsigned long size,unsigned long stride,unsigned long asid) +{ +if (size <= stride) +local_flush_tlb_page_asid (start, asid); +else +local_flush_tlb_all_asid (asid); +} + +static void __ipi_flush_tlb_all (void *info) +{ +local_flush_tlb_all (); +} +void flush_tlb_all (void ) { -sbi_remote_sfence_vma (NULL ,0 ,-1 ); +if (riscv_use_ipi_for_rfence ()) +on_each_cpu (__ipi_flush_tlb_all,NULL ,1 ); +else +sbi_remote_sfence_vma (NULL ,0 ,-1 ); +} + +struct flush_tlb_range_data { +unsigned long asid; +unsigned long start; +unsigned long size; +unsigned long stride; +}; + +static void __ipi_flush_tlb_range_asid (void *info) +{ +struct flush_tlb_range_data *d = info; + +local_flush_tlb_range_asid (d->start, d->size, d->stride, d->asid); +} + +static void __ipi_flush_tlb_range (void *info) +{ +struct flush_tlb_range_data *d = info; + +local_flush_tlb_range (d->start, d->size, d->stride); } -static void __sbi_tlb_flush_range (struct mm_struct *mm,unsigned long start, -unsigned long size,unsigned long stride) +static void __flush_tlb_range (struct mm_struct *mm,unsigned long start, +unsigned long size,unsigned long stride) { +struct flush_tlb_range_data ftd;struct cpumask *cmask =mm_cpumask (mm);unsigned int cpuid;bool broadcast;
@@ -45,19 +93,34 @@ static void __sbi_tlb_flush_range(struct mm_struct *mm, unsigned long start,unsigned long asid =atomic_long_read (&mm->context.id) & asid_mask;if (broadcast) { -sbi_remote_sfence_vma_asid (cmask, start, size, asid); - }else if (size <= stride) { -local_flush_tlb_page_asid (start, asid); +if (riscv_use_ipi_for_rfence ()) { + ftd.asid = asid; + ftd.start = start; + ftd.size = size; + ftd.stride = stride; +on_each_cpu_mask (cmask, + __ipi_flush_tlb_range_asid, + &ftd,1 ); + }else +sbi_remote_sfence_vma_asid (cmask, + start, size, asid); }else { -local_flush_tlb_all_asid (asid); +local_flush_tlb_range_asid (start, size, stride, asid); } }else {if (broadcast) { -sbi_remote_sfence_vma (cmask, start, size); - }else if (size <= stride) { -local_flush_tlb_page (start); +if (riscv_use_ipi_for_rfence ()) { + ftd.asid =0 ; + ftd.start = start; + ftd.size = size; + ftd.stride = stride; +on_each_cpu_mask (cmask, + __ipi_flush_tlb_range, + &ftd,1 ); + }else +sbi_remote_sfence_vma (cmask, start, size); }else { -local_flush_tlb_all (); +local_flush_tlb_range (start, size, stride); } }
@@ -66,23 +129,23 @@ static void __sbi_tlb_flush_range(struct mm_struct *mm, unsigned long start,void flush_tlb_mm (struct mm_struct *mm) { -__sbi_tlb_flush_range (mm,0 ,-1 ,PAGE_SIZE ); +__flush_tlb_range (mm,0 ,-1 ,PAGE_SIZE ); }void flush_tlb_page (struct vm_area_struct *vma,unsigned long addr) { -__sbi_tlb_flush_range (vma->vm_mm, addr,PAGE_SIZE ,PAGE_SIZE ); +__flush_tlb_range (vma->vm_mm, addr,PAGE_SIZE ,PAGE_SIZE ); }void flush_tlb_range (struct vm_area_struct *vma,unsigned long start,unsigned long end) { -__sbi_tlb_flush_range (vma->vm_mm, start, end - start,PAGE_SIZE ); +__flush_tlb_range (vma->vm_mm, start, end - start,PAGE_SIZE ); }#ifdef CONFIG_TRANSPARENT_HUGEPAGE void flush_pmd_tlb_range (struct vm_area_struct *vma,unsigned long start,unsigned long end) { -__sbi_tlb_flush_range (vma->vm_mm, start, end - start,PMD_SIZE ); +__flush_tlb_range (vma->vm_mm, start, end - start,PMD_SIZE ); }#endif
Signature · 7 lines
2.34.1 _______________________________________________ linux-riscv mailing list [email protected] http://lists.infradead.org/mailman/listinfo/linux-riscv
[irqchip: irq/irqchip-next] RISC-V: Use IPIs for remote TLB flush when possible
The following commit has been merged into the irq/irqchip-next branch of irqchip:
The following commit has been merged into the irq/irqchip-next branch of irqchip:
Commit-ID: 18d2199d81054f44e6d2a51177cc80566f43bf23 Gitweb: https://git.kernel.org/pub/scm/linux/kernel/git/maz/arm-platforms/18d2199d81054f44e6d2a51177cc80566f43bf23 Author: Anup Patel <[email protected]> AuthorDate: Tue, 28 Mar 2023 09:22:21 +05:30 Committer: Marc Zyngier <[email protected]> CommitterDate: Sat, 08 Apr 2023 11:26:24 +01:00
RISC-V: Use IPIs for remote TLB flush when possible
If we have specialized interrupt controller (such as AIA IMSIC) which allows supervisor mode to directly inject IPIs without any assistance from M-mode or HS-mode then using such specialized interrupt controller, we can do remote TLB flushes directly from supervisor mode instead of using the SBI RFENCE calls.
This patch extends remote TLB flush functions to use supervisor mode IPIs whenever direct supervisor mode IPIs.are supported by interrupt controller.
--- arch/riscv/mm/tlbflush.c | 93 ++++++++++++++++++++++++++++++++------- 1 file changed, 78 insertions(+), 15 deletions(-)
arch/riscv/mm/tlbflush.c +78 -15
@@ -23,14 +23,62 @@ static inline void local_flush_tlb_page_asid(unsigned long addr, : "memory"); } +static inline void local_flush_tlb_range (unsigned long start, +unsigned long size,unsigned long stride) +{ +if (size <= stride) +local_flush_tlb_page (start); +else +local_flush_tlb_all (); +} + +static inline void local_flush_tlb_range_asid (unsigned long start, +unsigned long size,unsigned long stride,unsigned long asid) +{ +if (size <= stride) +local_flush_tlb_page_asid (start, asid); +else +local_flush_tlb_all_asid (asid); +} + +static void __ipi_flush_tlb_all (void *info) +{ +local_flush_tlb_all (); +} +void flush_tlb_all (void ) { -sbi_remote_sfence_vma (NULL ,0 ,-1 ); +if (riscv_use_ipi_for_rfence ()) +on_each_cpu (__ipi_flush_tlb_all,NULL ,1 ); +else +sbi_remote_sfence_vma (NULL ,0 ,-1 ); +} + +struct flush_tlb_range_data { +unsigned long asid; +unsigned long start; +unsigned long size; +unsigned long stride; +}; + +static void __ipi_flush_tlb_range_asid (void *info) +{ +struct flush_tlb_range_data *d = info; + +local_flush_tlb_range_asid (d->start, d->size, d->stride, d->asid); +} + +static void __ipi_flush_tlb_range (void *info) +{ +struct flush_tlb_range_data *d = info; + +local_flush_tlb_range (d->start, d->size, d->stride); } -static void __sbi_tlb_flush_range (struct mm_struct *mm,unsigned long start, -unsigned long size,unsigned long stride) +static void __flush_tlb_range (struct mm_struct *mm,unsigned long start, +unsigned long size,unsigned long stride) { +struct flush_tlb_range_data ftd;struct cpumask *cmask =mm_cpumask (mm);unsigned int cpuid;bool broadcast;
@@ -45,19 +93,34 @@ static void __sbi_tlb_flush_range(struct mm_struct *mm, unsigned long start,unsigned long asid =atomic_long_read (&mm->context.id) & asid_mask;if (broadcast) { -sbi_remote_sfence_vma_asid (cmask, start, size, asid); - }else if (size <= stride) { -local_flush_tlb_page_asid (start, asid); +if (riscv_use_ipi_for_rfence ()) { + ftd.asid = asid; + ftd.start = start; + ftd.size = size; + ftd.stride = stride; +on_each_cpu_mask (cmask, + __ipi_flush_tlb_range_asid, + &ftd,1 ); + }else +sbi_remote_sfence_vma_asid (cmask, + start, size, asid); }else { -local_flush_tlb_all_asid (asid); +local_flush_tlb_range_asid (start, size, stride, asid); } }else {if (broadcast) { -sbi_remote_sfence_vma (cmask, start, size); - }else if (size <= stride) { -local_flush_tlb_page (start); +if (riscv_use_ipi_for_rfence ()) { + ftd.asid =0 ; + ftd.start = start; + ftd.size = size; + ftd.stride = stride; +on_each_cpu_mask (cmask, + __ipi_flush_tlb_range, + &ftd,1 ); + }else +sbi_remote_sfence_vma (cmask, start, size); }else { -local_flush_tlb_all (); +local_flush_tlb_range (start, size, stride); } }
@@ -66,23 +129,23 @@ static void __sbi_tlb_flush_range(struct mm_struct *mm, unsigned long start,void flush_tlb_mm (struct mm_struct *mm) { -__sbi_tlb_flush_range (mm,0 ,-1 ,PAGE_SIZE ); +__flush_tlb_range (mm,0 ,-1 ,PAGE_SIZE ); }void flush_tlb_page (struct vm_area_struct *vma,unsigned long addr) { -__sbi_tlb_flush_range (vma->vm_mm, addr,PAGE_SIZE ,PAGE_SIZE ); +__flush_tlb_range (vma->vm_mm, addr,PAGE_SIZE ,PAGE_SIZE ); }void flush_tlb_range (struct vm_area_struct *vma,unsigned long start,unsigned long end) { -__sbi_tlb_flush_range (vma->vm_mm, start, end - start,PAGE_SIZE ); +__flush_tlb_range (vma->vm_mm, start, end - start,PAGE_SIZE ); }#ifdef CONFIG_TRANSPARENT_HUGEPAGE void flush_pmd_tlb_range (struct vm_area_struct *vma,unsigned long start,unsigned long end) { -__sbi_tlb_flush_range (vma->vm_mm, start, end - start,PMD_SIZE ); +__flush_tlb_range (vma->vm_mm, start, end - start,PMD_SIZE ); }#endif
PATCH v18 6/7 RISC-V: Use IPIs for remote icache flush when possible
In reply to Anup PatelIf we have specialized interrupt controller (such as AIA IMSIC) which allows supervisor mode to directly inject IPIs without any assistance from M-mode or HS-mode then using such specialized interrupt controller, we can do remote icache flushe directly from supervisor mode instead of using the SBI RFENCE calls.
This patch extends remote icache flush functions to use supervisor mode IPIs whenever direct supervisor mode IPIs.are supported by interrupt controller.
--- arch/riscv/mm/cacheflush.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-)
arch/riscv/mm/cacheflush.c +3 -2
@@ -19,7 +19,7 @@ void flush_icache_all(void) {local_flush_icache_all (); -if (IS_ENABLED (CONFIG_RISCV_SBI )) +if (IS_ENABLED (CONFIG_RISCV_SBI ) && !riscv_use_ipi_for_rfence ())sbi_remote_fence_i (NULL );else on_each_cpu (ipi_remote_fence_i,NULL ,1 );
@@ -67,7 +67,8 @@ void flush_icache_mm(struct mm_struct *mm, bool local)* with flush_icache_deferred(). */ smp_mb (); - }else if (IS_ENABLED (CONFIG_RISCV_SBI )) { + }else if (IS_ENABLED (CONFIG_RISCV_SBI ) && + !riscv_use_ipi_for_rfence ()) {sbi_remote_fence_i (&others); }else {on_each_cpu_mask (&others, ipi_remote_fence_i,NULL ,1 );
Signature · 7 lines
2.34.1 _______________________________________________ linux-riscv mailing list [email protected] http://lists.infradead.org/mailman/listinfo/linux-riscv
[irqchip: irq/irqchip-next] RISC-V: Use IPIs for remote icache flush when possible
The following commit has been merged into the irq/irqchip-next branch of irqchip:
The following commit has been merged into the irq/irqchip-next branch of irqchip:
Commit-ID: 6279228432352f43f43f5e760771151605bf6d82 Gitweb: https://git.kernel.org/pub/scm/linux/kernel/git/maz/arm-platforms/6279228432352f43f43f5e760771151605bf6d82 Author: Anup Patel <[email protected]> AuthorDate: Tue, 28 Mar 2023 09:22:22 +05:30 Committer: Marc Zyngier <[email protected]> CommitterDate: Sat, 08 Apr 2023 11:26:24 +01:00
RISC-V: Use IPIs for remote icache flush when possible
If we have specialized interrupt controller (such as AIA IMSIC) which allows supervisor mode to directly inject IPIs without any assistance from M-mode or HS-mode then using such specialized interrupt controller, we can do remote icache flushe directly from supervisor mode instead of using the SBI RFENCE calls.
This patch extends remote icache flush functions to use supervisor mode IPIs whenever direct supervisor mode IPIs.are supported by interrupt controller.
--- arch/riscv/mm/cacheflush.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-)
arch/riscv/mm/cacheflush.c +3 -2
@@ -19,7 +19,7 @@ void flush_icache_all(void) {local_flush_icache_all (); -if (IS_ENABLED (CONFIG_RISCV_SBI )) +if (IS_ENABLED (CONFIG_RISCV_SBI ) && !riscv_use_ipi_for_rfence ())sbi_remote_fence_i (NULL );else on_each_cpu (ipi_remote_fence_i,NULL ,1 );
@@ -67,7 +67,8 @@ void flush_icache_mm(struct mm_struct *mm, bool local)* with flush_icache_deferred(). */ smp_mb (); - }else if (IS_ENABLED (CONFIG_RISCV_SBI )) { + }else if (IS_ENABLED (CONFIG_RISCV_SBI ) && + !riscv_use_ipi_for_rfence ()) {sbi_remote_fence_i (&others); }else {on_each_cpu_mask (&others, ipi_remote_fence_i,NULL ,1 );
PATCH v18 7/7 irqchip/riscv-intc: Add empty irq_eoi() for chained irq handlers
In reply to Anup PatelWe add empty irq_eoi() in RISC-V INTC driver for child irqchip drivers (such as PLIC, SBI IPI, CLINT, APLIC, IMSIC, etc) which implement chained handlers for parent per-HART local interrupts. This hels us avoid unnecessary mask/unmask of per-HART local interrupts at the time of handling interrupts.
--- drivers/irqchip/irq-riscv-intc.c | 17 +++++++++++++++++ 1 file changed, 17 insertions(+)
drivers/irqchip/irq-riscv-intc.c +17 -0
@@ -46,10 +46,27 @@ static void riscv_intc_irq_unmask(struct irq_data *d)csr_set (CSR_IE ,BIT (d->hwirq)); } +static void riscv_intc_irq_eoi (struct irq_data *d) +{ +/* +* The RISC-V INTC driver uses handle_percpu_devid_irq() flow +* for the per-HART local interrupts and child irqchip drivers +* (such as PLIC, SBI IPI, CLINT, APLIC, IMSIC, etc) implement +* chained handlers for the per-HART local interrupts. +* +* In the absence of irq_eoi(), the chained_irq_enter() and +* chained_irq_exit() functions (used by child irqchip drivers) +* will do unnecessary mask/unmask of per-HART local interrupts +* at the time of handling interrupts. To avoid this, we provide +* an empty irq_eoi() callback for RISC-V INTC irqchip. +*/ +} +static struct irq_chip riscv_intc_chip = { .name ="RISC-V INTC" , .irq_mask = riscv_intc_irq_mask, .irq_unmask = riscv_intc_irq_unmask, + .irq_eoi = riscv_intc_irq_eoi, }; static int riscv_intc_domain_map(struct irq_domain *d, unsigned int irq,
Signature · 7 lines
2.34.1 _______________________________________________ linux-riscv mailing list [email protected] http://lists.infradead.org/mailman/listinfo/linux-riscv
[irqchip: irq/irqchip-next] irqchip/riscv-intc: Add empty irq_eoi() for chained irq handlers
The following commit has been merged into the irq/irqchip-next branch of irqchip:
The following commit has been merged into the irq/irqchip-next branch of irqchip:
Commit-ID: f8415f2def181c63486e93c511b82692e0914d9e Gitweb: https://git.kernel.org/pub/scm/linux/kernel/git/maz/arm-platforms/f8415f2def181c63486e93c511b82692e0914d9e Author: Anup Patel <[email protected]> AuthorDate: Tue, 28 Mar 2023 09:22:23 +05:30 Committer: Marc Zyngier <[email protected]> CommitterDate: Sat, 08 Apr 2023 11:26:24 +01:00
irqchip/riscv-intc: Add empty irq_eoi() for chained irq handlers
We add empty irq_eoi() in RISC-V INTC driver for child irqchip drivers (such as PLIC, SBI IPI, CLINT, APLIC, IMSIC, etc) which implement chained handlers for parent per-HART local interrupts. This hels us avoid unnecessary mask/unmask of per-HART local interrupts at the time of handling interrupts.
--- drivers/irqchip/irq-riscv-intc.c | 17 +++++++++++++++++ 1 file changed, 17 insertions(+)
drivers/irqchip/irq-riscv-intc.c +17 -0
@@ -46,10 +46,27 @@ static void riscv_intc_irq_unmask(struct irq_data *d)csr_set (CSR_IE ,BIT (d->hwirq)); } +static void riscv_intc_irq_eoi (struct irq_data *d) +{ +/* +* The RISC-V INTC driver uses handle_percpu_devid_irq() flow +* for the per-HART local interrupts and child irqchip drivers +* (such as PLIC, SBI IPI, CLINT, APLIC, IMSIC, etc) implement +* chained handlers for the per-HART local interrupts. +* +* In the absence of irq_eoi(), the chained_irq_enter() and +* chained_irq_exit() functions (used by child irqchip drivers) +* will do unnecessary mask/unmask of per-HART local interrupts +* at the time of handling interrupts. To avoid this, we provide +* an empty irq_eoi() callback for RISC-V INTC irqchip. +*/ +} +static struct irq_chip riscv_intc_chip = { .name ="RISC-V INTC" , .irq_mask = riscv_intc_irq_mask, .irq_unmask = riscv_intc_irq_unmask, + .irq_eoi = riscv_intc_irq_eoi, }; static int riscv_intc_domain_map(struct irq_domain *d, unsigned int irq,
Hi Marc and Palmer,
Quoted 125 lines · Anup Patel
This series aims to improve IPI support in Linux RISC-V in following ways:
1) Treat IPIs as normal per-CPU interrupts instead of having custom RISC-V specific hooks. This also makes Linux RISC-V IPI support aligned with other architectures.
2) Remote TLB flushes and icache flushes should prefer local IPIs instead of SBI calls whenever we have specialized hardware (such as RISC-V AIA IMSIC and RISC-V SWI) which allows S-mode software to directly inject IPIs without any assistance from M-mode runtime firmware.These patches were originally part of the "Linux RISC-V ACLINT Support" series but this now a separate series so that it can be merged independently of the "Linux RISC-V ACLINT Support" series.
(Refer, https://lore.kernel.org/lkml/[email protected]/)These patches are also a preparatory patches for the up-coming:
1) Linux RISC-V AIA support
2) Linux RISC-V SWI supportThese patches can also be found in
riscv_ipi_imp_v18branch at:
https://github.com/avpatel/linux.gitChanges since v17:
- Resolved merge conflicts and rebased on Linux-6.3-rc4Changes since v16:
- Rebased on Linux-6.3-rc1
- Dropped PATCH3 and PATCH9 since these patches are already merged
- Added Palmer's Acked-byChanges since v15:
- Rebased on Linux-6.2-rc2
- Added Reviewed-by and Tested-by tags to some of the patches.Changes since v14:
- Minor fixes in commit description of PATCH3 (as suggested by tglx)
- Don't disable parent IPI when CPU goes offline for SBI IPI driver and CLINT driver in PATCH4.
- Include Apple AIC driver changes from Marc Z as PATCH9Changes since v13:
- Included changes suggested by Marc Z in PATCH3
- Use chained handlers in PATCH4
- Added new PATCH8 to have emptyirq_eoi()in RISC-V INTC driver. This avoids the unnecessary mask/unmask dance at time of handling interrupts.Changes since v12:
- Rebased on Linux-6.1-rc7
- Bring-back the IPI optimization inipi_mux_send_mask()for PATCH3
- Callipi_mux_send()for one target CPU at a time in PATCH3Changes since v11:
- Removed ipi_mux_pre/post_handle() callbacks in PATCH3
- Removed sturctipi_mux_opsin PATCH3
- Removedparent_virqand data pointer from everywhere in PATCH3
- Removed structipi_mux_controlin PATCH3
- Improved function signature ofipi_mux_send()callback in PATCH3
- Used unsigned type with atomic operation in PATCH3Changes since v10:
- Rebased on Linux-6.1-rc5
- Drop the "!(pending & ibit)" check inipi_mux_send_mask()of PATCH3
- Disable local interrupts inipi_mux_send_mask()of PATCH3 because we can be preempted while using a per-CPU temporary variable.Changes since v9:
- Rebased on Linux-6.1-rc3
- Updated header comment block ofipi-mux.cin PATCH3
- Use a struct for global data ofipi-mux.cin PATCH3
- Add per-CPU temp cpumask for sending IPIs in PATCH3
- Drop the use of fwspec in PATCH3
- Use static key foripi_mux_pre_handle()andipi_mux_post_handle()in PATCH3
- Remove redundantpr_warn_ratelimited()called byipi_mux_process()in PATCH3
- Remove CPUHP thingy fromipi_mux_create()in PATCH3Changes since v8:
- Rebased on Linux-6.0-rc3
- Use dummy percpu data as parameter forrequest_percpu_irq()in PATCH4.Changes since v7:
- Rebased on Linux-6.0-rc1
- Use atomic operations to track per-CPU pending and enabled IPIs in PATCH3. (Note: this is inspired from IPI muxing implemented indrivers/irqchip/irq-apple-aic.c)
- Made "structipi_mux_ops" (added by PATCH3) flexible so thatdrivers/irqchip/irq-apple-aic.ccan adopt it in future.Changes since v6:
- Rebased on Linux-5.19-rc7
- Added documentation for structipi_mux_opsin PATCH3
- Dropped dummy irq_mask()/unmask() in PATCH3
- Added const for "ipi_mux_chip" in PATCH3
- Removed "type" initialization fromipi_mux_domain_alloc()in PATCH3
- Droppedtranslate()from "ipi_mux_domain_ops" in PATCH3
- Improved barrier documentation inipi_mux_process()of PATCH3
- Added percpu check inipi_mux_create()forparent_virqof PATCH3
- Addednr_ipiparameter inipi_mux_create()of PATCH3Changes since v5:
- Rebased on Linux-5.18-rc3
- Used kernel doc style in PATCH3
- Removed redundant loop inipi_mux_process()of PATCH3
- Removed "RISC-V" prefix form ipi_mux_chip.name of PATCH3
- Removed use of "this patch" in PATCH3 commit description
- Addressed few other nit comments in PATCH3Changes since v4:
- Rebased on Linux-5.17
- Includes new PATCH3 which adds mechanism to multiplex a single HW IPIChanges since v3:
- Rebased on Linux-5.17-rc6
- Updated PATCH2 to not exportriscv_set_intc_hwnode_fn()
- Simplifiedriscv_intc_hwnode()in PATCH2Changes since v2:
- Rebased on Linux-5.17-rc4
- Updated PATCH2 to not create synthetic INTC fwnode and instead provide a function which allows drivers to directly discover INTC fwnodeChanges since v1:
- Use synthetic fwnode for INTC instead ofirq_set_default_host()in PATCH2
Quoted 8 lines
Anup Patel (7):
RISC-V: Clear SIP bit only when using SBI IPI operations irqchip/riscv-intc: Allow drivers to directly discover INTC hwnode
RISC-V: Treat IPIs as normal Linux IRQs
RISC-V: Allow marking IPIs as suitable for remote FENCEs
RISC-V: Use IPIs for remote TLB flush when possible
RISC-V: Use IPIs for remote icache flush when possible irqchip/riscv-intc: Add emptyirq_eoi()for chained irq handlers
There were merge conflicts with Linux-6.3-rc4 which are resolved in this series.
It would be great if this series can be considered for Linux-6.4
Thanks,
Anup
Quoted 20 lines
arch/riscv/Kconfig | 2 + arch/riscv/include/asm/irq.h | 4 + arch/riscv/include/asm/sbi.h | 9 +- arch/riscv/include/asm/smp.h | 49 ++++++--- arch/riscv/kernel/Makefile | 1 + arch/riscv/kernel/cpu-hotplug.c | 3 +- arch/riscv/kernel/irq.c | 21 +++- arch/riscv/kernel/sbi-ipi.c | 77 ++++++++++++++ arch/riscv/kernel/sbi.c | 100 +++-------------- arch/riscv/kernel/smp.c | 171 +++++++++++++++--------------- arch/riscv/kernel/smpboot.c | 5 +- arch/riscv/mm/cacheflush.c | 5 +- arch/riscv/mm/tlbflush.c | 93 +++++++++++++--- drivers/clocksource/timer-clint.c | 65 +++++++++--- drivers/irqchip/Kconfig | 1 + drivers/irqchip/irq-riscv-intc.c | 71 ++++++++----- 16 files changed, 429 insertions(+), 248 deletions(-) create mode 100644 arch/riscv/kernel/sbi-ipi.c
Quoted 3 lines
--
2.34.1
_______________________________________________
linux-riscv mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/linux-riscv
This series was applied to riscv/linux.git (fixes) by Marc Zyngier <[email protected]>:
Hello:
This series was applied to riscv/linux.git (fixes) by Marc Zyngier <[email protected]>:
Quoted 10 lines · On Tue, 28 Mar 2023 09:22:16 +0530 you wrote:
This series aims to improve IPI support in Linux RISC-V in following ways:
1) Treat IPIs as normal per-CPU interrupts instead of having custom RISC-V specific hooks. This also makes Linux RISC-V IPI support aligned with other architectures.
2) Remote TLB flushes and icache flushes should prefer local IPIs instead of SBI calls whenever we have specialized hardware (such as RISC-V AIA IMSIC and RISC-V SWI) which allows S-mode software to directly inject IPIs without any assistance from M-mode runtime firmware.[...]
Here is the summary with links:
- [v18,1/7] RISC-V: Clear SIP bit only when using SBI IPI operations
https://git.kernel.org/riscv/c/3ee92565b83e - [v18,2/7] irqchip/riscv-intc: Allow drivers to directly discover INTC hwnode https://git.kernel.org/riscv/c/0c60a31ce62c - [v18,3/7] RISC-V: Treat IPIs as normal Linux IRQs https://git.kernel.org/riscv/c/832f15f42646 - [v18,4/7] RISC-V: Allow marking IPIs as suitable for remote FENCEs https://git.kernel.org/riscv/c/fb0f3d281b7f - [v18,5/7] RISC-V: Use IPIs for remote TLB flush when possible https://git.kernel.org/riscv/c/18d2199d8105 - [v18,6/7] RISC-V: Use IPIs for remote icache flush when possible https://git.kernel.org/riscv/c/627922843235 - [v18,7/7] irqchip/riscv-intc: Add empty irq_eoi() for chained irq handlers https://git.kernel.org/riscv/c/f8415f2def18
You are awesome, thank you!
Signature · 9 lines
Deet-doot-dot, I am a bot. https://korg.docs.kernel.org/patchwork/pwbot.html _______________________________________________ linux-riscv mailing list [email protected] http://lists.infradead.org/mailman/listinfo/linux-riscv