From nobody Thu Oct 31 16:36:33 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 4XfV4d6gtZz5c0Rm; Thu, 31 Oct 2024 16:36:33 +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 4XfV4d68C2z4glT; Thu, 31 Oct 2024 16:36:33 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1730392593; 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=4ru+AvV9pgwKrp0QuHMtoYqHAaNOMfNdFjY2Cdi8V/s=; b=SPGNDxvga8vQhUD+sWYK8v+jxuV7DXqD7UC6IrCBfSGAdOn71/0MB0MLGpj2u7spBhGNrk /wFtrE1OI6Wq7S26G0nnWmqkMPQUP7sMoOS7b5664cYHqygM55pJa6s+G4UIkmp64xhHKS 3wj169qN1yraY6YfwCpV27Mtiye175flr27H56NASA+eNdZu5Lv7+hy6Ek+KykGPbVE8Ht XhT50SpedMBO2A1g6kky36djlfRnc76J8zNFqqN5GNPGUhX1zGrkAchbrzxqNRXjJzujVh ezETSXQdEP5bO050aqQiEmkIz39pZizHb3+SdgTpzZGt3w51WEun7PlDWa//UQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1730392593; 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=4ru+AvV9pgwKrp0QuHMtoYqHAaNOMfNdFjY2Cdi8V/s=; b=e5TjrL2IxTT28wRi6MbpFl7PaXMaagR2rJ+9EL5+gTq0ziAO2Zm8zVejUYSWg7YpHsM6nX TetK3ofkLKWKewwcI+XHYUD0wxyfUU3E9GSG9bWoc2DwE3mp3fi7nA6LLwg37CPn51EHz/ gnh9e4MmmhYKE/b2EYCrPc47H1G2ntMli/F2yeiveHbZ1LL6/kFwczcqs7DYafuzt16WuW mv508hVr6VzRWFgvjAXugDiEP4AhBQSbmxKGJp4zHEZ/NojKV5z5w9s5VKwXljOihRe2rz wch89Rya0GcWUvgKU66DoQZaDUS/JyJNMQIm3sVjsbaE9u1ssD+bEwbkjzNAtg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1730392593; a=rsa-sha256; cv=none; b=R5cXUa5c3U6+x7Wmf1pj3jasxr3zr5dbLRc4R4q92vjHFq8IBznVmtbCwVukx7ibVBY/aM ly3pS9/fqh81nFNoy4ihP5xDIdfCXBgR57KhNxc2+7SD9Y+WuDILPtkkKeAKTXV8tVBlpP sH950/F8LQW6o+aRZyHiR0/aCvxCxikoeIFW7StEcWU6rVSWdHUpWBdld7HKZW4xegnl17 MT4/LdPHXLbYM0JpCz6vtc0LP0L8dc74eFHGdMXuR6eWMzkXQMmik7NpBn6bQmugu8yMdG TDgRimgm5q4wvdqCtJQnHBH1pq74hLLGgdSTBl2oPSV6l1bEYvkQBuYG0pvWyg== 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 4XfV4d5cLyzjyT; Thu, 31 Oct 2024 16:36:33 +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 49VGaXTF033079; Thu, 31 Oct 2024 16:36:33 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 49VGaXGr033076; Thu, 31 Oct 2024 16:36:33 GMT (envelope-from git) Date: Thu, 31 Oct 2024 16:36:33 GMT Message-Id: <202410311636.49VGaXGr033076@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: 3e8226cb8c83 - stable/13 - 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/13 X-Git-Reftype: branch X-Git-Commit: 3e8226cb8c8333c4e0a1118fe09d0a7b6e5711cd Auto-Submitted: auto-generated The branch stable/13 has been updated by tuexen: URL: https://cgit.FreeBSD.org/src/commit/?id=3e8226cb8c8333c4e0a1118fe09d0a7b6e5711cd commit 3e8226cb8c8333c4e0a1118fe09d0a7b6e5711cd Author: Michael Tuexen AuthorDate: 2024-08-30 07:26:41 +0000 Commit: Michael Tuexen CommitDate: 2024-10-31 16:36:28 +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 8fde062c0dc7..5ebf82eb97d9 100644 --- a/sys/netinet/tcp_stacks/bbr.c +++ b/sys/netinet/tcp_stacks/bbr.c @@ -13961,6 +13961,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 7429dcac5d5b..ce1f2b88cef8 100644 --- a/sys/netinet/tcp_stacks/rack.c +++ b/sys/netinet/tcp_stacks/rack.c @@ -18571,6 +18571,7 @@ nomore: case ENETDOWN: if (TCPS_HAVERCVDSYN(tp->t_state)) { tp->t_softerror = error; + error = 0; } /* FALLTHROUGH */ default: