Skip to contentSkip to conversation

RISC-V IPI Improvements

PATCH Superseded Anup Patel 4 participants 19 messages Sep 3, 2022 – Nov 14, 2022 1 message not in the archive

Subsystems (5)

v9 of 18 Superseded Latest is v18 →

lore
Share & tools
lore

Anup Patel

author
#0 lore raw

v9 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_v9 branch at:
https://github.com/avpatel/linux.git

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       |  60 ++++++++
 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 |  42 +++--
 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              | 244 ++++++++++++++++++++++++++++++
 19 files changed, 630 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
author
#1 lore raw

PATCH v9 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
index 775d3322b422..fc614650a2e3 100644
@@ -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
index 760a64518c58..c56d67f53ea9 100644
@@ -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
#2 lore raw

Re: [PATCH v9 1/7] RISC-V: Clear SIP bit only when using SBI IPI operations

Quoted 4 lines · Anup Patel

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.

Uh, where is this specified? I don’t see that, and that would be odd. The spec clearly says that if supervisor software interrupts are implemented then the bit is writeable, with no caveats on when (beyond the permissions required to access the CSR in general).

This patch does make sense for a different reason though: that IPIs may not be using software interrupts at all (in the IMSIC case).

Jess

Quoted 48 lines

---
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
index 775d3322b422..fc614650a2e3 100644
@@ -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
index 760a64518c58..c56d67f53ea9 100644
@@ -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 · 7 lines
2.34.1


_______________________________________________
linux-riscv mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/linux-riscv
author
#3 lore raw

Re: [PATCH v9 1/7] RISC-V: Clear SIP bit only when using SBI IPI operations

Quoted 11 lines · Jessica Clarke
Quoted 4 lines · Anup Patel

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.

Uh, where is this specified? I don’t see that, and that would be odd. The spec clearly says that if supervisor software interrupts are implemented then the bit is writeable, with no caveats on when (beyond the permissions required to access the CSR in general).

For mip.MSIP, refer the below text from section 3.1.9 of the RISC-V privileged specification:

"MSIP is read-only in mip, and is written by accesses to memory-mapped control registers, which are used by remote harts to provide machine-level interprocessor interrupts."

For sip.SSIP, refer the below text from section 4.1.3 of the RISC-V privileged specification:

"If implemented, SSIP is writable in sip and may also be set to 1 by a platform-specific interrupt controller."

Quoted 3 lines

This patch does make sense for a different reason though: that IPIs may not be using software interrupts at all (in the IMSIC case).

Sure, let me help you understand this better.

The IPI support in Linux RISC-V does not assume any particular IPI mechanism. In fact, we will be supporting multiple IPI mechanism in Linux RISC-V and one of these will be selected at boot-time based on platform capabilities:

1) Linux RISC-V NoMMU (M-mode) kernel will use IPIs provided by the CLINT timer driver (refer, drivers/clocksource/timer-clint.c). This mechanism uses the CLINT MMIO registers to update the state of mip.MSIP bit. The M-mode kernel cannot directly modify the mip.MSIP bit without going through the CLINT MMIO registers.

2) Linux RISC-V MMU (S-mode) kernel without IMSIC will use IPIs provided by the SBI IPI calls (refer, arch/riscv/kernel/sbi.c). This mechanism uses the SBI SEND_IPI call which sets the sip.SSIP bit from M-mode firmware and kernel itself will clear sip.SSIP bit after handling IPI on target HART.

3) Linux RISC-V MMU (S-mode) kernel with IMSIC will use IPIs as software injected MSIs (refer,
https://github.com/avpatel/linux/blob/riscv_aia_v1/drivers/irqchip/irq-riscv-imsic.c).
This mechanism does not use "Software Interrupt" bits defined in the mip/sip CSR. Instead IPIs are regular external interrupts injected via IMSIC and imsic_handle_irq() of the IMSIC driver clears the IPI pending through stopei CSR.

Currently, we were blindly clearing mip.[M|S]SIP bit in riscv_clear_ipi() which is a common function for all three mechanisms above which is not right considering the diversity in IPI mechanisms supported by Linux RISC-V.

This patch moves the clearing of SSIP bit to SBI IPI code so that it is only done for mechanism #2 (described above) and not done for mechanisms #1 & #3 (described above).

Regards,
Anup

Quoted 52 lines

Jess

Quoted 48 lines

---
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
index 775d3322b422..fc614650a2e3 100644
@@ -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 -3
index 760a64518c58..c56d67f53ea9 100644
@@ -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);
 
--

2.34.1

_______________________________________________
linux-riscv mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/linux-riscv

#4 lore raw

Re: [PATCH v9 1/7] RISC-V: Clear SIP bit only when using SBI IPI operations

