From nobody Fri May 16 11:07:47 2025 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4ZzPSN4v4Zz5wVSx; Fri, 16 May 2025 11:07:48 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4ZzPSN0jt8z3WQq; Fri, 16 May 2025 11:07:48 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1747393668; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=HxViMs7h0YhoMUmDlBHl2Ef07jJSkIchdey4MiaIEII=; b=EDc0339vho6jTZLe7IpBmXFFjQxV2COU51CxjP0zZoBdfPxKpx6brqUqoxF4aHqHtwnat1 RnsB96YA3jk+U8ZDfRniP05lybj6/Z5jCz8qjuUBWpxxejo0Qj/DbGUQfz5um3nyf3F7lZ jDRprPyxhPzBgQoqbwPx1xhETLnhdGu9xkYRWTO30j8oFQqHDFAKooOvm0moE1MrPy4l3D qkrgaQrZUXuXWR7759KwXZkyf9+okEtIPX73J9DTsIcqYBDazPYkihJTvw99c5kdRJcIt0 2bTg7QRWGbIb+PZS3gNvdAwE7ai7e1b8dFbtZyz02EkjcXOSG6KMQuCOpAz81A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1747393668; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=HxViMs7h0YhoMUmDlBHl2Ef07jJSkIchdey4MiaIEII=; b=fWE31XCGaoK4SajCy7BRnoB4IC33hVz2Gi03/M0thEaCjVl2WwAP6bhnV+HzYrz50QFyGm MBq3vaC4+KB05NPnU+9D8c0dvEkQ/00qD5zEXINU2HDkLGaoGebQrHsFRf/EzN40alQWKQ WnY8uQO/cTQzV8ipj3oyJ1Ogn0mtRtxtJgcYkxZey7cvsPJjPc7XWwNo+Faej2wAZMPVwp dYN6sgQxzozPlaHIdIPb4deAjWG25MDqbyIJpPcQqFsSTVwZY4GYNDEgnaU/UUHp4IMuiz jzh98abXIqFMr5iyExKKRGQzVw/my/3mxHg13M1eK/xehuvuX3ed2gmLZYDY0w== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1747393668; a=rsa-sha256; cv=none; b=dhxomVnhaexZGUCMgKr7tDGpB2TbUt1K4aQdYl8+Tk3qBz6eu2JePDUz57GZqrNBROrVz/ cEDAiBU7va29ro5dVavN+WQvynX5lx7iYdZkxjEXkm5SYsZ2uvUZDKkN/yP5/5GgU+th5C OdOf9bMT4JDpxyPOIxJmzjIG+5g2spuYg5Kvy4N8jgEYGiK2qwsDnX6fToJCSaTzjI4tTJ jYilFvYfFMeUOURaEKcg3lztHSjFZFYHGVESwodTDGGidJdC4IZth3rxaSrorDKv+36jr/ /vbZvL9AeyDuQE4vWVGmc8aydxNbe+6tnWBGKbEO8rOgOd7W8zjFt15YB5S5Nw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4ZzPSN0K7kz10qH; Fri, 16 May 2025 11:07:48 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 54GB7lKK085264; Fri, 16 May 2025 11:07:47 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 54GB7l0d085261; Fri, 16 May 2025 11:07:47 GMT (envelope-from git) Date: Fri, 16 May 2025 11:07:47 GMT Message-Id: <202505161107.54GB7l0d085261@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Peter Holm Subject: 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. List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: pho X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 91ef8c3e13046c0fb9a49512f4efe9ee09bd8099 Auto-Submitted: auto-generated The branch main has been updated by pho: URL: https://cgit.FreeBSD.org/src/commit/?id=91ef8c3e13046c0fb9a49512f4efe9ee09bd8099 commit 91ef8c3e13046c0fb9a49512f4efe9ee09bd8099 Author: Peter Holm AuthorDate: 2025-05-16 11:07:14 +0000 Commit: Peter Holm 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 +#include +#include +#include +#include #include #include #include #include #include #include -#include -#include -#include -#include #include 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 ", 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