From nobody Fri Sep 20 11:53:21 2024 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 4X99kp0xmkz5WhKp; Fri, 20 Sep 2024 11:53:22 +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 4X99kn5vlwz4qS9; Fri, 20 Sep 2024 11:53:21 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1726833201; 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=uz0OA4IZm3HYhwdPgBL0QUVo+goi0sjkETeA3WPduJY=; b=pTyzBT9NIVYA5HsthQUuNGAR+VYSfM7BzOfX1bKRkkqDO6x0kz/m1NZ/r/4wrcVor79eAh vQHj0j1wwN72jZrrech3125dx1OnQUnYpjNF1yS9BIWE6iz5/f8wtTd4jsjXf5E4sDHtz7 oDIoP72BbZLbvvTK9k0ect4zM5+12E9moCyYRbThSbd1NDK+OTZIpEBe1NkIy645pnBLK1 CTXk10j4KKATf40iWp7lHEMef3VB8cErD7JY9Wm6rlKhykeZU4gVPBY5dQMrsXwsJ2YGAi f35fPQH+nytGDHVLUAxHngYhuRviBdORQ4JkTA3qofi+V+dMl15h37bk3kbq8Q== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1726833201; a=rsa-sha256; cv=none; b=SNcFkchr4S4h4f3w90cRLLOkc9t070Cbl/2yEJxsdbDVqJ1iA3GzmxK0XS5ygsaCQo0dAR hwYNpvFvjBtFyCAF6W6e17hDSK+FgmLn3p1HrCMbrvKhnVSYKwC1QAsseyPpUaK07xnBNV IKzFif9PFUPX2pzoYgdMrs8h7VSZblqSgByLw7B6OemE2hU9FaMo6ib4mZ1e6mx7P1BB67 yASP+apPOXhbw/kkE5O69c2FH9lnL82nQbO21U5qkv0vUp+nluMsiGRzJBnBlYyIV87OhM gSY9w55PJjGmwI6J38Erat2t7U5io42+hSLut43R3dp1CFgl/o74gup9C8MaZw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1726833201; 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=uz0OA4IZm3HYhwdPgBL0QUVo+goi0sjkETeA3WPduJY=; b=UEVt0EP3Dl9nSZXk3WAD9tl5ZSdJbNRIJanpp7QQzduMt70IhzIeYlI1TeSeJpujaaG8qz WBupVFkYShfwO2gjpoW4nZv14mMFYyjKUKcN9JYVJMOsYrU0fjgi9UJaPPLqAguYdoZB2n Np+w2IAMMtOrSELiyUi7w5hCYs4ct5A2TgAVASEpS9YT+KTsU5iM44S4mQlZ4BxVgxTCn/ b/7pCBu/hVwQX+x0DM0I+LrO+HZPHARwMjNjUaeF9ku12duxWonzx4rDS5xWGeROmrKDVz Wa6zI7jORalTZga/Cc/RemQJnLwAgBqIcr0AuEN/ldCRSXhUInMb45ZHE6SPdw== 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 4X99kn5CbxzpHb; Fri, 20 Sep 2024 11:53:21 +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 48KBrLk2037418; Fri, 20 Sep 2024 11:53:21 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 48KBrLaf037415; Fri, 20 Sep 2024 11:53:21 GMT (envelope-from git) Date: Fri, 20 Sep 2024 11:53:21 GMT Message-Id: <202409201153.48KBrLaf037415@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Mark Johnston Subject: git: 283bf3b4b105 - main - socket: Only log splice structs to ktrace if KTR_STRUCT is configured 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: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: markj X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 283bf3b4b105ad24e919444ab0e21f3296891283 Auto-Submitted: auto-generated The branch main has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=283bf3b4b105ad24e919444ab0e21f3296891283 commit 283bf3b4b105ad24e919444ab0e21f3296891283 Author: Mark Johnston AuthorDate: 2024-09-20 11:40:31 +0000 Commit: Mark Johnston CommitDate: 2024-09-20 11:40:31 +0000 socket: Only log splice structs to ktrace if KTR_STRUCT is configured Fixes: a1da7dc1cdad ("socket: Implement SO_SPLICE") --- sys/kern/uipc_socket.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/sys/kern/uipc_socket.c b/sys/kern/uipc_socket.c index fb3dc4dfc224..e83422e3a29f 100644 --- a/sys/kern/uipc_socket.c +++ b/sys/kern/uipc_socket.c @@ -3955,7 +3955,8 @@ sosetopt(struct socket *so, struct sockopt *sopt) if (error) goto bad; #ifdef KTRACE - ktrsplice(&splice); + if (KTRPOINT(curthread, KTR_STRUCT)) + ktrsplice(&splice); #endif error = splice_init();