From nobody Thu Oct 31 13:38:26 2024 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 4XfQ7648jbz5bjNr; Thu, 31 Oct 2024 13:38: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 "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4XfQ763gH7z4rV4; Thu, 31 Oct 2024 13:38:26 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1730381906; 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=dIumlZj5gi2uIf0uGKyUryGUpjhWJSWEWCcslvSUcNk=; b=cVRmBJrM32+tsaWuqg1yCToc8IkbXq5zecrRfOJH9vFT41d0jxk/QIWPnD70u+EtYm/Uq/ M07asxIZAWj/GSw3O9P4bupU7g0YCk7uxy8BFbq0KZjjaESW6pbKW267zJw/UNhKe4NtOU 1AdbJgPTWdkhamPdmoUJ5dAIpwMgnGv80XeK+xjREn12oUtjdv5g5/pwqNLYr7hR4zw1sV PgnI/mUmMHr2BBN97iLwQ2xA2bbShAazYyVLJj1QUEo2GBRNtuiIATRTfJZes2C3ZdFBUR uFUT1qNGX1HcelKKlvwMENM6lKTVgmSiNXc9jmNUq5jTXI3YS2rceVaR6C/6hg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1730381906; 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=dIumlZj5gi2uIf0uGKyUryGUpjhWJSWEWCcslvSUcNk=; b=G1/knfNLSfKdT8HkW6FmTSlFJ+R8jCO5rfm/rNZ/xaZ8kVh00oyKJ2VaLtxE8JV1iIpQA8 VOU8XMQJtGCHrPVnbVMbas5jbcWOAv9g5uneBpiU+Nww2Jenlfod+iTXMRG4/2/9MjUNZO am9eC2UQ8HKb3N0qmJYXL1EgV3ldHLOm6H2ifJ6CyNS4OZq+eHHV4IKhNgsPVHv0QVmuvF JOCYiAknqI2VQ8nP1fruIaTJkJlrSrFwPeaGSaRpExGbWvHRWxgxmHa8b+Lq2iA/kB1TRV 9WMhin6p2i5LS0/Z8xwynTanD5gjxoJyj2fS9bJKVBB2XWPppf6JDzxxy2JY0A== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1730381906; a=rsa-sha256; cv=none; b=Psx2pamhjTr989kzaqJ7qPZ2RE+T6QehYPg75BoQceKO3QprrJf54wWq/e/T5Icj6m6FW1 TLTKG6ShOHd9E4ef/GgaX1BVM7knPk+wWZIjz0x8dtzaWXVQZsf+gFkyMUOgPk8rDbMGlJ 5i41u9eWCHlgPzDW5ki18WPAEp+RP2hAeBNvjZ5arrvfhib3bisQXzsuUzun34vdhwTa/X StO3db6/ILpNF8jcypGiGvD4suUvdEcb6cx/m/lNtZNg1uUf04X0hR8ykZHNAJPYffArX9 457f9LAuCYM3y50zHvxbNYuQmU+ipHB8mw0qj0BMzB6oZNawWz/gqq36lKc7Ow== 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 4XfQ7638R9zdfg; Thu, 31 Oct 2024 13:38:26 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 49VDcQds092352; Thu, 31 Oct 2024 13:38:26 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 49VDcQFk092349; Thu, 31 Oct 2024 13:38:26 GMT (envelope-from git) Date: Thu, 31 Oct 2024 13:38:26 GMT Message-Id: <202410311338.49VDcQFk092349@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Michael Tuexen Subject: git: 2e45166856e2 - stable/14 - tcp rack, bbr: improve handling of soft errors 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: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: tuexen X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 2e45166856e271f8a981a2c6c35f4738321851fb Auto-Submitted: auto-generated The branch stable/14 has been updated by tuexen: URL: https://cgit.FreeBSD.org/src/commit/?id=2e45166856e271f8a981a2c6c35f4738321851fb commit 2e45166856e271f8a981a2c6c35f4738321851fb Author: Michael Tuexen AuthorDate: 2024-08-30 07:26:41 +0000 Commit: Michael Tuexen CommitDate: 2024-10-31 11:16:29 +0000 tcp rack, bbr: improve handling of soft errors Do not report an error, if it is stored as a soft error. This avoids, for example, the dropping of TCP connections using an interface, while enabling or disabling LRO on that interface. Reviewed by: cc Sponsored by: Netflix, Inc. Differential Revision: https://reviews.freebsd.org/D46427 (cherry picked from commit b2044c4557443bbce974101f04e2b465d1bbe769) --- sys/netinet/tcp_stacks/bbr.c | 1 + sys/netinet/tcp_stacks/rack.c | 1 + 2 files changed, 2 insertions(+) diff --git a/sys/netinet/tcp_stacks/bbr.c b/sys/netinet/tcp_stacks/bbr.c index c1bbec3800fd..2c737360cbe4 100644 --- a/sys/netinet/tcp_stacks/bbr.c +++ b/sys/netinet/tcp_stacks/bbr.c @@ -13837,6 +13837,7 @@ nomore: case ENETUNREACH: if (TCPS_HAVERCVDSYN(tp->t_state)) { tp->t_softerror = error; + error = 0; } /* FALLTHROUGH */ default: diff --git a/sys/netinet/tcp_stacks/rack.c b/sys/netinet/tcp_stacks/rack.c index 35ae371a082e..8cdb6e1f9efe 100644 --- a/sys/netinet/tcp_stacks/rack.c +++ b/sys/netinet/tcp_stacks/rack.c @@ -22473,6 +22473,7 @@ nomore: case ENETDOWN: if (TCPS_HAVERCVDSYN(tp->t_state)) { tp->t_softerror = error; + error = 0; } /* FALLTHROUGH */ default: