irqchip/riscv-imsic: Add kernel parameter to disable IPIs
Subsystems (4)
PATCH v3 1/1 irqchip/riscv-imsic: Add kernel parameter to disable IPIs
When injecting IPIs to a set of harts, the IMSIC IPI support will do a separate MMIO write to the SETIPNUM_LE register of each target hart. This means on a platform where IMSIC is trap-n-emulated, there will be N MMIO traps when injecting IPI to N target harts hence IMSIC IPIs will be slow on such platform compared to the SBI IPI extension.
Unfortunately, there is no DT, ACPI, or any other way of discovering whether the underlying IMSIC is trap-n-emulated. Using MMIO write to the SETIPNUM_LE register for injecting IPI is purely a software choice in the IMSIC driver hence add a kernel parameter to allow users disable IMSIC IPIs on platforms with trap-n-emulated IMSIC.
---
Changes since v2:
- Skip enabling/disabling IMSIC_IPI_ID in imsic_ipi_starting_cpu() and imsic_ipi_dying_cpu() when imsic_noipi is set
- Re-use the reserved IPI ID for devices when imsic_noipi is set
Changes since v1:
- Added more details to patch description
--- .../admin-guide/kernel-parameters.txt | 7 +++++++ drivers/irqchip/irq-riscv-imsic-early.c | 20 ++++++++++++++++++- drivers/irqchip/irq-riscv-imsic-state.c | 7 ++++--- drivers/irqchip/irq-riscv-imsic-state.h | 1 + 4 files changed, 31 insertions(+), 4 deletions(-)
Documentation/admin-guide/kernel-parameters.txt +7 -0
@@ -2538,6 +2538,13 @@ requires the kernel to be built with CONFIG_ARM64_PSEUDO_NMI. + irqchip.riscv_imsic_noipi + [RISC-V,EARLY] + Force the kernel to not use IMSIC software injected MSIs + as IPIs. Intended for system where IMSIC is trap-n-emulated, + and thus want to reduce MMIO traps when triggering IPIs + to multiple harts. + irqfixup [HW] When an interrupt is not handled search all handlers for it. Intended to get systems with badly broken
drivers/irqchip/irq-riscv-imsic-early.c +19 -1
@@ -9,6 +9,7 @@#include <linux/cpu.h> #include <linux/export.h> #include <linux/interrupt.h> +#include <linux/init.h> #include <linux/io.h> #include <linux/irq.h> #include <linux/irqchip.h>
@@ -22,6 +23,14 @@#include "irq-riscv-imsic-state.h" static int imsic_parent_irq; +bool imsic_noipi; + +static int __init imsic_noipi_cfg (char *buf) +{ + imsic_noipi = true; +return 0 ; +} +early_param ("irqchip.riscv_imsic_noipi" , imsic_noipi_cfg);#ifdef CONFIG_SMP static void imsic_ipi_send (unsigned int cpu)
@@ -33,12 +42,18 @@ static void imsic_ipi_send(unsigned int cpu)static void imsic_ipi_starting_cpu (void ) { +if (imsic_noipi) +return ; +/* Enable IPIs for current CPU. */ __imsic_id_set_enable (IMSIC_IPI_ID ); }static void imsic_ipi_dying_cpu (void ) { +if (imsic_noipi) +return ; +/* Disable IPIs for current CPU. */ __imsic_id_clear_enable (IMSIC_IPI_ID ); }
@@ -47,6 +62,9 @@ static int __init imsic_ipi_domain_init(void) {int virq; +if (imsic_noipi) +return 0 ; +/* Create IMSIC IPI multiplexing */ virq =ipi_mux_create (IMSIC_NR_IPI , imsic_ipi_send);if (virq <=0 )
@@ -89,7 +107,7 @@ static void imsic_handle_irq(struct irq_desc *desc)while ((local_id =csr_swap (CSR_TOPEI ,0 ))) { local_id >>=TOPEI_ID_SHIFT ; -if (local_id ==IMSIC_IPI_ID ) { +if (!imsic_noipi && local_id ==IMSIC_IPI_ID ) {if (IS_ENABLED (CONFIG_SMP ))ipi_mux_process ();continue ;
drivers/irqchip/irq-riscv-imsic-state.c +4 -3
@@ -134,7 +134,7 @@ static bool __imsic_local_sync(struct imsic_local_priv *lpriv)lockdep_assert_held (&lpriv->lock);for_each_set_bit (i, lpriv->dirty_bitmap, imsic->global.nr_ids +1 ) { -if (!i || i ==IMSIC_IPI_ID ) +if (!i || (!imsic_noipi && i ==IMSIC_IPI_ID )) goto skip; vec = &lpriv->vectors[i];
@@ -419,7 +419,7 @@ void imsic_vector_debug_show(struct seq_file *m, struct imsic_vector *vec, int iseq_printf (m,"%*starget_cpu : %5u\n" , ind,"" , vec->cpu);seq_printf (m,"%*starget_local_id : %5u\n" , ind,"" , vec->local_id);seq_printf (m,"%*sis_reserved : %5u\n" , ind,"" , - (vec->local_id <=IMSIC_IPI_ID ) ?1 :0 ); + (!imsic_noipi && vec->local_id <=IMSIC_IPI_ID ) ?1 :0 );seq_printf (m,"%*sis_enabled : %5u\n" , ind,"" , is_enabled ?1 :0 );seq_printf (m,"%*sis_move_pending : %5u\n" , ind,"" , mvec ?1 :0 );if (mvec) {
@@ -583,7 +583,8 @@ static int __init imsic_matrix_init(void)irq_matrix_assign_system (imsic->matrix,0 , false);/* Reserve IPI ID because it is special and used internally */ -irq_matrix_assign_system (imsic->matrix,IMSIC_IPI_ID , false); +if (!imsic_noipi) +irq_matrix_assign_system (imsic->matrix,IMSIC_IPI_ID , false);return 0 ; }
drivers/irqchip/irq-riscv-imsic-state.h +1 -0
@@ -61,6 +61,7 @@ struct imsic_priv {struct irq_domain *base_domain; }; +extern bool imsic_noipi;extern struct imsic_priv *imsic;void __imsic_eix_update (unsigned long base_id,unsigned long num_id,bool pend,bool val);
Signature · 1 line
2.43.0
Quoted 2 lines · Anup Patel
#include <
linux/cpu.h>
#include <linux/export.h>
^^^ Neither in tip/irq/drivers nor in Linus tree ...
patching file drivers/irqchip/irq-riscv-imsic-early.c Hunk #1 FAILED at 9.
drivers/irqchip/irq-riscv-imsic-early.c line 26
Quoted 10 lines
#include <
linux/interrupt.h>drivers/irqchip/irq-riscv-imsic-early.c +2
-0+#include <linux/init.h> #include <linux/io.h> #include <linux/irq.h> #include <linux/irqchip.h> @@ -22,6 +23,14 @@#include "irq-riscv-imsic-state.h" static int imsic_parent_irq; +bool imsic_noipi;
__ro_after_init? No?
Thanks,
tglx
Quoted 9 lines · Thomas Gleixner
Quoted 2 lines · Anup Patel
#include <
linux/cpu.h>
#include <linux/export.h>^^^ Neither in tip/irq/drivers nor in Linus tree ...
patching file
drivers/irqchip/irq-riscv-imsic-early.cHunk #1 FAILED at 9.
I accidentally based this patch upon my MPXY RPMI patches. Let me re-base this on Linux-6.16-rc4 in the next revision.
Quoted 9 lines
Quoted 9 lines
#include <
linux/interrupt.h>drivers/irqchip/irq-riscv-imsic-early.c +1
-0+#include <linux/init.h> #include <linux/io.h> #include <linux/irq.h> #include <linux/irqchip.h> @@ -22,6 +23,14 @@#include "irq-riscv-imsic-state.h"
Quoted 4 lines
drivers/irqchip/irq-riscv-imsic-early.c line 26
Quoted 2 lines
drivers/irqchip/irq-riscv-imsic-early.c +1
-0static int imsic_parent_irq; +bool imsic_noipi;
__ro_after_init? No?
Yes, this should be __ro_after_init.
I will update in the next revision.
Regards,
Anup