From nobody Thu Oct 17 16:16:40 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 4XTtJ92WCqz5ZB34; Thu, 17 Oct 2024 16:16:41 +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 4XTtJ86WXLz431y; Thu, 17 Oct 2024 16:16:40 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1729181800; 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=nrdSMarihb7q2KmMEKevKoaaOfUxTQoNeoMJrTxoyO0=; b=JizNO5cIohamKzagvcID7lKENcOBsQgcvdTmn//7MCyEO+uhjL81VzeWB1fecUMRLnrZ7m 5ChBDxXNvfJ/9DjWnT3zgdP9IYzvBP4BnOTXA08OLTxq7l4dcAUczGbrYx5zbs1ofYxn2+ IVU+rrYBQ7Yf5d7jDlvK+j/8H8WBOipiQEOiK3uPxJMgwuSZqmEUqgdNrbynEEiPeozCQ8 svIyqeaIj4gpGCLeFlhYkuFKz1z9c4D5HaipYGscFwjL5bIuIaOBJNkiSFJ1nqxvDWAVWv w4EmprHl6TUG23w2zGTrxHo7fDg5Kb9Sah/N5J0iWwSR8QZ4pcgQsGSF+NWNrQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1729181800; 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=nrdSMarihb7q2KmMEKevKoaaOfUxTQoNeoMJrTxoyO0=; b=gYM7khEiSkSAvmbYC4WsZdz/eqI6GXMAPvMWd9vUEkUHS03+5E8RAavcrjqXIg0btJel64 ZP9UDhpvl5RSC8C5x91DVTrhAWfCBWkYDX9NVPvREdxRBBvCmt7uXPsLqXlD9u9ZZ3d2Zv Lxa8x9tZUEZ1oTmPtIXZh2UeRi8VIUkizYwol9B08FH01PpCz2GE/WpJ1itMjAowiVnBee HK3iKL9UCvPNZjabweJbWn7+pX5LR+8eq31LxuG2rxLt2J3m0Okd9/jRkY5pLeJZsZtu3B n9d2oQjzrPBPvcE6rTABxDXEV5NSZFo+IObyAg66uiXp6m0TETa2YKESMnWfJg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1729181800; a=rsa-sha256; cv=none; b=N9qH7kF6owIRyI0GoNyVJquMqx/ouwZslc4ibb7ox6w13CPShkVlWn2+iEy1GhQthnWrHR xYWRTu+2Vgo6XJ+ZZTg5whQBb/Ez/07KFvJZx3Fyom02PUQuAfqaoUShCIxvxcv0R1o9H/ wqjEqQpGYbrZ1AsrllsXCOcuwiUitpkez7S9dmfV9gn1tJ4OoAgVW0onzsOWcR3VxgDmDL 8hvz8GXZHL0WTR5wGOGTlaY+BsOcDUz92lHRUAtbiAxUzZXrmRBRfyvvSZ2x3lrd5DcTY5 Whf8DUVL5Hfv0qaZQc+EKtdvC9EfoRXU++o2uJSK7EgW8aK3hSe/fOEr7OuLVw== 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 4XTtJ85jl2zwxd; Thu, 17 Oct 2024 16:16:40 +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 49HGGee5099323; Thu, 17 Oct 2024 16:16:40 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 49HGGej6099320; Thu, 17 Oct 2024 16:16:40 GMT (envelope-from git) Date: Thu, 17 Oct 2024 16:16:40 GMT Message-Id: <202410171616.49HGGej6099320@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: 032014aaae70 - stable/14 - socket: wrap ktrsplice call with KTRACE ifdef 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: 032014aaae70c7166b714eb911ccb5b86213f837 Auto-Submitted: auto-generated The branch stable/14 has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=032014aaae70c7166b714eb911ccb5b86213f837 commit 032014aaae70c7166b714eb911ccb5b86213f837 Author: Siva Mahadevan AuthorDate: 2024-09-16 01:46:00 +0000 Commit: Mark Johnston CommitDate: 2024-10-17 15:49:11 +0000 socket: wrap ktrsplice call with KTRACE ifdef This fixes a build error when the kernel is built without KTRACE support. Reviewed by: emaste, markj Fixes: a1da7dc1cdad ("socket: Implement SO_SPLICE") Pull Request: https://github.com/freebsd/freebsd-src/pull/1426 (cherry picked from commit 75cd1e534c75fbdd3294debe6edea27e780bc5f1) --- sys/kern/uipc_socket.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/sys/kern/uipc_socket.c b/sys/kern/uipc_socket.c index edd26f28a292..1f5e09ada217 100644 --- a/sys/kern/uipc_socket.c +++ b/sys/kern/uipc_socket.c @@ -3951,7 +3951,9 @@ sosetopt(struct socket *so, struct sockopt *sopt) } if (error) goto bad; +#ifdef KTRACE ktrsplice(&splice); +#endif error = splice_init(); if (error != 0)