From nobody Thu Sep 18 08:14:50 2025 Delivered-To: wpasupplicant.patchew@gmail.com Received: by 2002:ac4:a898:0:b0:4b1:af33:c52d with SMTP id z24csp636973pid; Fri, 22 Apr 2022 14:55:56 -0700 (PDT) X-Google-Smtp-Source: ABdhPJwngiSo1daJTxk6MIqXQKPEIoplnoBpc/hFDSfh+twRb4aQ2Q6Ha09UENTmYa6oePiNjryO X-Received: by 2002:ac2:5302:0:b0:471:f2af:eca7 with SMTP id c2-20020ac25302000000b00471f2afeca7mr762383lfh.35.1650664556078; Fri, 22 Apr 2022 14:55:56 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1650664556; cv=none; d=google.com; s=arc-20160816; b=S797DS/HffqCakONlthT1OVigCqTvxDexWMUxDNBGSPwtLwRGuwO7kI7POf9xyIskV NZHqLh5b/+jGhdVM4XofJW2owROJTFTu3mv9rEpUXPZ/SkjYrwG3jGYmyjla6eQA6MMd V5VIa/NowU0k9AB+LMVnDvRhF+hjjiMfbwb9HQF2B8ruDWLX9kEAYTEZ1SwifD1Q2I5H yXkHOGUYJ9xapjFf0UUhKid6Sl5Y1s3v1HNIDDEPr8SkGCbdkS+XRYga73Ti+Tm04sbs XLSftrCAm7LnlJO784p31d4LFQAxUu6qfsaLw4j2z66g0MvMhzchV5x86vpoe7aoBHtQ u/TA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=content-transfer-encoding:mime-version:list-unsubscribe :list-subscribe:list-id:precedence:references:in-reply-to:message-id :date:subject:cc:to:from:dkim-signature; bh=tgGl5ijriEBZMBxPg2BOx28f2VDSm89dkRzm5EH1Kls=; b=Lml8P6rRjM+Lqdsu0xAoacML6Nzl/0pKCuxeGdrA5+D60SZ3sUHh62ugfHcqxJ4eag MKTVDmZel+i9XY0crOjxwd7fEbZNmI2fk9Cvfr2cWVK4PelbCWPM93FL7rEaHx7Kc//N PElyvzbcoR96iA6yseiQ+pMDlRBIXtHCFcDjZ7BcXDJkioOPoCUWmvEkPrarlA+8Y2qA OUAlQWZ9RJ+zEiUAnEilIkb+7miZLxvhTEfhE0GYMSISlRVHfArQqf3J933L7ZCoHcte Gc/gNQqflRylq/hAj5NA38MhuOQVNOMz3ughA0JBP2Gt8uW7wMZi+JW1kdKYgvzNy0j4 YgrQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@intel.com header.s=Intel header.b=kxVU0nsN; spf=pass (google.com: domain of mptcp+bounces-4861-wpasupplicant.patchew=gmail.com@lists.linux.dev designates 2604:1380:4040:4f00::1 as permitted sender) smtp.mailfrom="mptcp+bounces-4861-wpasupplicant.patchew=gmail.com@lists.linux.dev"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=intel.com Return-Path: Received: from da.mirrors.kernel.org (da.mirrors.kernel.org. [2604:1380:4040:4f00::1]) by mx.google.com with ESMTPS id m8-20020a2e97c8000000b0024d9b34de5fsi7955691ljj.547.2022.04.22.14.55.55 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Fri, 22 Apr 2022 14:55:56 -0700 (PDT) Received-SPF: pass (google.com: domain of mptcp+bounces-4861-wpasupplicant.patchew=gmail.com@lists.linux.dev designates 2604:1380:4040:4f00::1 as permitted sender) client-ip=2604:1380:4040:4f00::1; Authentication-Results: mx.google.com; dkim=pass header.i=@intel.com header.s=Intel header.b=kxVU0nsN; spf=pass (google.com: domain of mptcp+bounces-4861-wpasupplicant.patchew=gmail.com@lists.linux.dev designates 2604:1380:4040:4f00::1 as permitted sender) smtp.mailfrom="mptcp+bounces-4861-wpasupplicant.patchew=gmail.com@lists.linux.dev"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=intel.com Received: from smtp.subspace.kernel.org (wormhole.subspace.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by da.mirrors.kernel.org (Postfix) with ESMTPS id A2AB72E0989 for ; Fri, 22 Apr 2022 21:55:53 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id 64AB72F51; Fri, 22 Apr 2022 21:55:52 +0000 (UTC) X-Original-To: mptcp@lists.linux.dev Received: from mga12.intel.com (mga12.intel.com [192.55.52.136]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id D86777A for ; Fri, 22 Apr 2022 21:55:50 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1650664550; x=1682200550; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=1ZI/wWdgV4VW/clVksEhHQFe+EsRIy22X9gG8piZujc=; b=kxVU0nsN6ltSsDXZFS7FipCM8GDvo7qZ77Qjc1rgXOYu+nPojut0+XFL w8mwut9dRxN2uRviD6UUsaujCABBKmNYY9KhOKBS9XI+z7iCDTV/OgXuj M1zpgZSHAskRp3aLJbr2wbqF/SZ+8bt3k6tk2bv3nQ5VTaWPeVDafkiA6 QAcZTvHVRPhpQsS7Cr2t6577YbTRTPTNB8zGPuUkWAPrAjFPfKZ00L/wM IYtvv9o+qAhKgENTvx4Vd8LjLgm3DLtN9intCcuLC/bnw4mRDrbmSiott UpqAdKlE/NCn9ZmIeZSpFObakgclmHulnnyp3TeYxBVkHoJtIbfT6ejYP A==; X-IronPort-AV: E=McAfee;i="6400,9594,10324"; a="244720726" X-IronPort-AV: E=Sophos;i="5.90,282,1643702400"; d="scan'208";a="244720726" Received: from orsmga008.jf.intel.com ([10.7.209.65]) by fmsmga106.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 22 Apr 2022 14:55:48 -0700 X-IronPort-AV: E=Sophos;i="5.90,282,1643702400"; d="scan'208";a="578119255" Received: from mjmartin-desk2.amr.corp.intel.com (HELO mjmartin-desk2.intel.com) ([10.209.99.29]) by orsmga008-auth.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 22 Apr 2022 14:55:48 -0700 From: Mat Martineau To: netdev@vger.kernel.org Cc: Geliang Tang , davem@davemloft.net, kuba@kernel.org, pabeni@redhat.com, matthieu.baerts@tessares.net, mptcp@lists.linux.dev, Mat Martineau Subject: [PATCH net-next 1/8] mptcp: don't send RST for single subflow Date: Fri, 22 Apr 2022 14:55:36 -0700 Message-Id: <20220422215543.545732-2-mathew.j.martineau@linux.intel.com> X-Mailer: git-send-email 2.36.0 In-Reply-To: <20220422215543.545732-1-mathew.j.martineau@linux.intel.com> References: <20220422215543.545732-1-mathew.j.martineau@linux.intel.com> Precedence: bulk X-Mailing-List: mptcp@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" From: Geliang Tang When a bad checksum is detected and a single subflow is in use, don't send RST + MP_FAIL, send data_ack + MP_FAIL instead. So invoke tcp_send_active_reset() only when mptcp_has_another_subflow() is true. Signed-off-by: Geliang Tang Signed-off-by: Mat Martineau --- net/mptcp/subflow.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/net/mptcp/subflow.c b/net/mptcp/subflow.c index aba260f547da..f217926f6a9c 100644 --- a/net/mptcp/subflow.c +++ b/net/mptcp/subflow.c @@ -1206,14 +1206,14 @@ static bool subflow_check_data_avail(struct sock *s= sk) /* RFC 8684 section 3.7. */ if (subflow->send_mp_fail) { if (mptcp_has_another_subflow(ssk)) { + ssk->sk_err =3D EBADMSG; + tcp_set_state(ssk, TCP_CLOSE); + subflow->reset_transient =3D 0; + subflow->reset_reason =3D MPTCP_RST_EMIDDLEBOX; + tcp_send_active_reset(ssk, GFP_ATOMIC); while ((skb =3D skb_peek(&ssk->sk_receive_queue))) sk_eat_skb(ssk, skb); } - ssk->sk_err =3D EBADMSG; - tcp_set_state(ssk, TCP_CLOSE); - subflow->reset_transient =3D 0; - subflow->reset_reason =3D MPTCP_RST_EMIDDLEBOX; - tcp_send_active_reset(ssk, GFP_ATOMIC); WRITE_ONCE(subflow->data_avail, MPTCP_SUBFLOW_NODATA); return true; } --=20 2.36.0