git: 91ef8c3e1304 - main - stress2: Fix scenario after the changes to ptrace(PT_ATTACH) in commit ecc662c749b1. The traced process now no longer exits immediately at the attach. After a PT_DETACH do not try to wait on a non child process. Style fixes.
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Fri, 16 May 2025 11:07:47 UTC
The branch main has been updated by pho: URL: https://cgit.FreeBSD.org/src/commit/?id=91ef8c3e13046c0fb9a49512f4efe9ee09bd8099 commit 91ef8c3e13046c0fb9a49512f4efe9ee09bd8099 Author: Peter Holm <pho@FreeBSD.org> AuthorDate: 2025-05-16 11:07:14 +0000 Commit: Peter Holm <pho@FreeBSD.org> CommitDate: 2025-05-16 11:07:14 +0000 stress2: Fix scenario after the changes to ptrace(PT_ATTACH) in commit ecc662c749b1. The traced process now no longer exits immediately at the attach. After a PT_DETACH do not try to wait on a non child process. Style fixes. --- tools/test/stress2/misc/vfork.sh | 36 ++++++++++++++---------------------- 1 file changed, 14 insertions(+), 22 deletions(-) diff --git a/tools/test/stress2/misc/vfork.sh b/tools/test/stress2/misc/vfork.sh index 20db95c2b9be..cabc30ebaa6c 100755 --- a/tools/test/stress2/misc/vfork.sh +++ b/tools/test/stress2/misc/vfork.sh @@ -31,6 +31,9 @@ # "panic: failed to set signal flags for ast p ... fl 4" seen. # Fixed in r302999. +# Test scenario updated after commit: +# ecc662c749b1 - main - PT_ATTACH: do not interrupt interruptible sleeps + . ../default.cfg cd /tmp @@ -46,38 +49,32 @@ main(void) fprintf(stderr, "%d\n", getpid()); if ((pid = vfork()) == 0) { -#if 0 - if (ptrace(PT_TRACE_ME, 0, 0, 0) == -1) - err(1, "PT_TRACEME"); -#endif sleep(30); _exit(0); } if (pid == -1) err(1, "vfork"); - - return (0); } EOF -mycc -o vfork1 -Wall -Wextra -g vfork1.c -rm vfork1.c +mycc -o vfork1 -Wall -Wextra -g vfork1.c || exit 1 +rm vfork1.c cat > vfork2.c <<- EOF #include <sys/types.h> +#include <sys/ptrace.h> +#include <sys/resource.h> +#include <sys/time.h> +#include <sys/wait.h> #include <err.h> #include <errno.h> #include <signal.h> #include <stdio.h> #include <stdlib.h> #include <strings.h> -#include <sys/ptrace.h> -#include <sys/resource.h> -#include <sys/time.h> -#include <sys/wait.h> #include <unistd.h> int -main(int argc, char **argv) +main(int argc, char *argv[]) { pid_t pid, rpid; struct rusage ru; @@ -86,6 +83,7 @@ main(int argc, char **argv) if (argc != 2) errx(1, "Usage: %s <pid>", argv[0]); pid = atoi(argv[1]); + status = 0; if (pid == -1) err(1, "fork()"); @@ -99,24 +97,17 @@ main(int argc, char **argv) err(0, "OK wait4"); } if (rpid == 0) { -// fprintf(stderr, "No rusage info.\n"); if (ptrace(PT_DETACH, pid, NULL, 0) == -1) err(1, "ptrace(%d) detach", pid); - if (wait(&status) == -1) - err(1, "wait"); } else { fprintf(stderr, "FAIL Got unexpected rusage.\n"); if (ru.ru_utime.tv_sec != 0) fprintf(stderr, "FAIL tv_sec\n"); } - if (status != 0x4000) - fprintf(stderr, "FAIL Child exit status 0x%x\n", status); - - return (0); } EOF -mycc -o vfork2 -Wall -Wextra -g vfork2.c -rm vfork2.c +mycc -o vfork2 -Wall -Wextra -g vfork2.c || exit 1 +rm vfork2.c ./vfork1 & sleep .2 @@ -127,5 +118,6 @@ childpid=`ps -lx | grep -v grep | grep vfork1 | ./vfork2 $childpid s=$? +pkill vfork1 rm -f vfork1 vfork2 exit $s