From nobody Wed Feb 05 20:28:18 2025 X-Original-To: dev-commits-src-branches@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 4YpBdG5391z5mLb5; Wed, 05 Feb 2025 20:28:18 +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 4YpBdG44Jfz3CVG; Wed, 05 Feb 2025 20:28:18 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1738787298; 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=wp5UnWgYQrm/CWYbuKwLz3zpA8MVfwo1IzsjJGvhppM=; b=U/IGlFjMDByqPd7nQvqbXqNjGgIdgOgoe5Dh1+tqFpSMkf65rsxl2LYIq5ZvNcW5UrHO4A JyAn7Fi34a4P2shfe2z9V6Gyp7tJ9sN4J62ryB8XywYHt7Btym33W+O7hgzM0gl4G6FkeB uxRSxAwzgv1y/EyKg+MdgLEOKmJ+WS7Yl28mJslLFmBtKIERJ+YEuj02ehCyk2dJ10bfRY wv2GaD7acn7oELroEug1wIUZqWtNHSiQvCzGLu8o74+j0pKPKy4ix3Jatyftru3d6q7QWE 44HS3SxSfMT7q/toCxXzceF00aClEi40lwc9309EbAeIuIjdzD1r8i6GlibpTw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1738787298; 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=wp5UnWgYQrm/CWYbuKwLz3zpA8MVfwo1IzsjJGvhppM=; b=AUQ0yNagC/jq9QXVmIJYHiF4mBgQq2MsIFH445uIsmP7qVcjV3McGo4Ti7yIsYDy4kIWtH oOpNWI/cO8n5GQXbLq4QAfl5xTNsfGB1gUmWy9fLVpOXA+4ftL/daf3KXSTRBM/suM/0ft Vi0zNAQ0s14tLjkDcXUFYQHqnVRoQjAnlS9uQev5LRMpKGQpQ+5wKOtQHgRiHN+znF7oDw +YNQxAMeecQgZRKk1p2roG8f5EQBlT+4uJw22EHzgo2/yWVrqok1c/IhHZCHnAbMfYoWkk pJqcCyTio9WNZO+Z4EfaP+7tTF9zhAhTTSwxE+Nn5xoTtkItdQ5ZtR/ZBe9mVg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1738787298; a=rsa-sha256; cv=none; b=jyO3QvYQFCXUQK9zYagmE734X0JWYROTHc9D+ZkWROKaRC/s5cn0RpoJmOo1R/oJtAnhkU ciunUefFDnBUC0N+dul8tq1iRGeNZ7WElNM1RS8c3tB+8jA9+GcaMsHS8JmYZgKYt4g+I2 8CTsqib/gGmnHqxfBbEgEIDFV4dzenX1xuG4k19PKMWeAsblyhoQTsZWFZOo3SKxcsJmZT H4WyqLvz543VOAxZVypby1F6EZLLDiWUBqhxYPEGyosuk2k5+SQFSOLkV5PPzT9ivKMqYK f/5l1A2XdDtSQNU6eJKTx74JsRdQGvXadI9nVogIILP5Ozfp+EfiEe45EQEnnA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none 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 4YpBdG3dXmz16Qk; Wed, 05 Feb 2025 20:28:18 +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 515KSI5u045705; Wed, 5 Feb 2025 20:28:18 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 515KSI2x045702; Wed, 5 Feb 2025 20:28:18 GMT (envelope-from git) Date: Wed, 5 Feb 2025 20:28:18 GMT Message-Id: <202502052028.515KSI2x045702@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Michael Tuexen Subject: git: 1d39f58d735c - stable/13 - TCP BBR: fix getsockopt() for TCP_BBR_USEDEL_RATE List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: tuexen X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 1d39f58d735c64e5878f4bfb1ec53397bd5008c8 Auto-Submitted: auto-generated The branch stable/13 has been updated by tuexen: URL: https://cgit.FreeBSD.org/src/commit/?id=1d39f58d735c64e5878f4bfb1ec53397bd5008c8 commit 1d39f58d735c64e5878f4bfb1ec53397bd5008c8 Author: Michael Tuexen AuthorDate: 2024-12-31 16:29:04 +0000 Commit: Michael Tuexen CommitDate: 2025-02-05 20:13:25 +0000 TCP BBR: fix getsockopt() for TCP_BBR_USEDEL_RATE Actually implement the IPPROTO_TCP-level socket option TCP_BBR_USEDEL_RATE. Reviewed by: rrs CID: 1523813 CID: 1523814 Sponsored by: Netflix, Inc. Differential Revision: https://reviews.freebsd.org/D48261 (cherry picked from commit b47dcb4b1ff16e6af2e07798f6fe06580b4eddf0) --- sys/netinet/tcp_stacks/bbr.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/sys/netinet/tcp_stacks/bbr.c b/sys/netinet/tcp_stacks/bbr.c index 7faeadabf203..1a67bbbdd08f 100644 --- a/sys/netinet/tcp_stacks/bbr.c +++ b/sys/netinet/tcp_stacks/bbr.c @@ -14643,6 +14643,7 @@ static int bbr_get_sockopt(struct socket *so, struct sockopt *sopt, struct inpcb *inp, struct tcpcb *tp, struct tcp_bbr *bbr) { + uint64_t loptval; int32_t error, optval; /* @@ -14698,7 +14699,7 @@ bbr_get_sockopt(struct socket *so, struct sockopt *sopt, optval = bbr->rc_loss_exit; break; case TCP_BBR_USEDEL_RATE: - error = EINVAL; + loptval = get_filter_value(&bbr->r_ctl.rc_delrate); break; case TCP_BBR_MIN_RTO: optval = bbr->r_ctl.rc_min_rto_ms; @@ -14782,7 +14783,10 @@ bbr_get_sockopt(struct socket *so, struct sockopt *sopt, break; } INP_WUNLOCK(inp); - error = sooptcopyout(sopt, &optval, sizeof optval); + if (sopt->sopt_name == TCP_BBR_USEDEL_RATE) + error = sooptcopyout(sopt, &loptval, sizeof loptval); + else + error = sooptcopyout(sopt, &optval, sizeof optval); return (error); }