Received: from mga04.intel.com (mga04.intel.com [192.55.52.120]) (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 4CF582CA8 for ; Fri, 28 Jan 2022 00:38:46 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1643330326; x=1674866326; h=from:to:subject:date:message-id:in-reply-to:references: mime-version:content-transfer-encoding; bh=bKdXD6vgqKi6AwN+Uu8BGYp9THOjdb5gywK9XfblEa4=; b=Jcf/CQ3MqqNO0vi0fYUct0lm8QpyyMGUAoWWUOSjcLyHfBwiJj03P41o 5HGBO1jgOgALPH4tSBK9g2a9OrPc8Wqn6hGvjYuByjW3JLtpAhHZ1FRHq hl+KLKdKfmJ1KlxXYMPlY02VCSTQy6Qe9yA83jZgBk8M4X0CD91bttABN C2IpIJ5dHQPbTZOWe7vGouAp1zwYzSKZ2pwpjBHb+FwNwPrbKtRL3rj3J mC3REcXcZEMNVwfjT9SJTTLSMwYuN/Tco+FErAuLAc8yfVxOUma5EOw3t bBtBBTlU6LOoaDjSXmemxnci2Hap4Z2UypJhLCzTIf0a+0rx921SNuXSl Q==; X-IronPort-AV: E=McAfee;i="6200,9189,10239"; a="245846915" X-IronPort-AV: E=Sophos;i="5.88,322,1635231600"; d="scan'208";a="245846915" Received: from orsmga001.jf.intel.com ([10.7.209.18]) by fmsmga104.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 27 Jan 2022 16:38:24 -0800 X-IronPort-AV: E=Sophos;i="5.88,322,1635231600"; d="scan'208";a="564000999" Received: from otc-tsn-4.jf.intel.com ([10.23.153.135]) by orsmga001-auth.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 27 Jan 2022 16:38:20 -0800 From: Kishen Maloor To: kishen.maloor@intel.com, mptcp@lists.linux.dev Subject: [PATCH mptcp-next v3 4/8] mptcp: establish subflows from either end of connection Date: Thu, 27 Jan 2022 19:38:08 -0500 Message-Id: <20220128003812.2732609-5-kishen.maloor@intel.com> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20220128003812.2732609-1-kishen.maloor@intel.com> References: <20220128003812.2732609-1-kishen.maloor@intel.com> Precedence: bulk X-Mailing-List: mptcp@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit This change updates internal logic to permit subflows to be established from either the client or server ends of MPTCP connections. This symmetry and added flexibility may be harnessed by PM implementations running on either end in creating new subflows. The essence of this change lies in not relying on the "server_side" flag (which continues to be available if needed). Signed-off-by: Kishen Maloor --- v2: check for 3rd ACK retransmission only on passive side of the MPJ handshake v3: check for active subflow socket in subflow_simultaneous_connect --- net/mptcp/options.c | 2 +- net/mptcp/protocol.c | 5 +---- net/mptcp/protocol.h | 8 ++++++-- 3 files changed, 8 insertions(+), 7 deletions(-) diff --git a/net/mptcp/options.c b/net/mptcp/options.c index 0d3c8f7e5be6..947820a9da0d 100644 --- a/net/mptcp/options.c +++ b/net/mptcp/options.c @@ -930,7 +930,7 @@ static bool check_fully_established(struct mptcp_sock *msk, struct sock *ssk, if (TCP_SKB_CB(skb)->seq == subflow->ssn_offset + 1 && TCP_SKB_CB(skb)->end_seq == TCP_SKB_CB(skb)->seq && subflow->mp_join && (mp_opt->suboptions & OPTIONS_MPTCP_MPJ) && - READ_ONCE(msk->pm.server_side)) + !subflow->request_join) tcp_send_ack(ssk); goto fully_established; } diff --git a/net/mptcp/protocol.c b/net/mptcp/protocol.c index 526a0f5ba415..7c591177c3e8 100644 --- a/net/mptcp/protocol.c +++ b/net/mptcp/protocol.c @@ -3256,15 +3256,12 @@ bool mptcp_finish_join(struct sock *ssk) return false; } - if (!msk->pm.server_side) + if (!list_empty(&subflow->node)) goto out; if (!mptcp_pm_allow_new_subflow(msk)) goto err_prohibited; - if (WARN_ON_ONCE(!list_empty(&subflow->node))) - goto err_prohibited; - /* active connections are already on conn_list. * If we can't acquire msk socket lock here, let the release callback * handle it diff --git a/net/mptcp/protocol.h b/net/mptcp/protocol.h index d20c65fcba89..30006735afb7 100644 --- a/net/mptcp/protocol.h +++ b/net/mptcp/protocol.h @@ -906,13 +906,17 @@ static inline bool mptcp_check_infinite_map(struct sk_buff *skb) return false; } +static inline bool is_active_ssk(struct mptcp_subflow_context *subflow) +{ + return (subflow->request_mptcp || subflow->request_join); +} + static inline bool subflow_simultaneous_connect(struct sock *sk) { struct mptcp_subflow_context *subflow = mptcp_subflow_ctx(sk); - struct sock *parent = subflow->conn; return sk->sk_state == TCP_ESTABLISHED && - !mptcp_sk(parent)->pm.server_side && + is_active_ssk(subflow) && !subflow->conn_finished; } -- 2.31.1