Quoted 21 lines · Anup Patel
Quoted 11 lines · Jessica Clarke
Quoted 4 lines · Anup Patel

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.

Uh, where is this specified? I don’t see that, and that would be odd. The spec clearly says that if supervisor software interrupts are implemented then the bit is writeable, with no caveats on when (beyond the permissions required to access the CSR in general).

For mip.MSIP, refer the below text from section 3.1.9 of the RISC-V privileged specification:

"MSIP is read-only in mip, and is written by accesses to memory-mapped control registers, which are used by remote harts to provide machine-level interprocessor interrupts."

Quoted 5 lines

For sip.SSIP, refer the below text from section 4.1.3 of the RISC-V privileged specification:

"If implemented, SSIP is writable in sip and may also be set to 1 by a platform-specific interrupt controller."

I misinterpreted you; I thought you were saying SSIP could be set from S-mode but not M-mode, not that you were talking about the bit corresponding to the mode. I agree MSIP is different to SSIP (unfortunately).

Quoted 30 lines
Quoted 2 lines

This patch does make sense for a different reason though: that IPIs may not be using software interrupts at all (in the IMSIC case).

Sure, let me help you understand this better.

The IPI support in Linux RISC-V does not assume any particular IPI mechanism. In fact, we will be supporting multiple IPI mechanism in Linux RISC-V and one of these will be selected at boot-time based on platform capabilities:

1) Linux RISC-V NoMMU (M-mode) kernel will use IPIs provided by the CLINT timer driver (refer, drivers/clocksource/timer-clint.c). This mechanism uses the CLINT MMIO registers to update the state of mip.MSIP bit. The M-mode kernel cannot directly modify the mip.MSIP bit without going through the CLINT MMIO registers.

2) Linux RISC-V MMU (S-mode) kernel without IMSIC will use IPIs provided by the SBI IPI calls (refer, arch/riscv/kernel/sbi.c). This mechanism uses the SBI SEND_IPI call which sets the sip.SSIP bit from M-mode firmware and kernel itself will clear sip.SSIP bit after handling IPI on target HART.

3) Linux RISC-V MMU (S-mode) kernel with IMSIC will use IPIs as software injected MSIs (refer,
https://github.com/avpatel/linux/blob/riscv_aia_v1/drivers/irqchip/irq-riscv-imsic.c).
This mechanism does not use "Software Interrupt" bits defined in the mip/sip CSR. Instead IPIs are regular external interrupts injected via IMSIC and imsic_handle_irq() of the IMSIC driver clears the IPI pending through stopei CSR.

Quoted 8 lines

Currently, we were blindly clearing mip.[M|S]SIP bit in riscv_clear_ipi() which is a common function for all three mechanisms above which is not right considering the diversity in IPI mechanisms supported by Linux RISC-V.

This patch moves the clearing of SSIP bit to SBI IPI code so that it is only done for mechanism #2 (described above) and not done for mechanisms #1 & #3 (described above).

Yes, that’s what I was trying to communicate as to what the motivation of the patch should be (though omitted the M-mode case because I sometimes forget that Linux tries to support this odd-ball configuration). I always agreed with the content of the patch, just disagreed with the message. Now you’ve explained what you meant I don’t think it’s wrong, but I do think it could be clearer, especially since the IMSIC case (and I guess ACLINT SSWI too, which is yet another option) should be stated to justify why it’s tied to the SBI IPI implementation and not under !IS_ENABLED(CONFIG_RISCV_M_MODE).

Jess

Quoted 55 lines

Regards,
Anup

Quoted 52 lines

Jess

Quoted 48 lines

---
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
index 775d3322b422..fc614650a2e3 100644
@@ -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 -3
index 760a64518c58..c56d67f53ea9 100644
@@ -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);
 
--

2.34.1

_______________________________________________
linux-riscv mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/linux-riscv

Reviewed-by on v9 1/7
#5 lore raw

Re: [PATCH v9 1/7] RISC-V: Clear SIP bit only when using SBI IPI operations

In reply to Anup Patel
Quoted 46 lines · Anup Patel

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
index 775d3322b422..fc614650a2e3 100644
@@ -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 -3
index 760a64518c58..c56d67f53ea9 100644
@@ -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);
 
--
Quoted 2 lines

2.34.1

Signature · 2 lines
Regards,
Atish
#6 lore raw

Re: [PATCH v9 1/7] RISC-V: Clear SIP bit only when using SBI IPI operations

In reply to Anup Patel
Quoted 37 lines · Anup Patel

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
index 775d3322b422..fc614650a2e3 100644
@@ -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 -0
index 760a64518c58..c56d67f53ea9 100644

arch/riscv/kernel/smp.c void riscv_clear_ipi(void) · line 87

