mirror of https://lore.kernel.org/lkml/
 help / color / mirror / Atom feed
From: Geliang Tang <geliangtang@gmail.com>
To: Mat Martineau <mathew.j.martineau@linux.intel.com>,
	Matthieu Baerts <matthieu.baerts@tessares.net>,
	"David S. Miller" <davem@davemloft.net>,
	Jakub Kicinski <kuba@kernel.org>
Cc: Geliang Tang <geliangtang@gmail.com>,
	netdev@vger.kernel.org, mptcp@lists.01.org,
	linux-kernel@vger.kernel.org
Subject: [MPTCP][PATCH net-next 02/16] mptcp: add the outgoing RM_ADDR support
Date: Thu, 24 Sep 2020 08:29:48 +0800	[thread overview]
Message-ID: <e3c9ab612d773465ddf78cef0482208c73a0ca07.1600853093.git.geliangtang@gmail.com> (raw)
In-Reply-To: <cover.1600853093.git.geliangtang@gmail.com>
In-Reply-To: <bfecdd638bb74a02de1c3f1c84239911e304fcc3.1600853093.git.geliangtang@gmail.com>

This patch added a new signal named rm_addr_signal in PM. On outgoing path,
we called mptcp_pm_should_rm_signal to check if rm_addr_signal has been
set. If it has been, we sent out the RM_ADDR option.

Suggested-by: Matthieu Baerts <matthieu.baerts@tessares.net>
Suggested-by: Paolo Abeni <pabeni@redhat.com>
Signed-off-by: Geliang Tang <geliangtang@gmail.com>
---
 net/mptcp/options.c  | 29 +++++++++++++++++++++++++++++
 net/mptcp/pm.c       | 25 +++++++++++++++++++++++++
 net/mptcp/protocol.h |  9 +++++++++
 3 files changed, 63 insertions(+)

diff --git a/net/mptcp/options.c b/net/mptcp/options.c
index ee0cb0546324..bbc124876417 100644
--- a/net/mptcp/options.c
+++ b/net/mptcp/options.c
@@ -614,6 +614,31 @@ static bool mptcp_established_options_add_addr(struct sock *sk,
 	return true;
 }
 
+static bool mptcp_established_options_rm_addr(struct sock *sk,
+					      unsigned int *size,
+					      unsigned int remaining,
+					      struct mptcp_out_options *opts)
+{
+	struct mptcp_subflow_context *subflow = mptcp_subflow_ctx(sk);
+	struct mptcp_sock *msk = mptcp_sk(subflow->conn);
+	u8 rm_id;
+
+	if (!mptcp_pm_should_rm_signal(msk) ||
+	    !(mptcp_pm_rm_addr_signal(msk, remaining, &rm_id)))
+		return false;
+
+	if (remaining < TCPOLEN_MPTCP_RM_ADDR_BASE)
+		return false;
+
+	*size = TCPOLEN_MPTCP_RM_ADDR_BASE;
+	opts->suboptions |= OPTION_MPTCP_RM_ADDR;
+	opts->rm_id = rm_id;
+
+	pr_debug("rm_id=%d", opts->rm_id);
+
+	return true;
+}
+
 bool mptcp_established_options(struct sock *sk, struct sk_buff *skb,
 			       unsigned int *size, unsigned int remaining,
 			       struct mptcp_out_options *opts)
@@ -644,6 +669,10 @@ bool mptcp_established_options(struct sock *sk, struct sk_buff *skb,
 		*size += opt_size;
 		remaining -= opt_size;
 		ret = true;
+	} else if (mptcp_established_options_rm_addr(sk, &opt_size, remaining, opts)) {
+		*size += opt_size;
+		remaining -= opt_size;
+		ret = true;
 	}
 
 	return ret;
diff --git a/net/mptcp/pm.c b/net/mptcp/pm.c
index ce12b8b26ad2..81b07ae213b9 100644
--- a/net/mptcp/pm.c
+++ b/net/mptcp/pm.c
@@ -174,6 +174,29 @@ bool mptcp_pm_add_addr_signal(struct mptcp_sock *msk, unsigned int remaining,
 	return ret;
 }
 
