From nobody Fri Jan 20 03:23:48 2023 X-Original-To: dev-commits-src-all@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 4NylFx0mL9z30vg4; Fri, 20 Jan 2023 03:23:49 +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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4NylFw5zYnz3nyb; Fri, 20 Jan 2023 03:23:48 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1674185028; 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=y4bQYe1K6HYfmjsf8H4YyMpUSPfGoGGzzXaDFskeuwk=; b=xiR1iNdEhvbSd+OxbXXhYoldfh6juTjzG7C3EPGp/Y31NAQhmwxI2jaDzBNDEMFiALkT8G RMk/bmCmYfFsVAKzMrlrx8mIx/XXafUtHehbGPc5Fzjn5ahD6SHhT0puiapPVq7jKRXsy2 VkNnsnbZACuOoEM0dWavyhRmWsRIpr2806ibpemMDVS6w0eD+zDarqGOsL1diWAOrUn3rl abxYT57AdMu0UEoE+1LGVTk9TXAAdWWeg8ZQDXo+MMbtKeo9DmCsLa1Th54c95l6o/0jh3 0k01G5uT8+1Byc1YERpMBtoxzaSb8EzJs73g2LF0gcvqDqLE5UiVTrj9cRnd9g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1674185028; 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=y4bQYe1K6HYfmjsf8H4YyMpUSPfGoGGzzXaDFskeuwk=; b=b8a5DPUVwZyqGGNMdza9Z1JBv+unJXdpbOxXSiKSXqQeE4JLLWX/0Xs3Nhi+f+mBUHO8SC u7afnfEMUbL2bigTl3R1eGxBr05AXsnsrFDcEfcYfqBf0iFrfnx3/0eENNn3XnOTcLzBs4 0icbxRCenEUcKwJH5/y0i45j1SY71jZOorsWDzHVd3HCuIMDDy2QDJbvLYyv7ne0sGyq7c jf9XGxA6hPZPSal6vGkhL9dbyqcARdaZLfThZydvmfbSBog3Wb+sOXZCPFMe5xFbJmmSmF yPxApTVFHEsJTki5qfpRtTfDNadyHsh4F4IEkw2H+iny1JvJ1vqYHVoBPgfyzQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1674185028; a=rsa-sha256; cv=none; b=ttMRCaKHLnIetG4qsmvQyzaCOZWCP/5qt9LKW5Ong+QUBkPRHigNUlF9x38ReJB7rpxCKL rbpXAi1Yz3F6kgQ1UAMWHH9SkXyLC+ZeyUaYfwEczuPj6Mc1IU9zqt7n9XRcwGLFTJl2yr W6/XgbmdQ2jbeGv4DmieiOJ2kSXsVBgncWFajiEn0odwO+FrmzSf5wM0VU/f7iTDdZn5Ie /Jq9BfjHpjRaSZWSDggqq88KitULvTWwP/0bgOTwrA09vvECXnghHiZxiHeEqDxSd+njmk 7IYzNtSxTeh8Le4yE4/4rrN+NG4u8YfvOD5VmObcCo+FA3PdSXfQ+fCVIzDScw== 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 4NylFw4g1FzFys; Fri, 20 Jan 2023 03:23:48 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 30K3NmxG042668; Fri, 20 Jan 2023 03:23:48 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 30K3NmvC042667; Fri, 20 Jan 2023 03:23:48 GMT (envelope-from git) Date: Fri, 20 Jan 2023 03:23:48 GMT Message-Id: <202301200323.30K3NmvC042667@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Konstantin Belousov Subject: git: 1610f04c9dac - stable/13 - tools/test/ptrace: update scescx to do remote getpid(2) on each SCX event List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kib X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 1610f04c9daceb5b4f2849e48d0021ecc975bb60 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=1610f04c9daceb5b4f2849e48d0021ecc975bb60 commit 1610f04c9daceb5b4f2849e48d0021ecc975bb60 Author: Konstantin Belousov AuthorDate: 2022-12-02 01:26:13 +0000 Commit: Konstantin Belousov CommitDate: 2023-01-20 03:21:16 +0000 tools/test/ptrace: update scescx to do remote getpid(2) on each SCX event Tested by: pho (cherry picked from commit 6403a140243d4f5377f589f93aeb44fe75ea8d59) --- tools/test/ptrace/scescx.c | 34 ++++++++++++++++++++++++++++++---- 1 file changed, 30 insertions(+), 4 deletions(-) diff --git a/tools/test/ptrace/scescx.c b/tools/test/ptrace/scescx.c index 582d1734427e..8f19f9a55889 100644 --- a/tools/test/ptrace/scescx.c +++ b/tools/test/ptrace/scescx.c @@ -28,6 +28,7 @@ __FBSDID("$FreeBSD$"); #include #include +#include #include #include #include @@ -213,9 +214,13 @@ wait_info(int pid, int status, struct ptrace_lwpinfo *lwpinfo) printf("\n"); } +static int trace_syscalls = 1; +static int remote_getpid = 0; + static int trace_sc(int pid) { + struct ptrace_sc_remote pscr; struct ptrace_lwpinfo lwpinfo; int status; @@ -269,6 +274,24 @@ trace_sc(int pid) wait_info(pid, status, &lwpinfo); assert(lwpinfo.pl_flags & PL_FLAG_SCX); + if (remote_getpid) { + memset(&pscr, 0, sizeof(pscr)); + pscr.pscr_syscall = SYS_getpid; + pscr.pscr_nargs = 0; + if (ptrace(PT_SC_REMOTE, pid, (caddr_t)&pscr, + sizeof(pscr)) < 0) { + perror("PT_SC_REMOTE"); + ptrace(PT_KILL, pid, NULL, 0); + return (-1); + } else { + printf(TRACE "remote getpid %ld errno %d\n", + pscr.pscr_ret.sr_retval[0], pscr.pscr_ret.sr_error); + if (waitpid(pid, &status, 0) == -1) { + perror("waitpid"); + return (-1); + } + } + } if (lwpinfo.pl_flags & PL_FLAG_EXEC) get_pathname(pid); @@ -322,8 +345,6 @@ trace_cont(int pid) return (0); } -static int trace_syscalls = 1; - static int trace(pid_t pid) { @@ -340,12 +361,16 @@ main(int argc, char *argv[]) pid_t pid, pid1; trace_syscalls = 1; + remote_getpid = 0; use_vfork = 0; - while ((c = getopt(argc, argv, "csv")) != -1) { + while ((c = getopt(argc, argv, "crsv")) != -1) { switch (c) { case 'c': trace_syscalls = 0; break; + case 'r': + remote_getpid = 1; + break; case 's': trace_syscalls = 1; break; @@ -354,7 +379,8 @@ main(int argc, char *argv[]) break; default: case '?': - fprintf(stderr, "Usage: %s [-c] [-s] [-v]\n", argv[0]); + fprintf(stderr, "Usage: %s [-c] [-r] [-s] [-v]\n", + argv[0]); return (2); } }