From nobody Mon Mar 17 13:01:53 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 4ZGZqj5vKbz5qZgw; Mon, 17 Mar 2025 13:01:53 +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 4ZGZqj4xm5z3Q46; Mon, 17 Mar 2025 13:01:53 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1742216513; 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=hibCMuaOTE7+h5Rp9PglyHYtTcGVC3nJDESwFLcSFog=; b=ktIZiyTYw79RLc4dKM0ZKbAS59pBC8usxbrnGkfMGvYG68XSUD9hRpNOb5ctVl7tCb3j+l ex6fo4Q1wXU7mTdM1Wokq1ExoPa/tjNRr5wacb+JMFxo1ocJ6GQIpa6CVP5yr1PUoto0qO ehGO4g7GTbFKtrx2eVLcUlXbLqrtSpvqz7WTSFQqeV6y5N1G0CCCdNsXPaF3PEQbUvSe0b tXbtUWnMtmV7yRcSlAOmIyNTkZfaJXfMXIIRHJoj+ZGgRkzOsw1EGyVcFR2lceVoo83nqs QBCsiMviaB4qCZFb/2MpuP/cTIKWpOb+rSsRlTn/RId1N+IPG0sCNXr+FOuraQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1742216513; a=rsa-sha256; cv=none; b=dglVKOn5a24ACJdeam/z8N3mtwMOuuXv7CUazSeyY2EGBB6RlNZN/rxNOIy6QSL5EIJRNR u2jkyqDnogA0R8h+Pf5Sq9eDFzxyDojPIKxjCBWcWRzWQ62m1USRG/dU4T7i6h6/6k9NkN m06WilmaA/AXzENkMm3+ntFc/9vHpfc/qfa4eSnmTjyljmuz5GJNVi1oLHBITNDvzbOP7x la60AMbGOg4ArTqKlcsoRadY4nBwsCekYhbyw4aomNoQKSNBjty2omI1n4T5U1ksFVtFml nXDaNV/wnZCeLuPUud9XAXz3GB3b5ZB6O6ycCycmVybkG03TGpybBgsuzuipBQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1742216513; 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=hibCMuaOTE7+h5Rp9PglyHYtTcGVC3nJDESwFLcSFog=; b=cVmS4uywEzAHhrOhxN0OPnWE+KULkSNK8d/BlEcRPQxqiMQyiqAbKjYe/nbQxHqbDtY++E 3gyItn3BCAa6ngH0SAGpWZtfx7alR0rX9zMHiIlnycufTuXwCPfFgarsf5prdyefCKMf+W IsNAVTWtFueaz7O5CHLy9mPuY+GKSa6d4NoAQPwlGKfK9s1jmuZcPwIAb+t3PznqPtFw2n 843OROxtifPTUzhiSkIKI7jUywfcswdkXCEqjW7M58JwU+TT7Uodxw4P7YfL37n6DbMyo1 3JFMULcL0C24QTKFq4COD1WRp7C7OmOf8ipUXRAN18esXp96EO+OqQ1n44APJA== 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 4ZGZqj494dzp9X; Mon, 17 Mar 2025 13:01:53 +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 52HD1rwN093491; Mon, 17 Mar 2025 13:01:53 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 52HD1rpe093488; Mon, 17 Mar 2025 13:01:53 GMT (envelope-from git) Date: Mon, 17 Mar 2025 13:01:53 GMT Message-Id: <202503171301.52HD1rpe093488@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Cheng Cui Subject: git: a8d2bccb87d0 - main - tcp cc: use tcp_compute_pipe() for pipe in xx_post_recovery() directly 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: cc X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: a8d2bccb87d0738c91f7e6a080375ae276e4c7d5 Auto-Submitted: auto-generated The branch main has been updated by cc: URL: https://cgit.FreeBSD.org/src/commit/?id=a8d2bccb87d0738c91f7e6a080375ae276e4c7d5 commit a8d2bccb87d0738c91f7e6a080375ae276e4c7d5 Author: Cheng Cui AuthorDate: 2025-03-05 16:35:20 +0000 Commit: Cheng Cui CommitDate: 2025-03-17 13:00:50 +0000 tcp cc: use tcp_compute_pipe() for pipe in xx_post_recovery() directly This follows up with commit 67787d200488, and obsoletes the non-default pipe calculation from commit 46f584823798 nearly 25 years ago. Reviewed by: rscheff Differential Revision: https://reviews.freebsd.org/D49247 --- sys/netinet/cc/cc.c | 7 +------ sys/netinet/cc/cc_cubic.c | 8 +------- sys/netinet/cc/cc_htcp.c | 8 +------- 3 files changed, 3 insertions(+), 20 deletions(-) diff --git a/sys/netinet/cc/cc.c b/sys/netinet/cc/cc.c index a34eefcf0066..d85ad4e9f4fd 100644 --- a/sys/netinet/cc/cc.c +++ b/sys/netinet/cc/cc.c @@ -401,13 +401,8 @@ newreno_cc_post_recovery(struct cc_var *ccv) * approximately snd_ssthresh outstanding data. But in case we * would be inclined to send a burst, better to do it via the * slow start mechanism. - * - * XXXLAS: Find a way to do this without needing curack */ - if (V_tcp_do_newsack) - pipe = tcp_compute_pipe(ccv->tp); - else - pipe = CCV(ccv, snd_max) - ccv->curack; + pipe = tcp_compute_pipe(ccv->tp); if (pipe < CCV(ccv, snd_ssthresh)) /* * Ensure that cwnd does not collapse to 1 MSS under diff --git a/sys/netinet/cc/cc_cubic.c b/sys/netinet/cc/cc_cubic.c index 82b0d9b7fa99..a2e72130fa88 100644 --- a/sys/netinet/cc/cc_cubic.c +++ b/sys/netinet/cc/cc_cubic.c @@ -530,14 +530,8 @@ cubic_post_recovery(struct cc_var *ccv) * If inflight data is less than ssthresh, set cwnd * conservatively to avoid a burst of data, as suggested in * the NewReno RFC. Otherwise, use the CUBIC method. - * - * XXXLAS: Find a way to do this without needing curack */ - if (V_tcp_do_newsack) - pipe = tcp_compute_pipe(ccv->tp); - else - pipe = CCV(ccv, snd_max) - ccv->curack; - + pipe = tcp_compute_pipe(ccv->tp); if (pipe < CCV(ccv, snd_ssthresh)) /* * Ensure that cwnd does not collapse to 1 MSS under diff --git a/sys/netinet/cc/cc_htcp.c b/sys/netinet/cc/cc_htcp.c index ab6165f2e720..569495144d50 100644 --- a/sys/netinet/cc/cc_htcp.c +++ b/sys/netinet/cc/cc_htcp.c @@ -375,14 +375,8 @@ htcp_post_recovery(struct cc_var *ccv) * If inflight data is less than ssthresh, set cwnd * conservatively to avoid a burst of data, as suggested in the * NewReno RFC. Otherwise, use the HTCP method. - * - * XXXLAS: Find a way to do this without needing curack */ - if (V_tcp_do_newsack) - pipe = tcp_compute_pipe(ccv->tp); - else - pipe = CCV(ccv, snd_max) - ccv->curack; - + pipe = tcp_compute_pipe(ccv->tp); if (pipe < CCV(ccv, snd_ssthresh)) /* * Ensure that cwnd down not collape to 1 MSS under