From nobody Mon Nov 16 17:29:40 2026 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 4jSvxd2hDwz7184L for ; Mon, 16 Nov 2026 17:29:41 +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) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 4jSvxc6N0fz3HnD for ; Mon, 16 Nov 2026 17:29:40 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1794850180; 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=5oRZuVczTNDFlrCnDpJhlRKcbmYmtF2Ggra7XwCBFcw=; b=QtIai8OpYKcSGPk33yL5RqU0lz3nhf4MDWXupOQ/E9+HIQWNUFOYiJUo+IBl26WXH9w3V1 r/+hpdlxwJXxVmj09rQzaLGlsHfMRUp79uTpRBVUzjLWxZOgTNEM488HnPjbsSCvWLsexb 7nXodZ/QgnF8D1OtPPwqQ6zD+57Tg84/DMrwVnBmFLTw5+sBm3QeET01u8XUgM/aAxJNrG Fv51Rco3aa0CJpWXABzMi/ZPAYqcjvR9LdpcNN3we0aInrGvOuN+WL+yo4rSGeq5L0cIgF MktoX9rY182xsTmY7q4tUTBBFw59voAk6D+3fr6EV5MdRKBExxFHdWk3JPW3gg== ARC-Seal: i=1; a=rsa-sha256; d=freebsd.org; s=dkim; cv=none; t=1794850180; b=tWtRLeqDhCberTIp5uu8X+xDW2UfSiibJgE0Tjp4WBZVZYViAI3qSwy1x7A0T6Er6OyjJ/ e4PecJjhezfil9sCH9pldfox09ChVGalmAThylJ4dJxjDAiJuyearm4OHQsBF23F2bDNVp K72gH9Wk0B948GaiDMCwBzM+QOJmGrQpwsyK+wwBHilyMjzBNN7ALPnsRW+8dXgwLAjJ0i 0fyCB7rcMQdtbWpRcwudlS2G6yl5LZ3j9wX0dSoFMt7WGlvWoe5EkQJ/vZSwI+lo6yOzDh 4H8MrJZYVsk8PLrh0o/V77N4P0xS11tc9k82zr15ylwiAwzsKc5nbAjGx0bJSw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1794850180; 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=5oRZuVczTNDFlrCnDpJhlRKcbmYmtF2Ggra7XwCBFcw=; b=V4Ebz0znP80C0ca/DnzcsRvlislpE2W60KBXO1Q4k6bvRG8YHBglNQtUfc1Vmuei7ALJz2 aW3MNc0KLCC2kWeG1P4yGuhI0T4d8IBuYcL6pxPXA04/R+F5rFlGW2b/mhX0LpgQbXG96K GdDEEhb5gm1rZ1zTd0uC91jZL6ols77h8K+CgyYgZVmU2Cw2XjXQ0YauYSwJXk5UZpR0r3 du56TFuGLKECmzr+GqAdynWzjS89rpheCr4y5sHcqtA2eEhAegfEMXf5ZhxHvNzQCvqGGW T8VWDZtPcgYV8BfH+b0BQT7eLArM8GcD/vw/CFKFdBm6ROV0Rk8o5D6YArnA4w== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4jSvxc5lLqz13gf for ; Mon, 16 Nov 2026 17:29:40 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id fcf3 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Mon, 16 Nov 2026 17:29:40 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Michael Tuexen Subject: git: d174085f9f89 - main - tcp: improve sender side SWS avoidance List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all X-BeenThere: dev-commits-src-all@freebsd.org List-Id: Commit messages for all branches of the src repository List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list 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/main X-Git-Reftype: branch X-Git-Commit: d174085f9f895ed444bd95120da3eff481a58f1a Auto-Submitted: auto-generated Date: Mon, 16 Nov 2026 17:29:40 +0000 Message-Id: <6afb3d84.fcf3.2137b613@gitrepo.freebsd.org> The branch main has been updated by tuexen: URL: https://cgit.FreeBSD.org/src/commit/?id=d174085f9f895ed444bd95120da3eff481a58f1a commit d174085f9f895ed444bd95120da3eff481a58f1a Author: Michael Tuexen AuthorDate: 2026-11-16 17:25:32 +0000 Commit: Michael Tuexen CommitDate: 2026-11-16 17:25:32 +0000 tcp: improve sender side SWS avoidance When checking for a full sized segment, take all TCP options that will be included into account. This fixes a bug which can trigger the "sent too much" KASSERT related to limited transmit. Reported by: olivier Reviewed by: rscheff, Peter Lei MFC after: 3 days MFC to: stable/15 MFC to: stable/14 Sponsored by: Netflix, Inc. Differential Revision: https://reviews.freebsd.org/D61605 --- sys/netinet/tcp_output.c | 14 +------------- 1 file changed, 1 insertion(+), 13 deletions(-) diff --git a/sys/netinet/tcp_output.c b/sys/netinet/tcp_output.c index 2ed2a7319aba..b37edfa35248 100644 --- a/sys/netinet/tcp_output.c +++ b/sys/netinet/tcp_output.c @@ -587,19 +587,7 @@ after_sack_rexmit: if (len) { if (len >= tp->t_maxseg) goto send; - /* - * As the TCP header options are now - * considered when setting up the initial - * window, we would not send the last segment - * if we skip considering the option length here. - * Note: this may not work when tcp headers change - * very dynamically in the future. - */ - if ((((tp->t_flags & TF_SIGNATURE) ? - PADTCPOLEN(TCPOLEN_SIGNATURE) : 0) + - ((tp->t_flags & TF_RCVD_TSTMP) ? - PADTCPOLEN(TCPOLEN_TIMESTAMP) : 0) + - len) >= tp->t_maxseg) + if (len >= tcp_maxseg(tp)) goto send; /* * NOTE! on localhost connections an 'ack' from the remote