Commit 8008e77e authored by Geliang Tang's avatar Geliang Tang Committed by Jakub Kicinski
Browse files

mptcp: move mptcp_pm_remove_addrs into pm_userspace 



Since mptcp_pm_remove_addrs() is only called from the userspace PM, this
patch moves it into pm_userspace.c.

For this, lookup_subflow_by_saddr() and remove_anno_list_by_saddr()
helpers need to be exported in protocol.h. Also add "mptcp_" prefix for
these helpers.

Here, mptcp_pm_remove_addrs() is not changed to a static function because
it will be used in BPF Path Manager.

This patch doesn't change the behaviour of the code, just refactoring.

Signed-off-by: default avatarGeliang Tang <tanggeliang@kylinos.cn>
Reviewed-by: default avatarMatthieu Baerts (NGI0) <matttbe@kernel.org>
Signed-off-by: default avatarMatthieu Baerts (NGI0) <matttbe@kernel.org>
Link: https://patch.msgid.link/20241213-net-next-mptcp-pm-misc-cleanup-v1-4-ddb6d00109a8@kernel.org


Signed-off-by: default avatarJakub Kicinski <kuba@kernel.org>
parent 6a389c8c

net/mptcp/pm_netlink.c

+8 −38
Original line number Diff line number Diff line
@@ -107,7 +107,7 @@ static void remote_address(const struct sock_common *skc, 
#endif

}



static bool lookup_subflow_by_saddr(const struct list_head *list,

bool mptcp_lookup_subflow_by_saddr(const struct list_head *list,

				   const struct mptcp_addr_info *saddr)

{

	struct mptcp_subflow_context *subflow;
@@ -1447,7 +1447,7 @@ int mptcp_pm_nl_add_addr_doit(struct sk_buff *skb, struct genl_info *info) 
	return ret;

}



static bool remove_anno_list_by_saddr(struct mptcp_sock *msk,

bool mptcp_remove_anno_list_by_saddr(struct mptcp_sock *msk,

				     const struct mptcp_addr_info *addr)

{

	struct mptcp_pm_add_entry *entry;
@@ -1476,7 +1476,7 @@ static bool mptcp_pm_remove_anno_addr(struct mptcp_sock *msk, 


	list.ids[list.nr++] = mptcp_endp_get_local_id(msk, addr);



	ret = remove_anno_list_by_saddr(msk, addr);

	ret = mptcp_remove_anno_list_by_saddr(msk, addr);

	if (ret || force) {

		spin_lock_bh(&msk->pm.lock);

		if (ret) {
@@ -1520,7 +1520,7 @@ static int mptcp_nl_remove_subflow_and_signal_addr(struct net *net, 
		}



		lock_sock(sk);

		remove_subflow = lookup_subflow_by_saddr(&msk->conn_list, addr);

		remove_subflow = mptcp_lookup_subflow_by_saddr(&msk->conn_list, addr);

		mptcp_pm_remove_anno_addr(msk, addr, remove_subflow &&

					  !(entry->flags & MPTCP_PM_ADDR_FLAG_IMPLICIT));
@@ -1633,36 +1633,6 @@ int mptcp_pm_nl_del_addr_doit(struct sk_buff *skb, struct genl_info *info) 
	return ret;

}



/* Called from the userspace PM only */

void mptcp_pm_remove_addrs(struct mptcp_sock *msk, struct list_head *rm_list)

{

	struct mptcp_rm_list alist = { .nr = 0 };

	struct mptcp_pm_addr_entry *entry;

	int anno_nr = 0;



	list_for_each_entry(entry, rm_list, list) {

		if (alist.nr >= MPTCP_RM_IDS_MAX)

			break;



		/* only delete if either announced or matching a subflow */

		if (remove_anno_list_by_saddr(msk, &entry->addr))

			anno_nr++;

		else if (!lookup_subflow_by_saddr(&msk->conn_list,

						  &entry->addr))

			continue;



		alist.ids[alist.nr++] = entry->addr.id;

	}



	if (alist.nr) {

		spin_lock_bh(&msk->pm.lock);

		msk->pm.add_addr_signaled -= anno_nr;

		mptcp_pm_remove_addr(msk, &alist);

		spin_unlock_bh(&msk->pm.lock);

	}

}



/* Called from the in-kernel PM only */

static void mptcp_pm_flush_addrs_and_subflows(struct mptcp_sock *msk,

					      struct list_head *rm_list)

{
@@ -1671,11 +1641,11 @@ static void mptcp_pm_flush_addrs_and_subflows(struct mptcp_sock *msk, 


	list_for_each_entry(entry, rm_list, list) {

		if (slist.nr < MPTCP_RM_IDS_MAX &&

		    lookup_subflow_by_saddr(&msk->conn_list, &entry->addr))

		    mptcp_lookup_subflow_by_saddr(&msk->conn_list, &entry->addr))

			slist.ids[slist.nr++] = mptcp_endp_get_local_id(msk, &entry->addr);



		if (alist.nr < MPTCP_RM_IDS_MAX &&

		    remove_anno_list_by_saddr(msk, &entry->addr))

		    mptcp_remove_anno_list_by_saddr(msk, &entry->addr))

			alist.ids[alist.nr++] = mptcp_endp_get_local_id(msk, &entry->addr);

	}

net/mptcp/pm_userspace.c

+28 −0
Original line number Diff line number Diff line
@@ -287,6 +287,34 @@ static int mptcp_userspace_pm_remove_id_zero_address(struct mptcp_sock *msk, 
	return err;

}



void mptcp_pm_remove_addrs(struct mptcp_sock *msk, struct list_head *rm_list)

{

	struct mptcp_rm_list alist = { .nr = 0 };

	struct mptcp_pm_addr_entry *entry;

	int anno_nr = 0;



	list_for_each_entry(entry, rm_list, list) {

		if (alist.nr >= MPTCP_RM_IDS_MAX)

			break;



		/* only delete if either announced or matching a subflow */

		if (mptcp_remove_anno_list_by_saddr(msk, &entry->addr))

			anno_nr++;

		else if (!mptcp_lookup_subflow_by_saddr(&msk->conn_list,

							&entry->addr))

			continue;



		alist.ids[alist.nr++] = entry->addr.id;

	}



	if (alist.nr) {

		spin_lock_bh(&msk->pm.lock);

		msk->pm.add_addr_signaled -= anno_nr;

		mptcp_pm_remove_addr(msk, &alist);

		spin_unlock_bh(&msk->pm.lock);

	}

}



int mptcp_pm_nl_remove_doit(struct sk_buff *skb, struct genl_info *info)

{

	struct nlattr *id = info->attrs[MPTCP_PM_ATTR_LOC_ID];

net/mptcp/protocol.h

+4 −0
Original line number Diff line number Diff line
@@ -1027,6 +1027,10 @@ mptcp_pm_del_add_timer(struct mptcp_sock *msk, 
struct mptcp_pm_add_entry *

mptcp_lookup_anno_list_by_saddr(const struct mptcp_sock *msk,

				const struct mptcp_addr_info *addr);

bool mptcp_lookup_subflow_by_saddr(const struct list_head *list,

				   const struct mptcp_addr_info *saddr);

bool mptcp_remove_anno_list_by_saddr(struct mptcp_sock *msk,

				     const struct mptcp_addr_info *addr);

int mptcp_pm_set_flags(struct sk_buff *skb, struct genl_info *info);

int mptcp_pm_nl_set_flags(struct sk_buff *skb, struct genl_info *info);

int mptcp_userspace_pm_set_flags(struct sk_buff *skb, struct genl_info *info);