From nobody Wed Apr 17 14:17:30 2024 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 4VKNK706VSz5Gyx6; Wed, 17 Apr 2024 14:17:31 +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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4VKNK66dK2z4wDN; Wed, 17 Apr 2024 14:17:30 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1713363450; 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=6II7020D4/GFuFf3GSCaX/Vco+lnO/mYaLRnDcgoGGg=; b=wqRTLTFG4Vtwkpd1cCVC8YYaQcMEOIhNZr9yqPliB+wF1QuZ/UV3QxZiMgz2+Fm7JVIHVr V2Uy1Mm6n8trp13ZFlxe7PdO4OJVGahFRBNCUnaYaa2UWkZnBbjUDE1MlfeZmCq9SbHWlK D2aKsW9gIzZffs2cRWYMeJV9BpbkEsC5mFY0f0OKarlKxyByCTC1zItiUrY5h72k4/0pOS QHuTOozEV8ZXFEbUULEvSVTK+WPhHFPImANMWvaehSYpwhvXdc7WDQR/jaS+0blPoDkzMj onL3B5PyFEwtA7NqzxIonTFBRyfzUk6WGS8zMzwRz/ZU1CFNE72Um64aaTSulQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1713363450; a=rsa-sha256; cv=none; b=NQYI8+R5FAYqW/9NNOCDkMrVE2l6HHormaq3Bb7im5WAnHsAipBjOYuLXF3doiRdfDTfZP WC5cjK7bMWgPFFowJZDcrJmjYvjLy2wCJpspaif3VpU1gGUS9T/1CbZgRwpoINCy3keu9E 4AlE9KRAHGG8xyrEa03oRaYLqZxJ99ezfWinqkDmRaYKIN8zWjm/I09258IL19ojvtJ9mQ EyrlRN5HdDIYFQIHCk7nLgPojp+05KPE6xceaGN8TI+dWhwqMKFOIGQyZN8Rzlej3P0RZv Onq4YBBCug4EybXrag6Umln1UCMIxVct8qkxrYjTjjyQyrtJgK+L1DiayfqFtA== 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=1713363450; 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=6II7020D4/GFuFf3GSCaX/Vco+lnO/mYaLRnDcgoGGg=; b=E73eHTzRBeLgAIPfIT2tJeECh/uCq93J8p4B7ktuRbdx1W+ox+0ar6olIdwbM7L6mA/3wA t2Y/zHbgz1EgzDkbT/dW3nBEG4s9pSHrxjHMhfP1GxZURhvHheKDSVZ8EXihIK1u54xNpA 5JtWr2UIvrhczIt0WKaiWIio6xnztI5NW+7fvnc1c9ZNTPMRHRRxY5hJCnNhuszcfvwPgf VrbSaNwGAsGSFA4JILYJ1u/WsdcLL2LI/FdPgvaLgTBMiODPTx10FgBfN+lv0KQwE8ptD5 T9/VgXi63jQXOyGVzMN66P2Wzy9N7sqrmwXstxt1j6l0VO5Y10Ei+Q7HbOdrnw== 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 4VKNK666hNzVnW; Wed, 17 Apr 2024 14:17:30 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 43HEHU9X072689; Wed, 17 Apr 2024 14:17:30 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 43HEHUUW072686; Wed, 17 Apr 2024 14:17:30 GMT (envelope-from git) Date: Wed, 17 Apr 2024 14:17:30 GMT Message-Id: <202404171417.43HEHUUW072686@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: 134884436681 - stable/14 - Revert "tcp rack: fix sending" 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: 134884436681a8eaf23b26435153c637302482d7 Auto-Submitted: auto-generated The branch stable/14 has been updated by tuexen: URL: https://cgit.FreeBSD.org/src/commit/?id=134884436681a8eaf23b26435153c637302482d7 commit 134884436681a8eaf23b26435153c637302482d7 Author: Michael Tuexen AuthorDate: 2024-04-17 14:17:03 +0000 Commit: Michael Tuexen CommitDate: 2024-04-17 14:17:03 +0000 Revert "tcp rack: fix sending" This reverts commit b5ee7411bfabaf85f226fdfc4f2d8e0515d66691. --- sys/netinet/tcp_stacks/rack.c | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/sys/netinet/tcp_stacks/rack.c b/sys/netinet/tcp_stacks/rack.c index b05d19f5cbc2..fa3cd2f4f698 100644 --- a/sys/netinet/tcp_stacks/rack.c +++ b/sys/netinet/tcp_stacks/rack.c @@ -19927,10 +19927,6 @@ rack_output(struct tcpcb *tp) #endif int32_t idle, sendalot; -<<<<<<< HEAD -======= - uint32_t tot_idle; ->>>>>>> 7df0ef5f48e1 (tcp rack: fix sending) int32_t sub_from_prr = 0; volatile int32_t sack_rxmit; struct rack_sendmap *rsm = NULL; @@ -20168,8 +20164,8 @@ rack_output(struct tcpcb *tp) if ((tp->snd_una == tp->snd_max) && rack->r_ctl.rc_went_idle_time && TSTMP_GT(cts, rack->r_ctl.rc_went_idle_time)) { - tot_idle = (cts - rack->r_ctl.rc_went_idle_time); - if (tot_idle > rack_min_probertt_hold) { + idle = cts - rack->r_ctl.rc_went_idle_time; + if (idle > rack_min_probertt_hold) { /* Count as a probe rtt */ if (rack->in_probe_rtt == 0) { rack->r_ctl.rc_lower_rtt_us_cts = cts; @@ -20180,6 +20176,7 @@ rack_output(struct tcpcb *tp) rack_exit_probertt(rack, cts); } } + idle = 0; } if (rack_use_fsb && (rack->r_ctl.fsb.tcp_ip_hdr) &&