Commit f4b7a71b authored by Geliang Tang's avatar Geliang Tang
Browse files

mptcp: implement mptcp_userspace_pm_dump_addr 

mainline inclusion
from mainline-v6.9-rc1
commit 34e74a5cf3b7d0ab5e54725be19bd27c8b367a63
category: feature
bugzilla: https://gitee.com/openeuler/kernel/issues/I9VYQ9
CVE: NA

Reference: https://git.kernel.org/pub/scm/linux/kernel/git/next/linux-next.git/commit/?id=34e74a5cf3b7d0ab5e54725be19bd27c8b367a63



--------------------------------

This patch implements mptcp_userspace_pm_dump_addr() to dump addresses
from userspace pm address list. Use mptcp_token_get_sock() to get the
msk from the given token, if userspace PM is enabled in it, traverse
each address entry in address list, put every entry to userspace using
mptcp_pm_nl_put_entry_msg().

Signed-off-by: default avatarGeliang Tang <tanggeliang@kylinos.cn>
Reviewed-by: default avatarMatthieu Baerts (NGI0) <matttbe@kernel.org>
Reviewed-by: default avatarMat Martineau <martineau@kernel.org>
Signed-off-by: default avatarMatthieu Baerts (NGI0) <matttbe@kernel.org>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
Reviewed-by: default avatarJackie Liu <liuyun01@kylinos.cn>
Signed-off-by: default avatarGeliang Tang <tanggeliang@kylinos.cn>
parent ac720ea3

net/mptcp/pm_userspace.c

+60 −0
Original line number Diff line number Diff line
@@ -572,3 +572,63 @@ int mptcp_userspace_pm_set_flags(struct net *net, struct nlattr *token, 
	sock_put(sk);

	return ret;

}



int mptcp_userspace_pm_dump_addr(struct sk_buff *msg,

				 struct netlink_callback *cb)

{

	struct id_bitmap {

		DECLARE_BITMAP(map, MPTCP_PM_MAX_ADDR_ID + 1);

	} *bitmap;

	const struct genl_info *info = genl_info_dump(cb);

	struct net *net = sock_net(msg->sk);

	struct mptcp_pm_addr_entry *entry;

	struct mptcp_sock *msk;

	struct nlattr *token;

	int ret = -EINVAL;

	struct sock *sk;

	void *hdr;



	bitmap = (struct id_bitmap *)cb->ctx;

	token = info->attrs[MPTCP_PM_ATTR_TOKEN];



	msk = mptcp_token_get_sock(net, nla_get_u32(token));

	if (!msk) {

		NL_SET_ERR_MSG_ATTR(info->extack, token, "invalid token");

		return ret;

	}



	sk = (struct sock *)msk;



	if (!mptcp_pm_is_userspace(msk)) {

		GENL_SET_ERR_MSG(info, "invalid request; userspace PM not selected");

		goto out;

	}



	lock_sock(sk);

	spin_lock_bh(&msk->pm.lock);

	list_for_each_entry(entry, &msk->pm.userspace_pm_local_addr_list, list) {

		if (test_bit(entry->addr.id, bitmap->map))

			continue;



		hdr = genlmsg_put(msg, NETLINK_CB(cb->skb).portid,

				  cb->nlh->nlmsg_seq, &mptcp_genl_family,

				  NLM_F_MULTI, MPTCP_PM_CMD_GET_ADDR);

		if (!hdr)

			break;



		if (mptcp_nl_fill_addr(msg, entry) < 0) {

			genlmsg_cancel(msg, hdr);

			break;

		}



		__set_bit(entry->addr.id, bitmap->map);

		genlmsg_end(msg, hdr);

	}

	spin_unlock_bh(&msk->pm.lock);

	release_sock(sk);

	ret = msg->len;



out:

	sock_put(sk);

	return ret;

}

net/mptcp/protocol.h

+2 −0
Original line number Diff line number Diff line
@@ -1069,6 +1069,8 @@ bool mptcp_pm_rm_addr_signal(struct mptcp_sock *msk, unsigned int remaining, 
int mptcp_pm_get_local_id(struct mptcp_sock *msk, struct sock_common *skc);

int mptcp_pm_nl_get_local_id(struct mptcp_sock *msk, struct mptcp_addr_info *skc);

int mptcp_userspace_pm_get_local_id(struct mptcp_sock *msk, struct mptcp_addr_info *skc);

int mptcp_userspace_pm_dump_addr(struct sk_buff *msg,

				 struct netlink_callback *cb);



static inline u8 subflow_get_local_id(const struct mptcp_subflow_context *subflow)

{