From nobody Wed Feb 5 19:52:45 2025 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 4Yp9rG0y5Qz5mHnl; Wed, 05 Feb 2025 19:52:46 +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 4Yp9rF5B42z40Zc; Wed, 05 Feb 2025 19:52:45 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1738785165; 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=ZjaeiZ7C5BhukfdyZt2vgskI2b9fScUr4pqegyD3EIg=; b=AlYWZHu8l4hKp2SxkfSm9Eg+A28U1jdiZc222uR3zxj+qHaaN10F+friLPERaP4uxcSV71 fOdtnRyv/XtdSgo+X1Z/bw3IC5T8Xz0Lcg05u087RmKloNm7WF/dtuBO5Lxqtm3K3waQz5 Q03dnrG8BFEKj28EKawNJJA5zlOLr3/rdJ2+3APdvhGJRhNEWtIwVjU/mj+qcIpui/3Mur DmTyRQbqgH6PEe00C4BbEnziebQ4REVFyq6/mHtHsqBriXJjAVfI9hgwjtODY3g0sx+MFG QEVr308wi6nz888wqH0FOwQ0hRfDUaMFdbgcYqdoqHVD06pgXWLc/847vTPsiA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1738785165; 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=ZjaeiZ7C5BhukfdyZt2vgskI2b9fScUr4pqegyD3EIg=; b=leYDbwqREXuwe2bjOvVriUGIflMI4tibWyoWQlwhyGFykpzaemricWPacbXFTaqiiTijln S8E8jdrmGe1mca1VChmdJnycGcr5SDKSkawiFUqc+5UU5akRmDV64xS3LnzxRb57eSp/Ux b2Tc4lShZykAQdnVS32vW+vsmIpkagTZ6kkBArOXYI4xoyDZClOPYwhGGfchiLKsVpZHCy MCYCbGyFMXNdhqEhrF2hOTfVVxHe/tQHxn9pgbg19nBxMVkmRz8hc2Ql1lfF0tAHXGHAQN nSTpSXhEpC2E7sg2q4PsJisIwbJsTirD0hE/VuzHwn8ljK477+LnsKasmowsDw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1738785165; a=rsa-sha256; cv=none; b=LxHwPntJirjMq0i56qx3YVbi+4koccutDibv2tZRwoBJzjDvQfpxRPLK6iQbjP920lrcJ+ ucPU2xDInuctj82CwNgz3/29m842q00MV+/CLzNZJ3nOkPoY9BMdN0LRKNQ8NvbCsNfM4r Y7f/5mx8O9IBoV2fejzcTBidC0StXwii0UDgesPyS52SOx53hwOj11GtBMLXW05KIt58eI tuukYNAMWcDQmuaZXc/qLUKk84PcFxJ8kNX7lbibc+9J/zFgCHORfc7jTgzJrnqDE8XuFH gcOvf03d02oFvR4rsXFQyribmgBqf+SbaVoQxyg8Z9q58dWVzih/Rdpu0LRH4Q== 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 4Yp9rF2tpbz15mh; Wed, 05 Feb 2025 19:52:45 +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 515JqjpA086528; Wed, 5 Feb 2025 19:52:45 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 515JqjfW086525; Wed, 5 Feb 2025 19:52:45 GMT (envelope-from git) Date: Wed, 5 Feb 2025 19:52:45 GMT Message-Id: <202502051952.515JqjfW086525@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: b638491bb878 - stable/14 - TCP BBR: fix getsockopt() for TCP_BBR_USEDEL_RATE 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: tuexen X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: b638491bb8786b3093f291caf6e881d54ee1799a Auto-Submitted: auto-generated The branch stable/14 has been updated by tuexen: URL: https://cgit.FreeBSD.org/src/commit/?id=b638491bb8786b3093f291caf6e881d54ee1799a commit b638491bb8786b3093f291caf6e881d54ee1799a Author: Michael Tuexen AuthorDate: 2024-12-31 16:29:04 +0000 Commit: Michael Tuexen CommitDate: 2025-02-05 08:53:05 +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 eb4fd75bac3a..47b4a1bddc6c 100644 --- a/sys/netinet/tcp_stacks/bbr.c +++ b/sys/netinet/tcp_stacks/bbr.c @@ -14560,6 +14560,7 @@ bbr_get_sockopt(struct tcpcb *tp, struct sockopt *sopt) { struct inpcb *inp = tptoinpcb(tp); struct tcp_bbr *bbr; + uint64_t loptval; int32_t error, optval; bbr = (struct tcp_bbr *)tp->t_fb_ptr; @@ -14620,7 +14621,7 @@ bbr_get_sockopt(struct tcpcb *tp, 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; @@ -14704,7 +14705,10 @@ bbr_get_sockopt(struct tcpcb *tp, 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); }