Quoted 7 lines
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);

This really begs the question: why on Earth are these things exported to *modules*? I cannot see a good reason why they should be...

	M>
Signature · 1 line
Without deviation from the norm, progress is not possible.
author
#7 lore raw

Re: [PATCH v9 1/7] RISC-V: Clear SIP bit only when using SBI IPI operations

Quoted 34 lines · Marc Zyngier
Quoted 31 lines · Anup Patel

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
index 775d3322b422..fc614650a2e3 100644
@@ -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
 };
 
Quoted 16 lines

arch/riscv/kernel/smp.c void riscv_clear_ipi(void) · line 87

Quoted 13 lines
arch/riscv/kernel/sbi.c +0 -0
 void __init sbi_init(void)
arch/riscv/kernel/smp.c +0 -2
index 760a64518c58..c56d67f53ea9 100644
@@ -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);

This really begs the question: why on Earth are these things exported to *modules*? I cannot see a good reason why they should be...

I agree, the riscv_clear_ipi() should not be exported but the PATCH4 ("RISC-V: Treat IPIs as normal Linux IRQs") of this series removes this function.

Regards,
Anup

Quoted 5 lines
        M>

--
Without deviation from the norm, progress is not possible.

author
#8 lore raw

PATCH v9 2/7 irqchip/riscv-intc: Allow drivers to directly discover INTC hwnode

In reply to Anup Patel

Various 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
index e4c435509983..43b9ebfbd943 100644
@@ -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
index 7207fa08d78f..96d3171f0ca1 100644
@@ -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
index 499e5f81b3fe..9066467e99e4 100644
@@ -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
Reviewed-by on v9 2/7
#9 lore raw

Re: [PATCH v9 2/7] irqchip/riscv-intc: Allow drivers to directly discover INTC hwnode

Quoted 91 lines · Anup Patel

Various 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
index e4c435509983..43b9ebfbd943 100644
@@ -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
index 7207fa08d78f..96d3171f0ca1 100644
@@ -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 -1
index 499e5f81b3fe..9066467e99e4 100644
@@ -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,
--
Quoted 2 lines

2.34.1

Signature · 2 lines
Regards,
Atish
author
#10 lore raw

PATCH v9 3/7 genirq: Add mechanism to multiplex a single HW IPI

In reply to 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 shared among various RISC-V irqchip drivers.

---
 include/linux/irq.h  |  18 ++++
 kernel/irq/Kconfig   |   5 +
 kernel/irq/Makefile  |   1 +
 kernel/irq/ipi-mux.c | 244 +++++++++++++++++++++++++++++++++++++++++++
 4 files changed, 268 insertions(+)
 create mode 100644 kernel/irq/ipi-mux.c
include/linux/irq.h +18 -0
index c3eb89606c2b..5ab702cb0a5b 100644
@@ -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
index db3d174c53d4..df17dbc54b02 100644
@@ -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
index b4f53717d143..f19d3080bf11 100644
@@ -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 +244 -0

244 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
#11 lore raw

Re: [PATCH v9 3/7] genirq: Add mechanism to multiplex a single HW IPI

Quoted 31 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 shared among various RISC-V irqchip drivers.

---
 include/linux/irq.h  |  18 ++++
 kernel/irq/Kconfig   |   5 +
 kernel/irq/Makefile  |   1 +
 kernel/irq/ipi-mux.c | 244 +++++++++++++++++++++++++++++++++++++++++++
 4 files changed, 268 insertions(+)
 create mode 100644 kernel/irq/ipi-mux.c
include/linux/irq.h +3 -0
index c3eb89606c2b..5ab702cb0a5b 100644
@@ -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
+ *

include/linux/irq.h int __ipi_send_mask(struct irq_desc *desc, const struct cpumask *dest); · line 1281

Quoted 10 lines
include/linux/irq.h +10 -0
+ * @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);
+};

What is the rational for these pre/post handling functions? We don't have them for normal interrupts, why are they required for IPIs?

Quoted 42 lines
include/linux/irq.h +5 -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
index db3d174c53d4..df17dbc54b02 100644
@@ -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
index b4f53717d143..f19d3080bf11 100644
@@ -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 +0 -0
new file mode 100644
index 000000000000..8939fa2be73c

kernel/irq/ipi-mux.c line 5

Quoted 5 lines
kernel/irq/ipi-mux.c new file +5 -0
@@ -0,0 +1,244 @@
+// SPDX-License-Identifier: GPL-2.0-only
+/*
+ * Multiplex several virtual IPIs over a single HW IPI.
+ *
+ * Copyright (c) 2022 Ventana Micro Systems Inc.

Basic courtesy would be to at least mention where this was lifted from, as well as the original copyrights. Also, the original code states "GPL-2.0-or-later". Since this is a derivative work, the same licence should apply, shouldn't it?

Quoted 8 lines
kernel/irq/ipi-mux.c new file +8 -0
+ */
+
+#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>

