diff options
| author | Li Zhijian <lizhijian@cn.fujitsu.com> | 2021-12-17 17:29:55 +0800 |
|---|---|---|
| committer | Shuah Khan <skhan@linuxfoundation.org> | 2022-01-25 13:48:21 -0700 |
| commit | 92d25637a3a45904292c93f1863c6bbda4e3e38f (patch) | |
| tree | c06db92df29335def5fe15f5770dd09303141eb3 | |
| parent | 40d70d4d60974c28054a60316f2aec8810833526 (diff) | |
| download | linux-92d25637a3a45904292c93f1863c6bbda4e3e38f.tar.bz2 | |
kselftest: signal all child processes
We have some many cases that will create child process as well, such as
pidfd_wait. Previously, we will signal/kill the parent process when it
is time out, but this signal will not be sent to its child process. In
such case, if child process doesn't terminate itself, ksefltest framework
will hang forever.
Here we group all its child processes so that kill() can signal all of
them in timeout.
Fixed change log: Shuah Khan <skhan@linuxfoundation.org>
Suggested-by: yang xu <xuyang2018.jy@cn.fujitsu.com>
Signed-off-by: Li Zhijian <lizhijian@cn.fujitsu.com>
Acked-by: Christian Brauner <christian.brauner@ubuntu.com>
Signed-off-by: Shuah Khan <skhan@linuxfoundation.org>
| -rw-r--r-- | tools/testing/selftests/kselftest_harness.h | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/tools/testing/selftests/kselftest_harness.h b/tools/testing/selftests/kselftest_harness.h index 471eaa7b3a3f..11779405dc80 100644 --- a/tools/testing/selftests/kselftest_harness.h +++ b/tools/testing/selftests/kselftest_harness.h @@ -877,7 +877,8 @@ static void __timeout_handler(int sig, siginfo_t *info, void *ucontext) } t->timed_out = true; - kill(t->pid, SIGKILL); + // signal process group + kill(-(t->pid), SIGKILL); } void __wait_for_test(struct __test_metadata *t) @@ -987,6 +988,7 @@ void __run_test(struct __fixture_metadata *f, ksft_print_msg("ERROR SPAWNING TEST CHILD\n"); t->passed = 0; } else if (t->pid == 0) { + setpgrp(); t->fn(t, variant); if (t->skip) _exit(255); |