From nobody Thu Sep 18 08:14:49 2025 Delivered-To: wpasupplicant.patchew@gmail.com Received: by 2002:ac4:a898:0:b0:4b1:af33:c52d with SMTP id z24csp636964pid; Fri, 22 Apr 2022 14:55:55 -0700 (PDT) X-Google-Smtp-Source: ABdhPJwktqLK2sTbCJPLdL/cWlFFIQ7jxZ2s6dUGuzPlaR41wEsYNDYaPaEM2Z4VnMszd46x/Xx7 X-Received: by 2002:a63:694a:0:b0:3aa:e962:db29 with SMTP id e71-20020a63694a000000b003aae962db29mr1115469pgc.421.1650664554889; Fri, 22 Apr 2022 14:55:54 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1650664554; cv=none; d=google.com; s=arc-20160816; b=RGGPEXiKdvHCbKsoumL5DDbtuFcIJsyAAvc290GStqvIevYd6cK4bfqwJUmJTuBSNX NpHxKUZpXmfwB0ft77SlC+tINHLcMbdta47rqVyNtlc7I0VijSUaAV0tpejldfsaaO1k VphRUk91h7YEdpOqSoYiahZTGYQzvub8BNWh7MQvJW0+E42XRp1N11riv3I9xyBimSvM hJS/XqaHqqAnjlg4u2955Oh2ZACQr7I+7xOqB5OSz9RvQYjE4E4jsH+RB5PV5zgNgf8E kQzDcowepuOuWfV2FnrrCMN8eepj29yuoGe11/T1wP6hjAVX64LhO8KStV8qA0oC+aIn fSOQ== 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=a5qcmbZhlCYKoFvrNZV1w81+yrmjnVHWA5pIgm+1Exk=; b=Ly7TCC+eXv7V62C+dAI7iKSge6nxy+tkda3hz7cPwkvelvlhIcw8mkbLxsWy63Abhv d1+C1clGrefOPCKL8ASPyJ5I4PgAl3namtuJKMwF/XOF+KJ47XoaB+7EwjlwbjYe3Prq JVJ0Prf0Lj8rWuWgBGlvQLPfr56dbbWjfuU6nB4ZAxKAWn4pX09zCDG1AqAfxIY6KCro J+GjNwazaM4j2/zw4qg6+KTRwrnx1aLhbQKFMS+IJAJgoDxJbwCeGI5I6P3f05gASUt9 a6q4rceSdcN7SmSeXcaJtcMVTy6Db2uAiaYLHI0o4BnxtYI0PiYNP/mDBQ7cztjAqzf1 /zuw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@intel.com header.s=Intel header.b=Na6IPJBJ; spf=pass (google.com: domain of mptcp+bounces-4862-wpasupplicant.patchew=gmail.com@lists.linux.dev designates 139.178.88.99 as permitted sender) smtp.mailfrom="mptcp+bounces-4862-wpasupplicant.patchew=gmail.com@lists.linux.dev"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=intel.com Return-Path: Received: from sv.mirrors.kernel.org (sv.mirrors.kernel.org. [139.178.88.99]) by mx.google.com with ESMTPS id s6-20020a63ff46000000b003aa2d163bdesi9727190pgk.732.2022.04.22.14.55.54 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Fri, 22 Apr 2022 14:55:54 -0700 (PDT) Received-SPF: pass (google.com: domain of mptcp+bounces-4862-wpasupplicant.patchew=gmail.com@lists.linux.dev designates 139.178.88.99 as permitted sender) client-ip=139.178.88.99; Authentication-Results: mx.google.com; dkim=pass header.i=@intel.com header.s=Intel header.b=Na6IPJBJ; spf=pass (google.com: domain of mptcp+bounces-4862-wpasupplicant.patchew=gmail.com@lists.linux.dev designates 139.178.88.99 as permitted sender) smtp.mailfrom="mptcp+bounces-4862-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 sv.mirrors.kernel.org (Postfix) with ESMTPS id 6C5EA280C0A for ; Fri, 22 Apr 2022 21:55:54 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id C39C72F56; 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 4FBD52F4E for ; Fri, 22 Apr 2022 21:55:51 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1650664551; x=1682200551; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=OLEkBdK7onccBpmQX1luhp5dKr/ZK3Z7PbbHCEDcqyg=; b=Na6IPJBJkrm7NqqJiRtclnDXGrkgZ3OMZltMJgLaB4hSLd500zT6XIYN OTjznbTkuvEWVl3T27zztVO7JuNq1eqUPBNfQrrhrh71mLaPHPbDFA6d6 HQQ+2Dq8pqbv4eL+GBUE3Kylck89QOPwxZ5/rJxpkwbiB72qUhd+etkrX EresYFX1TLQuyyawuPuCqTFifsQzmPrjjyw+I/U+niYBEqLvQNqu4BDQi Rq1C9h7IuKt+1m12i8DaJcEx64Vcdi1eUosRadtvfruBSjmTGGGlWpdBe F9M2tLD4+prW7K1V+lkeiohNssYCmubgCyyjzeYJuJaEo9wBcL9OMmZ6N Q==; X-IronPort-AV: E=McAfee;i="6400,9594,10324"; a="244720727" X-IronPort-AV: E=Sophos;i="5.90,282,1643702400"; d="scan'208";a="244720727" 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="578119257" 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 2/8] mptcp: add the fallback check Date: Fri, 22 Apr 2022 14:55:37 -0700 Message-Id: <20220422215543.545732-3-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 This patch adds the fallback check in subflow_check_data_avail(). Only do the fallback when the msk hasn't fallen back yet. Suggested-by: Paolo Abeni Signed-off-by: Geliang Tang Signed-off-by: Mat Martineau --- net/mptcp/subflow.c | 45 ++++++++++++++++++++++++--------------------- 1 file changed, 24 insertions(+), 21 deletions(-) diff --git a/net/mptcp/subflow.c b/net/mptcp/subflow.c index f217926f6a9c..7f26a5b04ad3 100644 --- a/net/mptcp/subflow.c +++ b/net/mptcp/subflow.c @@ -1203,35 +1203,38 @@ static bool subflow_check_data_avail(struct sock *s= sk) return false; =20 fallback: - /* RFC 8684 section 3.7. */ - if (subflow->send_mp_fail) { - if (mptcp_has_another_subflow(ssk)) { + if (!__mptcp_check_fallback(msk)) { + /* 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); + } + WRITE_ONCE(subflow->data_avail, MPTCP_SUBFLOW_NODATA); + return true; + } + + if (subflow->mp_join || subflow->fully_established) { + /* fatal protocol error, close the socket. + * subflow_error_report() will introduce the appropriate barriers + */ ssk->sk_err =3D EBADMSG; tcp_set_state(ssk, TCP_CLOSE); subflow->reset_transient =3D 0; - subflow->reset_reason =3D MPTCP_RST_EMIDDLEBOX; + subflow->reset_reason =3D MPTCP_RST_EMPTCP; tcp_send_active_reset(ssk, GFP_ATOMIC); - while ((skb =3D skb_peek(&ssk->sk_receive_queue))) - sk_eat_skb(ssk, skb); + WRITE_ONCE(subflow->data_avail, MPTCP_SUBFLOW_NODATA); + return false; } - WRITE_ONCE(subflow->data_avail, MPTCP_SUBFLOW_NODATA); - return true; - } =20 - if (subflow->mp_join || subflow->fully_established) { - /* fatal protocol error, close the socket. - * subflow_error_report() will introduce the appropriate barriers - */ - ssk->sk_err =3D EBADMSG; - tcp_set_state(ssk, TCP_CLOSE); - subflow->reset_transient =3D 0; - subflow->reset_reason =3D MPTCP_RST_EMPTCP; - tcp_send_active_reset(ssk, GFP_ATOMIC); - WRITE_ONCE(subflow->data_avail, MPTCP_SUBFLOW_NODATA); - return false; + __mptcp_do_fallback(msk); } =20 - __mptcp_do_fallback(msk); skb =3D skb_peek(&ssk->sk_receive_queue); subflow->map_valid =3D 1; subflow->map_seq =3D READ_ONCE(msk->ack_seq); --=20 2.36.0