kernel/irq/ipi-mux.c line 23

Quoted 10 lines
kernel/irq/ipi-mux.c new file +10 -0
+#include <linux/irqdomain.h>
+#include <linux/smp.h>
+
+static void *ipi_mux_data;
+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(atomic_t, ipi_mux_enable);
+static DEFINE_PER_CPU(atomic_t, ipi_mux_bits);

How about making these fields part of a structure, and only allocate them on creation of an IPI irqdomain? Most platforms do not require this at all.

Quoted 18 lines
kernel/irq/ipi-mux.c new file +18 -0
+
+static void ipi_mux_mask(struct irq_data *d)
+{
+	atomic_andnot(BIT(irqd_to_hwirq(d)), this_cpu_ptr(&ipi_mux_enable));
+}
+
+static void ipi_mux_unmask(struct irq_data *d)
+{
+	u32 ipi_bit = BIT(irqd_to_hwirq(d));
+
+	atomic_or(ipi_bit, this_cpu_ptr(&ipi_mux_enable));
+
+	/*
+	 * The atomic_or() above must complete before the atomic_read()
+	 * below to avoid racing ipi_mux_send_mask().
+	 */
+	smp_mb__after_atomic();
+

kernel/irq/ipi-mux.c line 51

Quoted 10 lines
kernel/irq/ipi-mux.c new file +10 -0
+	/* If a pending IPI was unmasked, raise a parent IPI immediately. */
+	if (atomic_read(this_cpu_ptr(&ipi_mux_bits)) & ipi_bit)
+		ipi_mux_ops->ipi_mux_send(ipi_mux_parent_virq, ipi_mux_data,
+					  cpumask_of(smp_processor_id()));
+}
+
+static void ipi_mux_send_mask(struct irq_data *d, const struct cpumask *mask)
+{
+	u32 ipi_bit = BIT(irqd_to_hwirq(d));
+	struct cpumask pmask = { 0 };

Urgh, no (see the comment in cpumask.h). struct cpumask can be really huge (it uses NR_CPUS), and we only want to depend on nr_cpus. Use a per-CPU temp if you must, but don't allocate something like this on the stack.

Quoted 28 lines
kernel/irq/ipi-mux.c new file +28 -0
+	unsigned long pending;
+	int cpu;
+
+	for_each_cpu(cpu, mask) {
+		pending = atomic_fetch_or_release(ipi_bit,
+					per_cpu_ptr(&ipi_mux_bits, cpu));
+
+		/*
+		 * The atomic_fetch_or_release() above must complete before
+		 * the atomic_read() below to avoid racing ipi_mux_unmask().
+		 */
+		smp_mb__after_atomic();
+
+		if (!(pending & ipi_bit) &&
+		    (atomic_read(per_cpu_ptr(&ipi_mux_enable, cpu)) & ipi_bit))
+			cpumask_set_cpu(cpu, &pmask);
+	}
+
+	/* Trigger the parent IPI */
+	ipi_mux_ops->ipi_mux_send(ipi_mux_parent_virq, ipi_mux_data, &pmask);
+}
+
+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,
+};

kernel/irq/ipi-mux.c line 89

Quoted 10 lines
kernel/irq/ipi-mux.c new file +10 -0
+
+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);

Where is the format of this fwspec documented?

Quoted 18 lines
kernel/irq/ipi-mux.c new file +18 -0
+	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,
+};
+

kernel/irq/ipi-mux.c line 117

Quoted 10 lines
kernel/irq/ipi-mux.c new file +10 -0
+/**
+ * ipi_mux_process - Process multiplexed virtual IPIs
+ */
+void ipi_mux_process(void)
+{
+	irq_hw_number_t hwirq;
+	unsigned long ipis;
+	int en, err;
+
+	if (ipi_mux_ops->ipi_mux_pre_handle)

Given that this shouldn't change in the lifetime of the system, this needs to be turned into a static key in order to avoid the overhead of accessing this on each and every IPI.

Quoted 13 lines
kernel/irq/ipi-mux.c new file +13 -0
+		ipi_mux_ops->ipi_mux_pre_handle(ipi_mux_parent_virq,
+						ipi_mux_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(this_cpu_ptr(&ipi_mux_enable));
+
+	/*
+	 * Clear the IPIs we are about to handle. This pairs with the
+	 * atomic_fetch_or_release() in ipi_mux_send_mask().

kernel/irq/ipi-mux.c line 140

Quoted 10 lines
kernel/irq/ipi-mux.c new file +10 -0
+	 */
+	ipis = atomic_fetch_andnot(en, this_cpu_ptr(&ipi_mux_bits)) & en;
+
+	for_each_set_bit(hwirq, &ipis, 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);

How can this happen?

kernel/irq/ipi-mux.c line 143

Quoted 3 lines
kernel/irq/ipi-mux.c new file +3 -0
+	}
+
+	if (ipi_mux_ops->ipi_mux_post_handle)

Same thing as above.

Quoted 22 lines
kernel/irq/ipi-mux.c new file +22 -0
+		ipi_mux_ops->ipi_mux_post_handle(ipi_mux_parent_virq,
+						 ipi_mux_data);
+}
+
+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,

