RISC-V IPI Improvements
Subsystems (5)
v11 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_v11 branch at:
https://github.com/avpatel/linux.git
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
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 | 7 + 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 | 80 +++++++++ arch/riscv/kernel/sbi.c | 11 -- arch/riscv/kernel/smp.c | 166 +++++++++--------- arch/riscv/kernel/smpboot.c | 5 +- arch/riscv/mm/cacheflush.c | 5 +- arch/riscv/mm/tlbflush.c | 93 +++++++++-- drivers/clocksource/timer-clint.c | 43 +++-- drivers/irqchip/irq-riscv-intc.c | 60 +++---- include/linux/irq.h | 18 ++ kernel/irq/Kconfig | 5 + kernel/irq/Makefile | 1 + kernel/irq/ipi-mux.c | 268 ++++++++++++++++++++++++++++++ 19 files changed, 675 insertions(+), 167 deletions(-) create mode 100644 arch/riscv/kernel/sbi-ipi.c create mode 100644 kernel/irq/ipi-mux.c
Signature · 1 line
2.34.1
PATCH v11 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
@@ -83,8 +83,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
PATCH v11 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
PATCH v11 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 add a generic IPI multiplexing mechanism which help us create multiple virtual IPIs using a single HW IPI. This generic IPI multiplexing is inspired from the Apple AIC irqchip driver and it is shared by various RISC-V irqchip drivers.
--- include/linux/irq.h | 18 +++ kernel/irq/Kconfig | 5 + kernel/irq/Makefile | 1 + kernel/irq/ipi-mux.c | 268 +++++++++++++++++++++++++++++++++++++++++++ 4 files changed, 292 insertions(+) create mode 100644 kernel/irq/ipi-mux.c
include/linux/irq.h +18 -0
@@ -1266,6 +1266,24 @@ 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); +/** +* struct ipi_mux_ops - IPI multiplex operations +* +* @ipi_mux_pre_handle: Optional function called before handling parent IPI +* @ipi_mux_post_handle:Optional function called after handling parent IPI +* @ipi_mux_send: Trigger parent IPI on target CPUs +*/ +struct ipi_mux_ops { +void (*ipi_mux_pre_handle)(unsigned int parent_virq,void *data); +void (*ipi_mux_post_handle)(unsigned int parent_virq,void *data); +void (*ipi_mux_send)(unsigned int parent_virq,void *data, +const struct cpumask *mask); +}; + +void ipi_mux_process (void ); +int ipi_mux_create (unsigned int parent_virq,unsigned int nr_ipi, +const struct ipi_mux_ops *ops,void *data); +#ifdef CONFIG_GENERIC_IRQ_MULTI_HANDLER /* * Registers a generic IRQ handling function as the top-level IRQ handler in
kernel/irq/Kconfig +5 -0
@@ -86,6 +86,11 @@ config GENERIC_IRQ_IPI depends on SMP select IRQ_DOMAIN_HIERARCHY +# Generic IRQ IPI Mux support +config GENERIC_IRQ_IPI_MUX + bool + depends on SMP + # 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 +268 -0
268 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
Re: [PATCH v11 3/7] genirq: Add mechanism to multiplex a single HW IPI
Quoted 28 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 add a generic IPI multiplexing mechanism which help us create multiple virtual IPIs using a single HW IPI. This generic IPI multiplexing is inspired from the Apple AIC irqchip driver and it is shared by various RISC-V irqchip drivers.
Signed-off-by Anup Patel <[email protected]>--- include/linux/irq.h | 18 +++ kernel/irq/Kconfig | 5 + kernel/irq/Makefile | 1 + kernel/irq/ipi-mux.c | 268 +++++++++++++++++++++++++++++++++++++++++++ 4 files changed, 292 insertions(+) create mode 100644 kernel/irq/ipi-mux.cinclude/linux/irq.h +0
-0@@ -1266,6 +1266,24 @@ 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);
include/linux/irq.h int __ipi_send_mask(struct irq_desc *desc, const struct cpumask *dest); · line 1278
Quoted 10 lines
include/linux/irq.h +10
-0+/** +* struct ipi_mux_ops - IPI multiplex operations +* +* @ipi_mux_pre_handle: Optional function called before handling parent IPI +* @ipi_mux_post_handle:Optional function called after handling parent IPI +* @ipi_mux_send: Trigger parent IPI on target CPUs +*/ +struct ipi_mux_ops { +void (*ipi_mux_pre_handle)(unsigned int parent_virq,void *data); +void (*ipi_mux_post_handle)(unsigned int parent_virq,void *data);
I still haven't seen any decent explanation for this other than "we need it". What is it that cannot be achieved via the irq_ack() and irq_eoi() callbacks?
include/linux/irq.h int __ipi_send_mask(struct irq_desc *desc, const struct cpumask *dest); · line 1280
Quoted 2 lines
include/linux/irq.h +2
-0+void (*ipi_mux_send)(unsigned int parent_virq,void *data, +const struct cpumask *mask);
In what context would the 'parent_virq' be useful? You are *sending* an IPI, not receiving it, and I expect the mechanism by which you send such an IPI to be independent of the Linux view of the irq.
Also, please swap data and mask in the function signature.
Quoted 61 lines
include/linux/irq.h +6
-0+}; + +void ipi_mux_process (void ); +int ipi_mux_create (unsigned int parent_virq,unsigned int nr_ipi, +const struct ipi_mux_ops *ops,void *data); +#ifdef CONFIG_GENERIC_IRQ_MULTI_HANDLER /* * Registers a generic IRQ handling function as the top-level IRQ handler in kernel/irq/Kconfig +5
-0@@ -86,6 +86,11 @@ config GENERIC_IRQ_IPI depends on SMP select IRQ_DOMAIN_HIERARCHY +# Generic IRQ IPI Mux support +config GENERIC_IRQ_IPI_MUX + bool + depends on SMP + # Generic MSI interrupt support config GENERIC_MSI_IRQ boolkernel/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.okernel/irq/ipi-mux.c new file +18
-0@@ -0,0 +1,268 @@ +// SPDX-License-Identifier: GPL-2.0-or-later +/* +* Multiplex several virtual IPIs over a single HW IPI. +* +* Copyright The Asahi Linux Contributors +* Copyright (c) 2022 Ventana Micro Systems Inc. +*/ + +#define pr_fmt (fmt) "ipi-mux: " fmt +#include <linux/cpu.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/jump_label.h> +#include <linux/percpu.h> +#include <linux/smp.h>
kernel/irq/ipi-mux.c line 28
Quoted 10 lines
kernel/irq/ipi-mux.c new file +10
-0+ +struct ipi_mux_cpu { +atomic_t enable; +atomic_t bits; +struct cpumask send_mask; +}; + +struct ipi_mux_control { +void *data; +unsigned int nr;
Honestly, I think we can get rid of this. The number of IPIs Linux uses is pretty small, and assuming a huge value (like 32) would be enough. It would save looking up this value on each IPI handling.
Quoted 69 lines
kernel/irq/ipi-mux.c new file +69
-0+unsigned int parent_virq; +struct irq_domain *domain; +const struct ipi_mux_ops *ops; +struct ipi_mux_cpu __percpu *cpu; +}; + +static struct ipi_mux_control *imux; +static DEFINE_STATIC_KEY_FALSE (imux_pre_handle); +static DEFINE_STATIC_KEY_FALSE (imux_post_handle); + +static void ipi_mux_mask (struct irq_data *d) +{ +struct ipi_mux_cpu *icpu =this_cpu_ptr (imux->cpu); + +atomic_andnot (BIT (irqd_to_hwirq (d)), &icpu->enable); +} + +static void ipi_mux_unmask (struct irq_data *d) +{ +u32 ibit =BIT (irqd_to_hwirq (d)); +struct ipi_mux_cpu *icpu =this_cpu_ptr (imux->cpu); + +atomic_or (ibit, &icpu->enable); + +/* +* The atomic_or() above must complete before the atomic_read() +* below to avoid racing ipi_mux_send_mask(). +*/ +smp_mb__after_atomic (); + +/* If a pending IPI was unmasked, raise a parent IPI immediately. */ +if (atomic_read (&icpu->bits) & ibit) + imux->ops->ipi_mux_send (imux->parent_virq, imux->data, +cpumask_of (smp_processor_id ())); +} + +static void ipi_mux_send_mask (struct irq_data *d,const struct cpumask *mask) +{ +u32 ibit =BIT (irqd_to_hwirq (d)); +struct ipi_mux_cpu *icpu =this_cpu_ptr (imux->cpu); +struct cpumask *send_mask = &icpu->send_mask; +unsigned long flags; +int cpu; + +/* +* We use send_mask as a per-CPU variable so disable local +* interrupts to avoid being preempted. +*/ +local_irq_save (flags); + +cpumask_clear (send_mask); + +for_each_cpu (cpu, mask) { + icpu =per_cpu_ptr (imux->cpu, cpu); +atomic_or (ibit, &icpu->bits); + +/* +* The atomic_or() above must complete before +* the atomic_read() below to avoid racing with +* ipi_mux_unmask(). +*/ +smp_mb__after_atomic (); + +if (atomic_read (&icpu->enable) & ibit) +cpumask_set_cpu (cpu, send_mask); + } + +/* Trigger the parent IPI */ + imux->ops->ipi_mux_send (imux->parent_virq, imux->data, send_mask);
kernel/irq/ipi-mux.c line 107
Quoted 10 lines
kernel/irq/ipi-mux.c new file +10
-0+ +local_irq_restore (flags); +} + +static const struct irq_chip ipi_mux_chip = { + .name ="IPI Mux" , + .irq_mask = ipi_mux_mask, + .irq_unmask = ipi_mux_unmask, + .ipi_send_mask = ipi_mux_send_mask, +};
I really think this could either be supplied by the irqchip, or somehow patched to avoid the pointless imux->ops->ipi_mux_send indirection. Pointer chasing hurts.
Quoted 20 lines
kernel/irq/ipi-mux.c new file +20
-0+ +static int ipi_mux_domain_alloc (struct irq_domain *d,unsigned int virq, +unsigned int nr_irqs,void *arg) +{ +int i; + +for (i =0 ; i < nr_irqs; i++) { +irq_set_percpu_devid (virq + i); +irq_domain_set_info (d, virq + i, i, + &ipi_mux_chip, d->host_data, + handle_percpu_devid_irq,NULL ,NULL ); + } + +return 0 ; +} + +static const struct irq_domain_ops ipi_mux_domain_ops = { + .alloc = ipi_mux_domain_alloc, + .free = irq_domain_free_irqs_top, +};
kernel/irq/ipi-mux.c line 137
Quoted 10 lines
kernel/irq/ipi-mux.c new file +10
-0+ +/** +* ipi_mux_process - Process multiplexed virtual IPIs +*/ +void ipi_mux_process (void ) +{ +struct ipi_mux_cpu *icpu =this_cpu_ptr (imux->cpu); +irq_hw_number_t hwirq; +unsigned long ipis; +int en;
Please use an unsigned type here (see the rationale in atomic_t.txt).
Quoted 12 lines
kernel/irq/ipi-mux.c new file +12
-0+ +if (static_branch_unlikely (&imux_pre_handle)) + imux->ops->ipi_mux_pre_handle (imux->parent_virq, imux->data); + +/* +* Reading enable mask does not need to be ordered as long as +* this function called from interrupt handler because only +* the CPU itself can change it's own enable mask. +*/ + en =atomic_read (&icpu->enable); + +/*
kernel/irq/ipi-mux.c line 159
Quoted 10 lines
kernel/irq/ipi-mux.c new file +10
-0+* Clear the IPIs we are about to handle. This pairs with the +* atomic_fetch_or_release() in ipi_mux_send_mask(). +*/ + ipis =atomic_fetch_andnot (en, &icpu->bits) & en; + +for_each_set_bit (hwirq, &ipis, imux->nr) +generic_handle_domain_irq (imux->domain, hwirq); + +if (static_branch_unlikely (&imux_post_handle)) + imux->ops->ipi_mux_post_handle (imux->parent_virq, imux->data);
Do you see what I meant about the {pre,post}_handle callback, and how they are *exactly* like irq_{ack,eoi}?
Quoted 9 lines
kernel/irq/ipi-mux.c new file +9
-0+} + +static void ipi_mux_handler (struct irq_desc *desc) +{ +struct irq_chip *chip =irq_desc_get_chip (desc); + +chained_irq_enter (chip, desc); +ipi_mux_process (); +chained_irq_exit (chip, desc);
kernel/irq/ipi-mux.c line 178
Quoted 10 lines
kernel/irq/ipi-mux.c new file +10
-0+} + +/** +* ipi_mux_create - Create virtual IPIs multiplexed on top of a single +* parent IPI. +* @parent_virq: virq of the parent per-CPU IRQ +* @nr_ipi: number of virtual IPIs to create. This should +* be <= BITS_PER_TYPE(int) +* @ops: multiplexing operations for the parent IPI +* @data: opaque data used by the multiplexing operations
What is the use for data? If anything, that data should be passed via the mux interrupt. But the whole point of this is to make the mux invisible. So this whole 'data' business is a mystery to me.
kernel/irq/ipi-mux.c line 184
Quoted 6 lines
kernel/irq/ipi-mux.c new file +6
-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 responsibility of irqchip drivers +* to explicitly call ipi_mux_process() for processing muxed IPIs.
0 is a much more idiomatic value for "no parent IRQ". < 0 normally represents an error.
kernel/irq/ipi-mux.c line 189
Quoted 5 lines
kernel/irq/ipi-mux.c new file +5
-0+* +* Returns first virq of the newly created virtual IPIs upon success +* or <=0 upon failure +*/ +int ipi_mux_create(unsigned int parent_virq, unsigned int nr_ipi,
Tell me how I can express a negative parent_virq here?
Quoted 5 lines
kernel/irq/ipi-mux.c new file +5
-0+ const struct ipi_mux_ops *ops, void *data) +{ + struct fwnode_handle *fwnode; +struct irq_domain *domain; +int rc;
kernel/irq/ipi-mux.c line 204
Quoted 10 lines
kernel/irq/ipi-mux.c new file +10
-0+ +if (imux) +return -EEXIST ; + +if (BITS_PER_TYPE (int) < nr_ipi || !ops || !ops->ipi_mux_send) +return -EINVAL ; + +if (parent_virq && + !irqd_is_per_cpu (irq_desc_get_irq_data (irq_to_desc (parent_virq)))) +return -EINVAL ;
See how buggy this is if I follow your definition of "no parent IRQ"?
M.
Signature · 1 line
Without deviation from the norm, progress is not possible.
Re: [PATCH v11 3/7] genirq: Add mechanism to multiplex a single HW IPI
Quoted 31 lines · Marc Zyngier
Quoted 28 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 add a generic IPI multiplexing mechanism which help us create multiple virtual IPIs using a single HW IPI. This generic IPI multiplexing is inspired from the Apple AIC irqchip driver and it is shared by various RISC-V irqchip drivers.
Signed-off-by Anup Patel <[email protected]>--- include/linux/irq.h | 18 +++ kernel/irq/Kconfig | 5 + kernel/irq/Makefile | 1 + kernel/irq/ipi-mux.c | 268 +++++++++++++++++++++++++++++++++++++++++++ 4 files changed, 292 insertions(+) create mode 100644 kernel/irq/ipi-mux.cinclude/linux/irq.h +0
-0@@ -1266,6 +1266,24 @@ 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 14 lines
include/linux/irq.h int __ipi_send_mask(struct irq_desc *desc, const struct cpumask *dest); · line 1278
Quoted 10 lines
include/linux/irq.h +10
-0+/** +* struct ipi_mux_ops - IPI multiplex operations +* +* @ipi_mux_pre_handle: Optional function called before handling parent IPI +* @ipi_mux_post_handle:Optional function called after handling parent IPI +* @ipi_mux_send: Trigger parent IPI on target CPUs +*/ +struct ipi_mux_ops { +void (*ipi_mux_pre_handle)(unsigned int parent_virq,void *data); +void (*ipi_mux_post_handle)(unsigned int parent_virq,void *data);I still haven't seen any decent explanation for this other than "we need it". What is it that cannot be achieved via the
irq_ack()andirq_eoi()callbacks?
Sure, even I think these are strange looking callbacks. I will drop these callbacks in the next patch revision.
Quoted 7 lines
include/linux/irq.h int __ipi_send_mask(struct irq_desc *desc, const struct cpumask *dest); · line 1280
Quoted 3 lines
include/linux/irq.h +2
-0+void (*ipi_mux_send)(unsigned int parent_virq,void *data, +const struct cpumask *mask);In what context would the '
parent_virq' be useful? You are *sending* an IPI, not receiving it, and I expect the mechanism by which you send such an IPI to be independent of the Linux view of the irq.
Okay, I will drop the 'parent_virq' parameter.
Quoted 2 lines
Also, please swap data and mask in the function signature.
Okay, I will change the order.
Quoted 68 lines
Quoted 68 lines
include/linux/irq.h +6
-0+}; + +void ipi_mux_process (void ); +int ipi_mux_create (unsigned int parent_virq,unsigned int nr_ipi, +const struct ipi_mux_ops *ops,void *data); +#ifdef CONFIG_GENERIC_IRQ_MULTI_HANDLER /* * Registers a generic IRQ handling function as the top-level IRQ handler in kernel/irq/Kconfig +5
-0@@ -86,6 +86,11 @@ config GENERIC_IRQ_IPI depends on SMP select IRQ_DOMAIN_HIERARCHY +# Generic IRQ IPI Mux support +config GENERIC_IRQ_IPI_MUX + bool + depends on SMP + # Generic MSI interrupt support config GENERIC_MSI_IRQ boolkernel/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.okernel/irq/ipi-mux.c new file +24
-0@@ -0,0 +1,268 @@ +// SPDX-License-Identifier: GPL-2.0-or-later +/* +* Multiplex several virtual IPIs over a single HW IPI. +* +* Copyright The Asahi Linux Contributors +* Copyright (c) 2022 Ventana Micro Systems Inc. +*/ + +#define pr_fmt (fmt) "ipi-mux: " fmt +#include <linux/cpu.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/jump_label.h> +#include <linux/percpu.h> +#include <linux/smp.h> + +struct ipi_mux_cpu { +atomic_t enable; +atomic_t bits; +struct cpumask send_mask; +};
Quoted 8 lines
kernel/irq/ipi-mux.c line 28
Quoted 4 lines
kernel/irq/ipi-mux.c new file +4
-0+ +struct ipi_mux_control { +void *data; +unsigned int nr;Honestly, I think we can get rid of this. The number of IPIs Linux uses is pretty small, and assuming a huge value (like 32) would be enough. It would save looking up this value on each IPI handling.
I had kept in-case some driver wanted to create fewer (< 32) muxed IPIs.
Quoted 76 lines
Quoted 76 lines
kernel/irq/ipi-mux.c new file +75
-0+unsigned int parent_virq; +struct irq_domain *domain; +const struct ipi_mux_ops *ops; +struct ipi_mux_cpu __percpu *cpu; +}; + +static struct ipi_mux_control *imux; +static DEFINE_STATIC_KEY_FALSE (imux_pre_handle); +static DEFINE_STATIC_KEY_FALSE (imux_post_handle); + +static void ipi_mux_mask (struct irq_data *d) +{ +struct ipi_mux_cpu *icpu =this_cpu_ptr (imux->cpu); + +atomic_andnot (BIT (irqd_to_hwirq (d)), &icpu->enable); +} + +static void ipi_mux_unmask (struct irq_data *d) +{ +u32 ibit =BIT (irqd_to_hwirq (d)); +struct ipi_mux_cpu *icpu =this_cpu_ptr (imux->cpu); + +atomic_or (ibit, &icpu->enable); + +/* +* The atomic_or() above must complete before the atomic_read() +* below to avoid racing ipi_mux_send_mask(). +*/ +smp_mb__after_atomic (); + +/* If a pending IPI was unmasked, raise a parent IPI immediately. */ +if (atomic_read (&icpu->bits) & ibit) + imux->ops->ipi_mux_send (imux->parent_virq, imux->data, +cpumask_of (smp_processor_id ())); +} + +static void ipi_mux_send_mask (struct irq_data *d,const struct cpumask *mask) +{ +u32 ibit =BIT (irqd_to_hwirq (d)); +struct ipi_mux_cpu *icpu =this_cpu_ptr (imux->cpu); +struct cpumask *send_mask = &icpu->send_mask; +unsigned long flags; +int cpu; + +/* +* We use send_mask as a per-CPU variable so disable local +* interrupts to avoid being preempted. +*/ +local_irq_save (flags); + +cpumask_clear (send_mask); + +for_each_cpu (cpu, mask) { + icpu =per_cpu_ptr (imux->cpu, cpu); +atomic_or (ibit, &icpu->bits); + +/* +* The atomic_or() above must complete before +* the atomic_read() below to avoid racing with +* ipi_mux_unmask(). +*/ +smp_mb__after_atomic (); + +if (atomic_read (&icpu->enable) & ibit) +cpumask_set_cpu (cpu, send_mask); + } + +/* Trigger the parent IPI */ + imux->ops->ipi_mux_send (imux->parent_virq, imux->data, send_mask); + +local_irq_restore (flags); +} + +static const struct irq_chip ipi_mux_chip = { + .name ="IPI Mux" ,
Quoted 8 lines
kernel/irq/ipi-mux.c line 107
Quoted 4 lines
kernel/irq/ipi-mux.c new file +4
-0+ .irq_mask = ipi_mux_mask, + .irq_unmask = ipi_mux_unmask, + .ipi_send_mask = ipi_mux_send_mask, +};I really think this could either be supplied by the irqchip, or somehow patched to avoid the pointless
imux->ops->ipi_mux_sendindirection. Pointer chasing hurts.
Once we remove ipi_mux_pre/post_handle() callbacks, the "ops" will be pointless and we will be able to remove one level of indirection here.
We certainly need a mux irqchip to implement the
mask/unmask semantics for muxed IPIs.
Quoted 25 lines
Quoted 25 lines
kernel/irq/ipi-mux.c new file +24
-0+ +static int ipi_mux_domain_alloc (struct irq_domain *d,unsigned int virq, +unsigned int nr_irqs,void *arg) +{ +int i; + +for (i =0 ; i < nr_irqs; i++) { +irq_set_percpu_devid (virq + i); +irq_domain_set_info (d, virq + i, i, + &ipi_mux_chip, d->host_data, + handle_percpu_devid_irq,NULL ,NULL ); + } + +return 0 ; +} + +static const struct irq_domain_ops ipi_mux_domain_ops = { + .alloc = ipi_mux_domain_alloc, + .free = irq_domain_free_irqs_top, +}; + +/** +* ipi_mux_process - Process multiplexed virtual IPIs +*/
Quoted 8 lines
kernel/irq/ipi-mux.c line 137
Quoted 6 lines
kernel/irq/ipi-mux.c new file +6
-0+void ipi_mux_process (void ) +{ +struct ipi_mux_cpu *icpu =this_cpu_ptr (imux->cpu); +irq_hw_number_t hwirq; +unsigned long ipis; +int en;Please use an unsigned type here (see the rationale in atomic_t.txt).
Sure, I will update.
Quoted 18 lines
Quoted 18 lines
kernel/irq/ipi-mux.c new file +17
-0+ +if (static_branch_unlikely (&imux_pre_handle)) + imux->ops->ipi_mux_pre_handle (imux->parent_virq, imux->data); + +/* +* Reading enable mask does not need to be ordered as long as +* this function called from interrupt handler because only +* the CPU itself can change it's own enable mask. +*/ + en =atomic_read (&icpu->enable); + +/* +* Clear the IPIs we are about to handle. This pairs with the +* atomic_fetch_or_release() in ipi_mux_send_mask(). +*/ + ipis =atomic_fetch_andnot (en, &icpu->bits) & en; +
Quoted 8 lines
kernel/irq/ipi-mux.c line 159
Quoted 5 lines
kernel/irq/ipi-mux.c new file +5
-0+for_each_set_bit (hwirq, &ipis, imux->nr) +generic_handle_domain_irq (imux->domain, hwirq); + +if (static_branch_unlikely (&imux_post_handle)) + imux->ops->ipi_mux_post_handle (imux->parent_virq, imux->data);Do you see what I meant about the {pre,post}_handle callback, and how they are *exactly* like irq_{ack,eoi}?
I see. I will remove these in the next patch revision.
Quoted 16 lines
Quoted 16 lines
kernel/irq/ipi-mux.c new file +15
-0+} + +static void ipi_mux_handler (struct irq_desc *desc) +{ +struct irq_chip *chip =irq_desc_get_chip (desc); + +chained_irq_enter (chip, desc); +ipi_mux_process (); +chained_irq_exit (chip, desc); +} + +/** +* ipi_mux_create - Create virtual IPIs multiplexed on top of a single +* parent IPI. +* @parent_virq: virq of the parent per-CPU IRQ
Quoted 8 lines
kernel/irq/ipi-mux.c line 178
Quoted 4 lines
kernel/irq/ipi-mux.c new file +4
-0+* @nr_ipi: number of virtual IPIs to create. This should +* be <= BITS_PER_TYPE(int) +* @ops: multiplexing operations for the parent IPI +* @data: opaque data used by the multiplexing operations What is the use for data? If anything, that data should be passed via the mux interrupt. But the whole point of this is to make the mux invisible. So this whole 'data' business is a mystery to me.
This is added only to pass back driver data in ipi_mux_send().
Quoted 10 lines
kernel/irq/ipi-mux.c line 184
Quoted 7 lines
kernel/irq/ipi-mux.c new file +6
-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 responsibility of irqchip drivers +* to explicitly call ipi_mux_process() for processing muxed IPIs. 0 is a much more idiomatic value for "no parent IRQ". < 0 normally represents an error.
I am going to remove the "parent_virq" parameter itself so this will go away.
Quoted 8 lines
kernel/irq/ipi-mux.c line 189
Quoted 6 lines
kernel/irq/ipi-mux.c new file +5
-0+* +* Returns first virq of the newly created virtual IPIs upon success +* or <=0 upon failure +*/ +int ipi_mux_create(unsigned int parent_virq, unsigned int nr_ipi,Tell me how I can express a negative
parent_virqhere?
Sure, I will fix this.
Quoted 10 lines
Quoted 10 lines
kernel/irq/ipi-mux.c new file +9
-0+ const struct ipi_mux_ops *ops, void *data) +{ + struct fwnode_handle *fwnode; +struct irq_domain *domain; +int rc; + +if (imux) +return -EEXIST ; +
Quoted 8 lines
kernel/irq/ipi-mux.c line 204
Quoted 6 lines
kernel/irq/ipi-mux.c new file +6
-0+if (BITS_PER_TYPE (int) < nr_ipi || !ops || !ops->ipi_mux_send) +return -EINVAL ; + +if (parent_virq && + !irqd_is_per_cpu (irq_desc_get_irq_data (irq_to_desc (parent_virq)))) +return -EINVAL ;See how buggy this is if I follow your definition of "no parent IRQ"?
Sure, I will fix this.
Quoted 5 lines
M.--
Without deviation from the norm, progress is not possible.
Thanks,
Anup
Re: [PATCH v11 3/7] genirq: Add mechanism to multiplex a single HW IPI
Quoted 10 lines · Anup Patel
Quoted 8 lines · Marc Zyngier
Quoted 4 lines · Anup Patel
kernel/irq/ipi-mux.c new file +3
-0+struct ipi_mux_control { +void *data; +unsigned int nr;
Quoted 6 lines
Quoted 3 lines
Honestly, I think we can get rid of this. The number of IPIs Linux uses is pretty small, and assuming a huge value (like 32) would be enough. It would save looking up this value on each IPI handling.
I had kept in-case some driver wanted to create fewer (< 32) muxed IPIs.
I'm fine with being able to specifying the max, but I'm not sure there is a need to keep track of it any further. Certainly, the overhead of loading this value on each IPI could be removed. On most architecture, for_each_set_bit() and co and better optimised with a fixed number of bits.
Quoted 11 lines
Quoted 10 lines
kernel/irq/ipi-mux.c line 107
Quoted 6 lines
kernel/irq/ipi-mux.c new file +6
-0+static const struct irq_chip ipi_mux_chip = { + .name ="IPI Mux" , + .irq_mask = ipi_mux_mask, + .irq_unmask = ipi_mux_unmask, + .ipi_send_mask = ipi_mux_send_mask, +};I really think this could either be supplied by the irqchip, or somehow patched to avoid the pointless
imux->ops->ipi_mux_sendindirection. Pointer chasing hurts.
Quoted 6 lines
Once we remove ipi_mux_pre/post_handle() callbacks, the "ops" will be pointless and we will be able to remove one level of indirection here.
We certainly need a mux irqchip to implement the
mask/unmask semantics for muxed IPIs.
I'm not disputing that last point.
Quoted 9 lines
Quoted 9 lines
Quoted 8 lines
+/**
+ *ipi_mux_create- Create virtual IPIs multiplexed on top of a single
+ * parent IPI.+ * @parent_virq: virq of the parent per-CPU IRQ + * @nr_ipi: number of virtual IPIs to create. This should + * be <= BITS_PER_TYPE(int) + * @ops: multiplexing operations for the parent IPI + * @data: opaque data used by the multiplexing operations
Quoted 5 lines
Quoted 3 lines
What is the use for data? If anything, that data should be passed via the mux interrupt. But the whole point of this is to make the mux invisible. So this whole 'data' business is a mystery to me.
This is added only to pass back driver data in
ipi_mux_send().
Again, what is the purpose of such data? If you need per-interrupt data, this should be provided by the requester of the interrupt.
M.
Signature · 1 line
Without deviation from the norm, progress is not possible.
Re: [PATCH v11 3/7] genirq: Add mechanism to multiplex a single HW IPI
Quoted 17 lines · Marc Zyngier
Quoted 14 lines · Anup Patel
Quoted 11 lines · Marc Zyngier
kernel/irq/ipi-mux.c line 28
Quoted 4 lines · Anup Patel
kernel/irq/ipi-mux.c new file +3
-0+struct ipi_mux_control { +void *data; +unsigned int nr;Honestly, I think we can get rid of this. The number of IPIs Linux uses is pretty small, and assuming a huge value (like 32) would be enough. It would save looking up this value on each IPI handling.
Quoted 8 lines
Quoted 2 lines
I had kept in-case some driver wanted to create fewer (< 32) muxed IPIs.
I'm fine with being able to specifying the max, but I'm not sure there is a need to keep track of it any further. Certainly, the overhead of loading this value on each IPI could be removed. On most architecture,
for_each_set_bit()and co and better optimised with a fixed number of bits.
Okay, I will update like you suggested.
Quoted 30 lines
Quoted 12 lines
Quoted 11 lines
kernel/irq/ipi-mux.c line 107
Quoted 7 lines
kernel/irq/ipi-mux.c new file +6
-0+static const struct irq_chip ipi_mux_chip = { + .name ="IPI Mux" , + .irq_mask = ipi_mux_mask, + .irq_unmask = ipi_mux_unmask, + .ipi_send_mask = ipi_mux_send_mask, +};I really think this could either be supplied by the irqchip, or somehow patched to avoid the pointless
imux->ops->ipi_mux_sendindirection. Pointer chasing hurts.Quoted 6 lines
Once we remove ipi_mux_pre/post_handle() callbacks, the "ops" will be pointless and we will be able to remove one level of indirection here.
We certainly need a mux irqchip to implement the
mask/unmask semantics for muxed IPIs.I'm not disputing that last point.
Quoted 9 lines
Quoted 9 lines
Quoted 8 lines
+/**
+ *ipi_mux_create- Create virtual IPIs multiplexed on top of a single
+ * parent IPI.+ * @parent_virq: virq of the parent per-CPU IRQ + * @nr_ipi: number of virtual IPIs to create. This should + * be <= BITS_PER_TYPE(int) + * @ops: multiplexing operations for the parent IPI + * @data: opaque data used by the multiplexing operations
Quoted 8 lines
Quoted 5 lines
Quoted 3 lines
What is the use for data? If anything, that data should be passed via the mux interrupt. But the whole point of this is to make the mux invisible. So this whole 'data' business is a mystery to me.
This is added only to pass back driver data in
ipi_mux_send().Again, what is the purpose of such data? If you need per-interrupt data, this should be provided by the requester of the interrupt.
Currently, the irqchip drivers that we care about don't need this data pointer so I will remove it. If required we can add it in future.
Quoted 5 lines
M.--
Without deviation from the norm, progress is not possible.
Thanks,
Anup
PATCH v11 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 | 7 ++ 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 | 80 +++++++++++++++ arch/riscv/kernel/sbi.c | 17 ---- arch/riscv/kernel/smp.c | 155 +++++++++++++++--------------- arch/riscv/kernel/smpboot.c | 5 +- drivers/clocksource/timer-clint.c | 43 ++++++--- drivers/irqchip/irq-riscv-intc.c | 55 +++++------ 12 files changed, 251 insertions(+), 155 deletions(-) create mode 100644 arch/riscv/kernel/sbi-ipi.c
arch/riscv/Kconfig +2 -0
@@ -61,6 +61,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 -0
@@ -327,4 +327,11 @@ int sbi_err_map_linux_errno(int err);static inline int sbi_remote_fence_i (const struct cpumask *cpu_mask) {return -1 ; }static inline void sbi_init (void ) {}#endif /* CONFIG_RISCV_SBI */ + +#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);/* 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
@@ -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 +80 -0
80 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 +78 -77
211 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"
@@ -157,12 +156,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 +32 -11
113 lines not on this page · raw message
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
PATCH v11 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); +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)/* 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
@@ -75,6 +75,6 @@ void __init sbi_ipi_init(void)"irqchip/sbi-ipi:starting" , sbi_ipi_starting_cpu, sbi_ipi_dying_cpu); -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
@@ -145,7 +145,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;
@@ -168,6 +171,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
@@ -249,7 +249,7 @@ static int __init clint_timer_init_dt(struct device_node *np) goto fail_free_irq; } -riscv_ipi_set_virq_range (virq,BITS_PER_BYTE ); +riscv_ipi_set_virq_range (virq,BITS_PER_BYTE , true);clint_clear_ipi (clint_ipi_irq,NULL );return 0 ;
Signature · 7 lines
2.34.1 _______________________________________________ linux-riscv mailing list [email protected] http://lists.infradead.org/mailman/listinfo/linux-riscv
PATCH v11 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 · 7 lines
2.34.1 _______________________________________________ linux-riscv mailing list [email protected] http://lists.infradead.org/mailman/listinfo/linux-riscv
PATCH v11 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
@@ -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 · 1 line
2.34.1