[10/13] mptcp: allow creating non-backup subflows

Message ID	9c56d32d58e4d507564cc764c3cb4f84f562ade4.1596649926.git.pabeni@redhat.com
State	Accepted, archived
Delegated to:	Matthieu Baerts
Headers	show Return-Path: <mptcp-bounces@lists.01.org> Received-SPF: Pass (mailfrom) identity=mailfrom; client-ip=207.211.31.81; helo=us-smtp-delivery-1.mimecast.com; envelope-from=pabeni@redhat.com; receiver=<UNKNOWN> From: Paolo Abeni <pabeni@redhat.com> To: mptcp@lists.01.org Date: Wed, 5 Aug 2020 19:57:09 +0200 Message-Id: <9c56d32d58e4d507564cc764c3cb4f84f562ade4.1596649926.git.pabeni@redhat.com> In-Reply-To: <cover.1596649926.git.pabeni@redhat.com> References: <cover.1596649926.git.pabeni@redhat.com> MIME-Version: 1.0 Message-ID-Hash: BX7PGNSUITPNY56TRS44GBIRKKS3VVT6 Precedence: list Subject: [MPTCP] [PATCH 10/13] mptcp: allow creating non-backup subflows Archived-At: <https://lists.01.org/hyperkitty/list/mptcp@lists.01.org/message/BX7PGNSUITPNY56TRS44GBIRKKS3VVT6/> Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit
Series	mptcp: multiple xmit substreams support \| expand [00/13] mptcp: multiple xmit substreams support [01/13] mptcp: rethink 'is writable' conditional [02/13] mptcp: set data_ready status bit in subflow_check_data_avail() [03/13] mptcp: trigger msk processing even for OoO data [04/13] mptcp: basic sndbuf autotuning [05/13] mptcp: introduce and use mptcp_try_coalesce() [06/13] mptcp: move ooo skbs into msk out of order queue. [07/13] mptcp: cleanup mptcp_subflow_discard_data() [08/13] mptcp: add OoO related mibs [09/13] mptcp: move address attribute into mptcp_addr_info [10/13] mptcp: allow creating non-backup subflows [11/13] mptcp: allow picking different xmit subflows [12/13] mptcp: simult flow self-tests [13/13] mptcp: cache subflow write status in subflow ctx

Message ID

9c56d32d58e4d507564cc764c3cb4f84f562ade4.1596649926.git.pabeni@redhat.com

State

Accepted, archived

Delegated to:

Matthieu Baerts

Headers

Received-SPF: Pass (mailfrom) identity=mailfrom; client-ip=207.211.31.81;
 helo=us-smtp-delivery-1.mimecast.com; envelope-from=pabeni@redhat.com;
 receiver=<UNKNOWN> 
From: Paolo Abeni <pabeni@redhat.com>
To: mptcp@lists.01.org
Date: Wed,  5 Aug 2020 19:57:09 +0200
Message-Id: 
 <9c56d32d58e4d507564cc764c3cb4f84f562ade4.1596649926.git.pabeni@redhat.com>
In-Reply-To: <cover.1596649926.git.pabeni@redhat.com>
References: <cover.1596649926.git.pabeni@redhat.com>
MIME-Version: 1.0
Message-ID-Hash: BX7PGNSUITPNY56TRS44GBIRKKS3VVT6
Precedence: list
Subject: [MPTCP] [PATCH 10/13] mptcp: allow creating non-backup subflows
Archived-At: 
 <https://lists.01.org/hyperkitty/list/mptcp@lists.01.org/message/BX7PGNSUITPNY56TRS44GBIRKKS3VVT6/>
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: 7bit

Series

mptcp: multiple xmit substreams support | expand

Commit Message

Paolo Abeni Aug. 5, 2020, 5:57 p.m. UTC

Currently the 'backup' attribute of local endpoint
is ignored. Let's use it for the MP_JOIN handshake

Signed-off-by: Paolo Abeni <pabeni@redhat.com>
---
 net/mptcp/subflow.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/net/mptcp/subflow.c b/net/mptcp/subflow.c
index 00cab7d3dbae..587e3b653930 100644
--- a/net/mptcp/subflow.c
+++ b/net/mptcp/subflow.c
@@ -20,6 +20,7 @@ 
 #include <net/ip6_route.h>
 #endif
 #include <net/mptcp.h>
+#include <uapi/linux/mptcp.h>
 #include "protocol.h"
 #include "mib.h"
 
@@ -1097,7 +1098,7 @@  int __mptcp_subflow_connect(struct sock *sk, const struct mptcp_addr_info *loc,
 	subflow->remote_token = remote_token;
 	subflow->local_id = local_id;
 	subflow->request_join = 1;
-	subflow->request_bkup = 1;
+	subflow->request_bkup = !!(loc->flags & MPTCP_PM_ADDR_FLAG_BACKUP);
 	mptcp_info2sockaddr(remote, &addr);
 
 	err = kernel_connect(sf, (struct sockaddr *)&addr, addrlen, O_NONBLOCK);

[10/13] mptcp: allow creating non-backup subflows

Commit Message

Patch