Skip to contentSkip to conversation

RISC-V: Enable the IPI before workqueue_online_cpu()

PATCH Superseded Nick Hu 2 participants 3 messages Jul 16, 2024 – Jul 17, 2024

Subsystems (2)

v1 of 2 Superseded Latest is v2 →

lore
Share & tools
lore

Nick Hu

author
#0 lore raw

PATCH 1/1 RISC-V: Enable the IPI before workqueue_online_cpu()

Sometimes the hotplug cpu stalls at the arch_cpu_idle() for a while after workqueue_online_cpu(). When cpu stalls at the idle loop, the reschedule IPI is pending. However the enable bit is not enabled yet so the cpu stalls at WFI until watchdog timeout. Therefore enable the IPI before the workqueue_online_cpu() to fix the issue.

Fixes 63c5484e7495 ("workqueue: Add multiple affinity scopes and interface to select them")
---
 arch/riscv/kernel/sbi-ipi.c | 2 +-
 include/linux/cpuhotplug.h  | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)
arch/riscv/kernel/sbi-ipi.c +1 -1
index 1026e22955cc..e05e68de8871 100644
@@ -71,7 +71,7 @@ void __init sbi_ipi_init(void)
 	 * the masking/unmasking of virtual IPIs is done
 	 * via generic IPI-Mux
 	 */
-	cpuhp_setup_state(CPUHP_AP_ONLINE_DYN,
+	cpuhp_setup_state(CPUHP_AP_IRQ_RISCV_SWINT_STARTING,
 			  "irqchip/sbi-ipi:starting",
 			  sbi_ipi_starting_cpu, NULL);
 
include/linux/cpuhotplug.h +1 -0
index 7a5785f405b6..57dcf1229b27 100644
@@ -147,6 +147,7 @@ enum cpuhp_state {
 	CPUHP_AP_IRQ_LOONGARCH_STARTING,
 	CPUHP_AP_IRQ_SIFIVE_PLIC_STARTING,
 	CPUHP_AP_IRQ_RISCV_IMSIC_STARTING,
+	CPUHP_AP_IRQ_RISCV_SWINT_STARTING,
 	CPUHP_AP_ARM_MVEBU_COHERENCY,
 	CPUHP_AP_PERF_X86_AMD_UNCORE_STARTING,
 	CPUHP_AP_PERF_X86_STARTING,
Signature · 1 line
2.34.1
#1 lore raw
Quoted 32 lines · Nick Hu

Sometimes the hotplug cpu stalls at the arch_cpu_idle() for a while after workqueue_online_cpu(). When cpu stalls at the idle loop, the reschedule IPI is pending. However the enable bit is not enabled yet so the cpu stalls at WFI until watchdog timeout. Therefore enable the IPI before the workqueue_online_cpu() to fix the issue.

Fixes 63c5484e7495 ("workqueue: Add multiple affinity scopes and interface to select them")
---
 arch/riscv/kernel/sbi-ipi.c | 2 +-
 include/linux/cpuhotplug.h  | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)
arch/riscv/kernel/sbi-ipi.c +1 -1
index 1026e22955cc..e05e68de8871 100644
@@ -71,7 +71,7 @@ void __init sbi_ipi_init(void)
         * the masking/unmasking of virtual IPIs is done
         * via generic IPI-Mux
         */
-       cpuhp_setup_state(CPUHP_AP_ONLINE_DYN,
+       cpuhp_setup_state(CPUHP_AP_IRQ_RISCV_SWINT_STARTING,
                          "irqchip/sbi-ipi:starting",
                          sbi_ipi_starting_cpu, NULL);
 
include/linux/cpuhotplug.h +0 -0
index 7a5785f405b6..57dcf1229b27 100644

include/linux/cpuhotplug.h enum cpuhp_state { · line 150

Quoted 4 lines
include/linux/cpuhotplug.h +1 -0
@@ -147,6 +147,7 @@ enum cpuhp_state {
        CPUHP_AP_IRQ_LOONGARCH_STARTING,
        CPUHP_AP_IRQ_SIFIVE_PLIC_STARTING,
        CPUHP_AP_IRQ_RISCV_IMSIC_STARTING,
+       CPUHP_AP_IRQ_RISCV_SWINT_STARTING,

This is a misleading name.

I suggest s/_RISCV_SWINT_/_RISCV_SBI_IPI_/ .

Quoted 6 lines
include/linux/cpuhotplug.h +0 -1
        CPUHP_AP_ARM_MVEBU_COHERENCY,
        CPUHP_AP_PERF_X86_AMD_UNCORE_STARTING,
        CPUHP_AP_PERF_X86_STARTING,
--

2.34.1

Regards,
Anup

author
#2 lore raw

Hi Anup

Quoted 41 lines · Anup Patel
Quoted 32 lines · Nick Hu

Sometimes the hotplug cpu stalls at the arch_cpu_idle() for a while after workqueue_online_cpu(). When cpu stalls at the idle loop, the reschedule IPI is pending. However the enable bit is not enabled yet so the cpu stalls at WFI until watchdog timeout. Therefore enable the IPI before the workqueue_online_cpu() to fix the issue.

Fixes 63c5484e7495 ("workqueue: Add multiple affinity scopes and interface to select them")
---
 arch/riscv/kernel/sbi-ipi.c | 2 +-
 include/linux/cpuhotplug.h  | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)
arch/riscv/kernel/sbi-ipi.c +1 -1
index 1026e22955cc..e05e68de8871 100644
@@ -71,7 +71,7 @@ void __init sbi_ipi_init(void)
         * the masking/unmasking of virtual IPIs is done
         * via generic IPI-Mux
         */
-       cpuhp_setup_state(CPUHP_AP_ONLINE_DYN,
+       cpuhp_setup_state(CPUHP_AP_IRQ_RISCV_SWINT_STARTING,
                          "irqchip/sbi-ipi:starting",
                          sbi_ipi_starting_cpu, NULL);
 
include/linux/cpuhotplug.h +0 -0
index 7a5785f405b6..57dcf1229b27 100644

include/linux/cpuhotplug.h enum cpuhp_state { · line 150

Quoted 4 lines
include/linux/cpuhotplug.h +1 -0
@@ -147,6 +147,7 @@ enum cpuhp_state {
        CPUHP_AP_IRQ_LOONGARCH_STARTING,
        CPUHP_AP_IRQ_SIFIVE_PLIC_STARTING,
        CPUHP_AP_IRQ_RISCV_IMSIC_STARTING,
+       CPUHP_AP_IRQ_RISCV_SWINT_STARTING,

This is a misleading name.

Quoted 2 lines

I suggest s/_RISCV_SWINT_/_RISCV_SBI_IPI_/ .

Good point.
I'll update it in the next version.
Thank you for the feedback.

Quoted 9 lines
Quoted 6 lines
include/linux/cpuhotplug.h +0 -1
       CPUHP_AP_ARM_MVEBU_COHERENCY,
        CPUHP_AP_PERF_X86_AMD_UNCORE_STARTING,
        CPUHP_AP_PERF_X86_STARTING,
--

2.34.1

Regards,
Anup

Regards,
Nick