From nobody Sun May 14 21:24:02 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 4QKFql1dmxz499mr; Sun, 14 May 2023 21:24:03 +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 4QKFql17Ltz3w9m; Sun, 14 May 2023 21:24:03 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1684099443; 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=z3fnXm6pslNAGx1mxv3nTxvCWJ7lp+7XPsKWCxFkpxk=; b=bonQoL1f137QAgQr7i2JVY754f+PhykpWBE9a34PyrW/d6Z2FVjHpvwgVOAaSgdVZ/Kow3 DeNgXisGSQVyCvSJxmFn+/62XdYwamQrgXDop6ORyMAOHvOVmrW7WwvEXnFamng8pLTbcJ hkzEpyLmLfjZzeMtIv1ZV5cYvC6toJ+Ju9FI4aU/NWZD2+THfQ/Svm1pZRsTHOQidPRFf6 X3FQaPO813G7qtrgB0OljsK4WF7Ii1DS6WG/QybWPxI97bJI36RHYuc2neJN8dj2J+OQEs O4Cf1SKHZfaL2l21eV31YFZUyeSI8g+yUn0cWmDDv+VM2kQNBcfaN/5de/pteQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1684099443; 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=z3fnXm6pslNAGx1mxv3nTxvCWJ7lp+7XPsKWCxFkpxk=; b=wPNOjyxaZFuKPBmVWOc3UC0yVs3ybvZVvU4QL4p8EMpdDu2jNdzjlKEw7A5Hvzw57IPSjg HSLC6yODR0qi/3z1Jevuq+BqnvD95GYtriSfvBkETwmC7oYvnyP+RjfyiEBb6FApdAjDTL bsWyuqt7DTbNoutlw+PVjGKxVpAyzE3azRDER/jDQ3++TzBKTsbHbkeuuLV1mvSAH1EAUS Yu6y2wiVQknRoVS3X638rJ6cmlScltk+9RsbQ+vNP+dK2rTw8pn0QG4qnUXP+uHoWbMmGk e/DvV0ulNlJ/ILSkf3a9IbH9uhzWY/pYmz2equgfOWYO6pzt/9o2t4MzZ00GVw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1684099443; a=rsa-sha256; cv=none; b=o1kwXidsixPUFSvEDOMNX3AZVmTCWsVCO54Hu5uhfCiW1BKGpUcBJ/A06bLnUx46Sdq7Be sKDAVh2EGEr3LEReXM6EGqvRtI8SSy5gFR8B2C6qh1gGuPOKdffBMwAzzmqAvFhu/c5XHs f3x764qic0sIViB9qEZr4mOyewh59Xk6hg2Q76QzZniaQMCtpBzR3xyfcIfJqNdHgqFzEy nuatfz522rqoXlUvXClQSQau7OnYKDQhTGqkNmk40rzNIxat2w1wQIEScjp1Q+nLg8hqpd nmUXzA4ikLmup/LcDNL8Ql/j2O7pT2TGDgT4XHUoI7BmRVrBszvSX2KZSbeTxQ== 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 4QKFql09LHzFQB; Sun, 14 May 2023 21:24:03 +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 34ELO25f063676; Sun, 14 May 2023 21:24:02 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 34ELO2jM063675; Sun, 14 May 2023 21:24:02 GMT (envelope-from git) Date: Sun, 14 May 2023 21:24:02 GMT Message-Id: <202305142124.34ELO2jM063675@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Dmitry Chagin Subject: git: ae6ac58745b5 - main - ktrace: Fix syscall number on a child return path from fork 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: dchagin X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: ae6ac58745b58c0a3424b3714be1205821d93c51 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by dchagin: URL: https://cgit.FreeBSD.org/src/commit/?id=ae6ac58745b58c0a3424b3714be1205821d93c51 commit ae6ac58745b58c0a3424b3714be1205821d93c51 Author: Dmitry Chagin AuthorDate: 2023-05-14 21:23:50 +0000 Commit: Dmitry Chagin CommitDate: 2023-05-14 21:23:50 +0000 ktrace: Fix syscall number on a child return path from fork Reviewed by: kib Differential Revision: https://reviews.freebsd.org/D40078 MFC after 1 week --- sys/kern/kern_fork.c | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/sys/kern/kern_fork.c b/sys/kern/kern_fork.c index 87c14670ae10..ca2357edbe36 100644 --- a/sys/kern/kern_fork.c +++ b/sys/kern/kern_fork.c @@ -1125,6 +1125,9 @@ fork_exit(void (*callout)(void *, struct trapframe *), void *arg, void fork_return(struct thread *td, struct trapframe *frame) { +#ifdef KTRACE + struct syscall_args *sa; +#endif struct proc *p; p = td->td_proc; @@ -1167,8 +1170,10 @@ fork_return(struct thread *td, struct trapframe *frame) userret(td, frame); #ifdef KTRACE - if (KTRPOINT(td, KTR_SYSRET)) - ktrsysret(SYS_fork, 0, 0); + if (KTRPOINT(td, KTR_SYSRET)) { + sa = &td->td_sa; + ktrsysret(sa->code, 0, 0); + } #endif }