]> git.ipfire.org Git - thirdparty/kernel/stable.git/commitdiff
selftests/watchdog-test: Fix system accidentally reset after watchdog-test
authorLi Zhijian <lizhijian@fujitsu.com>
Tue, 29 Oct 2024 03:13:24 +0000 (11:13 +0800)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Thu, 5 Dec 2024 09:59:29 +0000 (10:59 +0100)
[ Upstream commit dc1308bee1ed03b4d698d77c8bd670d399dcd04d ]

When running watchdog-test with 'make run_tests', the watchdog-test will
be terminated by a timeout signal(SIGTERM) due to the test timemout.

And then, a system reboot would happen due to watchdog not stop. see
the dmesg as below:
```
[ 1367.185172] watchdog: watchdog0: watchdog did not stop!
```

Fix it by registering more signals(including SIGTERM) in watchdog-test,
where its signal handler will stop the watchdog.

After that
 # timeout 1 ./watchdog-test
 Watchdog Ticking Away!
 .
 Stopping watchdog ticks...

Link: https://lore.kernel.org/all/20241029031324.482800-1-lizhijian@fujitsu.com/
Signed-off-by: Li Zhijian <lizhijian@fujitsu.com>
Reviewed-by: Shuah Khan <skhan@linuxfoundation.org>
Signed-off-by: Shuah Khan <skhan@linuxfoundation.org>
Signed-off-by: Sasha Levin <sashal@kernel.org>
tools/testing/selftests/watchdog/watchdog-test.c

index f1c6e025cbe549a3eb2f083aa363080ec2db8126..561bcc253fb3e87e6a19189c166ab336f5273329 100644 (file)
@@ -152,7 +152,13 @@ int main(int argc, char *argv[])
 
        printf("Watchdog Ticking Away!\n");
 
+       /*
+        * Register the signals
+        */
        signal(SIGINT, term);
+       signal(SIGTERM, term);
+       signal(SIGKILL, term);
+       signal(SIGQUIT, term);
 
        while (1) {
                keep_alive();