From nobody Wed Apr 19 11:09:25 2023 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 4Q1dN55fr1z45Kgr; Wed, 19 Apr 2023 11:09:25 +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 4Q1dN54qKJz3K7j; Wed, 19 Apr 2023 11:09:25 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1681902565; 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=YHOdbofQmQv8Dcz6yqd0cUTiIBmDkUv+z9F6gGGgwgE=; b=ffOuStu8On09loHHm6pF3U9g3xkepsLdFjtLZ1oFA4A/MP3X9oadv6lNIpduK3sUnuai87 +Xl2hPH/5XDBNFOARVZAsAyCXoNzHsLYVlyiADdom7hZQBJEUN3HuFOX/UgoS+FT7mpHWr pb4V9XCXUtegFiipEHshH0tLoutCPQQP1DT+2wVcCOfDeMzdGU57saieEtAd+2nNJdd2eN +XDNSVz/BEn2q+DWT5SlJqKRG9joKbQo/L7HkHS6Q0ZixyRHDdESoG8U4fwElxunoGoZvA GDYoSdFRlWJoCGG/GjgOfNP5V5DoqsnbDxNBBegmmNN79zuaMFcvqY7ERYqLBg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1681902565; 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=YHOdbofQmQv8Dcz6yqd0cUTiIBmDkUv+z9F6gGGgwgE=; b=by3FVmbOY7xtDuQvI1KPWX4bsZHX9inpJ6syBc3CGpahLk8TQYSkyHSksr3VqMSAMeCPaj L6VsKzmxsbH4oZMyuwxPW9roPieUfTGSgQ+a1Yj4aDA18bpEh8Amn5GkW8WM7idQGqhv4w fPFiTfIniL2rtUwwzv3XRtuuHnYzDRzwJxfaNwkZBPGhktdtt1OSkEUqVdz+BOG/6wmky9 MhTw1f9/dTcbv7Ze0b9o598RU7r/UhB4Qum9J64R7tBrmf3nYGWF19rJojppzhybeoRETr va6+noKX2SR7ayErC3N5743KzPsV/X1uEEcTvcbDeZVMilyyRMXSm9lLB6dhTg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1681902565; a=rsa-sha256; cv=none; b=ak5oIva00HX9b0N8ZJp7Q6RHXXPg06Bb2PRmdG+lCEVAXe/4I03SLO/LiiWzB3Y9cMVyyu 4jU1TeU10nbsOKnBNi2aH9eD2XxWBBQny35OZsj3KFvfusCJJIo6oa6fSwHSQxDdKUN/XO OHUF0YKH7S9QSDDxgdEUoGWhvgnLLgqpR61Pg3IpWSwBNLQioUkZ62jfPzbPsindVtsLP1 dxz0VC3ADqxkCD06F0QoS76A1JCwJdcciZ/mlJ3sTHzRoBoojFmVrJC90aPecvkb+iuLUH bfPWTG7lqOXYjbQa9qk8JTU2WttD6yrNZKhx7wmsETgw6romGOa5Cz03MkEc2Q== 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 4Q1dN53mLCzrZt; Wed, 19 Apr 2023 11:09:25 +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 33JB9PgB064690; Wed, 19 Apr 2023 11:09:25 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 33JB9PBD064689; Wed, 19 Apr 2023 11:09:25 GMT (envelope-from git) Date: Wed, 19 Apr 2023 11:09:25 GMT Message-Id: <202304191109.33JB9PBD064689@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Randall Stewart Subject: git: 960985a209f2 - main - tcp: bbr.c is non-capable of doing ECN and sets an INP flag to fend off ECN however our syncache is not aware of that flag. 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: rrs X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 960985a209f28c3de776003be18c8238e9378d31 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by rrs: URL: https://cgit.FreeBSD.org/src/commit/?id=960985a209f28c3de776003be18c8238e9378d31 commit 960985a209f28c3de776003be18c8238e9378d31 Author: Randall Stewart AuthorDate: 2023-04-18 16:21:56 +0000 Commit: Randall Stewart CommitDate: 2023-04-18 16:21:56 +0000 tcp: bbr.c is non-capable of doing ECN and sets an INP flag to fend off ECN however our syncache is not aware of that flag. We need to make the syncache aware of the flag and not do ECN if its set. Note that this is not 100% full proof but the best we can do (i.e. its still possible that you can get in a situation where the peer try's to do ecn). Reviewed by: tuexen, glebius, rscheff Sponsored by: Netflix Inc Differential Revision:https://reviews.freebsd.org/D39672 --- sys/netinet/tcp_syncache.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/netinet/tcp_syncache.c b/sys/netinet/tcp_syncache.c index 96f57b9e0d95..5f4bae92974e 100644 --- a/sys/netinet/tcp_syncache.c +++ b/sys/netinet/tcp_syncache.c @@ -1724,7 +1724,7 @@ skip_alloc: if (ltflags & TF_NOOPT) sc->sc_flags |= SCF_NOOPT; /* ECN Handshake */ - if (V_tcp_do_ecn) + if (V_tcp_do_ecn && (inp->inp_flags2 & INP_CANNOT_DO_ECN) == 0) sc->sc_flags |= tcp_ecn_syncache_add(tcp_get_flags(th), iptos); if (V_tcp_syncookies)