iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix Kselftests timeout and race condition

Browse Source 
-----BEGIN PGP SIGNATURE-----
 
 iIYEABYKAC4WIQSVyBthFV4iTW/VU1/l49DojIL20gUCZoaS3BAcbWljQGRpZ2lr
 b2QubmV0AAoJEOXj0OiMgvbSCq4A/0yPPeNTsq0mio4mq1cvCCq5C5HcDOEjqAc/
 80qeUvb/AQCaV4dETTRSgHWQw3PNdsFBkZrqjWByakaLep5ZTPqOCQ==
 =0QIq
 -----END PGP SIGNATURE-----

Merge tag 'kselftest-fix-2024-07-04' of git://git.kernel.org/pub/scm/linux/kernel/git/mic/linux

Pull Kselftest fix from Mickaël Salaün:
 "Fix Kselftests timeout.

  We can't use CLONE_VFORK, since that blocks the parent - and thus the
  timeout handling - until the child exits or execve's.

  Go back to using plain fork()"

* tag 'kselftest-fix-2024-07-04' of git://git.kernel.org/pub/scm/linux/kernel/git/mic/linux:
  selftests/harness: Fix tests timeout and race condition
This commit is contained in:
Linus Torvalds 2024-07-04 09:29:42 -07:00
commit 4d85acef10
1 changed files with 24 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

43
tools/testing/selftests/kselftest_harness.h
View File

@ -66,8 +66,6 @@
#include <sys/wait.h> #include <sys/wait.h>
#include <unistd.h> #include <unistd.h>
#include <setjmp.h> #include <setjmp.h>
#include <syscall.h>
#include <linux/sched.h>
#include "kselftest.h" #include "kselftest.h"
@ -82,17 +80,6 @@
# define TH_LOG_ENABLED 1 # define TH_LOG_ENABLED 1
#endif #endif
/* Wait for the child process to end but without sharing memory mapping. */
static inline pid_t clone3_vfork(void)
{
struct clone_args args = {
.flags = CLONE_VFORK,
.exit_signal = SIGCHLD,
};
return syscall(__NR_clone3, &args, sizeof(args));
}
/** /**
* TH_LOG() * TH_LOG()
* *
@ -437,7 +424,7 @@ static inline pid_t clone3_vfork(void)
} \ } \
if (setjmp(_metadata->env) == 0) { \ if (setjmp(_metadata->env) == 0) { \
/* _metadata and potentially self are shared with all forks. */ \ /* _metadata and potentially self are shared with all forks. */ \
child = clone3_vfork(); \ child = fork(); \
if (child == 0) { \ if (child == 0) { \
fixture_name##_setup(_metadata, self, variant->data); \ fixture_name##_setup(_metadata, self, variant->data); \
/* Let setup failure terminate early. */ \ /* Let setup failure terminate early. */ \
@ -1016,7 +1003,14 @@ void __wait_for_test(struct __test_metadata *t)
.sa_flags = SA_SIGINFO, .sa_flags = SA_SIGINFO,
}; };
struct sigaction saved_action; struct sigaction saved_action;
int status; /*
* Sets status so that WIFEXITED(status) returns true and
* WEXITSTATUS(status) returns KSFT_FAIL. This safe default value
* should never be evaluated because of the waitpid(2) check and
* SIGALRM handling.
*/
int status = KSFT_FAIL << 8;
int child;
if (sigaction(SIGALRM, &action, &saved_action)) { if (sigaction(SIGALRM, &action, &saved_action)) {
t->exit_code = KSFT_FAIL; t->exit_code = KSFT_FAIL;
@ -1028,7 +1022,15 @@ void __wait_for_test(struct __test_metadata *t)
__active_test = t; __active_test = t;
t->timed_out = false; t->timed_out = false;
alarm(t->timeout); alarm(t->timeout);
waitpid(t->pid, &status, 0); child = waitpid(t->pid, &status, 0);
if (child == -1 && errno != EINTR) {
t->exit_code = KSFT_FAIL;
fprintf(TH_LOG_STREAM,
"# %s: Failed to wait for PID %d (errno: %d)\n",
t->name, t->pid, errno);
return;
}
alarm(0); alarm(0);
if (sigaction(SIGALRM, &saved_action, NULL)) { if (sigaction(SIGALRM, &saved_action, NULL)) {
t->exit_code = KSFT_FAIL; t->exit_code = KSFT_FAIL;
@ -1083,6 +1085,7 @@ void __wait_for_test(struct __test_metadata *t)
WTERMSIG(status)); WTERMSIG(status));
} }
} else { } else {
t->exit_code = KSFT_FAIL;
fprintf(TH_LOG_STREAM, fprintf(TH_LOG_STREAM,
"# %s: Test ended in some other way [%u]\n", "# %s: Test ended in some other way [%u]\n",
t->name, t->name,
@ -1218,6 +1221,7 @@ void __run_test(struct __fixture_metadata *f,
struct __test_xfail *xfail; struct __test_xfail *xfail;
char test_name[1024]; char test_name[1024];
const char *diagnostic; const char *diagnostic;
int child;
/* reset test struct */ /* reset test struct */
t->exit_code = KSFT_PASS; t->exit_code = KSFT_PASS;
@ -1236,15 +1240,16 @@ void __run_test(struct __fixture_metadata *f,
fflush(stdout); fflush(stdout);
fflush(stderr); fflush(stderr);
t->pid = clone3_vfork(); child = fork();
if (t->pid < 0) { if (child < 0) {
ksft_print_msg("ERROR SPAWNING TEST CHILD\n"); ksft_print_msg("ERROR SPAWNING TEST CHILD\n");
t->exit_code = KSFT_FAIL; t->exit_code = KSFT_FAIL;
} else if (t->pid == 0) { } else if (child == 0) {
setpgrp(); setpgrp();
t->fn(t, variant); t->fn(t, variant);
_exit(t->exit_code); _exit(t->exit_code);
} else { } else {
t->pid = child;
__wait_for_test(t); __wait_for_test(t);
} }
ksft_print_msg(" %4s %s\n", ksft_print_msg(" %4s %s\n",