From nobody Mon Jan 13 18:15:23 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 4YX0mX2VWsz5kcj6; Mon, 13 Jan 2025 18:15:24 +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 4YX0mW1stsz3KqZ; Mon, 13 Jan 2025 18:15:23 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1736792123; 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=r4CRESgTLiv/muXLOQBregguYpjBFhGmGhAu/uc/C0k=; b=pKcL/VB17+jr9rVXNP+A7IGFvVFOCJKiLebgl414Ih6dj6JposTKZD1JMFkJWEhUYGeXxy EdvxSrkOqjiQ1sNz+ZVzkP3uX4HD+QKw+hTh0YTTmNPKg3oJRbURnKR6HojcsjJXaPbQ7d kFbBR5MKmkO5VM+2DpcTNN7YCcZmQJB8ex5FZE6OlLm/hs/UG4LwEiqBbM6fcn08zOPdlQ CXvCR++LdMCnQ+uCLT/E9R4JFfcDfSrots7qJEmpd8Lm+jrZDzAkOLJLVQ3Bw2du1rdcQo 12PJCV8lPmWEAEHlSn+ZradrkwZezQU7UZtklEPYgGisPbbRIdLiczOG7qXS+w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1736792123; 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=r4CRESgTLiv/muXLOQBregguYpjBFhGmGhAu/uc/C0k=; b=d7PxN1kTgoiTZWqBrutdhRAdCynVK3BjJwVHFjjtauTdhCiB3ADbkS1Svwk6jmRyprNbpD hlghzXaETK/+QO9S2iH4SaqUCLA9BsCSvBmfnaEojBbGj9qlcG8G+ax2xA45tdysngQANg TRgRTCZJgfEknTJ3yt+et7XOVZ7sZOppEal7+Xj/0kU8ngGkvR0HrY8LwtOZmhxt7/WRdm D5jXppuXIGEH8boptM/jhuTjRm7MbwmmMRdCUFcIRSIfeVG3wyvez/7uyAGE+a0hrG0xlz MhDHTVWRqQ7kqfrJjTKUfGtUlR9YdtNb4cjZj1Ubr8S21ll0go65SJT9SXj76Q== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1736792123; a=rsa-sha256; cv=none; b=ZZFPw5ZLBMDQWVSm9jUMvMPZpV7TiNbzAKwjbFx+aLjPUL7Zj7tmZp33SGqSEHj0czqUFZ pPmCMZ5eDLjJhi4K2jYt+erKpEEIUb7UDtA9MZZ0agh85gEAP+3wj01q7stBtMDYykPHvX HzUvOQbXdKCobY/mX6PBudZLXbOeHbM9QbUEMyxY69i5mKN3UJCZsCQSdPmW06/ejdUM9s jmr54nk7Ym2Gi2o8ihx8CJS28Ad0zdheBwRQmgoh7gYgsnk865c0+2BRxPEdf4ov2dd1pa QvdM5HOfRkbc0cdzpW6P7KLUa0ax88sE0hnK585I/kyC5H8ewTFTeUG0O4lflQ== 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 4YX0mW16FXzhb4; Mon, 13 Jan 2025 18:15:23 +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 50DIFNV7008139; Mon, 13 Jan 2025 18:15:23 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 50DIFNIt008136; Mon, 13 Jan 2025 18:15:23 GMT (envelope-from git) Date: Mon, 13 Jan 2025 18:15:23 GMT Message-Id: <202501131815.50DIFNIt008136@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Gleb Smirnoff Subject: git: 1043b36b2054 - main - tcp: don't send beyond receivers advertised window 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: glebius X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 1043b36b2054ffb32aadfe1c276684bf463db59a Auto-Submitted: auto-generated The branch main has been updated by glebius: URL: https://cgit.FreeBSD.org/src/commit/?id=1043b36b2054ffb32aadfe1c276684bf463db59a commit 1043b36b2054ffb32aadfe1c276684bf463db59a Author: Gleb Smirnoff AuthorDate: 2025-01-13 18:13:54 +0000 Commit: Gleb Smirnoff CommitDate: 2025-01-13 18:13:54 +0000 tcp: don't send beyond receivers advertised window When calculating length of data to be sent, we may do some congestion calculations, but we shall never send a byte beyond (snd_una + snd_wnd). In 7dc78150c730e we started to use tcp_compute_pipe() instead of (snd_wnd - off). This function makes an estimate of how much data is in flight. It can return a value smaller and larger than (snd_nxt - snd_una). It will return a value larger when we have retransmitted some data from SACK holes, and smaller once those retransmitted SACK holes are acked. We may use tcp_compute_pipe() for length calculation, but always capped by the send offset 'off', which (snd_nxt - snd_una). PR: 283649 Reviewed by: rscheff Differential Revision: https://reviews.freebsd.org/D48237 Fixes: 7dc78150c730e90fa2afdaba3aa645932b30c429 --- sys/netinet/tcp_output.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/sys/netinet/tcp_output.c b/sys/netinet/tcp_output.c index 74a229012508..135e7d8493e2 100644 --- a/sys/netinet/tcp_output.c +++ b/sys/netinet/tcp_output.c @@ -421,8 +421,9 @@ after_sack_rexmit: * sending new data, having retransmitted all the * data possible in the scoreboard. */ - len = imin(sbavail(&so->so_snd) - off, - sendwin - tcp_compute_pipe(tp)); + len = imax( + imin(sbavail(&so->so_snd), sendwin) - + imax(tcp_compute_pipe(tp), off), 0); } }