From nobody Mon Jan 29 08:25:26 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 4TNhFL3mz4z58SvD; Mon, 29 Jan 2024 08:25:26 +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 4TNhFL1rDyz4dVm; Mon, 29 Jan 2024 08:25:26 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1706516726; 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=6RVnk7nR1CzK/NHlHzjryXpUhL2380vzSB6htka3E6Q=; b=ujRyRyrniVsQg7xrI7H9iR1YkSQ2hlsDzPnL8jSN4WSjEueh8ggbEgCvKSxloteWCRr1xV EOSTl6gEYC7B8FN+FEF2cwIHP8etlA95CM+TWnJy7/6Lsrm0IaUzaifu4PbHtaWjCNT9cD EXjdly4tbrvaXVcWWl/fAaMgBB6nnB6m5PTEjUrIAsR2lm526PzuSbCjEyNKf6gLpmkALf +ufYpaySbfLkV8YiKflqC6rYfF4ofBQirgofjlgHuEAhI7m5oodhUEyREuz/rAZAjbaky/ F6H2bUscjDWvHBTg9EdFWOjuIFeOQ4rs5hNAHfvivEmap1I0kuEaUt6qv76G8Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1706516726; 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=6RVnk7nR1CzK/NHlHzjryXpUhL2380vzSB6htka3E6Q=; b=lO3Dc4mYrJHtuTRa/c30mGYavJ9xnvkyhqGf3ubHyYU1aRF7YmkqT9C2gNfnPamdL2ZDGz VLfHarNZGJ4gJiMJLAkUPxfmjKhcZWSbYi6gCqUBSZrPY/7c94MWUaZzC1tfSusj9shG2B bMY2LIPsLl1u2B4Etat1005Icn3Pr1OYtX8biOzBvp3KIYK1I5ks+oACUtX3gQc7C5dps3 uFzho0LwQfaCX4jCA3mWIpsBhJUNre4JuHW5EikrMHsVhi4lXqFUXRvLicRj4wn9qwCPy3 zhYnVYYgC4gvLR8RDE77R+j3mS6h1whg2ENmGTyvDcqkf1JNLAUD8HK5kA569g== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1706516726; a=rsa-sha256; cv=none; b=WDDrF+/ZoqHeWn788+9TPlZLoD1UhUJNlEhPwD26ynu3zWmtOcsG+qmJy/dQu8+PvHUEB8 8o4SDHlAPmifGiCwcNGkenNPRlzHkYHH/+T1p1o0Cnd2L9ak6yGEMzZOgwp1wr/PA4yYxx MoK541gLFyloc+umrPI3T0DnGhU+vwhZgjTpEsdqAEFvGWVL6DMjVrKv3tsxXE1QlZJ81F x1tzZbjzjjiFdub5BMFw4cb7XGRNxndNRUcSMzr3KZsV1G8Fjn5vpVYhZqY4PwIO0r3YBF jJaDlKVGl3+lljqkHw8bP0zzIfdlbLp1eL1NPSs+tZInQZctnJXIU6vLn3C5PA== 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 4TNhFL0w1Kzkp1; Mon, 29 Jan 2024 08:25:26 +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 40T8PQgP081681; Mon, 29 Jan 2024 08:25:26 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 40T8PQFp081678; Mon, 29 Jan 2024 08:25:26 GMT (envelope-from git) Date: Mon, 29 Jan 2024 08:25:26 GMT Message-Id: <202401290825.40T8PQFp081678@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: 0b3f9e435f2b - main - tcp: move cc_post_recovery past snd_una update 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: 0b3f9e435f2bde9e5be27030d9f574a977a1ad47 Auto-Submitted: auto-generated The branch main has been updated by rscheff: URL: https://cgit.FreeBSD.org/src/commit/?id=0b3f9e435f2bde9e5be27030d9f574a977a1ad47 commit 0b3f9e435f2bde9e5be27030d9f574a977a1ad47 Author: Richard Scheffenegger AuthorDate: 2024-01-27 23:16:59 +0000 Commit: Richard Scheffenegger CommitDate: 2024-01-27 23:18:51 +0000 tcp: move cc_post_recovery past snd_una update The RFC6675 pipe calculation (sack.revised, enabled by default since D28702), uses outdated information, while the previous default calculated it correctly with up-to-date information from the incoming ACK. This difference can become as large as the receive window (not the congestion window previously), potentially triggering a massive burst of new packets. MFC after: 1 week Reviewed By: tuexen, #transport Sponsored by: NetApp, Inc. Differential Revision: https://reviews.freebsd.org/D43520 --- sys/netinet/tcp_input.c | 50 ++++++++++++++++++++++--------------------------- 1 file changed, 22 insertions(+), 28 deletions(-) diff --git a/sys/netinet/tcp_input.c b/sys/netinet/tcp_input.c index 98564ff67f22..afcda60137ec 100644 --- a/sys/netinet/tcp_input.c +++ b/sys/netinet/tcp_input.c @@ -474,13 +474,12 @@ cc_post_recovery(struct tcpcb *tp, struct tcphdr *th) { INP_WLOCK_ASSERT(tptoinpcb(tp)); - /* XXXLAS: KASSERT that we're in recovery? */ - if (CC_ALGO(tp)->post_recovery != NULL) { tp->t_ccv.curack = th->th_ack; CC_ALGO(tp)->post_recovery(&tp->t_ccv); } - /* XXXLAS: EXIT_RECOVERY ? */ + EXIT_RECOVERY(tp->t_flags); + tp->t_bytes_acked = 0; tp->sackhint.delivered_data = 0; tp->sackhint.prr_delivered = 0; @@ -2813,11 +2812,13 @@ resume_partialack: * If the congestion window was inflated to account * for the other side's cached packets, retract it. */ - if (IN_FASTRECOVERY(tp->t_flags)) { - if (SEQ_LT(th->th_ack, tp->snd_recover)) { + if (SEQ_LT(th->th_ack, tp->snd_recover)) { + if (IN_FASTRECOVERY(tp->t_flags)) { if (tp->t_flags & TF_SACK_PERMIT) { - if (V_tcp_do_prr && to.to_flags & TOF_SACK) { - tcp_timer_activate(tp, TT_REXMT, 0); + if (V_tcp_do_prr && + (to.to_flags & TOF_SACK)) { + tcp_timer_activate(tp, + TT_REXMT, 0); tp->t_rtttime = 0; tcp_do_prr_ack(tp, th, &to, sack_changed, &maxseg); @@ -2830,24 +2831,18 @@ resume_partialack: } else { tcp_newreno_partial_ack(tp, th); } - } else { - cc_post_recovery(tp, th); - } - } else if (IN_CONGRECOVERY(tp->t_flags)) { - if (SEQ_LT(th->th_ack, tp->snd_recover)) { - if (V_tcp_do_prr) { - tp->sackhint.delivered_data = BYTES_THIS_ACK(tp, th); - tp->snd_fack = th->th_ack; - /* - * During ECN cwnd reduction - * always use PRR-SSRB - */ - tcp_do_prr_ack(tp, th, &to, SACK_CHANGE, - &maxseg); - (void) tcp_output(tp); - } - } else { - cc_post_recovery(tp, th); + } else if (IN_CONGRECOVERY(tp->t_flags) && + (V_tcp_do_prr)) { + tp->sackhint.delivered_data = + BYTES_THIS_ACK(tp, th); + tp->snd_fack = th->th_ack; + /* + * During ECN cwnd reduction + * always use PRR-SSRB + */ + tcp_do_prr_ack(tp, th, &to, SACK_CHANGE, + &maxseg); + (void) tcp_output(tp); } } /* @@ -2999,12 +2994,11 @@ process_ACK: SEQ_GT(tp->snd_una, tp->snd_recover) && SEQ_LEQ(th->th_ack, tp->snd_recover)) tp->snd_recover = th->th_ack - 1; - /* XXXLAS: Can this be moved up into cc_post_recovery? */ + tp->snd_una = th->th_ack; if (IN_RECOVERY(tp->t_flags) && SEQ_GEQ(th->th_ack, tp->snd_recover)) { - EXIT_RECOVERY(tp->t_flags); + cc_post_recovery(tp, th); } - tp->snd_una = th->th_ack; if (tp->t_flags & TF_SACK_PERMIT) { if (SEQ_GT(tp->snd_una, tp->snd_recover)) tp->snd_recover = tp->snd_una;