RISC-V IPI Improvements
v4 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 ACLINT) 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) KVM RISC-V TLB flush improvements
3) Linux RISC-V SWI support
These patches can also be found in riscv_ipi_imp_v4 branch at:
https://github.com/avpatel/linux.git
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 (6):
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
arch/riscv/Kconfig | 1 + arch/riscv/include/asm/ipi-mux.h | 45 ++++++ arch/riscv/include/asm/irq.h | 4 + arch/riscv/include/asm/sbi.h | 2 + arch/riscv/include/asm/smp.h | 49 +++++-- arch/riscv/kernel/Makefile | 1 + arch/riscv/kernel/cpu-hotplug.c | 3 +- arch/riscv/kernel/ipi-mux.c | 223 ++++++++++++++++++++++++++++++ arch/riscv/kernel/irq.c | 21 ++- arch/riscv/kernel/sbi.c | 18 ++- arch/riscv/kernel/smp.c | 164 +++++++++++----------- arch/riscv/kernel/smpboot.c | 5 +- arch/riscv/mm/cacheflush.c | 5 +- arch/riscv/mm/tlbflush.c | 93 +++++++++++-- drivers/clocksource/timer-clint.c | 8 +- drivers/irqchip/irq-riscv-intc.c | 60 ++++---- 16 files changed, 546 insertions(+), 156 deletions(-) create mode 100644 arch/riscv/include/asm/ipi-mux.h create mode 100644 arch/riscv/kernel/ipi-mux.c
Signature · 1 line
2.25.1
PATCH v4 1/6 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
@@ -643,8 +643,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
@@ -89,8 +89,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 · 7 lines
2.25.1 _______________________________________________ linux-riscv mailing list [email protected] http://lists.infradead.org/mailman/listinfo/linux-riscv
PATCH v4 2/6 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) {
@@ -125,6 +130,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 · 7 lines
2.25.1 _______________________________________________ linux-riscv mailing list [email protected] http://lists.infradead.org/mailman/listinfo/linux-riscv
PATCH v4 3/6 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 | 1 + arch/riscv/include/asm/ipi-mux.h | 43 ++++++ arch/riscv/include/asm/sbi.h | 2 + arch/riscv/include/asm/smp.h | 35 +++-- arch/riscv/kernel/Makefile | 1 + arch/riscv/kernel/cpu-hotplug.c | 3 +- arch/riscv/kernel/ipi-mux.c | 222 ++++++++++++++++++++++++++++++ arch/riscv/kernel/irq.c | 3 +- arch/riscv/kernel/sbi.c | 13 +- arch/riscv/kernel/smp.c | 153 ++++++++++---------- arch/riscv/kernel/smpboot.c | 5 +- drivers/clocksource/timer-clint.c | 8 +- drivers/irqchip/irq-riscv-intc.c | 55 ++++---- 13 files changed, 405 insertions(+), 139 deletions(-) create mode 100644 arch/riscv/include/asm/ipi-mux.h create mode 100644 arch/riscv/kernel/ipi-mux.c
arch/riscv/Kconfig +1 -0
@@ -54,6 +54,7 @@ config RISCV select GENERIC_GETTIMEOFDAY if HAVE_GENERIC_VDSO select GENERIC_IDLE_POLL_SETUP select GENERIC_IOREMAP if MMU + select GENERIC_IRQ_IPI select GENERIC_IRQ_MULTI_HANDLER select GENERIC_IRQ_SHOW select GENERIC_IRQ_SHOW_LEVEL
arch/riscv/include/asm/ipi-mux.h new file +43 -0
43 lines not on this page · raw message
arch/riscv/include/asm/sbi.h +2 -0
@@ -133,6 +133,7 @@ struct sbiret { };void sbi_init (void ); +void sbi_ipi_init (void ); struct sbiret sbi_ecall(int ext, int fid, unsigned long arg0, unsigned long arg1, unsigned long arg2, unsigned long arg3, unsigned long arg4,
@@ -202,6 +203,7 @@ static inline unsigned long sbi_mk_version(unsigned long major,int sbi_err_map_linux_errno (int err);#else /* CONFIG_RISCV_SBI */ static inline int sbi_remote_fence_i (const struct cpumask *cpu_mask) {return -1 ; } +static inline void sbi_ipi_init (void ) { }static inline void sbi_init (void ) {}#endif /* CONFIG_RISCV_SBI */ #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 (int 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_irqs);/* Secondary hart entry */ asmlinkage void smp_callin(void);
@@ -82,11 +80,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
@@ -42,6 +42,7 @@ obj-$(CONFIG_RISCV_M_MODE) += traps_misaligned.o obj-$(CONFIG_FPU) += fpu.o obj-$(CONFIG_SMP) += smpboot.o obj-$(CONFIG_SMP) += smp.o +obj-$(CONFIG_SMP) += ipi-mux.o obj-$(CONFIG_SMP) += cpu_ops.o obj-$(CONFIG_RISCV_BOOT_SPINWAIT) += cpu_ops_spinwait.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/ipi-mux.c new file +222 -0
222 lines not on this page · raw message
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.c +7 -6
@@ -5,10 +5,12 @@* Copyright (c) 2020 Western Digital Corporation or its affiliates. */ +#define pr_fmt (fmt) "riscv: " fmt#include <linux/bits.h> #include <linux/init.h> #include <linux/pm.h> #include <linux/reboot.h> +#include <asm/ipi-mux.h> #include <asm/sbi.h> #include <asm/smp.h>
@@ -648,10 +650,11 @@ 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_clear = sbi_ipi_clear -}; +void __init sbi_ipi_init (void ) +{ +if (riscv_ipi_mux_create (true, sbi_ipi_clear, sbi_send_cpumask_ipi)) +pr_info ("providing IPIs using SBI IPI extension\n" ); +}void __init sbi_init (void ) {
@@ -699,6 +702,4 @@ void __init sbi_init(void) __sbi_send_ipi = __sbi_send_ipi_v01; __sbi_rfence = __sbi_rfence_v01; } - -riscv_set_ipi_ops (&sbi_ipi_ops); }
arch/riscv/kernel/smp.c +76 -77
204 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 <asm/alternative.h>
@@ -159,12 +158,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 (); +notify_cpu_starting (curr_cpuid);numa_add_cpu (curr_cpuid);update_siblings_masks (curr_cpuid);
drivers/clocksource/timer-clint.c +2 -6
@@ -20,6 +20,7 @@#include <linux/of_irq.h> #include <linux/smp.h> #include <linux/timex.h> +#include <asm/ipi-mux.h> #ifndef CONFIG_RISCV_M_MODE #include <asm/clint.h>
@@ -54,11 +55,6 @@ static void clint_clear_ipi(void)writel (0 , clint_ipi_base +cpuid_to_hartid_map (smp_processor_id ())); } -static struct riscv_ipi_ops clint_ipi_ops = { - .ipi_inject = clint_send_ipi, - .ipi_clear = clint_clear_ipi, -}; -#ifdef CONFIG_64BIT #define clint_get_cycles () readq_relaxed(clint_timer_val)#else
@@ -228,7 +224,7 @@ static int __init clint_timer_init_dt(struct device_node *np) goto fail_free_irq; } -riscv_set_ipi_ops (&clint_ipi_ops); +riscv_ipi_mux_create (true, clint_clear_ipi, clint_send_ipi);clint_clear_ipi ();return 0 ;
drivers/irqchip/irq-riscv-intc.c +24 -31
82 lines not on this page · raw message
Signature · 7 lines
2.25.1 _______________________________________________ linux-riscv mailing list [email protected] http://lists.infradead.org/mailman/listinfo/linux-riscv
Re: [PATCH v4 3/6] RISC-V: Treat IPIs as normal Linux IRQs
Quoted 18 lines · Anup Patel
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.Signed-off-by Anup Patel <[email protected]>
Quoted 15 lines
--- arch/riscv/Kconfig | 1 + arch/riscv/include/asm/ipi-mux.h | 43 ++++++ arch/riscv/include/asm/sbi.h | 2 + arch/riscv/include/asm/smp.h | 35 +++-- arch/riscv/kernel/Makefile | 1 + arch/riscv/kernel/cpu-hotplug.c | 3 +- arch/riscv/kernel/ipi-mux.c | 222 ++++++++++++++++++++++++++++++ arch/riscv/kernel/irq.c | 3 +- arch/riscv/kernel/sbi.c | 13 +- arch/riscv/kernel/smp.c | 153 ++++++++++---------- arch/riscv/kernel/smpboot.c | 5 +- drivers/clocksource/timer-clint.c | 8 +- drivers/irqchip/irq-riscv-intc.c | 55 ++++---- 13 files changed, 405 insertions(+), 139 deletions(-)
This patch is huge and touches way too many things to be reviewed as such. Please split arch-specific stuff from clocksource and irqchip, going through a transition phase.
More below.
Quoted 208 lines
create mode 100644 arch/riscv/include/asm/ipi-mux.h create mode 100644 arch/riscv/kernel/ipi-mux.carch/riscv/Kconfig +1
-0@@ -54,6 +54,7 @@ config RISCV select GENERIC_GETTIMEOFDAY if HAVE_GENERIC_VDSO select GENERIC_IDLE_POLL_SETUP select GENERIC_IOREMAP if MMU + select GENERIC_IRQ_IPI select GENERIC_IRQ_MULTI_HANDLER select GENERIC_IRQ_SHOW select GENERIC_IRQ_SHOW_LEVELarch/riscv/include/asm/ipi-mux.h new file +43
-0@@ -0,0 +1,43 @@ +/* SPDX-License-Identifier: GPL-2.0-only */ +/* +* Copyright (c) 2022 Ventana Micro Systems Inc. +*/ + +#ifndef _ASM_RISCV_IPI_MUX_H +#define _ASM_RISCV_IPI_MUX_H + +struct cpumask ; + +#ifdef CONFIG_SMP + +/* Handle muxed IPIs */ +void riscv_ipi_mux_handle_irq (void ); + +/* Create irq_domain for muxed IPIs */ +struct irq_domain *riscv_ipi_mux_create (bool use_soft_irq, +void (*clear_ipi)(void ), +void (*send_ipi)(const struct cpumask *mask)); + +/* Destroy irq_domain for muxed IPIs */ +void riscv_ipi_mux_destroy (struct irq_domain *d); + +#else + +static inline void riscv_ipi_mux_handle_irq (void ) +{ +} + +static inline struct irq_domain *riscv_ipi_mux_create (bool use_soft_irq, +void (*clear_ipi)(void ), +void (*send_ipi)(const struct cpumask *mask)) +{ +return NULL ; +} + +static inline void riscv_ipi_mux_destroy (struct irq_domain *d) +{ +} + +#endif + +#endif /* _ASM_RISCV_IPI_MUX_H */ arch/riscv/include/asm/sbi.h +2
-0@@ -133,6 +133,7 @@ struct sbiret { };void sbi_init (void ); +void sbi_ipi_init (void ); struct sbiret sbi_ecall(int ext, int fid, unsigned long arg0, unsigned long arg1, unsigned long arg2, unsigned long arg3, unsigned long arg4,@@ -202,6 +203,7 @@ static inline unsigned long sbi_mk_version(unsigned long major,int sbi_err_map_linux_errno (int err);#else /* CONFIG_RISCV_SBI */ static inline int sbi_remote_fence_i (const struct cpumask *cpu_mask) {return -1 ; } +static inline void sbi_ipi_init (void ) { }static inline void sbi_init (void ) {}#endif /* CONFIG_RISCV_SBI */ #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 (int 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_irqs);/* Secondary hart entry */ asmlinkage void smp_callin(void);@@ -82,11 +80,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@@ -42,6 +42,7 @@ obj-$(CONFIG_RISCV_M_MODE) += traps_misaligned.o obj-$(CONFIG_FPU) += fpu.o obj-$(CONFIG_SMP) += smpboot.o obj-$(CONFIG_SMP) += smp.o +obj-$(CONFIG_SMP) += ipi-mux.o obj-$(CONFIG_SMP) += cpu_ops.o obj-$(CONFIG_RISCV_BOOT_SPINWAIT) += cpu_ops_spinwait.oarch/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/ipi-mux.c new file +14
-0@@ -0,0 +1,222 @@ +// SPDX-License-Identifier: GPL-2.0-only +/* +* Multiplex several IPIs over a single HW IPI. +* +* Copyright (c) 2022 Ventana Micro Systems Inc. +*/ + +#define pr_fmt (fmt) "riscv-ipi-mux: " fmt +#include <linux/cpu.h> +#include <linux/cpumask.h> +#include <linux/init.h> +#include <linux/irq.h> +#include <linux/irqchip.h> +#include <linux/irqchip/chained_irq.h>
arch/riscv/kernel/ipi-mux.c line 24
Quoted 10 lines
arch/riscv/kernel/ipi-mux.c new file +10
-0+#include <linux/irqdomain.h> +#include <linux/smp.h> +#include <asm/ipi-mux.h> + +struct ipi_mux { +struct irq_domain *domain; +int parent_virq; +void (*clear_ipi)(void ); +void (*send_ipi)(const struct cpumask *mask); +};
Why do you need this in the arch code? It really looks like something that is irqchip specific (single IPI signal on which actual IPIs are overlayed). It is also something that other irqchips are already implementing, so there is potential for consolidation.
Quoted 115 lines
arch/riscv/kernel/ipi-mux.c new file +115
-0+ +static struct ipi_mux ipi_mux_priv; +static DEFINE_PER_CPU(unsigned long, ipi_mux_bits); + +static void ipi_mux_dummy (struct irq_data *d) +{ +} + +static void ipi_mux_send_mask (struct irq_data *d,const struct cpumask *mask) +{ +int cpu; + +/* Barrier before doing atomic bit update to IPI bits */ +smp_mb__before_atomic (); + +for_each_cpu (cpu, mask) +set_bit (d->hwirq,per_cpu_ptr (&ipi_mux_bits, cpu)); + +/* Barrier after doing atomic bit update to IPI bits */ +smp_mb__after_atomic (); + +if (ipi_mux_priv.send_ipi) + ipi_mux_priv.send_ipi (mask); +} + +static struct irq_chip ipi_mux_chip = { + .name ="RISC-V IPI Mux" , + .irq_mask = ipi_mux_dummy, + .irq_unmask = ipi_mux_dummy, + .ipi_send_mask = ipi_mux_send_mask, +}; + +static int ipi_mux_domain_map (struct irq_domain *d,unsigned int irq, +irq_hw_number_t hwirq) +{ +irq_set_percpu_devid (irq); +irq_domain_set_info (d, irq, hwirq, &ipi_mux_chip, d->host_data, + handle_percpu_devid_irq,NULL ,NULL ); + +return 0 ; +} + +static int ipi_mux_domain_alloc (struct irq_domain *d,unsigned int virq, +unsigned int nr_irqs,void *arg) +{ +int i, ret; +irq_hw_number_t hwirq; +unsigned int type =IRQ_TYPE_NONE ; +struct irq_fwspec *fwspec = arg; + + ret =irq_domain_translate_onecell (d, fwspec, &hwirq, &type); +if (ret) +return ret; + +for (i =0 ; i < nr_irqs; i++) { + ret =ipi_mux_domain_map (d, virq + i, hwirq + i); +if (ret) +return ret; + } + +return 0 ; +} + +static const struct irq_domain_ops ipi_mux_domain_ops = { + .translate = irq_domain_translate_onecell, + .alloc = ipi_mux_domain_alloc, + .free = irq_domain_free_irqs_top, +}; + +void riscv_ipi_mux_handle_irq (void ) +{ +int err; +unsigned long irqs, *bits =this_cpu_ptr (&ipi_mux_bits); +irq_hw_number_t hwirq; + +while (true) { +if (ipi_mux_priv.clear_ipi) + ipi_mux_priv.clear_ipi (); + +/* Order bit clearing and data access. */ +mb (); + + irqs =xchg (bits,0 ); +if (!irqs) +break ; + +for_each_set_bit (hwirq, &irqs,BITS_PER_LONG ) { + err =generic_handle_domain_irq (ipi_mux_priv.domain, + hwirq); +if (unlikely (err)) +pr_warn_ratelimited ( +"can't find mapping for hwirq %lu\n" , + hwirq); + } + } +} + +static void ipi_mux_handle_irq (struct irq_desc *desc) +{ +struct irq_chip *chip =irq_desc_get_chip (desc); + +chained_irq_enter (chip, desc); +riscv_ipi_mux_handle_irq (); +chained_irq_exit (chip, desc); +} + +static int ipi_mux_dying_cpu (unsigned int cpu) +{ +if (ipi_mux_priv.parent_virq) +disable_percpu_irq (ipi_mux_priv.parent_virq); +return 0 ; +} + +static int ipi_mux_starting_cpu (unsigned int cpu) +{
arch/riscv/kernel/ipi-mux.c line 149
Quoted 10 lines
arch/riscv/kernel/ipi-mux.c new file +10
-0+if (ipi_mux_priv.parent_virq) +enable_percpu_irq (ipi_mux_priv.parent_virq, +irq_get_trigger_type (ipi_mux_priv.parent_virq)); +return 0 ; +} + +struct irq_domain *riscv_ipi_mux_create (bool use_soft_irq, +void (*clear_ipi)(void ), +void (*send_ipi)(const struct cpumask *mask)) +{
There really shouldn't be a need for such a registration interface anyway (the current idiom is to allocate IPIs in the root irqchip, and pass them to the arch code).
Why can't you model it after the existing architectures?
Quoted 63 lines
arch/riscv/kernel/ipi-mux.c new file +63
-0+int virq, parent_virq =0 ; +struct irq_domain *domain; +struct irq_fwspec ipi; + +if (ipi_mux_priv.domain ||riscv_ipi_have_virq_range ()) +return NULL ; + +if (use_soft_irq) { + domain =irq_find_matching_fwnode (riscv_get_intc_hwnode (), +DOMAIN_BUS_ANY ); +if (!domain) { +pr_err ("unable to find INTC IRQ domain\n" ); +return NULL ; + } + + parent_virq =irq_create_mapping (domain,RV_IRQ_SOFT ); +if (!parent_virq) { +pr_err ("unable to create INTC IRQ mapping\n" ); +return NULL ; + } + } + + domain =irq_domain_add_linear (NULL ,BITS_PER_LONG , + &ipi_mux_domain_ops,NULL ); +if (!domain) { +pr_err ("unable to add IPI Mux domain\n" ); + goto fail_dispose_mapping; + } + + ipi.fwnode = domain->fwnode; + ipi.param_count =1 ; + ipi.param[0 ] =0 ; + virq =__irq_domain_alloc_irqs (domain,-1 ,BITS_PER_LONG , +NUMA_NO_NODE , &ipi, false,NULL ); +if (virq <=0 ) { +pr_err ("unable to alloc IRQs from IPI Mux domain\n" ); + goto fail_domain_remove; + } + + ipi_mux_priv.domain = domain; + ipi_mux_priv.parent_virq = parent_virq; + ipi_mux_priv.clear_ipi = clear_ipi; + ipi_mux_priv.send_ipi = send_ipi; + +if (parent_virq) +irq_set_chained_handler (parent_virq, ipi_mux_handle_irq); + +cpuhp_setup_state (CPUHP_AP_ONLINE_DYN , +"irqchip/riscv/ipi-mux:starting" , + ipi_mux_starting_cpu, ipi_mux_dying_cpu); + +riscv_ipi_set_virq_range (virq,BITS_PER_LONG ); + +return ipi_mux_priv.domain; + +fail_domain_remove: +irq_domain_remove (domain); +fail_dispose_mapping: +if (parent_virq) +irq_dispose_mapping (parent_virq); +return NULL ; +} +
arch/riscv/kernel/ipi-mux.c line 222
Quoted 10 lines
arch/riscv/kernel/ipi-mux.c new file +10
-0+void riscv_ipi_mux_destroy (struct irq_domain *d) +{ +if (!d || ipi_mux_priv.domain != d) +return ; + +irq_domain_remove (ipi_mux_priv.domain); +if (ipi_mux_priv.parent_virq) +irq_dispose_mapping (ipi_mux_priv.parent_virq); +memset (&ipi_mux_priv,0 ,sizeof (ipi_mux_priv)); +}
Err... Under which circumstances do you destroy such an irqdomain? Once all the CPUs have been removed from the machine?
I really think you should aim for a simpler abstraction. The arch code should deal with the interrupts themselves, and leave the *implementation* of the IPI to the driver code, potentially shared across irqchips. This would avoid creating more new interfaces that are specific to one architecture or another.
M.
Signature · 6 lines
Without deviation from the norm, progress is not possible. _______________________________________________ linux-riscv mailing list [email protected] http://lists.infradead.org/mailman/listinfo/linux-riscv
Anup Patel
maintainerRe: [PATCH v4 3/6] RISC-V: Treat IPIs as normal Linux IRQs
Quoted 37 lines · Marc Zyngier
Quoted 18 lines · Anup Patel
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.Signed-off-by Anup Patel <[email protected]>Quoted 15 lines
--- arch/riscv/Kconfig | 1 + arch/riscv/include/asm/ipi-mux.h | 43 ++++++ arch/riscv/include/asm/sbi.h | 2 + arch/riscv/include/asm/smp.h | 35 +++-- arch/riscv/kernel/Makefile | 1 + arch/riscv/kernel/cpu-hotplug.c | 3 +- arch/riscv/kernel/ipi-mux.c | 222 ++++++++++++++++++++++++++++++ arch/riscv/kernel/irq.c | 3 +- arch/riscv/kernel/sbi.c | 13 +- arch/riscv/kernel/smp.c | 153 ++++++++++---------- arch/riscv/kernel/smpboot.c | 5 +- drivers/clocksource/timer-clint.c | 8 +- drivers/irqchip/irq-riscv-intc.c | 55 ++++---- 13 files changed, 405 insertions(+), 139 deletions(-)
Quoted 3 lines
This patch is huge and touches way too many things to be reviewed as such. Please split arch-specific stuff from clocksource and irqchip, going through a transition phase.
Sure, I will split this patch into smaller patches.
Quoted 218 lines
More below.
Quoted 215 lines
create mode 100644 arch/riscv/include/asm/ipi-mux.h create mode 100644 arch/riscv/kernel/ipi-mux.carch/riscv/Kconfig +1
-0@@ -54,6 +54,7 @@ config RISCV select GENERIC_GETTIMEOFDAY if HAVE_GENERIC_VDSO select GENERIC_IDLE_POLL_SETUP select GENERIC_IOREMAP if MMU + select GENERIC_IRQ_IPI select GENERIC_IRQ_MULTI_HANDLER select GENERIC_IRQ_SHOW select GENERIC_IRQ_SHOW_LEVELarch/riscv/include/asm/ipi-mux.h new file +43
-0@@ -0,0 +1,43 @@ +/* SPDX-License-Identifier: GPL-2.0-only */ +/* +* Copyright (c) 2022 Ventana Micro Systems Inc. +*/ + +#ifndef _ASM_RISCV_IPI_MUX_H +#define _ASM_RISCV_IPI_MUX_H + +struct cpumask ; + +#ifdef CONFIG_SMP + +/* Handle muxed IPIs */ +void riscv_ipi_mux_handle_irq (void ); + +/* Create irq_domain for muxed IPIs */ +struct irq_domain *riscv_ipi_mux_create (bool use_soft_irq, +void (*clear_ipi)(void ), +void (*send_ipi)(const struct cpumask *mask)); + +/* Destroy irq_domain for muxed IPIs */ +void riscv_ipi_mux_destroy (struct irq_domain *d); + +#else + +static inline void riscv_ipi_mux_handle_irq (void ) +{ +} + +static inline struct irq_domain *riscv_ipi_mux_create (bool use_soft_irq, +void (*clear_ipi)(void ), +void (*send_ipi)(const struct cpumask *mask)) +{ +return NULL ; +} + +static inline void riscv_ipi_mux_destroy (struct irq_domain *d) +{ +} + +#endif + +#endif /* _ASM_RISCV_IPI_MUX_H */ arch/riscv/include/asm/sbi.h +2
-0@@ -133,6 +133,7 @@ struct sbiret { };void sbi_init (void ); +void sbi_ipi_init (void ); struct sbiret sbi_ecall(int ext, int fid, unsigned long arg0, unsigned long arg1, unsigned long arg2, unsigned long arg3, unsigned long arg4,@@ -202,6 +203,7 @@ static inline unsigned long sbi_mk_version(unsigned long major,int sbi_err_map_linux_errno (int err);#else /* CONFIG_RISCV_SBI */ static inline int sbi_remote_fence_i (const struct cpumask *cpu_mask) {return -1 ; } +static inline void sbi_ipi_init (void ) { }static inline void sbi_init (void ) {}#endif /* CONFIG_RISCV_SBI */ #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 (int 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_irqs);/* Secondary hart entry */ asmlinkage void smp_callin(void);@@ -82,11 +80,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@@ -42,6 +42,7 @@ obj-$(CONFIG_RISCV_M_MODE) += traps_misaligned.o obj-$(CONFIG_FPU) += fpu.o obj-$(CONFIG_SMP) += smpboot.o obj-$(CONFIG_SMP) += smp.o +obj-$(CONFIG_SMP) += ipi-mux.o obj-$(CONFIG_SMP) += cpu_ops.o obj-$(CONFIG_RISCV_BOOT_SPINWAIT) += cpu_ops_spinwait.oarch/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/ipi-mux.c new file +21
-0@@ -0,0 +1,222 @@ +// SPDX-License-Identifier: GPL-2.0-only +/* +* Multiplex several IPIs over a single HW IPI. +* +* Copyright (c) 2022 Ventana Micro Systems Inc. +*/ + +#define pr_fmt (fmt) "riscv-ipi-mux: " fmt +#include <linux/cpu.h> +#include <linux/cpumask.h> +#include <linux/init.h> +#include <linux/irq.h> +#include <linux/irqchip.h> +#include <linux/irqchip/chained_irq.h> +#include <linux/irqdomain.h> +#include <linux/smp.h> +#include <asm/ipi-mux.h> + +struct ipi_mux { +struct irq_domain *domain; +int parent_virq;
Quoted 8 lines
arch/riscv/kernel/ipi-mux.c line 24
Quoted 3 lines
arch/riscv/kernel/ipi-mux.c new file +3
-0+void (*clear_ipi)(void ); +void (*send_ipi)(const struct cpumask *mask); +};Why do you need this in the arch code? It really looks like something that is irqchip specific (single IPI signal on which actual IPIs are overlayed). It is also something that other irqchips are already implementing, so there is potential for consolidation.
I agree we can share the IPI muxing among irqchip drivers.
I was not sure where to place this IPI muxing so I made it RISC-V specific initially.
Can we place a simplified IPI muxing (with no RISC-V specific stuff) under drivers/irqchip or kernel/irq ??
Quoted 131 lines
Quoted 116 lines
arch/riscv/kernel/ipi-mux.c new file +115
-0+ +static struct ipi_mux ipi_mux_priv; +static DEFINE_PER_CPU(unsigned long, ipi_mux_bits); + +static void ipi_mux_dummy (struct irq_data *d) +{ +} + +static void ipi_mux_send_mask (struct irq_data *d,const struct cpumask *mask) +{ +int cpu; + +/* Barrier before doing atomic bit update to IPI bits */ +smp_mb__before_atomic (); + +for_each_cpu (cpu, mask) +set_bit (d->hwirq,per_cpu_ptr (&ipi_mux_bits, cpu)); + +/* Barrier after doing atomic bit update to IPI bits */ +smp_mb__after_atomic (); + +if (ipi_mux_priv.send_ipi) + ipi_mux_priv.send_ipi (mask); +} + +static struct irq_chip ipi_mux_chip = { + .name ="RISC-V IPI Mux" , + .irq_mask = ipi_mux_dummy, + .irq_unmask = ipi_mux_dummy, + .ipi_send_mask = ipi_mux_send_mask, +}; + +static int ipi_mux_domain_map (struct irq_domain *d,unsigned int irq, +irq_hw_number_t hwirq) +{ +irq_set_percpu_devid (irq); +irq_domain_set_info (d, irq, hwirq, &ipi_mux_chip, d->host_data, + handle_percpu_devid_irq,NULL ,NULL ); + +return 0 ; +} + +static int ipi_mux_domain_alloc (struct irq_domain *d,unsigned int virq, +unsigned int nr_irqs,void *arg) +{ +int i, ret; +irq_hw_number_t hwirq; +unsigned int type =IRQ_TYPE_NONE ; +struct irq_fwspec *fwspec = arg; + + ret =irq_domain_translate_onecell (d, fwspec, &hwirq, &type); +if (ret) +return ret; + +for (i =0 ; i < nr_irqs; i++) { + ret =ipi_mux_domain_map (d, virq + i, hwirq + i); +if (ret) +return ret; + } + +return 0 ; +} + +static const struct irq_domain_ops ipi_mux_domain_ops = { + .translate = irq_domain_translate_onecell, + .alloc = ipi_mux_domain_alloc, + .free = irq_domain_free_irqs_top, +}; + +void riscv_ipi_mux_handle_irq (void ) +{ +int err; +unsigned long irqs, *bits =this_cpu_ptr (&ipi_mux_bits); +irq_hw_number_t hwirq; + +while (true) { +if (ipi_mux_priv.clear_ipi) + ipi_mux_priv.clear_ipi (); + +/* Order bit clearing and data access. */ +mb (); + + irqs =xchg (bits,0 ); +if (!irqs) +break ; + +for_each_set_bit (hwirq, &irqs,BITS_PER_LONG ) { + err =generic_handle_domain_irq (ipi_mux_priv.domain, + hwirq); +if (unlikely (err)) +pr_warn_ratelimited ( +"can't find mapping for hwirq %lu\n" , + hwirq); + } + } +} + +static void ipi_mux_handle_irq (struct irq_desc *desc) +{ +struct irq_chip *chip =irq_desc_get_chip (desc); + +chained_irq_enter (chip, desc); +riscv_ipi_mux_handle_irq (); +chained_irq_exit (chip, desc); +} + +static int ipi_mux_dying_cpu (unsigned int cpu) +{ +if (ipi_mux_priv.parent_virq) +disable_percpu_irq (ipi_mux_priv.parent_virq); +return 0 ; +} + +static int ipi_mux_starting_cpu (unsigned int cpu) +{arch/riscv/kernel/ipi-mux.c line 149
Quoted 10 lines
arch/riscv/kernel/ipi-mux.c new file +10
-0+if (ipi_mux_priv.parent_virq) +enable_percpu_irq (ipi_mux_priv.parent_virq, +irq_get_trigger_type (ipi_mux_priv.parent_virq)); +return 0 ; +} + +struct irq_domain *riscv_ipi_mux_create (bool use_soft_irq, +void (*clear_ipi)(void ), +void (*send_ipi)(const struct cpumask *mask)) +{There really shouldn't be a need for such a registration interface anyway (the current idiom is to allocate IPIs in the root irqchip, and pass them to the arch code).
Quoted 1 line
Why can't you model it after the existing architectures?
I ended up with a lot of duplicate code between SBI IPI driver and SiFive CLINT driver so I factored out the IPI muxing as separate sources. We also have RISC-V AIA drivers using the same IPI muxing.
If we simplify the IPI muxing and move it out of arch/riscv then changes in this patch are straight forward to review.
Quoted 69 lines
Quoted 69 lines
arch/riscv/kernel/ipi-mux.c new file +68
-0+int virq, parent_virq =0 ; +struct irq_domain *domain; +struct irq_fwspec ipi; + +if (ipi_mux_priv.domain ||riscv_ipi_have_virq_range ()) +return NULL ; + +if (use_soft_irq) { + domain =irq_find_matching_fwnode (riscv_get_intc_hwnode (), +DOMAIN_BUS_ANY ); +if (!domain) { +pr_err ("unable to find INTC IRQ domain\n" ); +return NULL ; + } + + parent_virq =irq_create_mapping (domain,RV_IRQ_SOFT ); +if (!parent_virq) { +pr_err ("unable to create INTC IRQ mapping\n" ); +return NULL ; + } + } + + domain =irq_domain_add_linear (NULL ,BITS_PER_LONG , + &ipi_mux_domain_ops,NULL ); +if (!domain) { +pr_err ("unable to add IPI Mux domain\n" ); + goto fail_dispose_mapping; + } + + ipi.fwnode = domain->fwnode; + ipi.param_count =1 ; + ipi.param[0 ] =0 ; + virq =__irq_domain_alloc_irqs (domain,-1 ,BITS_PER_LONG , +NUMA_NO_NODE , &ipi, false,NULL ); +if (virq <=0 ) { +pr_err ("unable to alloc IRQs from IPI Mux domain\n" ); + goto fail_domain_remove; + } + + ipi_mux_priv.domain = domain; + ipi_mux_priv.parent_virq = parent_virq; + ipi_mux_priv.clear_ipi = clear_ipi; + ipi_mux_priv.send_ipi = send_ipi; + +if (parent_virq) +irq_set_chained_handler (parent_virq, ipi_mux_handle_irq); + +cpuhp_setup_state (CPUHP_AP_ONLINE_DYN , +"irqchip/riscv/ipi-mux:starting" , + ipi_mux_starting_cpu, ipi_mux_dying_cpu); + +riscv_ipi_set_virq_range (virq,BITS_PER_LONG ); + +return ipi_mux_priv.domain; + +fail_domain_remove: +irq_domain_remove (domain); +fail_dispose_mapping: +if (parent_virq) +irq_dispose_mapping (parent_virq); +return NULL ; +} + +void riscv_ipi_mux_destroy (struct irq_domain *d) +{ +if (!d || ipi_mux_priv.domain != d) +return ; +
Quoted 8 lines
arch/riscv/kernel/ipi-mux.c line 222
Quoted 5 lines
arch/riscv/kernel/ipi-mux.c new file +5
-0+irq_domain_remove (ipi_mux_priv.domain); +if (ipi_mux_priv.parent_virq) +irq_dispose_mapping (ipi_mux_priv.parent_virq); +memset (&ipi_mux_priv,0 ,sizeof (ipi_mux_priv)); +}Err... Under which circumstances do you destroy such an irqdomain? Once all the CPUs have been removed from the machine?
In case, there was a failure after creating an IPI muxing domain then this function allows us to destroy the IPI muxing domain.
Quoted 6 lines
I really think you should aim for a simpler abstraction. The arch code should deal with the interrupts themselves, and leave the *implementation* of the IPI to the driver code, potentially shared across irqchips. This would avoid creating more new interfaces that are specific to one architecture or another.
I agree.
Quoted 5 lines
M.--
Without deviation from the norm, progress is not possible.
Regards,
Anup
_______________________________________________
linux-riscv mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/linux-riscv
Re: [PATCH v4 3/6] RISC-V: Treat IPIs as normal Linux IRQs
Quoted 14 lines · Anup Patel
Quoted 11 lines · Marc Zyngier
arch/riscv/kernel/ipi-mux.c line 24
Quoted 6 lines
arch/riscv/kernel/ipi-mux.c new file +6
-0+struct ipi_mux { +struct irq_domain *domain; +int parent_virq; +void (*clear_ipi)(void ); +void (*send_ipi)(const struct cpumask *mask); +};Why do you need this in the arch code? It really looks like something that is irqchip specific (single IPI signal on which actual IPIs are overlayed). It is also something that other irqchips are already implementing, so there is potential for consolidation.
Quoted 7 lines
I agree we can share the IPI muxing among irqchip drivers.
I was not sure where to place this IPI muxing so I made it RISC-V specific initially.
Can we place a simplified IPI muxing (with no RISC-V specific stuff) under
drivers/irqchipor kernel/irq ??
We already have IPI-specific code in kernel/irq, so it should probably live there.
Quoted 9 lines
Quoted 9 lines
arch/riscv/include/asm/ipi-mux.h line 33
Quoted 4 lines
arch/riscv/include/asm/ipi-mux.h new file +4
-0+struct irq_domain *riscv_ipi_mux_create (bool use_soft_irq, +void (*clear_ipi)(void ), +void (*send_ipi)(const struct cpumask *mask)) +{There really shouldn't be a need for such a registration interface anyway (the current idiom is to allocate IPIs in the root irqchip, and pass them to the arch code).
Quoted 8 lines
Quoted 1 line
Why can't you model it after the existing architectures?
I ended up with a lot of duplicate code between SBI IPI driver and SiFive CLINT driver so I factored out the IPI muxing as separate sources. We also have RISC-V AIA drivers using the same IPI muxing.
If we simplify the IPI muxing and move it out of
arch/riscvthen changes in this patch are straight forward to review.
It isn't only about making things easier to review. It is about having consistent interfaces across architecture and reducing the amount of glue between arch code and random drivers. If there is a lot of similar code between your various irqchips, then it can be made common between the irqchips. But the interface between arch code and those should not be arch-specific.
M.
Signature · 1 line
Without deviation from the norm, progress is not possible.
PATCH v4 4/6 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/ipi-mux.h | 2 ++ arch/riscv/include/asm/smp.h | 18 ++++++++++++++++-- arch/riscv/kernel/ipi-mux.c | 3 ++- arch/riscv/kernel/sbi.c | 3 ++- arch/riscv/kernel/smp.c | 11 ++++++++++- drivers/clocksource/timer-clint.c | 2 +- 6 files changed, 33 insertions(+), 6 deletions(-)
arch/riscv/include/asm/ipi-mux.h +2 -0
@@ -15,6 +15,7 @@ void riscv_ipi_mux_handle_irq(void);/* Create irq_domain for muxed IPIs */ struct irq_domain *riscv_ipi_mux_create (bool use_soft_irq, +bool use_for_rfence,void (*clear_ipi)(void ),void (*send_ipi)(const struct cpumask *mask));
@@ -28,6 +29,7 @@ static inline void riscv_ipi_mux_handle_irq(void) }static inline struct irq_domain *riscv_ipi_mux_create (bool use_soft_irq, +bool use_for_rfence,void (*clear_ipi)(void ),void (*send_ipi)(const struct cpumask *mask)) {
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_irqs); +void riscv_ipi_set_virq_range (int virq,int nr_irqs,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)/* Secondary hart entry */ asmlinkage void smp_callin(void);
@@ -93,10 +101,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/ipi-mux.c +2 -1
@@ -144,6 +144,7 @@ static int ipi_mux_starting_cpu(unsigned int cpu) }struct irq_domain *riscv_ipi_mux_create (bool use_soft_irq, +bool use_for_rfence,void (*clear_ipi)(void ),void (*send_ipi)(const struct cpumask *mask)) {
@@ -198,7 +199,7 @@ struct irq_domain *riscv_ipi_mux_create(bool use_soft_irq,"irqchip/riscv/ipi-mux:starting" , ipi_mux_starting_cpu, ipi_mux_dying_cpu); -riscv_ipi_set_virq_range (virq,BITS_PER_LONG ); +riscv_ipi_set_virq_range (virq,BITS_PER_LONG , use_for_rfence);return ipi_mux_priv.domain;
arch/riscv/kernel/sbi.c +2 -1
@@ -652,7 +652,8 @@ static void sbi_ipi_clear(void)void __init sbi_ipi_init (void ) { -if (riscv_ipi_mux_create (true, sbi_ipi_clear, sbi_send_cpumask_ipi)) +if (riscv_ipi_mux_create (true, false, + sbi_ipi_clear, sbi_send_cpumask_ipi))pr_info ("providing IPIs using SBI IPI extension\n" ); }
arch/riscv/kernel/smp.c +10 -1
@@ -149,7 +149,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;
@@ -172,6 +175,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); }EXPORT_SYMBOL_GPL (riscv_ipi_set_virq_range);
drivers/clocksource/timer-clint.c +1 -1
@@ -224,7 +224,7 @@ static int __init clint_timer_init_dt(struct device_node *np) goto fail_free_irq; } -riscv_ipi_mux_create (true, clint_clear_ipi, clint_send_ipi); +riscv_ipi_mux_create (true, true, clint_clear_ipi, clint_send_ipi);clint_clear_ipi ();return 0 ;
Signature · 1 line
2.25.1
PATCH v4 5/6 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);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 · 1 line
2.25.1
PATCH v4 6/6 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
@@ -18,7 +18,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 );
@@ -66,7 +66,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.25.1 _______________________________________________ linux-riscv mailing list [email protected] http://lists.infradead.org/mailman/listinfo/linux-riscv