[Devel] [PATCH RHEL7 COMMIT] kernel/sysrq: reset watchdog on all cpus while during sysrq-w

[Konstantin Khorenko]

The commit is pushed to "branch-rh7-3.10.0-327.18.2.vz7.14.x-ovz" and will appear at https://src.openvz.org/scm/ovz/vzkernel.git
after rh7-3.10.0-327.18.2.vz7.14.8
------>
commit 60c21d9f08bf58c4ba891b732e41642fd184b797
Author: Andrey Ryabinin <aryabinin at virtuozzo.com>
Date:   Fri May 27 13:57:56 2016 +0400

    kernel/sysrq: reset watchdog on all cpus while during sysrq-w
    
    Lengthy output of sysrq-w may take a lot of time on slow serial console.
    Currently we reset NMI-watchdog on the current cpu to avoid softlockup,
    however this doesn't work since watchdog might be triggered on the other
    cpu which is waits for proceeding an IPI.
    
    Reset watchdog on all cpus to prevent spurious softlockup messages.
    
    https://jira.sw.ru/browse/PSBM-47486
    
    Signed-off-by: Andrey Ryabinin <aryabinin at virtuozzo.com>
---
 kernel/sched/core.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/kernel/sched/core.c b/kernel/sched/core.c
index 2c147c8..d21ccf0 100644
--- a/kernel/sched/core.c
+++ b/kernel/sched/core.c
@@ -5177,7 +5177,7 @@ void show_state_filter(unsigned long state_filter)
 		 * reset the NMI-timeout, listing all files on a slow
 		 * console might take a lot of time:
 		 */
-		touch_nmi_watchdog();
+		touch_all_softlockup_watchdogs();
 		if (!state_filter || (p->state & state_filter))
 			sched_show_task(p);
 	} while_each_thread(g, p);