kernel/irq/ipi-mux.c line 175

Quoted 10 lines
kernel/irq/ipi-mux.c new file +10 -0
+			  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_TYPE(int)

In general, please use 'long' rather than 'int', like for most other things in the kernel.

Quoted 35 lines
kernel/irq/ipi-mux.c new file +35 -0
+ * @ops:		multiplexing operations for the parent IPI
+ * @data:		opaque data used by the multiplexing operations
+ *
+ * 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, void *data)
+{
+	struct fwnode_handle *fwnode;
+	struct irq_domain *domain;
+	struct irq_fwspec ipi;
+	int virq;
+
+	if (ipi_mux_domain || 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;
+
+	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,

kernel/irq/ipi-mux.c line 220

Quoted 10 lines
kernel/irq/ipi-mux.c new file +10 -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;

This really deserves some documentation if this is to be used at scale (and not be a riscv-special).

Quoted 11 lines
kernel/irq/ipi-mux.c new file +11 -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_data = data;

kernel/irq/ipi-mux.c line 241

Quoted 10 lines
kernel/irq/ipi-mux.c new file +10 -0
+	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);
+	}

This whole CPUHP thing feels like something that should stay outside of the generic code. I'm pretty sure some architectures would have specific requirements and wouldn't be able to just use any odd dynamic value...

kernel/irq/ipi-mux.c line 228

Quoted 3 lines
kernel/irq/ipi-mux.c new file +3 -0
+
+	return virq;
+}

Thanks,

	M.
Signature · 1 line
Without deviation from the norm, progress is not possible.
author
#12 lore raw

Re: [PATCH v9 3/7] genirq: Add mechanism to multiplex a single HW IPI

Hi Marc,

Apologies for being slow, I got preempted by other tasks.

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 shared among various RISC-V irqchip drivers.

---
 include/linux/irq.h  |  18 ++++
 kernel/irq/Kconfig   |   5 +
 kernel/irq/Makefile  |   1 +
 kernel/irq/ipi-mux.c | 244 +++++++++++++++++++++++++++++++++++++++++++
 4 files changed, 268 insertions(+)
 create mode 100644 kernel/irq/ipi-mux.c
include/linux/irq.h +0 -0
index c3eb89606c2b..5ab702cb0a5b 100644
@@ -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 16 lines

include/linux/irq.h int __ipi_send_mask(struct irq_desc *desc, const struct cpumask *dest); · line 1281

Quoted 13 lines
include/linux/irq.h +13 -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);
+     void (*ipi_mux_send)(unsigned int parent_virq, void *data,
+                          const struct cpumask *mask);
+};

What is the rational for these pre/post handling functions? We don't have them for normal interrupts, why are they required for IPIs?

Yes, normal interrupts don't require these functions but there is diversity among irqchip drivers for IPI muxing.

For example: the Apple AIC driver has device specific MMIO access before and after handling IPIs whereas the RISC-V SBI IPI driver needs to clear the sip.SSIP bit before handling the IPIs.

Quoted 45 lines
Quoted 45 lines
include/linux/irq.h +5 -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
index db3d174c53d4..df17dbc54b02 100644
@@ -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
index b4f53717d143..f19d3080bf11 100644
@@ -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 +2 -0
new file mode 100644
index 000000000000..8939fa2be73c
@@ -0,0 +1,244 @@
+// SPDX-License-Identifier: GPL-2.0-only
+/*
Quoted 8 lines

kernel/irq/ipi-mux.c line 5

Quoted 3 lines
kernel/irq/ipi-mux.c new file +3 -0
+ * Multiplex several virtual IPIs over a single HW IPI.
+ *
+ * Copyright (c) 2022 Ventana Micro Systems Inc.

Basic courtesy would be to at least mention where this was lifted from, as well as the original copyrights. Also, the original code states "GPL-2.0-or-later". Since this is a derivative work, the same licence should apply, shouldn't it?

Sure, I will update it.

Quoted 15 lines
Quoted 15 lines
kernel/irq/ipi-mux.c new file +14 -0
+ */
+
+#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 void *ipi_mux_data;
+static unsigned int ipi_mux_nr;
+static unsigned int ipi_mux_parent_virq;
Quoted 8 lines

