diff mbox series

[v7,3/7] genirq: Add mechanism to multiplex a single HW IPI

Message ID 20220720152348.2889109-4-apatel@ventanamicro.com (mailing list archive)
State New, archived
Headers show
Series RISC-V IPI Improvements | expand

Commit Message

Anup Patel July 20, 2022, 3:23 p.m. UTC 
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 shared among various RISC-V
irqchip drivers.

Signed-off-by: Anup Patel <apatel@ventanamicro.com>
---
 include/linux/irq.h  |  16 ++++
 kernel/irq/Kconfig   |   4 +
 kernel/irq/Makefile  |   1 +
 kernel/irq/ipi-mux.c | 199 +++++++++++++++++++++++++++++++++++++++++++
 4 files changed, 220 insertions(+)
 create mode 100644 kernel/irq/ipi-mux.c

Comments

Marc Zyngier July 21, 2022, 11 a.m. UTC | #1 
On Wed, 20 Jul 2022 16:23:44 +0100,
Anup Patel <apatel@ventanamicro.com> wrote:
> 
> 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 shared among various RISC-V
> irqchip drivers.
> 
> Signed-off-by: Anup Patel <apatel@ventanamicro.com>
> ---
>  include/linux/irq.h  |  16 ++++
>  kernel/irq/Kconfig   |   4 +
>  kernel/irq/Makefile  |   1 +
>  kernel/irq/ipi-mux.c | 199 +++++++++++++++++++++++++++++++++++++++++++
>  4 files changed, 220 insertions(+)
>  create mode 100644 kernel/irq/ipi-mux.c
> 
> diff --git a/include/linux/irq.h b/include/linux/irq.h
> index 505308253d23..a97bf13a8965 100644
> --- a/include/linux/irq.h
> +++ b/include/linux/irq.h
> @@ -1249,6 +1249,22 @@ 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_clear:	Optional function to clear parent IPI
> + * @ipi_mux_send:	Trigger parent IPI on target CPUs
> + */
> +struct ipi_mux_ops {
> +	void (*ipi_mux_clear)(unsigned int parent_virq);
> +	void (*ipi_mux_send)(unsigned int parent_virq,
> +			     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);
> +
>  #ifdef CONFIG_GENERIC_IRQ_MULTI_HANDLER
>  /*
>   * Registers a generic IRQ handling function as the top-level IRQ handler in
> diff --git a/kernel/irq/Kconfig b/kernel/irq/Kconfig
> index 10929eda9825..2388e7d40ed3 100644
> --- a/kernel/irq/Kconfig
> +++ b/kernel/irq/Kconfig
> @@ -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
> diff --git a/kernel/irq/Makefile b/kernel/irq/Makefile
> index b4f53717d143..f19d3080bf11 100644
> --- a/kernel/irq/Makefile
> +++ b/kernel/irq/Makefile
> @@ -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
> diff --git a/kernel/irq/ipi-mux.c b/kernel/irq/ipi-mux.c
> new file mode 100644
> index 000000000000..bd6b31ca588b
> --- /dev/null
> +++ b/kernel/irq/ipi-mux.c
> @@ -0,0 +1,199 @@
> +// SPDX-License-Identifier: GPL-2.0-only
> +/*
> + * Multiplex several virtual IPIs over a single HW IPI.
> + *
> + * 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/smp.h>
> +
> +static unsigned int ipi_mux_nr;
> +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_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();
> +
> +	/* Trigger the parent IPI */
> +	ipi_mux_ops->ipi_mux_send(ipi_mux_parent_virq, mask);
> +}
> +
> +static const struct irq_chip ipi_mux_chip = {
> +	.name		= "IPI Mux",
> +	.ipi_send_mask	= ipi_mux_send_mask,

I've given this a bit more though, and I came to the conclusion that
we really should have the full masking semantics here, even if Linux
currently doesn't really use it.

It makes the handling a bit more complex, and unmasking a pending IPI
must be handled gracefully, but we already have implemented most of
that code in the irq-apple-aic driver.

And if we go down this road, such a driver should be very easy to move
over this infrastructure, making the change a lot more palatable.

	M.
Anup Patel July 21, 2022, 11:44 a.m. UTC | #2 
On Thu, Jul 21, 2022 at 4:30 PM Marc Zyngier <maz@kernel.org> wrote:
>
> On Wed, 20 Jul 2022 16:23:44 +0100,
> Anup Patel <apatel@ventanamicro.com> wrote:
> >
> > 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 shared among various RISC-V
> > irqchip drivers.
> >
> > Signed-off-by: Anup Patel <apatel@ventanamicro.com>
> > ---
> >  include/linux/irq.h  |  16 ++++
> >  kernel/irq/Kconfig   |   4 +
> >  kernel/irq/Makefile  |   1 +
> >  kernel/irq/ipi-mux.c | 199 +++++++++++++++++++++++++++++++++++++++++++
> >  4 files changed, 220 insertions(+)
> >  create mode 100644 kernel/irq/ipi-mux.c
> >
> > diff --git a/include/linux/irq.h b/include/linux/irq.h
> > index 505308253d23..a97bf13a8965 100644
> > --- a/include/linux/irq.h
> > +++ b/include/linux/irq.h
> > @@ -1249,6 +1249,22 @@ 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_clear:   Optional function to clear parent IPI
> > + * @ipi_mux_send:    Trigger parent IPI on target CPUs
> > + */
> > +struct ipi_mux_ops {
> > +     void (*ipi_mux_clear)(unsigned int parent_virq);
> > +     void (*ipi_mux_send)(unsigned int parent_virq,
> > +                          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);
> > +
> >  #ifdef CONFIG_GENERIC_IRQ_MULTI_HANDLER
> >  /*
> >   * Registers a generic IRQ handling function as the top-level IRQ handler in
> > diff --git a/kernel/irq/Kconfig b/kernel/irq/Kconfig
> > index 10929eda9825..2388e7d40ed3 100644
> > --- a/kernel/irq/Kconfig
> > +++ b/kernel/irq/Kconfig
> > @@ -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
> > diff --git a/kernel/irq/Makefile b/kernel/irq/Makefile
> > index b4f53717d143..f19d3080bf11 100644
> > --- a/kernel/irq/Makefile
> > +++ b/kernel/irq/Makefile
> > @@ -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
> > diff --git a/kernel/irq/ipi-mux.c b/kernel/irq/ipi-mux.c
> > new file mode 100644
> > index 000000000000..bd6b31ca588b
> > --- /dev/null
> > +++ b/kernel/irq/ipi-mux.c
> > @@ -0,0 +1,199 @@
> > +// SPDX-License-Identifier: GPL-2.0-only
> > +/*
> > + * Multiplex several virtual IPIs over a single HW IPI.
> > + *
> > + * 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/smp.h>
> > +
> > +static unsigned int ipi_mux_nr;
> > +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_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();
> > +
> > +     /* Trigger the parent IPI */
> > +     ipi_mux_ops->ipi_mux_send(ipi_mux_parent_virq, mask);
> > +}
> > +
> > +static const struct irq_chip ipi_mux_chip = {
> > +     .name           = "IPI Mux",
> > +     .ipi_send_mask  = ipi_mux_send_mask,
>
> I've given this a bit more though, and I came to the conclusion that
> we really should have the full masking semantics here, even if Linux
> currently doesn't really use it.
>
> It makes the handling a bit more complex, and unmasking a pending IPI
> must be handled gracefully, but we already have implemented most of
> that code in the irq-apple-aic driver.
>
> And if we go down this road, such a driver should be very easy to move
> over this infrastructure, making the change a lot more palatable.

Sounds good.

I will send v8 of ipi-mux which can be easily adapted for irq-apple-aic driver
and it will have masking semantics as well.

Thanks,
Anup

>
>         M.
>
> --
> Without deviation from the norm, progress is not possible.
Marc Zyngier July 21, 2022, 12:09 p.m. UTC | #3 
On 2022-07-21 12:44, Anup Patel wrote:
> On Thu, Jul 21, 2022 at 4:30 PM Marc Zyngier <maz@kernel.org> wrote:
>> 
>> On Wed, 20 Jul 2022 16:23:44 +0100,
>> Anup Patel <apatel@ventanamicro.com> wrote:
>> >
>> > 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 shared among various RISC-V
>> > irqchip drivers.
>> >
>> > Signed-off-by: Anup Patel <apatel@ventanamicro.com>
>> > ---
>> >  include/linux/irq.h  |  16 ++++
>> >  kernel/irq/Kconfig   |   4 +
>> >  kernel/irq/Makefile  |   1 +
>> >  kernel/irq/ipi-mux.c | 199 +++++++++++++++++++++++++++++++++++++++++++
>> >  4 files changed, 220 insertions(+)
>> >  create mode 100644 kernel/irq/ipi-mux.c
>> >
>> > diff --git a/include/linux/irq.h b/include/linux/irq.h
>> > index 505308253d23..a97bf13a8965 100644
>> > --- a/include/linux/irq.h
>> > +++ b/include/linux/irq.h
>> > @@ -1249,6 +1249,22 @@ 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_clear:   Optional function to clear parent IPI
>> > + * @ipi_mux_send:    Trigger parent IPI on target CPUs
>> > + */
>> > +struct ipi_mux_ops {
>> > +     void (*ipi_mux_clear)(unsigned int parent_virq);
>> > +     void (*ipi_mux_send)(unsigned int parent_virq,
>> > +                          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);
>> > +
>> >  #ifdef CONFIG_GENERIC_IRQ_MULTI_HANDLER
>> >  /*
>> >   * Registers a generic IRQ handling function as the top-level IRQ handler in
>> > diff --git a/kernel/irq/Kconfig b/kernel/irq/Kconfig
>> > index 10929eda9825..2388e7d40ed3 100644
>> > --- a/kernel/irq/Kconfig
>> > +++ b/kernel/irq/Kconfig
>> > @@ -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
>> > diff --git a/kernel/irq/Makefile b/kernel/irq/Makefile
>> > index b4f53717d143..f19d3080bf11 100644
>> > --- a/kernel/irq/Makefile
>> > +++ b/kernel/irq/Makefile
>> > @@ -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
>> > diff --git a/kernel/irq/ipi-mux.c b/kernel/irq/ipi-mux.c
>> > new file mode 100644
>> > index 000000000000..bd6b31ca588b
>> > --- /dev/null
>> > +++ b/kernel/irq/ipi-mux.c
>> > @@ -0,0 +1,199 @@
>> > +// SPDX-License-Identifier: GPL-2.0-only
>> > +/*
>> > + * Multiplex several virtual IPIs over a single HW IPI.
>> > + *
>> > + * 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/smp.h>
>> > +
>> > +static unsigned int ipi_mux_nr;
>> > +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_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();
>> > +
>> > +     /* Trigger the parent IPI */
>> > +     ipi_mux_ops->ipi_mux_send(ipi_mux_parent_virq, mask);
>> > +}
>> > +
>> > +static const struct irq_chip ipi_mux_chip = {
>> > +     .name           = "IPI Mux",
>> > +     .ipi_send_mask  = ipi_mux_send_mask,
>> 
>> I've given this a bit more though, and I came to the conclusion that
>> we really should have the full masking semantics here, even if Linux
>> currently doesn't really use it.
>> 
>> It makes the handling a bit more complex, and unmasking a pending IPI
>> must be handled gracefully, but we already have implemented most of
>> that code in the irq-apple-aic driver.
>> 
>> And if we go down this road, such a driver should be very easy to move
>> over this infrastructure, making the change a lot more palatable.
> 
> Sounds good.
> 
> I will send v8 of ipi-mux which can be easily adapted for irq-apple-aic 
> driver
> and it will have masking semantics as well.

Thanks. No hurry though, as I'm closing the queue for 5.20 (fixes
only until -rc1).

Thanks,

         M.
Anup Patel July 21, 2022, 12:26 p.m. UTC | #4 
On Thu, Jul 21, 2022 at 5:39 PM Marc Zyngier <maz@kernel.org> wrote:
>
> On 2022-07-21 12:44, Anup Patel wrote:
> > On Thu, Jul 21, 2022 at 4:30 PM Marc Zyngier <maz@kernel.org> wrote:
> >>
> >> On Wed, 20 Jul 2022 16:23:44 +0100,
> >> Anup Patel <apatel@ventanamicro.com> wrote:
> >> >
> >> > 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 shared among various RISC-V
> >> > irqchip drivers.
> >> >
> >> > Signed-off-by: Anup Patel <apatel@ventanamicro.com>
> >> > ---
> >> >  include/linux/irq.h  |  16 ++++
> >> >  kernel/irq/Kconfig   |   4 +
> >> >  kernel/irq/Makefile  |   1 +
> >> >  kernel/irq/ipi-mux.c | 199 +++++++++++++++++++++++++++++++++++++++++++
> >> >  4 files changed, 220 insertions(+)
> >> >  create mode 100644 kernel/irq/ipi-mux.c
> >> >
> >> > diff --git a/include/linux/irq.h b/include/linux/irq.h
> >> > index 505308253d23..a97bf13a8965 100644
> >> > --- a/include/linux/irq.h
> >> > +++ b/include/linux/irq.h
> >> > @@ -1249,6 +1249,22 @@ 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_clear:   Optional function to clear parent IPI
> >> > + * @ipi_mux_send:    Trigger parent IPI on target CPUs
> >> > + */
> >> > +struct ipi_mux_ops {
> >> > +     void (*ipi_mux_clear)(unsigned int parent_virq);
> >> > +     void (*ipi_mux_send)(unsigned int parent_virq,
> >> > +                          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);
> >> > +
> >> >  #ifdef CONFIG_GENERIC_IRQ_MULTI_HANDLER
> >> >  /*
> >> >   * Registers a generic IRQ handling function as the top-level IRQ handler in
> >> > diff --git a/kernel/irq/Kconfig b/kernel/irq/Kconfig
> >> > index 10929eda9825..2388e7d40ed3 100644
> >> > --- a/kernel/irq/Kconfig
> >> > +++ b/kernel/irq/Kconfig
> >> > @@ -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
> >> > diff --git a/kernel/irq/Makefile b/kernel/irq/Makefile
> >> > index b4f53717d143..f19d3080bf11 100644
> >> > --- a/kernel/irq/Makefile
> >> > +++ b/kernel/irq/Makefile
> >> > @@ -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
> >> > diff --git a/kernel/irq/ipi-mux.c b/kernel/irq/ipi-mux.c
> >> > new file mode 100644
> >> > index 000000000000..bd6b31ca588b
> >> > --- /dev/null
> >> > +++ b/kernel/irq/ipi-mux.c
> >> > @@ -0,0 +1,199 @@
> >> > +// SPDX-License-Identifier: GPL-2.0-only
> >> > +/*
> >> > + * Multiplex several virtual IPIs over a single HW IPI.
> >> > + *
> >> > + * 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/smp.h>
> >> > +
> >> > +static unsigned int ipi_mux_nr;
> >> > +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_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();
> >> > +
> >> > +     /* Trigger the parent IPI */
> >> > +     ipi_mux_ops->ipi_mux_send(ipi_mux_parent_virq, mask);
> >> > +}
> >> > +
> >> > +static const struct irq_chip ipi_mux_chip = {
> >> > +     .name           = "IPI Mux",
> >> > +     .ipi_send_mask  = ipi_mux_send_mask,
> >>
> >> I've given this a bit more though, and I came to the conclusion that
> >> we really should have the full masking semantics here, even if Linux
> >> currently doesn't really use it.
> >>
> >> It makes the handling a bit more complex, and unmasking a pending IPI
> >> must be handled gracefully, but we already have implemented most of
> >> that code in the irq-apple-aic driver.
> >>
> >> And if we go down this road, such a driver should be very easy to move
> >> over this infrastructure, making the change a lot more palatable.
> >
> > Sounds good.
> >
> > I will send v8 of ipi-mux which can be easily adapted for irq-apple-aic
> > driver
> > and it will have masking semantics as well.
>
> Thanks. No hurry though, as I'm closing the queue for 5.20 (fixes
> only until -rc1).

Okay, I will send after 5.20-rc1.

Regards,
Anup

>
> Thanks,
>
>          M.
> --
> Jazz is not dead. It just smells funny...
diff mbox series

Patch

diff --git a/include/linux/irq.h b/include/linux/irq.h
index 505308253d23..a97bf13a8965 100644
--- a/include/linux/irq.h
+++ b/include/linux/irq.h
@@ -1249,6 +1249,22 @@  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_clear:	Optional function to clear parent IPI
+ * @ipi_mux_send:	Trigger parent IPI on target CPUs
+ */
+struct ipi_mux_ops {
+	void (*ipi_mux_clear)(unsigned int parent_virq);
+	void (*ipi_mux_send)(unsigned int parent_virq,
+			     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);
+
 #ifdef CONFIG_GENERIC_IRQ_MULTI_HANDLER
 /*
  * Registers a generic IRQ handling function as the top-level IRQ handler in
diff --git a/kernel/irq/Kconfig b/kernel/irq/Kconfig
index 10929eda9825..2388e7d40ed3 100644
--- a/kernel/irq/Kconfig
+++ b/kernel/irq/Kconfig
@@ -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
diff --git a/kernel/irq/Makefile b/kernel/irq/Makefile
index b4f53717d143..f19d3080bf11 100644
--- a/kernel/irq/Makefile
+++ b/kernel/irq/Makefile
@@ -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
diff --git a/kernel/irq/ipi-mux.c b/kernel/irq/ipi-mux.c
new file mode 100644
index 000000000000..bd6b31ca588b
--- /dev/null
+++ b/kernel/irq/ipi-mux.c
@@ -0,0 +1,199 @@ 
+// SPDX-License-Identifier: GPL-2.0-only
+/*
+ * Multiplex several virtual IPIs over a single HW IPI.
+ *
+ * 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/smp.h>
+
+static unsigned int ipi_mux_nr;
+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_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();
+
+	/* Trigger the parent IPI */
+	ipi_mux_ops->ipi_mux_send(ipi_mux_parent_virq, mask);
+}
+
+static const struct irq_chip ipi_mux_chip = {
+	.name		= "IPI Mux",
+	.ipi_send_mask	= ipi_mux_send_mask,
+};
+
+static int ipi_mux_domain_alloc(struct irq_domain *d, unsigned int virq,
+				unsigned int nr_irqs, void *arg)
+{
+	struct irq_fwspec *fwspec = arg;
+	irq_hw_number_t hwirq;
+	unsigned int type;
+	int i, ret;
+
+	ret = irq_domain_translate_onecell(d, fwspec, &hwirq, &type);
+	if (ret)
+		return ret;
+
+	for (i = 0; i < nr_irqs; i++) {
+		irq_set_percpu_devid(virq + i);
+		irq_domain_set_info(d, virq + i, hwirq + 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
+ */
+void ipi_mux_process(void)
+{
+	unsigned long irqs, *bits = this_cpu_ptr(&ipi_mux_bits);
+	irq_hw_number_t hwirq;
+	int err;
+
+	/* Clear the parent IPI */
+	if (ipi_mux_ops->ipi_mux_clear)
+		ipi_mux_ops->ipi_mux_clear(ipi_mux_parent_virq);
+
+	/*
+	 * Barrier for IPI bits paired with smp_mb__before_atomic()
+	 * and smp_mb__after_atomic() used in ipi_mux_send_mask().
+	 */
+	smp_mb();
+
+	irqs = xchg(bits, 0);
+	if (!irqs)
+		return;
+
+	for_each_set_bit(hwirq, &irqs, ipi_mux_nr) {
+		err = generic_handle_domain_irq(ipi_mux_domain,
+						hwirq);
+		if (unlikely(err))
+			pr_warn_ratelimited(
+				"can't find mapping for hwirq %lu\n",
+				hwirq);
+	}
+}
+
+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);
+}
+
+static int ipi_mux_dying_cpu(unsigned int cpu)
+{
+	disable_percpu_irq(ipi_mux_parent_virq);
+	return 0;
+}
+
+static int ipi_mux_starting_cpu(unsigned int cpu)
+{
+	enable_percpu_irq(ipi_mux_parent_virq,
+			  irq_get_trigger_type(ipi_mux_parent_virq));
+	return 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_LONG
+ * @ops:		multiplexing operations for the 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 responsibility of irqchip drivers
+ * to explicitly call ipi_mux_process() for processing muxed IPIs.
+ *
+ * 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,
+		   const struct ipi_mux_ops *ops)
+{
+	struct fwnode_handle *fwnode;
+	struct irq_domain *domain;
+	struct irq_fwspec ipi;
+	int virq;
+
+	if (ipi_mux_domain || BITS_PER_LONG < 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;
+
+	fwnode = irq_domain_alloc_named_fwnode("IPI-Mux");
+	if (!fwnode) {
+		pr_err("unable to create IPI Mux fwnode\n");
+		return -ENOMEM;
+	}
+
+	domain = irq_domain_create_simple(fwnode, nr_ipi, 0,
+					  &ipi_mux_domain_ops, NULL);
+	if (!domain) {
+		pr_err("unable to add IPI Mux domain\n");
+		irq_domain_free_fwnode(fwnode);
+		return -ENOMEM;
+	}
+
+	ipi.fwnode = domain->fwnode;
+	ipi.param_count = 1;
+	ipi.param[0] = 0;
+	virq = __irq_domain_alloc_irqs(domain, -1, nr_ipi,
+				       NUMA_NO_NODE, &ipi, false, NULL);
+	if (virq <= 0) {
+		pr_err("unable to alloc IRQs from IPI Mux domain\n");
+		irq_domain_remove(domain);
+		irq_domain_free_fwnode(fwnode);
+		return virq;
+	}
+
+	ipi_mux_domain = domain;
+	ipi_mux_nr = nr_ipi;
+	ipi_mux_parent_virq = parent_virq;
+	ipi_mux_ops = ops;
+
+	if (parent_virq > 0) {
+		irq_set_chained_handler(parent_virq, ipi_mux_handler);
+		cpuhp_setup_state(CPUHP_AP_ONLINE_DYN,
+				  "irqchip/ipi-mux:starting",
+				  ipi_mux_starting_cpu, ipi_mux_dying_cpu);
+	}
+
+	return virq;
+}