+bool mptcp_pm_rm_addr_signal(struct mptcp_sock *msk, unsigned int remaining,
+			     u8 *rm_id)
+{
+	int ret = false;
+
+	spin_lock_bh(&msk->pm.lock);
+
+	/* double check after the lock is acquired */
+	if (!mptcp_pm_should_rm_signal(msk))
+		goto out_unlock;
+
+	if (remaining < TCPOLEN_MPTCP_RM_ADDR_BASE)
+		goto out_unlock;
+
+	*rm_id = msk->pm.rm_id;
+	WRITE_ONCE(msk->pm.rm_addr_signal, false);
+	ret = true;
+
+out_unlock:
+	spin_unlock_bh(&msk->pm.lock);
+	return ret;
+}
+
 int mptcp_pm_get_local_id(struct mptcp_sock *msk, struct sock_common *skc)
 {
 	return mptcp_pm_nl_get_local_id(msk, skc);
@@ -185,8 +208,10 @@ void mptcp_pm_data_init(struct mptcp_sock *msk)
 	msk->pm.add_addr_accepted = 0;
 	msk->pm.local_addr_used = 0;
 	msk->pm.subflows = 0;
+	msk->pm.rm_id = 0;
 	WRITE_ONCE(msk->pm.work_pending, false);
 	WRITE_ONCE(msk->pm.add_addr_signal, false);
+	WRITE_ONCE(msk->pm.rm_addr_signal, false);
 	WRITE_ONCE(msk->pm.accept_addr, false);
 	WRITE_ONCE(msk->pm.accept_subflow, false);
 	msk->pm.status = 0;
diff --git a/net/mptcp/protocol.h b/net/mptcp/protocol.h
index 91adc9a19757..8929b0c7660a 100644
--- a/net/mptcp/protocol.h
+++ b/net/mptcp/protocol.h
@@ -163,6 +163,7 @@ struct mptcp_pm_data {
 	spinlock_t	lock;		/*protects the whole PM data */
 
 	bool		add_addr_signal;
+	bool		rm_addr_signal;
 	bool		server_side;
 	bool		work_pending;
 	bool		accept_addr;
@@ -176,6 +177,7 @@ struct mptcp_pm_data {
 	u8		local_addr_max;
 	u8		subflows_max;
 	u8		status;
+	u8		rm_id;
 };
 
 struct mptcp_data_frag {
@@ -443,6 +445,11 @@ static inline bool mptcp_pm_should_add_signal(struct mptcp_sock *msk)
 	return READ_ONCE(msk->pm.add_addr_signal);
 }
 
+static inline bool mptcp_pm_should_rm_signal(struct mptcp_sock *msk)
+{
+	return READ_ONCE(msk->pm.rm_addr_signal);
+}
+
 static inline unsigned int mptcp_add_addr_len(int family)
 {
 	if (family == AF_INET)
@@ -452,6 +459,8 @@ static inline unsigned int mptcp_add_addr_len(int family)
 
 bool mptcp_pm_add_addr_signal(struct mptcp_sock *msk, unsigned int remaining,
 			      struct mptcp_addr_info *saddr);
+bool mptcp_pm_rm_addr_signal(struct mptcp_sock *msk, unsigned int remaining,
+			     u8 *rm_id);
 int mptcp_pm_get_local_id(struct mptcp_sock *msk, struct sock_common *skc);
 
 void __init mptcp_pm_nl_init(void);
-- 
2.17.1


  reply	other threads:[~2020-09-24  0:36 UTC|newest]

Thread overview: 29+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2020-09-24  0:29 [MPTCP][PATCH net-next 00/16] mptcp: RM_ADDR/ADD_ADDR enhancements Geliang Tang
2020-09-24  0:29 ` [MPTCP][PATCH net-next 01/16] mptcp: rename addr_signal and the related functions Geliang Tang
2020-09-24  0:29   ` Geliang Tang [this message]
2020-09-24  0:29     ` [MPTCP][PATCH net-next 03/16] mptcp: add the incoming RM_ADDR support Geliang Tang
2020-09-24  0:29       ` [MPTCP][PATCH net-next 04/16] mptcp: send out ADD_ADDR with echo flag Geliang Tang
2020-09-24  0:29         ` [MPTCP][PATCH net-next 05/16] mptcp: add ADD_ADDR related mibs Geliang Tang
2020-09-24  0:29           ` [MPTCP][PATCH net-next 06/16] selftests: mptcp: add ADD_ADDR mibs check function Geliang Tang
2020-09-24  0:29             ` [MPTCP][PATCH net-next 07/16] mptcp: add accept_subflow re-check Geliang Tang
2020-09-24  0:29               ` [MPTCP][PATCH net-next 08/16] mptcp: remove addr and subflow in PM netlink Geliang Tang
2020-09-24  0:29                 ` [MPTCP][PATCH net-next 09/16] mptcp: implement mptcp_pm_remove_subflow Geliang Tang
2020-09-24  0:29                   ` [MPTCP][PATCH net-next 10/16] mptcp: add RM_ADDR related mibs Geliang Tang
2020-09-24  0:29                     ` [MPTCP][PATCH net-next 11/16] mptcp: add mptcp_destroy_common helper Geliang Tang
2020-09-24  0:29                       ` [MPTCP][PATCH net-next 12/16] selftests: mptcp: add remove cfg in mptcp_connect Geliang Tang
2020-09-24  0:29                         ` [MPTCP][PATCH net-next 13/16] selftests: mptcp: add remove addr and subflow test cases Geliang Tang
2020-09-24  0:30                           ` [MPTCP][PATCH net-next 14/16] mptcp: add struct mptcp_pm_add_entry Geliang Tang
2020-09-24  0:30                             ` [MPTCP][PATCH net-next 15/16] mptcp: add sk_stop_timer_sync helper Geliang Tang
2020-09-24  0:30                               ` [MPTCP][PATCH net-next 16/16] mptcp: retransmit ADD_ADDR when timeout Geliang Tang
2020-09-25  0:26                                 ` Mat Martineau
2020-09-25  0:26                               ` [MPTCP][PATCH net-next 15/16] mptcp: add sk_stop_timer_sync helper Mat Martineau
2020-09-25  0:25                             ` [MPTCP][PATCH net-next 14/16] mptcp: add struct mptcp_pm_add_entry Mat Martineau
2020-09-25  0:25                           ` [MPTCP][PATCH net-next 13/16] selftests: mptcp: add remove addr and subflow test cases Mat Martineau
2020-09-25  0:24                         ` [MPTCP][PATCH net-next 12/16] selftests: mptcp: add remove cfg in mptcp_connect Mat Martineau
2020-09-25  0:23                       ` [MPTCP][PATCH net-next 11/16] mptcp: add mptcp_destroy_common helper Mat Martineau
2020-09-25  0:21                     ` [MPTCP][PATCH net-next 10/16] mptcp: add RM_ADDR related mibs Mat Martineau
2020-09-25  0:20                 ` [MPTCP][PATCH net-next 08/16] mptcp: remove addr and subflow in PM netlink Mat Martineau
2020-09-25  0:19       ` [MPTCP][PATCH net-next 03/16] mptcp: add the incoming RM_ADDR support Mat Martineau
2020-09-25  0:17     ` [MPTCP][PATCH net-next 02/16] mptcp: add the outgoing " Mat Martineau
2020-09-25  0:17   ` [MPTCP][PATCH net-next 01/16] mptcp: rename addr_signal and the related functions Mat Martineau
2020-09-25  2:58 ` [MPTCP][PATCH net-next 00/16] mptcp: RM_ADDR/ADD_ADDR enhancements David Miller

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=e3c9ab612d773465ddf78cef0482208c73a0ca07.1600853093.git.geliangtang@gmail.com \
    --to=geliangtang@gmail.com \
    --cc=davem@davemloft.net \
    --cc=kuba@kernel.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=mathew.j.martineau@linux.intel.com \
    --cc=matthieu.baerts@tessares.net \
    --cc=mptcp@lists.01.org \
    --cc=netdev@vger.kernel.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox

all inboxes | Powered by JetHome®