From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-8.7 required=3.0 tests=HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS, URIBL_BLOCKED,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id D0633C31E5B for ; Mon, 17 Jun 2019 22:59:17 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id ABCE02084A for ; Mon, 17 Jun 2019 22:59:17 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728905AbfFQW7Q (ORCPT ); Mon, 17 Jun 2019 18:59:16 -0400 Received: from mga18.intel.com ([134.134.136.126]:10994 "EHLO mga18.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728273AbfFQW65 (ORCPT ); Mon, 17 Jun 2019 18:58:57 -0400 X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from orsmga002.jf.intel.com ([10.7.209.21]) by orsmga106.jf.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 17 Jun 2019 15:58:52 -0700 X-ExtLoop1: 1 Received: from mjmartin-nuc01.amr.corp.intel.com (HELO mjmartin-nuc01.sea.intel.com) ([10.241.98.42]) by orsmga002.jf.intel.com with ESMTP; 17 Jun 2019 15:58:52 -0700 From: Mat Martineau To: edumazet@google.com, netdev@vger.kernel.org Cc: Peter Krystad , cpaasch@apple.com, fw@strlen.de, pabeni@redhat.com, dcaratti@redhat.com, matthieu.baerts@tessares.net Subject: [RFC PATCH net-next 31/33] mptcp: Add path manager interface Date: Mon, 17 Jun 2019 15:58:06 -0700 Message-Id: <20190617225808.665-32-mathew.j.martineau@linux.intel.com> X-Mailer: git-send-email 2.22.0 In-Reply-To: <20190617225808.665-1-mathew.j.martineau@linux.intel.com> References: <20190617225808.665-1-mathew.j.martineau@linux.intel.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org From: Peter Krystad Add enough of a path manager interface to allow sending of ADD_ADDR when an incoming MPTCP connection is created. Capable of sending only a single IPv4 ADD_ADDR option. The 'pm_data' element of the connection sock will need to be expanded to handle multiple interfaces and IPv6. This is a skeleton interface definition for events generated by MPTCP. Signed-off-by: Peter Krystad --- net/mptcp/Makefile | 2 +- net/mptcp/pm.c | 57 ++++++++++++++++++++++++++++++++++++++++++++ net/mptcp/protocol.c | 4 ++++ net/mptcp/protocol.h | 25 ++++++++++++++++++- 4 files changed, 86 insertions(+), 2 deletions(-) create mode 100644 net/mptcp/pm.c diff --git a/net/mptcp/Makefile b/net/mptcp/Makefile index 178ae81d8b66..7fe7aa64eda0 100644 --- a/net/mptcp/Makefile +++ b/net/mptcp/Makefile @@ -1,4 +1,4 @@ # SPDX-License-Identifier: GPL-2.0 obj-$(CONFIG_MPTCP) += mptcp.o -mptcp-y := protocol.o subflow.o options.o token.o crypto.o +mptcp-y := protocol.o subflow.o options.o token.o crypto.o pm.o diff --git a/net/mptcp/pm.c b/net/mptcp/pm.c new file mode 100644 index 000000000000..512dc110098a --- /dev/null +++ b/net/mptcp/pm.c @@ -0,0 +1,57 @@ +// SPDX-License-Identifier: GPL-2.0 +/* Multipath TCP + * + * Copyright (c) 2019, Intel Corporation. + */ +#include +#include +#include +#include "protocol.h" + +void pm_new_connection(struct mptcp_sock *msk) +{ + pr_debug("msk=%p", msk); +} + +void pm_fully_established(struct mptcp_sock *msk) +{ + pr_debug("msk=%p", msk); +} + +void pm_connection_closed(struct mptcp_sock *msk) +{ + pr_debug("msk=%p", msk); +} + +void pm_subflow_established(struct mptcp_sock *msk, u8 id) +{ + pr_debug("msk=%p", msk); +} + +void pm_subflow_closed(struct mptcp_sock *msk, u8 id) +{ + pr_debug("msk=%p", msk); +} + +void pm_add_addr(struct mptcp_sock *msk, const struct in_addr *addr, u8 id) +{ + pr_debug("msk=%p", msk); +} + +void pm_add_addr6(struct mptcp_sock *msk, const struct in6_addr *addr, u8 id) +{ + pr_debug("msk=%p", msk); +} + +void pm_rm_addr(struct mptcp_sock *msk, u8 id) +{ + pr_debug("msk=%p", msk); +} + +bool pm_addr_signal(struct mptcp_sock *msk, unsigned int *size, + unsigned int remaining, struct mptcp_out_options *opts) +{ + pr_debug("msk=%p", msk); + + return false; +} diff --git a/net/mptcp/protocol.c b/net/mptcp/protocol.c index d4ffa47f53ef..e071fc8191ee 100644 --- a/net/mptcp/protocol.c +++ b/net/mptcp/protocol.c @@ -632,6 +632,8 @@ static struct sock *mptcp_accept(struct sock *sk, int flags, int *err, token_update_accept(new_sock->sk, new_mptcp_sock); msk->subflow = NULL; + pm_new_connection(msk); + crypto_key_sha1(msk->remote_key, NULL, &ack_seq); msk->write_seq = subflow->idsn + 1; ack_seq++; @@ -757,6 +759,8 @@ void mptcp_finish_connect(struct sock *sk, int mp_capable) msk->token = subflow->token; pr_debug("msk=%p, token=%u", msk, msk->token); + pm_new_connection(msk); + crypto_key_sha1(msk->remote_key, NULL, &ack_seq); msk->write_seq = subflow->idsn + 1; ack_seq++; diff --git a/net/mptcp/protocol.h b/net/mptcp/protocol.h index 556981f9e5fd..044665328b79 100644 --- a/net/mptcp/protocol.h +++ b/net/mptcp/protocol.h @@ -14,7 +14,7 @@ #define MPTCPOPT_MP_JOIN 1 #define MPTCPOPT_DSS 2 #define MPTCPOPT_ADD_ADDR 3 -#define MPTCPOPT_REMOVE_ADDR 4 +#define MPTCPOPT_RM_ADDR 4 #define MPTCPOPT_MP_PRIO 5 #define MPTCPOPT_MP_FAIL 6 #define MPTCPOPT_MP_FASTCLOSE 7 @@ -45,6 +45,17 @@ #define MPTCP_DSS_HAS_ACK BIT(0) #define MPTCP_DSS_FLAG_MASK (0x1F) +struct pm_data { + u8 addr_id; + sa_family_t family; + union { + struct in_addr addr; +#if IS_ENABLED(CONFIG_IPV6) + struct in6_addr addr6; +#endif + }; +}; + /* MPTCP connection sock */ struct mptcp_sock { /* inet_connection_sock must be the first member */ @@ -56,6 +67,7 @@ struct mptcp_sock { u32 token; struct list_head conn_list; struct socket *subflow; /* outgoing connect/listener/!mp_capable */ + struct pm_data pm; }; #define mptcp_for_each_subflow(__msk, __subflow) \ @@ -157,6 +169,17 @@ void crypto_key_sha1(u64 key, u32 *token, u64 *idsn); void crypto_hmac_sha1(u64 key1, u64 key2, u32 *hash_out, int arg_num, ...); +void pm_new_connection(struct mptcp_sock *msk); +void pm_fully_established(struct mptcp_sock *msk); +void pm_connection_closed(struct mptcp_sock *msk); +void pm_subflow_established(struct mptcp_sock *msk, u8 id); +void pm_subflow_closed(struct mptcp_sock *msk, u8 id); +void pm_add_addr(struct mptcp_sock *msk, const struct in_addr *addr, u8 id); +void pm_add_addr6(struct mptcp_sock *msk, const struct in6_addr *addr, u8 id); +void pm_rm_addr(struct mptcp_sock *msk, u8 id); +bool pm_addr_signal(struct mptcp_sock *msk, unsigned int *size, + unsigned int remaining, struct mptcp_out_options *opts); + static inline struct mptcp_ext *mptcp_get_ext(struct sk_buff *skb) { return (struct mptcp_ext *)skb_ext_find(skb, SKB_EXT_MPTCP); -- 2.22.0