From nobody Wed Feb 05 20:57:53 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 4YpCHP3wPNz5mNvk; Wed, 05 Feb 2025 20:57:53 +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 4YpCHP3PWnz3WN8; Wed, 05 Feb 2025 20:57:53 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1738789073; 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=7dZi0JBn0Vu2EOWobzIbT2r6gZ65HcfO+yiw18bnHzs=; b=Atk4OK2RVy2Mb5pTYBjQTo54+o8IJA7844n5A0W1S8RtBhBvEfuzxU9gJ4uZxyYLr1Savk JshEfw4mabZd0B1RodsEAGt7/GSeU4TTUPWCZPtg2lebGAdNlxS139UA4DH1Rv6r6iPKdw 0V/S6FYxAiv/JeXlPATdnLRhmmGUX0iZ5zvE7oq+8KricxxsiVHISr7AoLR/xZE8v4Jntj tCGNWWsyJRhS2wsmet6kWjg6u3nxckCpwVrjzSuE6NeoYJmdP2S4pUISOxtAOYbpSlrkdc SOZx1fqWHGd1KOREOtz+lPaoA0M2NjnQZlgiDxOzZlL39iKBQbwZiQ5vXIOyjg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1738789073; 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=7dZi0JBn0Vu2EOWobzIbT2r6gZ65HcfO+yiw18bnHzs=; b=wEqFJbBhOxMPB0bJJAjwWLOefPTT6hoi0uNQuVoq/eP0YE7oSOB4nq15oJlSWHbGUN9n2S 6YC3Fvxq7iCYWNqDadoH9DQmAjONtIW2lUu3RACM7J0FUXJTgEckUlRA7lAtwl+N9nlqU0 60a/t2yK/wBoFr41WhmM3DNlWLg5ez3bwlUbMfUmpTNi1XhcFvweTD1WA+clmwSOfYiMZk vA9mrkXMGn+7Eu22z/Hy/jWQkE/JFOkmsjsem6hBwHtiLwsZkFRzNcfO9DMjHUNjzUwVx8 1JCyKfJmttO5z4bCNikjRC22EpxIYBRzige4YST3qUcp9STt6XDOf8oN9nmkhA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1738789073; a=rsa-sha256; cv=none; b=UrIjwWUTCgYQ5K844CBxno3M9GH0aFuh8BXV8CX41u5f3ZpG1p+qRAK9bb1tfHdmQUtnx9 jKWXtJJ6ZOXQIU1BHsj62zfxD86tWgenjR+1a2DMjLA+UvB+6KzEB6w2RQK/Guytw2vn7D ACWcIegDuOrP0GKj3LF8ufQX+BqKL6dn61eDhYRsBqpusf6U/yuY20Y0YLfYCe5R7z8OED uRT9EwJWoSjgQdSBCoR0FZPvxxAS5gsct5rTbllu40eF8MFr3MHCf6/9VcdWJozFTz0yAC NWx/ZJPycaeRXBGg74qXb9648RkshIptxAZxC7e05Fct9tNTE1cJ5IIccflBsQ== 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 4YpCHP2whcz16Pl; Wed, 05 Feb 2025 20:57:53 +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 515KvrGj005350; Wed, 5 Feb 2025 20:57:53 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 515Kvrfd005346; Wed, 5 Feb 2025 20:57:53 GMT (envelope-from git) Date: Wed, 5 Feb 2025 20:57:53 GMT Message-Id: <202502052057.515Kvrfd005346@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: 992f67691ada - stable/14 - TCP RACK: fix TCP_RACK_PACING_BETA socket option 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/14 X-Git-Reftype: branch X-Git-Commit: 992f67691ada56b4bd73e2cc1c20d6e6813a88e0 Auto-Submitted: auto-generated The branch stable/14 has been updated by tuexen: URL: https://cgit.FreeBSD.org/src/commit/?id=992f67691ada56b4bd73e2cc1c20d6e6813a88e0 commit 992f67691ada56b4bd73e2cc1c20d6e6813a88e0 Author: Michael Tuexen AuthorDate: 2025-01-06 20:38:34 +0000 Commit: Michael Tuexen CommitDate: 2025-02-05 09:58:12 +0000 TCP RACK: fix TCP_RACK_PACING_BETA socket option Bring back the code, which was accidentally removed. While there, indent a comment correctly. Reviewed by: rrs CID: 1540026 Fixes: e18b97bd63a8 ("Update to bring the rack stack with all its fixes in.") Sponsored by: Netflix, Inc. Differential Revision: https://reviews.freebsd.org/D48340 (cherry picked from commit e8ec28047df5185582a95c5211ed75682fad5ec5) --- sys/netinet/tcp_stacks/rack.c | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) diff --git a/sys/netinet/tcp_stacks/rack.c b/sys/netinet/tcp_stacks/rack.c index a2325b88751b..2fefcdcbf01d 100644 --- a/sys/netinet/tcp_stacks/rack.c +++ b/sys/netinet/tcp_stacks/rack.c @@ -24092,14 +24092,13 @@ rack_get_sockopt(struct tcpcb *tp, struct sockopt *sopt) error = EINVAL; } break; - /* - * Beta_ecn is the congestion control value for NewReno that influences how - * much of a backoff happens when a ECN mark is detected. It is normally set - * to 80 for 80% i.e. the cwnd is reduced by 20% of its previous value when - * you exit recovery. Note that classic ECN has a beta of 50, it is only - * ABE Ecn that uses this "less" value, but we do too with pacing :) - */ - + /* + * Beta_ecn is the congestion control value for NewReno that influences how + * much of a backoff happens when a ECN mark is detected. It is normally set + * to 80 for 80% i.e. the cwnd is reduced by 20% of its previous value when + * you exit recovery. Note that classic ECN has a beta of 50, it is only + * ABE Ecn that uses this "less" value, but we do too with pacing :) + */ case TCP_RACK_PACING_BETA_ECN: if (strcmp(tp->t_cc->name, CCALGONAME_NEWRENO) != 0) error = EINVAL;