Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]

Groups > linux.kernel > #1678584 > unrolled thread

[PATCH] powerpc/64s: watchdog false positive warning at CPU unplug

Back to article view | Back to linux.kernel

Contents

  [PATCH] powerpc/64s: watchdog false positive warning at CPU unplug Nicholas Piggin <npiggin@gmail.com> - 2017-06-30 10:10 +0200
    Re: [PATCH] powerpc/64s: watchdog false positive warning at CPU unplug Michael Ellerman <mpe@ellerman.id.au> - 2017-06-30 12:20 +0200

#1678584 — [PATCH] powerpc/64s: watchdog false positive warning at CPU unplug

CPU unplug will call stop_wd_on_cpu regardless if the watchdog has
been configured to be enabled on that CPU. Don't warn in the case
it's not in our enabled mask, this is a valid case.

Fixes: powerpc-64s-implement-arch-specific-hardlockup-watchdog.patch
Reported-by: Santosh Sivaraj <santosiv@in.ibm.com>
Signed-off-by: Nicholas Piggin <npiggin@gmail.com>
---
 arch/powerpc/kernel/watchdog.c | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/arch/powerpc/kernel/watchdog.c b/arch/powerpc/kernel/watchdog.c
index d46040c0da40..93395a53336b 100644
--- a/arch/powerpc/kernel/watchdog.c
+++ b/arch/powerpc/kernel/watchdog.c
@@ -310,10 +310,8 @@ static int start_wd_on_cpu(unsigned int cpu)
 
 static int stop_wd_on_cpu(unsigned int cpu)
 {
-	if (!cpumask_test_cpu(cpu, &wd_cpus_enabled)) {
-		WARN_ON(1);
-		return 0;
-	}
+	if (!cpumask_test_cpu(cpu, &wd_cpus_enabled))
+		return 0; /* Can happen in CPU unplug case */
 
 	stop_watchdog_timer_on(cpu);
 
-- 
2.11.0

[toc] | [next] | [standalone]

#1678659

Nicholas Piggin <npiggin@gmail.com> writes:

> CPU unplug will call stop_wd_on_cpu regardless if the watchdog has
> been configured to be enabled on that CPU. Don't warn in the case
> it's not in our enabled mask, this is a valid case.
>
> Fixes: powerpc-64s-implement-arch-specific-hardlockup-watchdog.patch
> Reported-by: Santosh Sivaraj <santosiv@in.ibm.com>
> Signed-off-by: Nicholas Piggin <npiggin@gmail.com>
> ---
>  arch/powerpc/kernel/watchdog.c | 6 ++----
>  1 file changed, 2 insertions(+), 4 deletions(-)

Acked-by: Michael Ellerman <mpe@ellerman.id.au>

cheers

[toc] | [prev] | [standalone]

Back to top | Article view | linux.kernel

csiph-web