kernel/irq/ipi-mux.c line 23

Quoted 4 lines
kernel/irq/ipi-mux.c new file +4 -0
+static struct irq_domain *ipi_mux_domain;
+static const struct ipi_mux_ops *ipi_mux_ops;
+static DEFINE_PER_CPU(atomic_t, ipi_mux_enable);
+static DEFINE_PER_CPU(atomic_t, ipi_mux_bits);

How about making these fields part of a structure, and only allocate them on creation of an IPI irqdomain? Most platforms do not require this at all.

Okay, I will update like you suggested.

Quoted 26 lines
Quoted 26 lines
kernel/irq/ipi-mux.c new file +25 -0
+
+static void ipi_mux_mask(struct irq_data *d)
+{
+     atomic_andnot(BIT(irqd_to_hwirq(d)), this_cpu_ptr(&ipi_mux_enable));
+}
+
+static void ipi_mux_unmask(struct irq_data *d)
+{
+     u32 ipi_bit = BIT(irqd_to_hwirq(d));
+
+     atomic_or(ipi_bit, this_cpu_ptr(&ipi_mux_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(this_cpu_ptr(&ipi_mux_bits)) & ipi_bit)
+             ipi_mux_ops->ipi_mux_send(ipi_mux_parent_virq, ipi_mux_data,
+                                       cpumask_of(smp_processor_id()));
+}
+
+static void ipi_mux_send_mask(struct irq_data *d, const struct cpumask *mask)
Quoted 8 lines

kernel/irq/ipi-mux.c line 51

Quoted 3 lines
kernel/irq/ipi-mux.c new file +3 -0
+{
+     u32 ipi_bit = BIT(irqd_to_hwirq(d));
+     struct cpumask pmask = { 0 };

Urgh, no (see the comment in cpumask.h). struct cpumask can be really huge (it uses NR_CPUS), and we only want to depend on nr_cpus. Use a per-CPU temp if you must, but don't allocate something like this on the stack.

Okay, I will create per-CPU temp like you suggested.

Quoted 33 lines
Quoted 33 lines
kernel/irq/ipi-mux.c new file +32 -0
+     unsigned long pending;
+     int cpu;
+
+     for_each_cpu(cpu, mask) {
+             pending = atomic_fetch_or_release(ipi_bit,
+                                     per_cpu_ptr(&ipi_mux_bits, cpu));
+
+             /*
+              * The atomic_fetch_or_release() above must complete before
+              * the atomic_read() below to avoid racing ipi_mux_unmask().
+              */
+             smp_mb__after_atomic();
+
+             if (!(pending & ipi_bit) &&
+                 (atomic_read(per_cpu_ptr(&ipi_mux_enable, cpu)) & ipi_bit))
+                     cpumask_set_cpu(cpu, &pmask);
+     }
+
+     /* Trigger the parent IPI */
+     ipi_mux_ops->ipi_mux_send(ipi_mux_parent_virq, ipi_mux_data, &pmask);
+}
+
+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,
+};
+
+static int ipi_mux_domain_alloc(struct irq_domain *d, unsigned int virq,
+                             unsigned int nr_irqs, void *arg)
+{
Quoted 8 lines

kernel/irq/ipi-mux.c line 89

Quoted 6 lines
kernel/irq/ipi-mux.c new file +6 -0
+     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);

Where is the format of this fwspec documented?

We don't need this fwspec. I will remove it in next patch revision.

