From nobody Thu Sep 4 22:26:10 2025 X-Original-To: dev-commits-src-main@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 4cHvFv0jQGz66cfm; Thu, 04 Sep 2025 22:26:11 +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 "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4cHvFv04kGz3vf9; Thu, 04 Sep 2025 22:26:11 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1757024771; 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=hbAYZsHHrXWtTcrxk2BPvuPUQf+5Uy75IyxKoI4iQ9A=; b=jVghpjeFCOgl6lE2RU2Yp/kx5zXdEdoWWxDvJIDEQ62Lo3UOyRCsYMfObf+dFcc/9CiAj+ LYSBB4U9KsDGj0qPIZayqzDjeDzEjHagoDiEhShkOAxbcRCADxFKuaN7m5D9r1jaOgIHnc 5mZ7hVLajQ3DBr1l8hpVIY8Xuk3KlhRN+jSFehBEKcyYAMz98OBsjEPcn+ezUsgS9FL7om 50NM/cRJIvwZBt+fJRiaigWHTOxGxshUQyvEpkL796yDRqoZKCZfASxPF0dS8Spa1ArQfO o1plBHpG9dppNM9/tk2CJlIB6rotgCPObnOiRgWxZGwSbrk9a1cgB18wE0O54Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1757024771; 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=hbAYZsHHrXWtTcrxk2BPvuPUQf+5Uy75IyxKoI4iQ9A=; b=i9SCQ7BE6/txaZ0t2ALTB7a7TXItyjOXSL61tPkLZx9hsRN0TaOaNAN6nlxtWpWlSDn8OI ZcPoSQa50Z3i58Rx4c8yLMi+DH4I02dz1y5kp0fq2Ox+puYw+9AVroKObLjxYKRv0bI2RB KKLAKGfaW69ZwgtKi3MeQAz2GCz+RIsDXWyP9hIg8irx7ML7gchuKjfCn21XpNakZiFaFe MqBbEAaT6ulXJFqGYCDdp7Ru3AWT5Y8bmerxpBY6t6stTykzkNmzLlyn912Bv9O3hSGk5K PGDGmazZLJ+bon/meNJXsMCMpF9KxHzoKcIuhHi7RKUpoWBOjVzE+BdS/IVEzA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1757024771; a=rsa-sha256; cv=none; b=pzi51Ji/8XsLtCHHwuxxZRonOpbzWY50fJElTs/u6fd8MeTnYAmAoU15WHDdcNyr7/V1b1 5JmMfRAWDLp1Vt4U3I8jYmr8Ipjt1XPYn4Gu/mTh2Nta1wAC5vc5Dz6Uq78hZ+xD00ZFJO aM2Ki/NJ9/WHzuYjqVKwHhL/ihOtch8jKTL6wqb96aTwQcBI4jGEcimVLGlZ0NinM0JbBc az8vWUu22hrzkKXLGg+Vt8/u9CGW1oJBTEan9zt/zelXLBupcy6OE0ozOA59583EfRI8bN VSy/ZyLkrRA9OM6PW5uLU0XzwNrOFOXDuK2O0yD7gu3Dt70/UKzK2mTODM2PJg== 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 4cHvFt6mTbz6RM; Thu, 04 Sep 2025 22:26:10 +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 584MQAio009723; Thu, 4 Sep 2025 22:26:10 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 584MQAc6009720; Thu, 4 Sep 2025 22:26:10 GMT (envelope-from git) Date: Thu, 4 Sep 2025 22:26:10 GMT Message-Id: <202509042226.584MQAc6009720@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Richard Scheffenegger Subject: git: 3aa0a0aaa23b - main - tcp: add gone_in note for net.inet.tcp.sack.revised for fbsd16 List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: rscheff X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 3aa0a0aaa23b95dbf0ef58b16b313637f515b460 Auto-Submitted: auto-generated The branch main has been updated by rscheff: URL: https://cgit.FreeBSD.org/src/commit/?id=3aa0a0aaa23b95dbf0ef58b16b313637f515b460 commit 3aa0a0aaa23b95dbf0ef58b16b313637f515b460 Author: Richard Scheffenegger AuthorDate: 2025-09-04 22:23:14 +0000 Commit: Richard Scheffenegger CommitDate: 2025-09-04 22:23:52 +0000 tcp: add gone_in note for net.inet.tcp.sack.revised for fbsd16 Depricate the support for the old RFC3517 behavior of SACK loss recovery, and simplfy the code to always adhere to RFC6675. Reviewed By: tuexen, cc, #transport Sponsored by: NetApp, Inc. Differential Revision: https://reviews.freebsd.org/D52383 --- share/man/man4/tcp.4 | 10 ++++++---- sys/netinet/tcp_sack.c | 21 +++++++++++++++++++-- 2 files changed, 25 insertions(+), 6 deletions(-) diff --git a/share/man/man4/tcp.4 b/share/man/man4/tcp.4 index fcfda42908d8..3c9f4ff83f3d 100644 --- a/share/man/man4/tcp.4 +++ b/share/man/man4/tcp.4 @@ -31,7 +31,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.Dd June 27, 2025 +.Dd September 5, 2025 .Dt TCP 4 .Os .Sh NAME @@ -940,9 +940,6 @@ maximum segment size. This helps throughput in general, but particularly affects short transfers and high-bandwidth large propagation-delay connections. -.It Va rfc6675_pipe -Deprecated and superseded by -.Va sack.revised .It Va sack.enable Enable support for RFC 2018, TCP Selective Acknowledgment option, which allows the receiver to inform the sender about all successfully @@ -974,6 +971,11 @@ recovery, the trailing segment is immediately resent, rather than waiting for a Retransmission timeout. Finally, SACK loss recovery is also engaged, once two segments plus one byte are SACKed - even if no traditional duplicate ACKs were observed. +.Va sack.revised +is deprecated and will be removed in +.Fx 16 . +.Va sack.enable +will always follow RFC6675. .It Va sendbuf_auto Enable automatic send buffer sizing. .It Va sendbuf_auto_lowat diff --git a/sys/netinet/tcp_sack.c b/sys/netinet/tcp_sack.c index b6c55fac50b3..6e08ad2796a8 100644 --- a/sys/netinet/tcp_sack.c +++ b/sys/netinet/tcp_sack.c @@ -128,8 +128,25 @@ SYSCTL_INT(_net_inet_tcp_sack, OID_AUTO, enable, CTLFLAG_VNET | CTLFLAG_RW, "Enable/Disable TCP SACK support"); VNET_DEFINE(int, tcp_do_newsack) = 1; -SYSCTL_INT(_net_inet_tcp_sack, OID_AUTO, revised, CTLFLAG_VNET | CTLFLAG_RW, - &VNET_NAME(tcp_do_newsack), 0, + +static int +sysctl_net_inet_tcp_sack_revised(SYSCTL_HANDLER_ARGS) +{ + int error; + int new; + + new = V_tcp_do_newsack; + error = sysctl_handle_int(oidp, &new, 0, req); + if (error == 0 && req->newptr) { + V_tcp_do_newsack = new; + gone_in(16, "net.inet.tcp.sack.revised will be deprecated." + " net.inet.tcp.sack.enable will always follow RFC6675 SACK.\n"); + } + return (error); +} + +SYSCTL_PROC(_net_inet_tcp_sack, OID_AUTO, revised, CTLFLAG_VNET | CTLFLAG_RW | CTLTYPE_INT, + &VNET_NAME(tcp_do_newsack), 0, sysctl_net_inet_tcp_sack_revised, "CU", "Use revised SACK loss recovery per RFC 6675"); VNET_DEFINE(int, tcp_do_lrd) = 1;