From nobody Fri Feb 25 19:07:47 2022 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 ED7BE19D6D14; Fri, 25 Feb 2022 19:07:47 +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 4K4zmz6Kgvz3HZv; Fri, 25 Feb 2022 19:07:47 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1645816067; 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=y4h15T3zPGboUD363LQc9Lhr848pu9FkIUUycF1I/no=; b=Ky6OrhbbdVYeib9mPvcGbWaC+Ik+g8UCRNFxP9pNieIn4sV8aLzTptea0YpwfOR1hXdE8j UcdkwgzOCo803DYB5uSF7wAarIe/GmVahYM0xK3XtGq/0EhkI4s3LXZ2st/DeCX8CTgjJZ pG5dsvMhAmzy4LKRv6dZU0d5A23sK3nyMklrbE8J2hDGIDx24KabTFC0L0tXSf7qyItLlr JzNIS5XKEhHf2NBga6nBS+InlDfutP/atAtlM7L6WEAdtEix7xe4tS/EVxhE8dmN7SDmd0 3NBwNpeUkmG8srL5NcCIAhA5D+7zBq5v/+SpMV27vtwAhfOo6Tq/Mh1q1JwQ9Q== 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 B8EFA251CA; Fri, 25 Feb 2022 19:07:47 +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 21PJ7lAu060692; Fri, 25 Feb 2022 19:07:47 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 21PJ7lCC060691; Fri, 25 Feb 2022 19:07:47 GMT (envelope-from git) Date: Fri, 25 Feb 2022 19:07:47 GMT Message-Id: <202202251907.21PJ7lCC060691@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: 2ff07d9220a0 - main - tcp: Restore correct ECT marking behavior on SACK retransmissions 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: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@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: 2ff07d9220a0af1ffe31849bfd66139557a9aa27 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1645816067; 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=y4h15T3zPGboUD363LQc9Lhr848pu9FkIUUycF1I/no=; b=bozoy10hgxaGk84iHcQeNCzhuqIv1WtvbjHYdY+TokO+9Q9YyBsEqTK8pBlCYfJn7ukfFF i5iKsunRqnWxYRdrG6E+YiUpjQf7FSOZgeVkjPBr3DaemU6DNjZ7ch3XaIwBdRuVyRyUaq AuTpjbLmcy3Hy66LLDwZn1aciKXM4mzE3cHfFPYKEai9g+xtDOWpp4sVG3f8T1MbnOkGuq RBScF1vbDsgx1qhAuPzGa8mbPOtRu0juUhFgxWJSsd/d5DopcuA53p4mFbbMNIXxTq1Q6P ExO+Epyxj7veWB9O7BVYJ5wvktc4hVIuATM1nmapnN8N02sKd/LXepFMjQuI3w== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1645816067; a=rsa-sha256; cv=none; b=qKANxJO911MHhVmyFxPt+A19x0pZhGQfj+haF2Ua+YuI67OF1qXxkLjI+cgLv/gr9k5TYF dMeYg+afE7fzx7tccKZYLU1G08LjS90h+gwH3gbnjpn47+TnraV44nkXKEvYUXy4uB8oV1 6TXC9zhFnfuiseXT4FXoK1Bs3L5LnUBXt/ywiZmx2qu97f5SQxhmG4i47c7aAICMzxPF1f 6tZnppe8jmhNwiXclCWSe8zvrJDLWrnEokrGqv9XpGEWaGKDZijClfNiYZRngvNPuTnY5Y EuYmyujuJ1r3Dtf7eq2slKSo4Y9x4e7CNc6BRr0TOr0sivfuWY30Rg+JItX91g== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by rscheff: URL: https://cgit.FreeBSD.org/src/commit/?id=2ff07d9220a0af1ffe31849bfd66139557a9aa27 commit 2ff07d9220a0af1ffe31849bfd66139557a9aa27 Author: Richard Scheffenegger AuthorDate: 2022-02-25 19:05:15 +0000 Commit: Richard Scheffenegger CommitDate: 2022-02-25 19:05:32 +0000 tcp: Restore correct ECT marking behavior on SACK retransmissions While coalescing all ECN-related code into new common source files, the flag to deal with SACK retransmissions was skipped. This leads to non-compliant ECT-marking of SACK retransmissions, as well as the premature sending of other TCP ECN flags (CWR). Reviewed By: rrs, #transport Sponsored by: NetApp, Inc. Differential Revision: https://reviews.freebsd.org/D34376 --- sys/netinet/tcp_ecn.c | 3 ++- sys/netinet/tcp_ecn.h | 2 +- sys/netinet/tcp_output.c | 2 +- sys/netinet/tcp_stacks/rack.c | 6 +++--- 4 files changed, 7 insertions(+), 6 deletions(-) diff --git a/sys/netinet/tcp_ecn.c b/sys/netinet/tcp_ecn.c index 17b3c90a46fb..20f84a0c9d98 100644 --- a/sys/netinet/tcp_ecn.c +++ b/sys/netinet/tcp_ecn.c @@ -201,7 +201,7 @@ tcp_ecn_output_syn_sent(struct tcpcb *tp) * returning IP ECN header codepoint */ int -tcp_ecn_output_established(struct tcpcb *tp, uint16_t *thflags, int len) +tcp_ecn_output_established(struct tcpcb *tp, uint16_t *thflags, int len, bool rxmit) { int ipecn = IPTOS_ECN_NOTECT; bool newdata; @@ -213,6 +213,7 @@ tcp_ecn_output_established(struct tcpcb *tp, uint16_t *thflags, int len) * and window probes. */ newdata = (len > 0 && SEQ_GEQ(tp->snd_nxt, tp->snd_max) && + !rxmit && !((tp->t_flags & TF_FORCEDATA) && len == 1)); if (newdata) { ipecn = IPTOS_ECN_ECT0; diff --git a/sys/netinet/tcp_ecn.h b/sys/netinet/tcp_ecn.h index b8a52bac83b2..38ac2f398e54 100644 --- a/sys/netinet/tcp_ecn.h +++ b/sys/netinet/tcp_ecn.h @@ -45,7 +45,7 @@ void tcp_ecn_input_syn_sent(struct tcpcb *, uint16_t, int); void tcp_ecn_input_parallel_syn(struct tcpcb *, uint16_t, int); int tcp_ecn_input_segment(struct tcpcb *, uint16_t, int); uint16_t tcp_ecn_output_syn_sent(struct tcpcb *); -int tcp_ecn_output_established(struct tcpcb *, uint16_t *, int); +int tcp_ecn_output_established(struct tcpcb *, uint16_t *, int, bool); void tcp_ecn_syncache_socket(struct tcpcb *, struct syncache *); int tcp_ecn_syncache_add(uint16_t, int); uint16_t tcp_ecn_syncache_respond(uint16_t, struct syncache *); diff --git a/sys/netinet/tcp_output.c b/sys/netinet/tcp_output.c index 0817997c72d3..83ce5b061f09 100644 --- a/sys/netinet/tcp_output.c +++ b/sys/netinet/tcp_output.c @@ -1206,7 +1206,7 @@ send: /* Also handle parallel SYN for ECN */ if ((TCPS_HAVERCVDSYN(tp->t_state)) && (tp->t_flags2 & TF2_ECN_PERMIT)) { - int ect = tcp_ecn_output_established(tp, &flags, len); + int ect = tcp_ecn_output_established(tp, &flags, len, sack_rxmit); if ((tp->t_state == TCPS_SYN_RECEIVED) && (tp->t_flags2 & TF2_ECN_SND_ECE)) tp->t_flags2 &= ~TF2_ECN_SND_ECE; diff --git a/sys/netinet/tcp_stacks/rack.c b/sys/netinet/tcp_stacks/rack.c index 7bab75a637fa..f8734c08bbbd 100644 --- a/sys/netinet/tcp_stacks/rack.c +++ b/sys/netinet/tcp_stacks/rack.c @@ -15742,7 +15742,7 @@ rack_fast_rsm_output(struct tcpcb *tp, struct tcp_rack *rack, struct rack_sendma m->m_pkthdr.rcvif = (struct ifnet *)0; if (TCPS_HAVERCVDSYN(tp->t_state) && (tp->t_flags2 & TF2_ECN_PERMIT)) { - int ect = tcp_ecn_output_established(tp, &flags, len); + int ect = tcp_ecn_output_established(tp, &flags, len, true); if ((tp->t_state == TCPS_SYN_RECEIVED) && (tp->t_flags2 & TF2_ECN_SND_ECE)) tp->t_flags2 &= ~TF2_ECN_SND_ECE; @@ -16233,7 +16233,7 @@ again: m->m_pkthdr.rcvif = (struct ifnet *)0; if (TCPS_HAVERCVDSYN(tp->t_state) && (tp->t_flags2 & TF2_ECN_PERMIT)) { - int ect = tcp_ecn_output_established(tp, &flags, len); + int ect = tcp_ecn_output_established(tp, &flags, len, false); if ((tp->t_state == TCPS_SYN_RECEIVED) && (tp->t_flags2 & TF2_ECN_SND_ECE)) tp->t_flags2 &= ~TF2_ECN_SND_ECE; @@ -18278,7 +18278,7 @@ send: /* Also handle parallel SYN for ECN */ if (TCPS_HAVERCVDSYN(tp->t_state) && (tp->t_flags2 & TF2_ECN_PERMIT)) { - int ect = tcp_ecn_output_established(tp, &flags, len); + int ect = tcp_ecn_output_established(tp, &flags, len, sack_rxmit); if ((tp->t_state == TCPS_SYN_RECEIVED) && (tp->t_flags2 & TF2_ECN_SND_ECE)) tp->t_flags2 &= ~TF2_ECN_SND_ECE;