RISC-V IPI Improvements
Subsystems (5)
v5 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) KVM RISC-V TLB flush improvements
3) Linux RISC-V SWI support
These patches can also be found in riscv_ipi_imp_v5 branch at:
https://github.com/avpatel/linux.git
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
genirq: Add mechanism to multiplex a single HW IPI
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 | 2 + 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/irq.c | 21 +++- arch/riscv/kernel/sbi-ipi.c | 60 ++++++++++ arch/riscv/kernel/sbi.c | 11 -- 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 | 41 +++++-- drivers/irqchip/irq-riscv-intc.c | 60 +++++----- include/linux/irq.h | 28 +++++ kernel/irq/Kconfig | 4 + kernel/irq/Makefile | 1 + kernel/irq/ipi-mux.c | 190 ++++++++++++++++++++++++++++++ 19 files changed, 577 insertions(+), 167 deletions(-) create mode 100644 arch/riscv/kernel/sbi-ipi.c create mode 100644 kernel/irq/ipi-mux.c
Signature · 1 line
2.25.1
PATCH v5 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
@@ -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 · 1 line
2.25.1
PATCH v5 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) {
@@ -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 · 1 line
2.25.1
PATCH v5 3/7 genirq: Add mechanism to multiplex a single HW IPI
In reply to Anup PatelAll RISC-V platforms have a single HW IPI provided by the INTC local interrupt controller. The HW method to trigger INTC IPI can be through external irqchip (e.g. RISC-V AIA), through platform specific device (e.g. SiFive CLINT timer), or through firmware (e.g. SBI IPI call).
To support multiple IPIs on RISC-V, we need a generic mechanism to create multiple per-CPU vIRQs using a single HW IPI hence this patch.
The generic IPI multiplex mechanism added by this patch can also be useful to other architectures.
--- include/linux/irq.h | 28 +++++++ kernel/irq/Kconfig | 4 + kernel/irq/Makefile | 1 + kernel/irq/ipi-mux.c | 190 +++++++++++++++++++++++++++++++++++++++++++ 4 files changed, 223 insertions(+) create mode 100644 kernel/irq/ipi-mux.c
include/linux/irq.h +28 -0
@@ -1248,6 +1248,34 @@ int __ipi_send_mask(struct irq_desc *desc, const struct cpumask *dest);int ipi_send_single (unsigned int virq,unsigned int cpu);int ipi_send_mask (unsigned int virq,const struct cpumask *dest); +#define IPI_MUX_NR_IRQS BITS_PER_LONG +struct ipi_mux_ops { +void (*ipi_mux_clear)(unsigned int parent_virq); +void (*ipi_mux_send)(unsigned int parent_virq, +const struct cpumask *mask); +}; + +/* Process multiplexed IPIs */ +void ipi_mux_process (void ); + +/* +* Create multiple IPIs (total IPI_MUX_NR_IRQS) multiplexed on top of a +* single parent IPI. +* +* If the parent IPI > 0 then ipi_mux_process() will be automatically +* called via chained handler. +* +* If the parent IPI <= 0 then it is responsiblity of irqchip drivers +* to explicitly call ipi_mux_process() for processing muxed +* IPIs. +* +* Returns first virq of the muxed IPIs upon success or <=0 upon failure +*/ +int ipi_mux_create (unsigned int parent_virq,const struct ipi_mux_ops *ops); + +/* Destroy multiplexed IPIs */ +void ipi_mux_destroy (void ); +#ifdef CONFIG_GENERIC_IRQ_MULTI_HANDLER /* * Registers a generic IRQ handling function as the top-level IRQ handler in
kernel/irq/Kconfig +4 -0
@@ -84,6 +84,10 @@ config GENERIC_IRQ_IPI bool select IRQ_DOMAIN_HIERARCHY +# Generic IRQ IPI Mux support +config GENERIC_IRQ_IPI_MUX + bool + # Generic MSI interrupt support config GENERIC_MSI_IRQ bool
kernel/irq/Makefile +1 -0
@@ -15,6 +15,7 @@ obj-$(CONFIG_GENERIC_IRQ_MIGRATION) += cpuhotplug.o obj-$(CONFIG_PM_SLEEP) += pm.o obj-$(CONFIG_GENERIC_MSI_IRQ) += msi.o obj-$(CONFIG_GENERIC_IRQ_IPI) += ipi.o +obj-$(CONFIG_GENERIC_IRQ_IPI_MUX) += ipi-mux.o obj-$(CONFIG_SMP) += affinity.o obj-$(CONFIG_GENERIC_IRQ_DEBUGFS) += debugfs.o obj-$(CONFIG_GENERIC_IRQ_MATRIX_ALLOCATOR) += matrix.o
kernel/irq/ipi-mux.c new file +190 -0
190 lines not on this page · raw message
Signature · 1 line
2.25.1
Re: [PATCH v5 3/7] genirq: Add mechanism to multiplex a single HW IPI
Anup,
Quoted 7 lines · Anup Patel
All RISC-V platforms have a single HW IPI provided by the INTC local interrupt controller. The HW method to trigger INTC IPI can be through external irqchip (e.g. RISC-V AIA), through platform specific device (e.g. SiFive CLINT timer), or through firmware (e.g. SBI IPI call).
To support multiple IPIs on RISC-V, we need a generic mechanism to create multiple per-CPU vIRQs using a single HW IPI hence this patch.
git grep 'This patch' Documentation/process
Quoted 2 lines
The generic IPI multiplex mechanism added by this patch can also be useful to other architectures.
Which ones? Sane architectures have more than one IPI.
include/linux/irq.h int __ipi_send_mask(struct irq_desc *desc, const struct cpumask *dest); · line 1252
Quoted 10 lines
include/linux/irq.h +2
-0@@ -1248,6 +1248,34 @@ int __ipi_send_mask(struct irq_desc *desc, const struct cpumask *dest);int ipi_send_single (unsigned int virq,unsigned int cpu);int ipi_send_mask (unsigned int virq,const struct cpumask *dest); +#define IPI_MUX_NR_IRQS BITS_PER_LONG +struct ipi_mux_ops {
This is unreadable. Newlines exist for a reason.
Quoted 12 lines
include/linux/irq.h +12
-0+void (*ipi_mux_clear)(unsigned int parent_virq); +void (*ipi_mux_send)(unsigned int parent_virq, +const struct cpumask *mask); +}; + +/* Process multiplexed IPIs */ +void ipi_mux_process (void ); + +/* +* Create multiple IPIs (total IPI_MUX_NR_IRQS) multiplexed on top of a +* single parent IPI. +*
include/linux/irq.h int __ipi_send_mask(struct irq_desc *desc, const struct cpumask *dest); · line 1274
Quoted 10 lines
include/linux/irq.h +10
-0+* If the parent IPI > 0 then ipi_mux_process() will be automatically +* called via chained handler. +* +* If the parent IPI <= 0 then it is responsiblity of irqchip drivers +* to explicitly call ipi_mux_process() for processing muxed +* IPIs. +* +* Returns first virq of the muxed IPIs upon success or <=0 upon failure +*/ +int ipi_mux_create (unsigned int parent_virq,const struct ipi_mux_ops *ops);
While it is kinda sensible to have the documentation near the declaration, I prefer it to be near the code because thats where it matters and also has a higher chance to be updated when the code changes.
Please use proper kernel doc while at it.
Quoted 18 lines
include/linux/irq.h +18
-0+static unsigned int ipi_mux_parent_virq; +static struct irq_domain *ipi_mux_domain; +static const struct ipi_mux_ops *ipi_mux_ops; +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));
include/linux/irq.h int __ipi_send_mask(struct irq_desc *desc, const struct cpumask *dest);
Quoted 10 lines
include/linux/irq.h +10
-0+ +/* Barrier after doing atomic bit update to IPI bits */ +smp_mb__after_atomic (); + +/* Trigger the parent IPI */ + ipi_mux_ops->ipi_mux_send (ipi_mux_parent_virq, mask); +} + +static struct irq_chip ipi_mux_chip = { + .name ="RISC-V IPI Mux" ,
RISC-V IPI Mux is a truly generic name :)
Quoted 12 lines
include/linux/irq.h +12
-0+ .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 ); +
include/linux/irq.h
Quoted 10 lines
include/linux/irq.h +10
-0+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;
Documentation/process/maintainer-tip.rst #coding-style-notes
Quoted 18 lines
include/linux/irq.h +18
-0+ 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, +};
include/linux/irq.h
Quoted 10 lines
include/linux/irq.h +10
-0+ +void ipi_mux_process (void ) +{ +int err; +unsigned long irqs, *bits =this_cpu_ptr (&ipi_mux_bits); +irq_hw_number_t hwirq; + +while (true) { +/* Clear the parent IPI */ + ipi_mux_ops->ipi_mux_clear (ipi_mux_parent_virq);
This being in a loop smells fishy at least without a comment. And the more I read all of this the less I'm convinced that this code can be used by anything else than RISCV.
include/linux/irq.h
Quoted 2 lines
include/linux/irq.h +2
-0+/* Order bit clearing and data access. */ +mb ();
This mb() pairs with what? Memory barriers have a counterpart and it's mandatory to document that in the comment.
Quoted 7 lines
include/linux/irq.h +7
-0+ irqs =xchg (bits,0 ); +if (!irqs) +break ; + +for_each_set_bit (hwirq, &irqs,IPI_MUX_NR_IRQS ) { + err =generic_handle_domain_irq (ipi_mux_domain, + hwirq);
include/linux/irq.h
Quoted 10 lines
include/linux/irq.h +10
-0+if (unlikely (err)) +pr_warn_ratelimited ( +"can't find mapping for hwirq %lu\n" , + hwirq); + } + } +} + + +void ipi_mux_destroy (void )
Seriously? You provide a function to rip the IPI mechanism out in a running system? What's that for?
include/linux/irq.h
Quoted 7 lines
include/linux/irq.h +7
-0+{ +if (!ipi_mux_domain) +return ; + +irq_domain_remove (ipi_mux_domain); + ipi_mux_domain =NULL ; + ipi_mux_parent_virq =0 ;
If it would be useful, then this would leak the hotplug callbacks, but the good news is that after tearing down the IPI domain hotplug does not work anymore :)
Thanks,
tglx
Re: [PATCH v5 3/7] genirq: Add mechanism to multiplex a single HW IPI
Quoted 9 lines · Thomas Gleixner
Anup,
Quoted 5 lines · Anup Patel
All RISC-V platforms have a single HW IPI provided by the INTC local interrupt controller. The HW method to trigger INTC IPI can be through external irqchip (e.g. RISC-V AIA), through platform specific device (e.g. SiFive CLINT timer), or through firmware (e.g. SBI IPI call).
Quoted 4 lines
Quoted 2 lines
To support multiple IPIs on RISC-V, we need a generic mechanism to create multiple per-CPU vIRQs using a single HW IPI hence this patch.
git grep 'This patch'
Documentation/process
Okay, I will update the commit description as-per Documentation.
Quoted 5 lines
Quoted 3 lines
The generic IPI multiplex mechanism added by this patch can also be useful to other architectures.
Which ones? Sane architectures have more than one IPI.
Currently, the IPI muxing is shared code for various RISC-V drivers (such as CLINT driver, SBI IPI irqchip driver, and AIA (coming soon)).
Overall, the IPI muxing seems independent of RISC-V so maybe it is useful to have it as common selectable API.
Quoted 9 lines
Quoted 9 lines
include/linux/irq.h +0
-0@@ -1248,6 +1248,34 @@ int __ipi_send_mask(struct irq_desc *desc, const struct cpumask *dest);int ipi_send_single (unsigned int virq,unsigned int cpu);int ipi_send_mask (unsigned int virq,const struct cpumask *dest);
Quoted 4 lines
include/linux/irq.h int __ipi_send_mask(struct irq_desc *desc, const struct cpumask *dest); · line 1252
Quoted 2 lines
include/linux/irq.h +2
-0+#define IPI_MUX_NR_IRQS BITS_PER_LONG +struct ipi_mux_ops {This is unreadable. Newlines exist for a reason.
Okay, I will add a newline above the struct.
Quoted 20 lines
Quoted 20 lines
include/linux/irq.h +19
-0+void (*ipi_mux_clear)(unsigned int parent_virq); +void (*ipi_mux_send)(unsigned int parent_virq, +const struct cpumask *mask); +}; + +/* Process multiplexed IPIs */ +void ipi_mux_process (void ); + +/* +* Create multiple IPIs (total IPI_MUX_NR_IRQS) multiplexed on top of a +* single parent IPI. +* +* If the parent IPI > 0 then ipi_mux_process() will be automatically +* called via chained handler. +* +* If the parent IPI <= 0 then it is responsiblity of irqchip drivers +* to explicitly call ipi_mux_process() for processing muxed +* IPIs. +*
Quoted 8 lines
include/linux/irq.h int __ipi_send_mask(struct irq_desc *desc, const struct cpumask *dest); · line 1274
Quoted 3 lines
include/linux/irq.h +3
-0+* Returns first virq of the muxed IPIs upon success or <=0 upon failure +*/ +int ipi_mux_create (unsigned int parent_virq,const struct ipi_mux_ops *ops);While it is kinda sensible to have the documentation near the declaration, I prefer it to be near the code because thats where it matters and also has a higher chance to be updated when the code changes.
Okay, I will move documentation near the code.
Quoted 2 lines
Please use proper kernel doc while at it.
Sure, I will update.
Quoted 23 lines
Quoted 23 lines
include/linux/irq.h +22
-0+static unsigned int ipi_mux_parent_virq; +static struct irq_domain *ipi_mux_domain; +static const struct ipi_mux_ops *ipi_mux_ops; +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 (); +
Quoted 8 lines
include/linux/irq.h
Quoted 6 lines
include/linux/irq.h +6
-0+/* Trigger the parent IPI */ + ipi_mux_ops->ipi_mux_send (ipi_mux_parent_virq, mask); +} + +static struct irq_chip ipi_mux_chip = { + .name ="RISC-V IPI Mux" ,RISC-V IPI Mux is a truly generic name :)
Aargh, I forgot to remove "RISC-V" from the name here. I will update.
Quoted 17 lines
Quoted 17 lines
include/linux/irq.h +16
-0+ .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,
Quoted 8 lines
include/linux/irq.h
Quoted 6 lines
include/linux/irq.h +6
-0+ 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;
Documentation/process/maintainer-tip.rst#coding-style-notes
Okay, I will refer and update.
Quoted 25 lines
Quoted 25 lines
include/linux/irq.h +24
-0+ 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 ipi_mux_process (void ) +{ +int err; +unsigned long irqs, *bits =this_cpu_ptr (&ipi_mux_bits); +irq_hw_number_t hwirq;
Quoted 8 lines
include/linux/irq.h
Quoted 4 lines
include/linux/irq.h +4
-0+ +while (true) { +/* Clear the parent IPI */ + ipi_mux_ops->ipi_mux_clear (ipi_mux_parent_virq);This being in a loop smells fishy at least without a comment. And the more I read all of this the less I'm convinced that this code can be used by anything else than RISCV.
The original IPI muxing code in RISC-V had this loop so I did not remove it.
Actually, the loop is redundant because if a CPU gets another IPI while it was in ipi_mux_process() then another interrupt will be taken and ipi_mux_process() will be called again. I test more and remove this loop.
Quoted 6 lines
include/linux/irq.h
Quoted 3 lines
include/linux/irq.h +2
-0+/* Order bit clearing and data access. */ +mb ();This
mb()pairs with what? Memory barriers have a counterpart and it's mandatory to document that in the comment.
It pairs with barriers in ipi_mux_send_mask(). I will update the comment.
Quoted 22 lines
Quoted 8 lines
include/linux/irq.h +7
-0+ irqs =xchg (bits,0 ); +if (!irqs) +break ; + +for_each_set_bit (hwirq, &irqs,IPI_MUX_NR_IRQS ) { + err =generic_handle_domain_irq (ipi_mux_domain, + hwirq);include/linux/irq.h
Quoted 10 lines
include/linux/irq.h +10
-0+if (unlikely (err)) +pr_warn_ratelimited ( +"can't find mapping for hwirq %lu\n" , + hwirq); + } + } +} + + +void ipi_mux_destroy (void )Seriously? You provide a function to rip the IPI mechanism out in a running system? What's that for?
Quoted 11 lines
include/linux/irq.h
Quoted 7 lines
include/linux/irq.h +7
-0+{ +if (!ipi_mux_domain) +return ; + +irq_domain_remove (ipi_mux_domain); + ipi_mux_domain =NULL ; + ipi_mux_parent_virq =0 ;If it would be useful, then this would leak the hotplug callbacks, but the good news is that after tearing down the IPI domain hotplug does not work anymore :)
The only use of this function was to clean up in-case the irqchip driver failed after creating mux.
I will certainly remove this function in the next patch revision.
Quoted 4 lines
Thanks,
tglx
Regards,
Anup
PATCH v5 4/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 | 2 + 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 | 60 ++++++++++++ arch/riscv/kernel/sbi.c | 17 ---- arch/riscv/kernel/smp.c | 153 +++++++++++++++--------------- arch/riscv/kernel/smpboot.c | 5 +- drivers/clocksource/timer-clint.c | 41 +++++--- drivers/irqchip/irq-riscv-intc.c | 55 +++++------ 12 files changed, 222 insertions(+), 155 deletions(-) create mode 100644 arch/riscv/kernel/sbi-ipi.c
arch/riscv/Kconfig +2 -0
@@ -54,6 +54,8 @@ 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_IPI_MUX select GENERIC_IRQ_MULTI_HANDLER select GENERIC_IRQ_SHOW select GENERIC_IRQ_SHOW_LEVEL
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
@@ -57,6 +57,7 @@ obj-$(CONFIG_RISCV_BASE_PMU) += perf_event.o obj-$(CONFIG_PERF_EVENTS) += perf_callchain.o obj-$(CONFIG_HAVE_PERF_REGS) += perf_regs.o obj-$(CONFIG_RISCV_SBI) += sbi.o +obj-$(CONFIG_RISCV_SBI) += sbi-ipi.o ifeq ($(CONFIG_RISCV_SBI), y) obj-$(CONFIG_SMP) += cpu_ops_sbi.o endif
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 +60 -0
60 lines not on this page · raw message
arch/riscv/kernel/sbi.c +0 -17
@@ -638,21 +638,6 @@ long sbi_get_mimpid(void)return __sbi_base_ecall (SBI_EXT_BASE_GET_MIMPID ); } -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_clear = sbi_ipi_clear -}; -void __init sbi_init (void ) {int ret;
@@ -699,6 +684,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 +30 -11
96 lines not on this page · raw message
drivers/irqchip/irq-riscv-intc.c +24 -31
82 lines not on this page · raw message
Signature · 1 line
2.25.1
PATCH v5 5/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_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/sbi-ipi.c +1 -1
@@ -55,6 +55,6 @@ void __init sbi_ipi_init(void)return ; } -riscv_ipi_set_virq_range (virq,IPI_MUX_NR_IRQS ); +riscv_ipi_set_virq_range (virq,IPI_MUX_NR_IRQS , false);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
@@ -245,7 +245,7 @@ static int __init clint_timer_init_dt(struct device_node *np) goto fail_remove_cpuhp; } -riscv_ipi_set_virq_range (virq,IPI_MUX_NR_IRQS ); +riscv_ipi_set_virq_range (virq,IPI_MUX_NR_IRQS , true);clint_clear_ipi (clint_ipi_irq);return 0 ;
Signature · 1 line
2.25.1
PATCH v5 6/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);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 v5 7/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
@@ -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