Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

watchdog: do not unpark threads in watchdog_park_threads() on error

If kthread_park() returns an error, watchdog_park_threads() should not
blindly 'roll back' the already parked threads to the unparked state.
Instead leave it up to the callers to handle such errors appropriately in
their context. For example, it is redundant to unpark the threads if the
lockup detectors will soon be disabled by the callers anyway.

Signed-off-by: Ulrich Obergfell <uobergfe@redhat.com>
Reviewed-by: Aaron Tomlin <atomlin@redhat.com>
Acked-by: Don Zickus <dzickus@redhat.com>
Cc: Ulrich Obergfell <uobergfe@redhat.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

authored by

Ulrich Obergfell and committed by
Linus Torvalds
ee7fed54 c993590c

+6 -4
+6 -4
kernel/watchdog.c
··· 654 654 655 655 /* 656 656 * park all watchdog threads that are specified in 'watchdog_cpumask' 657 + * 658 + * This function returns an error if kthread_park() of a watchdog thread 659 + * fails. In this situation, the watchdog threads of some CPUs can already 660 + * be parked and the watchdog threads of other CPUs can still be runnable. 661 + * Callers are expected to handle this special condition as appropriate in 662 + * their context. 657 663 */ 658 664 static int watchdog_park_threads(void) 659 665 { ··· 670 664 ret = kthread_park(per_cpu(softlockup_watchdog, cpu)); 671 665 if (ret) 672 666 break; 673 - } 674 - if (ret) { 675 - for_each_watchdog_cpu(cpu) 676 - kthread_unpark(per_cpu(softlockup_watchdog, cpu)); 677 667 } 678 668 put_online_cpus(); 679 669