From nobody Fri Sep 20 11:53:20 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 4X99km6rZXz5Wh15; Fri, 20 Sep 2024 11:53:20 +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 4X99km4gKfz4qd8; Fri, 20 Sep 2024 11:53:20 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1726833200; 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=hTY1453zMikXWuqgp5G6eb3vf1cdoJ6sYW8DfDkIHlY=; b=v2ojYGKOIJnlLM4Yd3ZB5ozpmFKGQeYoVBbgLjFNAosKPQGMPh/xly2fuTmqUmPi6NEkgQ ReldFSHH1iiQ7kxGfZ9PUckGHkBtl5YCw91GX6yCOvjAZ8/mQ3tOIj3Fn4wqGEwKdbkNza ya/6+WNm5WgK6+/uTryItFrwq4adSuR1oDqpNLZ3HCnO7LxfXxgEWeBslVJj8SeI6bpzLg lqvSxPY2wQPc4SxYrC1ZgYN8LW6n0Xxv9mCYxuOig/jpmAS9/jpcbNBOf6UbuWK9bPYv6S RiqsF/+llW8rMei90ieOLEGpD8z7TdtzTpCDYTSbkYHBrAjuHl6KPNQbpgO/BA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1726833200; a=rsa-sha256; cv=none; b=XKqX6FhOT0UeXGU/JSUJdBHB6IxMHPO1AhhEf4O4qGEMspKGrAymhORUCBkBnqTdc/5NKH 16U7KhCFSqU23Nga0tZOFLAOqEOfrbS31dcac3c2rLf3aahMCvKKRfvPF9cbQDAjyLzjnA AjRKT3oxsM6eT6tZJb1DY+OK5b6G6ka3NwW7T0FuvYg0SZqlcy5reblizr0O89kFn05FWv xm2rmkOrk1jQ5q1g9g9I2fI2G/Z8i3JOAsrlgr3SSkprQqaJulRlewKL1NUUKgyiRJFlwr WdgF75IySW70EBHE5LFxISgx3BAPALnCv1p8pZTgHjK0sZeh+DVKS4T0+jq/xQ== 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=1726833200; 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=hTY1453zMikXWuqgp5G6eb3vf1cdoJ6sYW8DfDkIHlY=; b=MYSIOLbEUKQUl9rYAmrOJb7GWIRwn1vKv8qNcafmfVy/L1v+aRTjHliwNqjEqLUfFr3PzG og/f83gc6zoNsn+OnuYth2VAaYA3b0TvZ++Kvc2YxJTpCX0l77EEmtdD7TSihWVdB/BO+T qDsZykXA4l77E7RgYq5mgTFH0p05h1DR8JsHsJZHkLIznNmiuW2XSOyZJCQsK5LerYRqEU JQb/XvhP0kX/3qSnv01v1a1ye3+Nf2Ybdk0jQIOgfa0fz77T19goge2Wn+N6udUxKOXJba Ya8YUJVEtmU0GeyN6CfEg7OZ44DyU94h6CJx1PmFgrExP8s3e6NGIR5dS4f2LA== 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 4X99km48bHzpHZ; Fri, 20 Sep 2024 11:53:20 +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 48KBrK1n037358; Fri, 20 Sep 2024 11:53:20 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 48KBrKY5037355; Fri, 20 Sep 2024 11:53:20 GMT (envelope-from git) Date: Fri, 20 Sep 2024 11:53:20 GMT Message-Id: <202409201153.48KBrKY5037355@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: 75cd1e534c75 - main - 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/main X-Git-Reftype: branch X-Git-Commit: 75cd1e534c75fbdd3294debe6edea27e780bc5f1 Auto-Submitted: auto-generated The branch main has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=75cd1e534c75fbdd3294debe6edea27e780bc5f1 commit 75cd1e534c75fbdd3294debe6edea27e780bc5f1 Author: Siva Mahadevan AuthorDate: 2024-09-16 01:46:00 +0000 Commit: Mark Johnston CommitDate: 2024-09-20 11:34:04 +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 --- 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 071530925892..fb3dc4dfc224 100644 --- a/sys/kern/uipc_socket.c +++ b/sys/kern/uipc_socket.c @@ -3954,7 +3954,9 @@ sosetopt(struct socket *so, struct sockopt *sopt) } if (error) goto bad; +#ifdef KTRACE ktrsplice(&splice); +#endif error = splice_init(); if (error != 0)