Quoted 25 lines
Quoted 25 lines
kernel/irq/ipi-mux.c new file +24 -0
+     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)
+{
+     irq_hw_number_t hwirq;
Quoted 8 lines

kernel/irq/ipi-mux.c line 117

Quoted 4 lines
kernel/irq/ipi-mux.c new file +4 -0
+     unsigned long ipis;
+     int en, err;
+
+     if (ipi_mux_ops->ipi_mux_pre_handle)

Given that this shouldn't change in the lifetime of the system, this needs to be turned into a static key in order to avoid the overhead of accessing this on each and every IPI.

Sure, I will use static keys here.

Quoted 18 lines
Quoted 18 lines
kernel/irq/ipi-mux.c new file +17 -0
+             ipi_mux_ops->ipi_mux_pre_handle(ipi_mux_parent_virq,
+                                             ipi_mux_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(this_cpu_ptr(&ipi_mux_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, this_cpu_ptr(&ipi_mux_bits)) & en;
+
+     for_each_set_bit(hwirq, &ipis, ipi_mux_nr) {
Quoted 8 lines

kernel/irq/ipi-mux.c line 140

Quoted 6 lines
kernel/irq/ipi-mux.c new file +6 -0
+             err = generic_handle_domain_irq(ipi_mux_domain,
+                                             hwirq);
+             if (unlikely(err))
+                     pr_warn_ratelimited(
+                             "can't find mapping for hwirq %lu\n",
+                             hwirq);

How can this happen?

This is a paranoid check on my side. I will remove it.

Quoted 6 lines

kernel/irq/ipi-mux.c line 143

Quoted 4 lines
kernel/irq/ipi-mux.c new file +3 -0
+     }
+
+     if (ipi_mux_ops->ipi_mux_post_handle)

Same thing as above.

Okay, I will update.

Quoted 28 lines
Quoted 28 lines
kernel/irq/ipi-mux.c new file +27 -0
+             ipi_mux_ops->ipi_mux_post_handle(ipi_mux_parent_virq,
+                                              ipi_mux_data);
+}
+
+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;
+}
+
+/**
Quoted 8 lines

kernel/irq/ipi-mux.c line 175

Quoted 5 lines
kernel/irq/ipi-mux.c new file +5 -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)

In general, please use 'long' rather than 'int', like for most other things in the kernel.

This is BITS_PER_TYPE(int) because we are using 32bit atomic operations.

Quoted 41 lines
Quoted 41 lines
kernel/irq/ipi-mux.c new file +40 -0
+ * @ops:             multiplexing operations for the parent IPI
+ * @data:            opaque data used by the multiplexing operations
+ *
+ * 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, void *data)
+{
+     struct fwnode_handle *fwnode;
+     struct irq_domain *domain;
+     struct irq_fwspec ipi;
+     int virq;
+
+     if (ipi_mux_domain || 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;
+
+     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;
Quoted 8 lines

kernel/irq/ipi-mux.c line 220

Quoted 5 lines
kernel/irq/ipi-mux.c new file +5 -0
+     }
+
+     ipi.fwnode = domain->fwnode;
+     ipi.param_count = 1;
+     ipi.param[0] = 0;

This really deserves some documentation if this is to be used at scale (and not be a riscv-special).

This fwspec is not needed. I will be removing it in the next patch revision.

Quoted 19 lines
Quoted 19 lines
kernel/irq/ipi-mux.c new file +18 -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_data = data;
+     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,
Quoted 8 lines

kernel/irq/ipi-mux.c line 241

Quoted 3 lines
kernel/irq/ipi-mux.c new file +3 -0
+                               "irqchip/ipi-mux:starting",
+                               ipi_mux_starting_cpu, ipi_mux_dying_cpu);
+     }

This whole CPUHP thing feels like something that should stay outside of the generic code. I'm pretty sure some architectures would have specific requirements and wouldn't be able to just use any odd dynamic value...

I agree. I will update irqchip drivers to do the parent_virq enable/disable and remove it from here.

Quoted 11 lines

kernel/irq/ipi-mux.c line 228

Quoted 4 lines
kernel/irq/ipi-mux.c new file +3 -0
+
+     return virq;
+}

Thanks,

        M.

--
Without deviation from the norm, progress is not possible.

Thanks,
Anup

_______________________________________________
linux-riscv mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/linux-riscv

A message that is not in the archive (sent off-list or not yet received): [email protected]

author
#14 lore raw

Re: [PATCH v9 3/7] genirq: Add mechanism to multiplex a single HW IPI

Quoted 23 lines · Hillf Danton
Quoted 21 lines · On 3 Sep 2022 21:43:05 +0530 Anup Patel <[email protected]> wrote:
kernel/irq/ipi-mux.c new file +20 -0
+static void ipi_mux_send_mask(struct irq_data *d, const struct cpumask *mask)
+{
+     u32 ipi_bit = BIT(irqd_to_hwirq(d));
+     struct cpumask pmask = { 0 };
+     unsigned long pending;
+     int cpu;
+
+     for_each_cpu(cpu, mask) {
+             pending = atomic_fetch_or_release(ipi_bit,
+                                     per_cpu_ptr(&ipi_mux_bits, cpu));
+
+             /*
+              * The atomic_fetch_or_release() above must complete before
+              * the atomic_read() below to avoid racing ipi_mux_unmask().
+              */
+             smp_mb__after_atomic();
+
+             if (!(pending & ipi_bit) &&
+                 (atomic_read(per_cpu_ptr(&ipi_mux_enable, cpu)) & ipi_bit))
+                     cpumask_set_cpu(cpu, &pmask);
Quoted 8 lines

kernel/irq/ipi-mux.c line 72

Quoted 5 lines
kernel/irq/ipi-mux.c new file +5 -0
+     }
+
+     /* Trigger the parent IPI */
+     ipi_mux_ops->ipi_mux_send(ipi_mux_parent_virq, ipi_mux_data, &pmask);
+}

