From nobody Thu Dec 22 22:10:58 2022 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 4NdPdt47ttz1J20G; Thu, 22 Dec 2022 22:10:58 +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 4NdPdt204wz3jt3; Thu, 22 Dec 2022 22:10:58 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1671747058; 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=7foeMQlgECZmzQ5o7EDrA1QwNlaBqxwn6oXJ4z0qZBY=; b=VVm/HmZha/q7RppYWWQOCvvGPJq7hteF4aPFp7h6y0971xJr021VrErzRR0ZeMxnNhvx7b d4Nz9mDnbCiDdQf55dhzv8QklZX8De6ePbAFLqoH6cYrj6f+CjnGrsKZzeRSe7fUJFvNcc MCuIt8jIR2KhCQ4bu3yUBDuTHLnuW4jzD+EFzV7olnW2Ijy/Vb/BwyYhiiy+xDLtjwtTrU ttspfryxQsMC+KAm7pSoI8E65Y6PBvxA238CiWzM+BKs1wu4dDJnZcecsYtQrebxtWw1Uw B9KxHgGXYFJinVENRGWUikHd2aJKInmzuj41dCMYCYZOh8dU6BcN7M5Ftv79xg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1671747058; 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=7foeMQlgECZmzQ5o7EDrA1QwNlaBqxwn6oXJ4z0qZBY=; b=CJvAd6fHt1LzvztmISif/oV+lASOBdTaptam1OSyY+V2DMlFF0vAsZrWuK+aL4wVdLd/8n 3SDzH/vGdvtX0NPW5S60MfmQoMnESOLRpbCmzJh/SUfBtZZLL5PLCIPEqfBp97jQv7Yphg vhioU5a93xCspr1lHUdy0yMwE4GVSQIKTT/VuDFfAWxHBbD8lzIUtanD95UrGWN8F0cYva oKIgAQ4Z+xmJDn3frZkAChDpuUmBVwNjkNRNXDnjNE7YgKT62WjsP2tFkiSP6vdjt9tCTy FeJzOpTOK7fh6RgMgaV+7e1MsVMdRBWEv3zjX/pMfy7OrsFFNdbUtgE7MIvfEA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1671747058; a=rsa-sha256; cv=none; b=hPMwjldNhYab68EESGOqrIXyX5f34gqvPhd+HlNXAzKGAtobuJFS1z65kWTPANo+nFlELr tyhekOu8eTqp4uWoaakZzl0IipTkK6IhlRhhH2PiV7qoeits8FO2i3nhGgIlnoDavwLhrr QrHT/Jh/a1luj9O8Y2fVfBT9IHv7yRUi2//FZbHHw6O78zI8MfODPjRxmUcC+b4jnnPGUa ambcKZisW6AR0DHdIvOec9RNEvu+TfEbqgS0FQF/CDY6vOUq5wXKqOZOqxdFCyg8slkbIP +eIeUEF/7le3vMoUnOjj1qtMLybdHaf43Zp6GNQnqR1tU5JyZo0/JXQS5K73+g== 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 4NdPdt15ztz196s; Thu, 22 Dec 2022 22:10:58 +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 2BMMAwel039032; Thu, 22 Dec 2022 22:10:58 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 2BMMAwnM039031; Thu, 22 Dec 2022 22:10:58 GMT (envelope-from git) Date: Thu, 22 Dec 2022 22:10:58 GMT Message-Id: <202212222210.2BMMAwnM039031@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Konstantin Belousov Subject: git: 6403a140243d - main - 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/main X-Git-Reftype: branch X-Git-Commit: 6403a140243d4f5377f589f93aeb44fe75ea8d59 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=6403a140243d4f5377f589f93aeb44fe75ea8d59 commit 6403a140243d4f5377f589f93aeb44fe75ea8d59 Author: Konstantin Belousov AuthorDate: 2022-12-02 01:26:13 +0000 Commit: Konstantin Belousov CommitDate: 2022-12-22 21:32:09 +0000 tools/test/ptrace: update scescx to do remote getpid(2) on each SCX event Reviewed by: markj Sponsored by: The FreeBSD Foundation MFC after: 1 week Differential revision: https://reviews.freebsd.org/D37590 --- 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); } }