[MPTCP][PATCH mptcp-next 6/9] mptcp: add netdev up event handler

[Geliang Tang <geliangtang@gmail.com>]

This patch added the net device UP event handler function named
mptcp_fm_cmd_add_addr. In it, alloc an address entry, populate it, and
append this entry to the local address list.

Signed-off-by: Geliang Tang <geliangtang@gmail.com>
---
 net/mptcp/pm_fullmesh.c | 45 ++++++++++++++++++++++++++++++++++++++++-
 net/mptcp/pm_netlink.c  |  4 ++--
 net/mptcp/protocol.h    |  2 ++
 3 files changed, 48 insertions(+), 3 deletions(-)

diff --git a/net/mptcp/pm_fullmesh.c b/net/mptcp/pm_fullmesh.c
index 4b2eddc2b4e9..1ef268d34360 100644
--- a/net/mptcp/pm_fullmesh.c
+++ b/net/mptcp/pm_fullmesh.c
@@ -132,6 +132,47 @@ void mptcp_pm_fm_data_init(struct mptcp_sock *msk)
 	WRITE_ONCE(pm->accept_subflow, MPTCP_PM_FM_MAX_ADDR);
 }
 
+static int mptcp_pm_fm_append_new_local_addr(struct pm_fm_pernet *pernet,
+					     struct mptcp_fm_addr_entry *entry)
+{
+	struct mptcp_fm_addr_entry *cur;
+
+	spin_lock_bh(&pernet->lock);
+
+	if (pernet->next_id > 255)
+		goto out;
+
+	list_for_each_entry(cur, &pernet->local_addr_list, list) {
+		if (addresses_equal(&cur->addr, &entry->addr, false))
+			goto out;
+	}
+
+	list_add_tail_rcu(&entry->list, &pernet->local_addr_list);
+
+out:
+	spin_unlock_bh(&pernet->lock);
+
+	return 0;
+}
+
+static int mptcp_fm_cmd_add_addr(struct net *net, const struct mptcp_addr_info *addr)
+{
+	struct pm_fm_pernet *pernet = net_generic(net, pm_fm_pernet_id);
+	struct mptcp_fm_addr_entry *entry;
+
+	entry = kmalloc(sizeof(*entry), GFP_ATOMIC);
+	if (!entry)
+		return -ENOMEM;
+
+	entry->addr = *addr;
+	entry->addr.id = pernet->next_id++;
+	entry->addr.port = 0;
+
+	mptcp_pm_fm_append_new_local_addr(pernet, entry);
+
+	return 0;
+}
+
 static int mptcp_fm_cmd_mod_addr(struct net *net, const struct mptcp_addr_info *addr)
 {
 	return 0;
@@ -140,7 +181,9 @@ static int mptcp_fm_cmd_mod_addr(struct net *net, const struct mptcp_addr_info *
 static void addr_event_handler(unsigned long event, struct net *net,
 			       struct mptcp_addr_info *addr)
 {
-	if (event == NETDEV_CHANGE)
+	if (event == NETDEV_UP)
+		mptcp_fm_cmd_add_addr(net, addr);
+	else if (event == NETDEV_CHANGE)
 		mptcp_fm_cmd_mod_addr(net, addr);
 }
 
diff --git a/net/mptcp/pm_netlink.c b/net/mptcp/pm_netlink.c
index d050dbd89e24..debec16e9209 100644
--- a/net/mptcp/pm_netlink.c
+++ b/net/mptcp/pm_netlink.c
@@ -57,8 +57,8 @@ struct pm_nl_pernet {
 #define MPTCP_PM_ADDR_MAX	8
 #define ADD_ADDR_RETRANS_MAX	3
 
-static bool addresses_equal(const struct mptcp_addr_info *a,
-			    struct mptcp_addr_info *b, bool use_port)
+bool addresses_equal(const struct mptcp_addr_info *a,
+		     struct mptcp_addr_info *b, bool use_port)
 {
 	bool addr_equals = false;
 
diff --git a/net/mptcp/protocol.h b/net/mptcp/protocol.h
index 99c23a1887d8..ea93bd1b4fde 100644
--- a/net/mptcp/protocol.h
+++ b/net/mptcp/protocol.h
@@ -717,6 +717,8 @@ mptcp_pm_del_add_timer(struct mptcp_sock *msk,
 struct mptcp_pm_add_entry *
 mptcp_lookup_anno_list_by_saddr(struct mptcp_sock *msk,
 				struct mptcp_addr_info *addr);
+bool addresses_equal(const struct mptcp_addr_info *a,
+		     struct mptcp_addr_info *b, bool use_port);
 bool lookup_subflow_by_saddr(const struct list_head *list,
 			     struct mptcp_addr_info *saddr);
 void remote_address(const struct sock_common *skc,
-- 
2.31.1