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 z24csp636972pid; Fri, 22 Apr 2022 14:55:56 -0700 (PDT) X-Google-Smtp-Source: ABdhPJyIHGMAZPOZN5RHKKFZt83gEIVgoy4scbFhfK3AG7jQ5vQ4C7VZAhwpwEtI8lE8tAa2nEBO X-Received: by 2002:a63:14c:0:b0:3aa:c642:82ef with SMTP id 73-20020a63014c000000b003aac64282efmr4185976pgb.448.1650664556074; 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=PsQdkfCO0FPUtdP1OWKQxvCCQeKo4hlfk0bkU5dswAqoncQhlRKis+WW/bUDe9WBn7 D7r09uvfrIcyz+iEDL2+JFbQdh0/SZ0ezuFJ47oPwOvB6N2SS0BEj7sPxf3qRfk+hggJ 6nncApNB3MRpQPQlmGBLRccvFRK2HuxzY5fB8dNUoEpRwM5Ha1JxDf06j25UrjccdlxE GbtgWOdCun5O058eqOgNUPIqjkrqsK67TaQDGA7M58+K12lWF+Eguqn92OvJ7raTR5gt AHeygCqEJnDVNkOkZ9VegMB497VjAPJA0AH5g7cbNYSsiMKecYc/OCtqSL6pLtW41bHy /zLw== 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=hm0IwuDOJg7zbYVK/F84bpa9HTz+fG0esnfumeqCMhQ=; b=kqrs46t6GeZKvE4zDJxEI4MOyfWM46DWN5S9RwLj6spzFWVFaYCNAtTC7hROZOf9s9 oQYJ7gjb+gUjK7W7/qbSUNbHxD8DoLqLYZG3mwdRhbZPpcTPUS1fuR9ryrHTHZww4Re1 bregcDVBW/9aJNJCVpmtWoVsKQD3c9iEdA4YDNs6oMxLtRVB9YEwE8E9WdrXH3II3P5F f2jnXGGVUTtA6CA0//Oxn/Y88841DulWN3EtwyUaDZOlgpoMsHc3x8xOorFsXlBkinwo ea+IeFjHiBoHCrRoOWjg1T859z/TlU0JuPTmxkguXB0P3N9VJdAN2W2QCxnF1NhF2wwT aTyg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@intel.com header.s=Intel header.b=f1Lx39dM; spf=pass (google.com: domain of mptcp+bounces-4863-wpasupplicant.patchew=gmail.com@lists.linux.dev designates 139.178.88.99 as permitted sender) smtp.mailfrom="mptcp+bounces-4863-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.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-4863-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=f1Lx39dM; spf=pass (google.com: domain of mptcp+bounces-4863-wpasupplicant.patchew=gmail.com@lists.linux.dev designates 139.178.88.99 as permitted sender) smtp.mailfrom="mptcp+bounces-4863-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 84463280C11 for ; Fri, 22 Apr 2022 21:55:55 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id D4D2B2F4A; Fri, 22 Apr 2022 21:55:53 +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 6B6632F55 for ; Fri, 22 Apr 2022 21:55:52 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1650664552; x=1682200552; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=SihafiiIWl8xeQ/8FEZfOF2xPjFHGPAiYamiWwV82b0=; b=f1Lx39dMT/5B++uYmHV8f16budSgTe6x8k0qVa2U4Mf9thOMxH8VYYAk 9V9xy+49qyS5VVKa5zFcV/GDD5U3+pcPXSmm5C1YWeLpjLg3Jub/DTFqv Rg6F1xsK/zOecsf0ROE9I23f3VD+/fNlAS47O9hxWqAzTbYs2BM3BVa/9 YZTgpPLb7lihhLRKJsJNBLeuZXcf7QdYSRxviamoe4bOkDEH/p1kYqKB+ 4w4d34GphhsKsXHdaOn1HRkedSkRvk7Q/G2rnc+z3Idts9N46v2wdspd1 hTkeEBrxxUZVVxCsQ5btIP0FCDt2MbFCFu6VCmzuuyGkzuRZpbJVp+2Vw g==; X-IronPort-AV: E=McAfee;i="6400,9594,10324"; a="244720729" X-IronPort-AV: E=Sophos;i="5.90,282,1643702400"; d="scan'208";a="244720729" 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="578119258" 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 3/8] mptcp: track and update contiguous data status Date: Fri, 22 Apr 2022 14:55:38 -0700 Message-Id: <20220422215543.545732-4-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 a new member allow_infinite_fallback in mptcp_sock, which is initialized to 'true' when the connection begins and is set to 'false' on any retransmit or successful MP_JOIN. Only do infinite mapping fallback if there is a single subflow AND there have been no retransmissions AND there have never been any MP_JOINs. Suggested-by: Paolo Abeni Signed-off-by: Geliang Tang Signed-off-by: Mat Martineau --- net/mptcp/protocol.c | 3 +++ net/mptcp/protocol.h | 1 + net/mptcp/subflow.c | 4 +++- 3 files changed, 7 insertions(+), 1 deletion(-) diff --git a/net/mptcp/protocol.c b/net/mptcp/protocol.c index 0492aa9308c7..6d653914e9fe 100644 --- a/net/mptcp/protocol.c +++ b/net/mptcp/protocol.c @@ -2465,6 +2465,7 @@ static void __mptcp_retrans(struct sock *sk) dfrag->already_sent =3D max(dfrag->already_sent, info.sent); tcp_push(ssk, 0, info.mss_now, tcp_sk(ssk)->nonagle, info.size_goal); + WRITE_ONCE(msk->allow_infinite_fallback, false); } =20 release_sock(ssk); @@ -2539,6 +2540,7 @@ static int __mptcp_init_sock(struct sock *sk) msk->first =3D NULL; inet_csk(sk)->icsk_sync_mss =3D mptcp_sync_mss; WRITE_ONCE(msk->csum_enabled, mptcp_is_checksum_enabled(sock_net(sk))); + WRITE_ONCE(msk->allow_infinite_fallback, true); msk->recovery =3D false; =20 mptcp_pm_data_init(msk); @@ -3275,6 +3277,7 @@ bool mptcp_finish_join(struct sock *ssk) } =20 subflow->map_seq =3D READ_ONCE(msk->ack_seq); + WRITE_ONCE(msk->allow_infinite_fallback, false); =20 out: mptcp_event(MPTCP_EVENT_SUB_ESTABLISHED, msk, ssk, GFP_ATOMIC); diff --git a/net/mptcp/protocol.h b/net/mptcp/protocol.h index aca1fb56523f..88d292374599 100644 --- a/net/mptcp/protocol.h +++ b/net/mptcp/protocol.h @@ -263,6 +263,7 @@ struct mptcp_sock { bool rcv_fastclose; bool use_64bit_ack; /* Set when we received a 64-bit DSN */ bool csum_enabled; + bool allow_infinite_fallback; u8 recvmsg_inq:1, cork:1, nodelay:1; diff --git a/net/mptcp/subflow.c b/net/mptcp/subflow.c index 7f26a5b04ad3..31dcb550316f 100644 --- a/net/mptcp/subflow.c +++ b/net/mptcp/subflow.c @@ -1206,7 +1206,8 @@ static bool subflow_check_data_avail(struct sock *ssk) if (!__mptcp_check_fallback(msk)) { /* RFC 8684 section 3.7. */ if (subflow->send_mp_fail) { - if (mptcp_has_another_subflow(ssk)) { + if (mptcp_has_another_subflow(ssk) || + !READ_ONCE(msk->allow_infinite_fallback)) { ssk->sk_err =3D EBADMSG; tcp_set_state(ssk, TCP_CLOSE); subflow->reset_transient =3D 0; @@ -1486,6 +1487,7 @@ int __mptcp_subflow_connect(struct sock *sk, const st= ruct mptcp_addr_info *loc, /* discard the subflow socket */ mptcp_sock_graft(ssk, sk->sk_socket); iput(SOCK_INODE(sf)); + WRITE_ONCE(msk->allow_infinite_fallback, false); return err; =20 failed_unlink: --=20 2.36.0