From nobody Wed Sep 14 01:29:07 2022 X-Original-To: dev-commits-src-branches@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 4MS2mh001pz4bm57; Wed, 14 Sep 2022 01:29:07 +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 4MS2mg6dpqz3y1l; Wed, 14 Sep 2022 01:29:07 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1663118947; 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=cgvg4Yt7koMUvnBhF7Hq7wp+T0Bix1toT/gOBS8Zpu8=; b=SSjTyOUzLCzfZaFDffYojzQ6bIr3Y1x814GXZka2eIi3J+zgaWKdvG8yHX7U8SRVpBrlFl un3X7bJ1oHTvx3VNSomN7P6PuHhuuow6PMWusB7EUmCp+i/S7V9ccJg1OjZh1dwPU2pfa1 6RwgxsLdhe4ykrpcmajdveuqSk3pBX4x7g2LU500gZH0IhGVrDE2fsLbFKCfev+yPGHqJj oeREHeOPvvS6biPluRO5JlVBJYEED83IZPqQENap6TzqWut2ccSGGmK9EwJGEn7VWnLijv hZjLQeFs4awdsFgXR0kQZhdImbE8ANdYtXKtlIctZzHTchc12mox9A9gyl0Sig== 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 4MS2mg5jfLzWq4; Wed, 14 Sep 2022 01:29:07 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 28E1T7ES032095; Wed, 14 Sep 2022 01:29:07 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 28E1T7Rx032094; Wed, 14 Sep 2022 01:29:07 GMT (envelope-from git) Date: Wed, 14 Sep 2022 01:29:07 GMT Message-Id: <202209140129.28E1T7Rx032094@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Richard Scheffenegger Subject: git: 99c1c6755de4 - stable/13 - Revert "tcp: finish SACK loss recovery on sudden lack of SACK blocks" List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@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/stable/13 X-Git-Reftype: branch X-Git-Commit: 99c1c6755de49b2814511d1744ec239446c6ac1d Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1663118947; 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=cgvg4Yt7koMUvnBhF7Hq7wp+T0Bix1toT/gOBS8Zpu8=; b=fFbH/PXI771g+wpd1e+d+loig/j3RG0ZEc8QafBWfuc6gU1EU2vPI+zE+6ohcdDuhw3avJ jKua0vTIzvBaVVTnANMDyDUMtgmDZLwXXcF7rduOZ70um1QgLQcovS5j6VpFBbtM6D68yX UX7G2DTQHDGOn7qCmTQScESKqQLJL28q1plDzdHNmdBMDQRUBT2JuPWsbs5qumdWC+RAQl 43D18BB8329vkX1a6iRho7dEtbUUi7pYv1vlhWd0TMfNF6BxLsOSfnvSJhGWMQUCuGM5aT EJuohULV4V5HbwlUlH2hgqXuar4fAuOZEzTNxkK5iD+DGI0ZvtyrDMuaR+7JZg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1663118947; a=rsa-sha256; cv=none; b=GkFSrg2B4oXmGCw4ElBDOmg/RTLIi4IitS2Zky9Z+Ql4MIGUU82oCoo4frfx1+rs5da/qh yKYVafuw6i04oKrrbMt7ZXWAmqxdw0BUpP3J0UoJGWXd3IfuGMczSMczxUNZ6B7gQ7qSSF ZiqtKD8TdKciz4zliKKTcsEZ1Dl9Kz+iomR61w6fZcHeXHzDhnIYeq38ZC1pgqx1xuBSo8 d+SmcVewF+uthrSHOPSOWN17bD+OOqBjudJ5Z/8AJa2N3O0Xj9JKLqYVcbco2Ev6Ntkv8U oJtNWy+xDe3v9nPdFHNEWDASDJ5VYm3S+iXWJKDf+zIduzGMUCtOeBoYTOWomg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by rscheff: URL: https://cgit.FreeBSD.org/src/commit/?id=99c1c6755de49b2814511d1744ec239446c6ac1d commit 99c1c6755de49b2814511d1744ec239446c6ac1d Author: Richard Scheffenegger AuthorDate: 2022-09-13 15:28:07 +0000 Commit: Richard Scheffenegger CommitDate: 2022-09-13 15:28:07 +0000 Revert "tcp: finish SACK loss recovery on sudden lack of SACK blocks" This reverts commit 3d0b768cc0a07196aa6167b76b32abb928fb03be. --- sys/netinet/tcp_input.c | 39 +++++++++++++++++---------------------- 1 file changed, 17 insertions(+), 22 deletions(-) diff --git a/sys/netinet/tcp_input.c b/sys/netinet/tcp_input.c index 557e27721a67..601b4a63716f 100644 --- a/sys/netinet/tcp_input.c +++ b/sys/netinet/tcp_input.c @@ -287,20 +287,6 @@ kmod_tcpstat_add(int statnum, int val) counter_u64_add(VNET(tcpstat)[statnum], val); } -/* - * Make sure that we only start a SACK loss recovery when - * receiving a duplicate ACK with a SACK block, and also - * complete SACK loss recovery in case the other end - * reneges. - */ -static bool inline -tcp_is_sack_recovery(struct tcpcb *tp, struct tcpopt *to) -{ - return ((tp->t_flags & TF_SACK_PERMIT) && - ((to->to_flags & TOF_SACK) || - (!TAILQ_EMPTY(&tp->snd_holes)))); -} - #ifdef TCP_HHOOK /* * Wrapper for the TCP established input helper hook. @@ -2539,7 +2525,9 @@ tcp_do_segment(struct mbuf *m, struct tcphdr *th, struct socket *so, TCPSTAT_INC(tcps_rcvacktoomuch); goto dropafterack; } - if (tcp_is_sack_recovery(tp, &to)) { + if ((tp->t_flags & TF_SACK_PERMIT) && + ((to.to_flags & TOF_SACK) || + !TAILQ_EMPTY(&tp->snd_holes))) sack_changed = tcp_sack_doack(tp, &to, th->th_ack); else /* @@ -2609,7 +2597,8 @@ tcp_do_segment(struct mbuf *m, struct tcphdr *th, struct socket *so, * duplicating packets or a possible DoS attack. */ if (th->th_ack != tp->snd_una || - (tcp_is_sack_recovery(tp, &to) && + ((tp->t_flags & TF_SACK_PERMIT) && + (to.to_flags & TOF_SACK) && !sack_changed)) break; else if (!tcp_timer_active(tp, TT_REXMT)) @@ -2621,7 +2610,8 @@ tcp_do_segment(struct mbuf *m, struct tcphdr *th, struct socket *so, if (V_tcp_do_prr && IN_FASTRECOVERY(tp->t_flags)) { tcp_do_prr_ack(tp, th, &to); - } else if (tcp_is_sack_recovery(tp, &to) && + } else if ((tp->t_flags & TF_SACK_PERMIT) && + (to.to_flags & TOF_SACK) && IN_FASTRECOVERY(tp->t_flags)) { int awnd; @@ -2694,7 +2684,8 @@ enter_recovery: * snd_ssthresh is already updated by * cc_cong_signal. */ - if (tcp_is_sack_recovery(tp, &to)) { + if ((tp->t_flags & TF_SACK_PERMIT) && + (to.to_flags & TOF_SACK)) { tp->sackhint.prr_delivered = tp->sackhint.sacked_bytes; } else { @@ -2706,7 +2697,8 @@ enter_recovery: tp->sackhint.recover_fs = max(1, tp->snd_nxt - tp->snd_una); } - if (tcp_is_sack_recovery(tp, &to)) { + if ((tp->t_flags & TF_SACK_PERMIT) && + (to.to_flags & TOF_SACK)) { TCPSTAT_INC( tcps_sack_recovery_episode); tp->snd_recover = tp->snd_nxt; @@ -2798,7 +2790,8 @@ enter_recovery: * from the left side. Such partial ACKs should not be * counted as dupacks here. */ - if (tcp_is_sack_recovery(tp, &to) && + if ((tp->t_flags & TF_SACK_PERMIT) && + (to.to_flags & TOF_SACK) && sack_changed) { tp->t_dupacks++; /* limit overhead by setting maxseg last */ @@ -3980,7 +3973,8 @@ tcp_do_prr_ack(struct tcpcb *tp, struct tcphdr *th, struct tcpopt *to) * (del_data) and an estimate of how many bytes are in the * network. */ - if (tcp_is_sack_recovery(tp, to) || + if (((tp->t_flags & TF_SACK_PERMIT) && + (to->to_flags & TOF_SACK)) || (IN_CONGRECOVERY(tp->t_flags) && !IN_FASTRECOVERY(tp->t_flags))) { del_data = tp->sackhint.delivered_data; @@ -4024,7 +4018,8 @@ tcp_do_prr_ack(struct tcpcb *tp, struct tcphdr *th, struct tcpopt *to) * accordingly. */ if (IN_FASTRECOVERY(tp->t_flags)) { - if (tcp_is_sack_recovery(tp, to)) { + if ((tp->t_flags & TF_SACK_PERMIT) && + (to->to_flags & TOF_SACK)) { tp->snd_cwnd = tp->snd_nxt - tp->snd_recover + tp->sackhint.sack_bytes_rexmit + (snd_cnt * maxseg);