The NMI IPI timeout logic is broken, if __smp_send_nmi_ipi times out
on the first condition, delay_us will be zero which will send it into
the second spin loop with no timeout so it will spin forever.

Fixes: 5b73151fff63 ("powerpc: NMI IPI make NMI IPIs fully sychronous")
Signed-off-by: Nicholas Piggin <[email protected]>
---
 arch/powerpc/kernel/smp.c | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/arch/powerpc/kernel/smp.c b/arch/powerpc/kernel/smp.c
index 3f15edf25a0d..137196a4248b 100644
--- a/arch/powerpc/kernel/smp.c
+++ b/arch/powerpc/kernel/smp.c
@@ -519,7 +519,7 @@ int __smp_send_nmi_ipi(int cpu, void (*fn)(struct pt_regs 
*), u64 delay_us, bool
                if (delay_us) {
                        delay_us--;
                        if (!delay_us)
-                               break;
+                               goto timeout;
                }
        }
 
@@ -530,10 +530,11 @@ int __smp_send_nmi_ipi(int cpu, void (*fn)(struct pt_regs 
*), u64 delay_us, bool
                if (delay_us) {
                        delay_us--;
                        if (!delay_us)
-                               break;
+                               goto timeout;
                }
        }
 
+timeout:
        if (!cpumask_empty(&nmi_ipi_pending_mask)) {
                /* Timeout waiting for CPUs to call smp_handle_nmi_ipi */
                ret = 0;
-- 
2.19.2

Reply via email to