From nobody Fri Sep 05 18:55:48 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 4cJQXh5wSkz66F1s; Fri, 05 Sep 2025 18:55:48 +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 4cJQXh5K1Fz3Kbm; Fri, 05 Sep 2025 18:55:48 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1757098548; 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=PfkZrh9IiSd/RJH+FEL6PVsan7mT7ffW925e3mPZTII=; b=oopbI6IZyKMVXvPe/N63JMEZa3zrdAlpL0kfxFva59VCTGCWchbjGSRxqptOIG3lqaPQrE 2EMx1Nth1l9qr4SoFsHLl2kGexKajkcuzFz161i/QYLAq9U4a4G9f1DvZ1QptTBmbTZu5k ZqAC4XajVe2pQBkr/dQGVECi5EyuKcPKowww1/aQuVoTsmG6hOpZ0C1jUFiwFhWmPWwh+N STIx62PQ8X2nJ4HR8STc9Gd3KrajCpDkTh4AoovRgSIWaCa7nzyM4owXzJXZcHcfBFPbhp AOUpDLLjahniprVkC3KMQKbu4yLOxeSq6rKKBQyaOCr/KxBA1+9mwyOgnOlu4A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1757098548; 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=PfkZrh9IiSd/RJH+FEL6PVsan7mT7ffW925e3mPZTII=; b=fAcK/yo/YGEdRd9Ad4NzLHbD5ix1BG3AppxQZ3u/BHQPAvxnkjkzzUrhGlBXBk/LhfcMvV S7i/SX7OFmC46Ucsyru/wu8LDG4uBvczhhGTW+uQ9Z8J9Seb0T6NQHraKjhjQ6S37j9Lyf yit15rvNyJPZyJ2ZG9MpveoQlHSK9TlkZ/JvzlLlwev3GMKZ+ulxU0GffHzzbBnAT9BTPy d3tK6e0PBDLmHvTVjkCJ8irzhBG3lD9TspP4tnFlji3uOwdyfZvexRRzKaE32u2QfYS9bI 0GzuTS1YL5kGz5TAaLk14YGjp77BwrDJmy4HhN/ldQmp0wqShkgHCHLR71GOGg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1757098548; a=rsa-sha256; cv=none; b=Wf4xTKwNRJHhv6tKlbEvmQTsHnd+aCI+IJB9jseBhwnJ9p8C+loEx0sZn4QbMNYb0Dzt3y 2umAl5KLGL0+OqMfzA/CKe/XxPtZPNhMU6PuWLtuXWR3iHgQV/z2/Df1jOnabfz21H5Y78 RQcE4Piw8L+VQ3dSZ4l/fImvnXAbnEqB9smGWgwBxeqF/0ZBQegLzW0IOQTU8g/1tBf3Ly sp8FAlWV+Nyw3sp0MrcLfW/p1ps9Y9MTWmiq5ensaYok3C/ZrGFgbXBf74GMf5GMdVTJ1Y Mh+PaeO5YejLuSIvdmAzcpJTw2IDyfVsNgjw07u3JRw/NWny+1lFYG9UChoXBQ== 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 4cJQXh4Xccz118C; Fri, 05 Sep 2025 18:55:48 +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 585ItmAs017317; Fri, 5 Sep 2025 18:55:48 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 585ItmcG017314; Fri, 5 Sep 2025 18:55:48 GMT (envelope-from git) Date: Fri, 5 Sep 2025 18:55:48 GMT Message-Id: <202509051855.585ItmcG017314@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: 63803f20f90d - stable/14 - tcp sack: improve computation of delivered_data 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: 63803f20f90df2afe84932e2a8e6e7556e246004 Auto-Submitted: auto-generated The branch stable/14 has been updated by tuexen: URL: https://cgit.FreeBSD.org/src/commit/?id=63803f20f90df2afe84932e2a8e6e7556e246004 commit 63803f20f90df2afe84932e2a8e6e7556e246004 Author: Michael Tuexen AuthorDate: 2025-08-06 10:33:17 +0000 Commit: Michael Tuexen CommitDate: 2025-09-05 18:54:21 +0000 tcp sack: improve computation of delivered_data delivered_data is the number of bytes, which have newly been delivered to the peer. This includes the number of bytes cumulatively acknowledged and selectively acknowledged. Reviewed by: rscheff Sponsored by: Netflix, Inc. Differential Revision: https://reviews.freebsd.org/D51718 (cherry picked from commit 0950ab7d76951ea8e65f25a68511dc809339e802) --- sys/netinet/tcp_sack.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/netinet/tcp_sack.c b/sys/netinet/tcp_sack.c index cc02263512da..2672a868ba98 100644 --- a/sys/netinet/tcp_sack.c +++ b/sys/netinet/tcp_sack.c @@ -570,6 +570,7 @@ tcp_sack_doack(struct tcpcb *tp, struct tcpopt *to, tcp_seq th_ack) */ if (SEQ_LT(tp->snd_una, th_ack) && !TAILQ_EMPTY(&tp->snd_holes)) { left_edge_delta = th_ack - tp->snd_una; + delivered_data += left_edge_delta; sack_blocks[num_sack_blks].start = tp->snd_una; sack_blocks[num_sack_blks++].end = th_ack; /* @@ -577,7 +578,6 @@ tcp_sack_doack(struct tcpcb *tp, struct tcpopt *to, tcp_seq th_ack) * due to DSACK blocks */ if (SEQ_LT(tp->snd_fack, th_ack)) { - delivered_data += th_ack - tp->snd_una; tp->snd_fack = th_ack; sack_changed = SACK_CHANGE; }