Can you shed some light on the reasons why a pending TLB ipi for flushing page3 on CPU2 prevents TLB ipi from being sent to CPU2 for flushing page9.

The "!(pending & ipi_bit)" check in the above "if ()" statement seems to be causing this. I am seeing CPU soft-lockup due to the "!(pending & ipi_bit)" check on a QEMU RISC-V virt machine with large CPUs.

I will quickly send v11 with the check removed.

Thanks,
Anup

author
#15 lore raw

PATCH v9 4/7 RISC-V: Treat IPIs as normal Linux IRQs

In reply to Anup Patel

Currently, the RISC-V kernel provides arch specific hooks (i.e. struct riscv_ipi_ops) to register IPI handling methods. The stats gathering of IPIs is also arch specific in the RISC-V kernel.

Other architectures (such as ARM, ARM64, and MIPS) have moved away from custom arch specific IPI handling methods. Currently, these architectures have Linux irqchip drivers providing a range of Linux IRQ numbers to be used as IPIs and IPI triggering is done using generic IPI APIs. This approach allows architectures to treat IPIs as normal Linux IRQs and IPI stats gathering is done by the generic Linux IRQ subsystem.

We extend the RISC-V IPI handling as-per above approach so that arch specific IPI handling methods (struct riscv_ipi_ops) can be removed and the IPI handling is done through the Linux IRQ subsystem.

---
 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       |  60 ++++++++++++
 arch/riscv/kernel/sbi.c           |  17 ----
 arch/riscv/kernel/smp.c           | 155 +++++++++++++++---------------
 arch/riscv/kernel/smpboot.c       |   5 +-
 drivers/clocksource/timer-clint.c |  42 +++++---
 drivers/irqchip/irq-riscv-intc.c  |  55 +++++------
 12 files changed, 230 insertions(+), 155 deletions(-)
 create mode 100644 arch/riscv/kernel/sbi-ipi.c
arch/riscv/Kconfig +2 -0
index 37d6370d29c3..72e99463cd20 100644
@@ -60,6 +60,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
index 2a0ef738695e..c43f115714a0 100644
@@ -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
index d3443be7eedc..79ed0b73cd4e 100644
@@ -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
index 33bb60a354cd..173497b22e95 100644
@@ -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
index f7a832e3a1d1..39235cf50652 100644
@@ -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
index 96d3171f0ca1..eb9a68a539e6 100644
@@ -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
index fc614650a2e3..e9f04eba0e09 100644
@@ -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
index a752c7b41683..0e41c550d3ff 100644
@@ -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"
@@ -156,12 +155,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 +31 -11

97 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.34.1
author
#16 lore raw

PATCH v9 5/7 RISC-V: Allow marking IPIs as suitable for remote FENCEs

In reply to Anup Patel

To 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
index 79ed0b73cd4e..56976e41a21e 100644
@@ -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
index 0bb070a5dcb4..27fdc394d2f0 100644
@@ -55,6 +55,6 @@ void __init sbi_ipi_init(void)
 		return;
 	}
 
-	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
index e8a20454d65b..74b8cb1a89ab 100644
@@ -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
index ac7c2caaa65a..f418816fd706 100644
@@ -246,7 +246,7 @@ static int __init clint_timer_init_dt(struct device_node *np)
 		goto fail_remove_cpuhp;
 	}
 
-	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
author
#17 lore raw

PATCH v9 6/7 RISC-V: Use IPIs for remote TLB flush when possible

In reply to Anup Patel

If 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
index 37ed760d007c..27a7db8eb2c4 100644
@@ -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
author
#18 lore raw

PATCH v9 7/7 RISC-V: Use IPIs for remote icache flush when possible

In reply to Anup Patel

If 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
index 336c5deea870..45bcf1f635c5 100644
@@ -20,7 +20,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);
@@ -68,7 +68,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.34.1


_______________________________________________
linux-riscv mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/linux-riscv
author
#19 lore raw
In reply to Anup Patel

Hi Marc,

Quoted 70 lines · Anup Patel

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_v9 branch at:
https://github.com/avpatel/linux.git

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

Quoted 8 lines

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

Friendly, ping ?

Regards,
Anup

Quoted 24 lines
 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       |  60 ++++++++
 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 |  42 +++--
 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              | 244 ++++++++++++++++++++++++++++++
 19 files changed, 630 insertions(+), 167 deletions(-)
 create mode 100644 arch/riscv/kernel/sbi-ipi.c
 create mode 100644 kernel/irq/ipi-mux.c
Quoted 3 lines

--
2.34.1

_______________________________________________
linux-riscv mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/linux-riscv