From nobody Wed Aug 06 08:35:40 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 4bxkC10p6Hz63Q3X; Wed, 06 Aug 2025 08:35: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 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4bxkC10C2Vz3CnR; Wed, 06 Aug 2025 08:35:41 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1754469341; 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=19Q+V3iP9sYaxfbzzGDS2QPt0uqpxyIRzyaQFc5zwiE=; b=XYJZie3ktqz/k4iXU5qyzcduB1rd3vrpKVng54wjMU2JIEpA6kI6Sz71wxqsQsAf3CvWmF p7E8uMZxW6NApiAQL3M1SGHk5/dcsARSZgsRAHpIPFBFmaHVexqNPB1dNmYVeTitiYeLxx laXmm1fxwhfA27OyiWzO2EqZvvHkeUyAWp14q4/1ORtyjLw7l2cFooY2gTc9ZsCHqBgmCE OmLdkH2xCjHgcTQIRko01jrDQvvrtQToNgCy7JWnF8qaZRVB8CYtw+3CngTvoZy6s+29yH aDw5u5vYEv0U9bsVv2aFgNfh7D/hyESf/dik8YBw5nHHRC76+vHK2aT9+V/yig== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1754469341; 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=19Q+V3iP9sYaxfbzzGDS2QPt0uqpxyIRzyaQFc5zwiE=; b=Xy6liPzPePg+8u6QVhNuhljbWvWjnGxH6BvrWLUBk0GTWRHiyD2Ws5PSQR+rBsqMpan+sk hOKQigWcq6N1BSqnI79yVHYPYzGyAfvjZpn77jWRk5VCY1Tp9xIYb61mZZ9E1V/4vZiVa4 nL21cwcUETuH81qRtZxy5Ey2x0hUkuD2UqL3wMKKdHYjz08Ylx+W+lyYzyf19N016V3+rA 9HWybfUkqNsb7Hwpn9la8adbarmv5GwhN4etkhYY1I0/HbcqrHvyIqB+d20Uj2l0mY0mI5 KaMF/STST0NCvFCiPET9YuSrCWZCh8qVmCOSRl2KMbz3aXWVZW8/LV9ev2gmrw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1754469341; a=rsa-sha256; cv=none; b=PZkOYJvyZ7BoSuynSvtrSBZdOCNpnn33G3MpKZXpcK1yauyXpBpU/2Apb9Lz96XSXlry4l ax6N5JYbSzBbcrOCe+FxKqtHQJ5s0MuDi7sHxutaxKeJA6E6lZZuMW0+XUv0eXtwY3fui3 P054Rw15qo+cqXKm5r9XqMgnwOtGrRPYgKS2uzWiJdxtxg+f9xAi3tIVJh2WzGf0MqMXTa cq5HB1A7IbUIWvvfB68AtqdLLRSiT7G1aePiv6Vc68AtgfI25FIltOSb2/EnWnblGEpYOz q1KTFQ8Q1ug5ZvkN6gHduw//NZL45HJSKziQAomexYlSeZS2+KRjZLENLT79Xw== 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 4bxkC06hVQz1CTY; Wed, 06 Aug 2025 08:35:40 +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 5768Ze3U060252; Wed, 6 Aug 2025 08:35:40 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 5768ZekS060249; Wed, 6 Aug 2025 08:35:40 GMT (envelope-from git) Date: Wed, 6 Aug 2025 08:35:40 GMT Message-Id: <202508060835.5768ZekS060249@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Michael Tuexen Subject: git: 0950ab7d7695 - main - tcp sack: improve computation of delivered_data 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: tuexen X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 0950ab7d76951ea8e65f25a68511dc809339e802 Auto-Submitted: auto-generated The branch main has been updated by tuexen: URL: https://cgit.FreeBSD.org/src/commit/?id=0950ab7d76951ea8e65f25a68511dc809339e802 commit 0950ab7d76951ea8e65f25a68511dc809339e802 Author: Michael Tuexen AuthorDate: 2025-08-06 10:33:17 +0000 Commit: Michael Tuexen CommitDate: 2025-08-06 10:33:17 +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 MFC after: 1 week Sponsored by: Netflix, Inc. Differential Revision: https://reviews.freebsd.org/D51718 --- 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 f48e60207cc2..66275cb04bdd 100644 --- a/sys/netinet/tcp_sack.c +++ b/sys/netinet/tcp_sack.c @@ -583,6 +583,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; /* @@ -590,7 +591,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; }