From nobody Mon Aug 25 06:13:49 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 4c9L8Y6jgvz65DtH; Mon, 25 Aug 2025 06:13:49 +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 4c9L8Y5pz1z3Qsv; Mon, 25 Aug 2025 06:13:49 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1756102429; 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=n1NRx6IdmhxqT4BKYaB8pX0o6vyhl26Z8KrzFKMV6HI=; b=vVcDyn42NYpoWObxzyiH1J3O7UYJFcLhViqt4eM9xvVaQgc1aNQx67cR1Avq3I2jlGFo+N YFLCCkOMqC+z1YgSleZTD6naN08CcK6DVCUnaXp/KvbXZFgCWWB05QPv79n8a/5SzrbYcu WdBLF0WdWaP8L+uG32pGb57VGvXfMg+0DRAUTZikrbEXIP24pOD5MzYhaXwl2KpvKZYyBI 0fOmXteZpqztTNGxWmtxyc9YDhsSydsr8gIZdCdkdNow9yDSOlPbvyNIsdA6hFMa5nrKpw RNhCukgkGtDWGtB6BjbK2LA69IED5i5HIZtaMGO2Fxz0N2TO/5HtzknEnFONSw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1756102429; 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=n1NRx6IdmhxqT4BKYaB8pX0o6vyhl26Z8KrzFKMV6HI=; b=sf9g+Cyn44erSed+/sgZHTU/+HRNpEFveVh8JqhAFQZ+nMnYpPgb65ahQAmhxAkPNPAhe7 /XqHxlqsB5iQQYrud9xnximGc2n9frhuQnffRBnBqDcz9CBPZe6wMeZn56BGO+wvbUeLA9 8ecI6FEHjwC2zErwLX3+iyuuiq4vsKfw8VqbcdYm2HvmN5YFivZn2vhXysnIheNg+bJXbt VteO8vMqsrCoormAWUq2J7AQcJozpuDwloHEPrK/xK530EjwAUEJljcBb4vXM2Iz7kuAa8 azU1uK7Bjh051u3gCFOwj6q0UaXdkuhKvNMs+0561CWEI9uJVL/Fm33E/e20MA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1756102429; a=rsa-sha256; cv=none; b=Ua1CS8NqAgOAgx89zc+djMn5bmmNvVqu6hASncWfnItY2oDl/FitMTG+9GJTqftZ1HJS8I WMmULM/wBd8cgW32ypYwG17PQtA4cbom9CcKw92rUtjpWmPP0vfdO4YueUeKKhT0PBZ2Y9 VNQrM83cVmcbaJqNr+njgvpcaZPDsZeRocDF+N/oCiho7jczLq1BWCSUPDj5jIKkFRSSIQ 1K4nkb87sv7k9c1VHpYXZoX8p1Yb9rcxmznAIkI4lzyc4kdJv7UUEezyiotOYusvWQc4z1 RIW1U5XQm69NgrLMTK2pYeXKDq7SEwUuNKqrPz19QMAZM4b+KwpVjxYxulsy7Q== 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 4c9L8Y5QSCzdgq; Mon, 25 Aug 2025 06:13:49 +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 57P6DnsZ013484; Mon, 25 Aug 2025 06:13:49 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 57P6DnaY013481; Mon, 25 Aug 2025 06:13:49 GMT (envelope-from git) Date: Mon, 25 Aug 2025 06:13:49 GMT Message-Id: <202508250613.57P6DnaY013481@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: 6c45a5dad0a0 - main - tcp: improve inflating cwnd in limited transmit 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: 6c45a5dad0a000b1fae452b6b1d17aee6857cf5c Auto-Submitted: auto-generated The branch main has been updated by tuexen: URL: https://cgit.FreeBSD.org/src/commit/?id=6c45a5dad0a000b1fae452b6b1d17aee6857cf5c commit 6c45a5dad0a000b1fae452b6b1d17aee6857cf5c Author: Michael Tuexen AuthorDate: 2025-08-25 06:08:46 +0000 Commit: Michael Tuexen CommitDate: 2025-08-25 06:08:46 +0000 tcp: improve inflating cwnd in limited transmit Don't subtract tcp_sack_adjust() sometimes twice, just once in all cases. Reviewed by: rscheff Sponsored by: Netflix, Inc. Differential Revision: https://reviews.freebsd.org/D52140 --- sys/netinet/tcp_input.c | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/sys/netinet/tcp_input.c b/sys/netinet/tcp_input.c index ec7102223c2d..d5dc516c28aa 100644 --- a/sys/netinet/tcp_input.c +++ b/sys/netinet/tcp_input.c @@ -2761,12 +2761,10 @@ enter_recovery: if ((tp->snd_nxt == tp->snd_max) && (tp->t_rxtshift == 0)) tp->snd_cwnd = - SEQ_SUB(tp->snd_nxt, - tp->snd_una) - - tcp_sack_adjust(tp); + SEQ_SUB(tp->snd_nxt, tp->snd_una); tp->snd_cwnd += - (tp->t_dupacks - tp->snd_limited) * - maxseg - tcp_sack_adjust(tp); + (tp->t_dupacks - tp->snd_limited) * maxseg; + tp->snd_cwnd -= tcp_sack_adjust(tp); /* * Only call tcp_output when there * is new data available to be sent