From nobody Thu Oct 17 16:16:41 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 4XTtJB24S6z5ZB37; Thu, 17 Oct 2024 16:16:42 +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 4XTtJB04h8z430G; Thu, 17 Oct 2024 16:16:42 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1729181802; 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=KvopPzgPIEIja1n+fsMA5uL7BtFsB+zOlwK4FCUw1hY=; b=o4cfHQVGjwh1VcEzvJNzzO3MkFYhSGV6EVghmV7h1qpHStn3/486ClKM1CS4v+pOyUSG35 BpUfjvZaUzjgSqNcShliQ7jcl46rrrzcOhjfKsPXyC6V0lRrV/dZps04b0xGuWZTYG7myj 7IxnOoDb9lpiY/+ReGO2IAE3ef9BE2nYJUDE17BkzJW0SuUibzxljcv4yD0QvOKGgnzuKF Di2M1Gz1IYVVYrclKkad2LbS1haJtocgbfEWo6rwx3ckT36TdvzBgL16JpHomj64K/89j7 W204BbOLp8KZeAw5s1QDwC32H4JwFx0IF9xqd2Xx1nctl529b/K2X8bNQ02xIA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1729181802; 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=KvopPzgPIEIja1n+fsMA5uL7BtFsB+zOlwK4FCUw1hY=; b=HtE1GhfdcKG5+2fcwaCSbdsFPCOGeepDC+49Q2aqJHTMOLILmcMtarA4W9rKdqon1jZGg0 f0a6elFLZcnPnBJ+dibMSqmcELM1u49c8CCdivzHNDU6mQf7baLwo7Ty1m+d8GMahVRSol PukMrNFwj30sjtkISVXBkzpyQ5WfIVYoVTDwBcXw1+jYt34Kwsb7SC8ULPSQgR59F10pqL XxkA9l+CKBejQxXfAb1vOcBN84p+tX8IIKPGmY1sCkw5AJpFycjncXZHzOallsRaUeopXb KKyEnNBk/u/pLGgRQHi1vveZqBLB8+Qh44K8DGg6F106Wk2FIznc4+2PMQvZ0g== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1729181802; a=rsa-sha256; cv=none; b=EDZNw1SmZwSPHd4hczYk4awPWaMbhWz+oDWkYOIko+8WDQhdpI1YhjJfju/7Gx+33+CVzD LjVsYqws5swcT2ygeSURyOoEazbrDYBTKfCHiF3KWi6/wjZVhJtr4qiVyO75xY7CFGu1Gy BIUZAwX17MWXgqTKaBffPs1RYrbNSjD8sjU2EqLuGRzz0D5h++uprrdvJWM7272FeNbJvu teknUK5EsSBkIAT5VzHIxTmaUti0h92LqnMvnap3CxMZMFhJsu/yTtlHscechUPOhWOqpT Dk15MfJp49O8lXji3bVUToPgKPLBRpdnp+nBuu1a5tXxvYGn7EucjvSUMBQabw== 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 4XTtJ96kjKzw6H; Thu, 17 Oct 2024 16:16:41 +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 49HGGfKa099384; Thu, 17 Oct 2024 16:16:41 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 49HGGfpa099381; Thu, 17 Oct 2024 16:16:41 GMT (envelope-from git) Date: Thu, 17 Oct 2024 16:16:41 GMT Message-Id: <202410171616.49HGGfpa099381@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Mark Johnston Subject: git: 4601b3e04d5e - stable/14 - 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/stable/14 X-Git-Reftype: branch X-Git-Commit: 4601b3e04d5e30fa6c4432feeb2cb09a597cf763 Auto-Submitted: auto-generated The branch stable/14 has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=4601b3e04d5e30fa6c4432feeb2cb09a597cf763 commit 4601b3e04d5e30fa6c4432feeb2cb09a597cf763 Author: Mark Johnston AuthorDate: 2024-09-20 11:40:31 +0000 Commit: Mark Johnston CommitDate: 2024-10-17 15:49:12 +0000 socket: Only log splice structs to ktrace if KTR_STRUCT is configured Fixes: a1da7dc1cdad ("socket: Implement SO_SPLICE") (cherry picked from commit 283bf3b4b105ad24e919444ab0e21f3296891283) --- 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 1f5e09ada217..a038939399e3 100644 --- a/sys/kern/uipc_socket.c +++ b/sys/kern/uipc_socket.c @@ -3952,7 +3952,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();