From nobody Wed Feb 14 13:58:19 2024 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 4TZft418d1z59vQs; Wed, 14 Feb 2024 13:58:20 +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 4TZft40XHPz4k5F; Wed, 14 Feb 2024 13:58:20 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1707919100; 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=mkeYDbxeJG5S+sybQgIr6hc9voEH1rUHZRk9E7Xsi/c=; b=oMiCVVYGf/VpLw2hkIYd/p6kdUu6t7O7+bjTVMErT89Ccp0h7xfUDGETh6NygB/6JQIkRO Zsh7ZrFNLHIid1ikE7o3ulu49v21BXvhViEUdjGaZTh9xdOaD7UuX0XMDzFN2zgHdAqt0/ +i7D3LpiT+TdjSO/08zB1uzkPRHKgpyPMOeDUEzgvoOAvQ/ZweKX8IEaJpbaR9dGsmUeMt Ia97WziyYCVG59EHEX48IEjhbvU2FCFnGfcuIcTLthf7+wQk8VWLfnoGnnc2mSK9lfts1v T/H6ft0aGpSRS8s42yCRXLZIiSresqRr2hIEcKW3Rphl4pCNntrLucolIgIDyg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1707919100; a=rsa-sha256; cv=none; b=R5+ZavN2Wn1LEwqxiO+l6iSRtc7/4g+xV9clTJQ/8okV2HTtPv40vYD/Gcj1OA8YDXjW95 fu+dq8WR1UGBM4fpaBnIloZnFe+r22D1bdMu7T32m2Sn4sg2e189ghoY5cJ0DVDm4GgdD1 +n21/vCSJsjdYD9g0fKx6UZonZrrQSHgKa2pKE1SMnD9SJ7lq2cQXBm2O3nDwC7DZ1SPOl 7RiFS3gOGzWGsAs+XrszkLFjDVPHsY1KUn8eaoeXMI/Fked5AXfMOa1Ft8mcrekCm+12kb 3UBPIWea/x9JrRVPAEA/tIgj1eMtnpmUXbdMGMMhYV9IAw9Fv2yA5o2mrgTZmQ== 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=1707919100; 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=mkeYDbxeJG5S+sybQgIr6hc9voEH1rUHZRk9E7Xsi/c=; b=pOy7sLR/bnLzNytCeisU/9Xu6CrwndEiPnLjaC8Owpmq12UYZ2TpzCfZdZcorZ1OVOjeuN vm7E1lnovB6TvYJOijVC7q7fecEoXTW6vogMa/uceDhCccLTvxmLOVxvZeLIDkeTwlr0bf 4cgAqwHukEZ1GIe4wqbrbgQDmi08KaBQhFJ+XFxDqIsWWscDqcVg0Kezf9P1rcnNGgOb4E +wnx7QtaEEL9AG8uEDSkssp2g1BrTgYoW6UpcuUdAlhArFEh424m/BZc2F1VTn2/sF+VAw B6/PzT6IaT0omR+k2BU5WmVItxtisbdl/n4/QA9MTOoA2F/D8EdE9tiIpumK+Q== 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 4TZft36j5Gz11Xq; Wed, 14 Feb 2024 13:58:19 +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 41EDwJEU075717; Wed, 14 Feb 2024 13:58:19 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 41EDwJ0N075714; Wed, 14 Feb 2024 13:58:19 GMT (envelope-from git) Date: Wed, 14 Feb 2024 13:58:19 GMT Message-Id: <202402141358.41EDwJ0N075714@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Richard Scheffenegger Subject: git: fcea1cc9711a - main - tcp: fix RTO ssthresh for non-6675 pipe calculation 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: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: rscheff X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: fcea1cc9711aa774f6fac305418db4d42b64a5bd Auto-Submitted: auto-generated The branch main has been updated by rscheff: URL: https://cgit.FreeBSD.org/src/commit/?id=fcea1cc9711aa774f6fac305418db4d42b64a5bd commit fcea1cc9711aa774f6fac305418db4d42b64a5bd Author: Richard Scheffenegger AuthorDate: 2024-02-14 13:51:39 +0000 Commit: Richard Scheffenegger CommitDate: 2024-02-14 13:51:53 +0000 tcp: fix RTO ssthresh for non-6675 pipe calculation Follow up on D43768 to properly deal with the non-default pipe calculation. When CC_RTO is processed, the timeout will have already pulled back snd_nxt. Further, snd_fack is not pulled along with snd_una. Reviewed By: tuexen, #transport Sponsored by: NetApp, Inc. Differential Revision: https://reviews.freebsd.org/D43876 --- sys/netinet/cc/cc.c | 2 +- sys/netinet/cc/cc_cubic.c | 2 +- sys/netinet/cc/cc_dctcp.c | 2 +- sys/netinet/cc/cc_htcp.c | 2 +- sys/netinet/cc/cc_newreno.c | 2 +- sys/netinet/tcp_input.c | 4 ++++ 6 files changed, 9 insertions(+), 5 deletions(-) diff --git a/sys/netinet/cc/cc.c b/sys/netinet/cc/cc.c index a3d19e31d438..c2965b1e6a48 100644 --- a/sys/netinet/cc/cc.c +++ b/sys/netinet/cc/cc.c @@ -492,7 +492,7 @@ newreno_cc_cong_signal(struct cc_var *ccv, uint32_t type) if (V_tcp_do_newsack) { pipe = tcp_compute_pipe(ccv->ccvc.tcp); } else { - pipe = CCV(ccv, snd_nxt) - + pipe = CCV(ccv, snd_max) - CCV(ccv, snd_fack) + CCV(ccv, sackhint.sack_bytes_rexmit); } diff --git a/sys/netinet/cc/cc_cubic.c b/sys/netinet/cc/cc_cubic.c index dcb096af6cbf..eb1587d44427 100644 --- a/sys/netinet/cc/cc_cubic.c +++ b/sys/netinet/cc/cc_cubic.c @@ -479,7 +479,7 @@ cubic_cong_signal(struct cc_var *ccv, uint32_t type) if (V_tcp_do_newsack) { pipe = tcp_compute_pipe(ccv->ccvc.tcp); } else { - pipe = CCV(ccv, snd_nxt) - + pipe = CCV(ccv, snd_max) - CCV(ccv, snd_fack) + CCV(ccv, sackhint.sack_bytes_rexmit); } diff --git a/sys/netinet/cc/cc_dctcp.c b/sys/netinet/cc/cc_dctcp.c index 41db7e0811aa..ae0a56839449 100644 --- a/sys/netinet/cc/cc_dctcp.c +++ b/sys/netinet/cc/cc_dctcp.c @@ -296,7 +296,7 @@ dctcp_cong_signal(struct cc_var *ccv, uint32_t type) if (V_tcp_do_newsack) { pipe = tcp_compute_pipe(ccv->ccvc.tcp); } else { - pipe = CCV(ccv, snd_nxt) - + pipe = CCV(ccv, snd_max) - CCV(ccv, snd_fack) + CCV(ccv, sackhint.sack_bytes_rexmit); } diff --git a/sys/netinet/cc/cc_htcp.c b/sys/netinet/cc/cc_htcp.c index 7500446d3051..949715a69c67 100644 --- a/sys/netinet/cc/cc_htcp.c +++ b/sys/netinet/cc/cc_htcp.c @@ -327,7 +327,7 @@ htcp_cong_signal(struct cc_var *ccv, uint32_t type) if (V_tcp_do_newsack) { pipe = tcp_compute_pipe(ccv->ccvc.tcp); } else { - pipe = CCV(ccv, snd_nxt) - + pipe = CCV(ccv, snd_max) - CCV(ccv, snd_fack) + CCV(ccv, sackhint.sack_bytes_rexmit); } diff --git a/sys/netinet/cc/cc_newreno.c b/sys/netinet/cc/cc_newreno.c index 4f55fb7e0f7a..71f2764ef4bc 100644 --- a/sys/netinet/cc/cc_newreno.c +++ b/sys/netinet/cc/cc_newreno.c @@ -431,7 +431,7 @@ newreno_cong_signal(struct cc_var *ccv, uint32_t type) if (V_tcp_do_newsack) { pipe = tcp_compute_pipe(ccv->ccvc.tcp); } else { - pipe = CCV(ccv, snd_nxt) - + pipe = CCV(ccv, snd_max) - CCV(ccv, snd_fack) + CCV(ccv, sackhint.sack_bytes_rexmit); } diff --git a/sys/netinet/tcp_input.c b/sys/netinet/tcp_input.c index b3201750c1e6..f023d7477790 100644 --- a/sys/netinet/tcp_input.c +++ b/sys/netinet/tcp_input.c @@ -461,6 +461,10 @@ cc_cong_signal(struct tcpcb *tp, struct tcphdr *th, uint32_t type) tp->t_badrxtwin = 0; break; } + if (SEQ_LT(tp->snd_fack, tp->snd_una) || + SEQ_GT(tp->snd_fack, tp->snd_max)) { + tp->snd_fack = tp->snd_una; + } if (CC_ALGO(tp)->cong_signal != NULL) { if (th != NULL)