Unverified Commit 73c47e90 authored by openeuler-ci-bot's avatar openeuler-ci-bot Committed by Gitee
Browse files

!13110 MPTCP Upstream part 19 

Merge Pull Request from: @geliangtang 
 
Patches from v6.9-rc1.
 
 
Link:https://gitee.com/openeuler/kernel/pulls/13110

 

Reviewed-by: default avatarYue Haibing <yuehaibing@huawei.com>
Signed-off-by: default avatarZhang Peng <zhangpeng362@huawei.com>
parents a9a1ac4d 709759b4

net/mptcp/pm.c

+7 −0
Original line number Diff line number Diff line
@@ -430,6 +430,13 @@ int mptcp_pm_get_flags_and_ifindex_by_id(struct mptcp_sock *msk, unsigned int id 
	return mptcp_pm_nl_get_flags_and_ifindex_by_id(msk, id, flags, ifindex);

}



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

{

	if (info->attrs[MPTCP_PM_ATTR_TOKEN])

		return mptcp_userspace_pm_get_addr(skb, info);

	return mptcp_pm_nl_get_addr(skb, info);

}



int mptcp_pm_dump_addr(struct sk_buff *msg, struct netlink_callback *cb)

{

	const struct genl_info *info = genl_info_dump(cb);

net/mptcp/pm_netlink.c

+6 −1
Original line number Diff line number Diff line
@@ -1795,7 +1795,7 @@ int mptcp_nl_fill_addr(struct sk_buff *skb, 
	return -EMSGSIZE;

}



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

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

{

	struct nlattr *attr = info->attrs[MPTCP_PM_ENDPOINT_ADDR];

	struct pm_nl_pernet *pernet = genl_info_pm_nl(info);
@@ -1845,6 +1845,11 @@ int mptcp_pm_nl_get_addr_doit(struct sk_buff *skb, struct genl_info *info) 
	return ret;

}



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

{

	return mptcp_pm_get_addr(skb, info);

}



int mptcp_pm_nl_dump_addr(struct sk_buff *msg,

			  struct netlink_callback *cb)

{

net/mptcp/pm_userspace.c

+90 −15
Original line number Diff line number Diff line
@@ -106,19 +106,26 @@ static int mptcp_userspace_pm_delete_local_addr(struct mptcp_sock *msk, 
	return -EINVAL;

}



static struct mptcp_pm_addr_entry *

mptcp_userspace_pm_lookup_addr_by_id(struct mptcp_sock *msk, unsigned int id)

{

	struct mptcp_pm_addr_entry *entry;



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

		if (entry->addr.id == id)

			return entry;

	}

	return NULL;

}



int mptcp_userspace_pm_get_flags_and_ifindex_by_id(struct mptcp_sock *msk,

						   unsigned int id,

						   u8 *flags, int *ifindex)

{

	struct mptcp_pm_addr_entry *entry, *match = NULL;

	struct mptcp_pm_addr_entry *match;



	spin_lock_bh(&msk->pm.lock);

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

		if (id == entry->addr.id) {

			match = entry;

			break;

		}

	}

	match = mptcp_userspace_pm_lookup_addr_by_id(msk, id);

	spin_unlock_bh(&msk->pm.lock);

	if (match) {

		*flags = match->flags;
@@ -261,7 +268,7 @@ int mptcp_pm_nl_remove_doit(struct sk_buff *skb, struct genl_info *info) 
{

	struct nlattr *token = info->attrs[MPTCP_PM_ATTR_TOKEN];

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

	struct mptcp_pm_addr_entry *match = NULL;

	struct mptcp_pm_addr_entry *match;

	struct mptcp_pm_addr_entry *entry;

	struct mptcp_sock *msk;

	LIST_HEAD(free_list);
@@ -298,13 +305,7 @@ int mptcp_pm_nl_remove_doit(struct sk_buff *skb, struct genl_info *info) 


	lock_sock(sk);



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

		if (entry->addr.id == id_val) {

			match = entry;

			break;

		}

	}



	match = mptcp_userspace_pm_lookup_addr_by_id(msk, id_val);

	if (!match) {

		GENL_SET_ERR_MSG(info, "address with specified id not found");

		release_sock(sk);
@@ -637,3 +638,77 @@ int mptcp_userspace_pm_dump_addr(struct sk_buff *msg, 
	sock_put(sk);

	return ret;

}



int mptcp_userspace_pm_get_addr(struct sk_buff *skb,

				struct genl_info *info)

{

	struct nlattr *attr = info->attrs[MPTCP_PM_ENDPOINT_ADDR];

	struct nlattr *token = info->attrs[MPTCP_PM_ATTR_TOKEN];

	struct mptcp_pm_addr_entry addr, *entry;

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

	struct mptcp_sock *msk;

	struct sk_buff *msg;

	int ret = -EINVAL;

	struct sock *sk;

	void *reply;



	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;

	}



	ret = mptcp_pm_parse_entry(attr, info, false, &addr);

	if (ret < 0)

		goto out;



	msg = nlmsg_new(NLMSG_DEFAULT_SIZE, GFP_KERNEL);

	if (!msg) {

		ret = -ENOMEM;

		goto out;

	}



	reply = genlmsg_put_reply(msg, info, &mptcp_genl_family, 0,

				  info->genlhdr->cmd);

	if (!reply) {

		GENL_SET_ERR_MSG(info, "not enough space in Netlink message");

		ret = -EMSGSIZE;

		goto fail;

	}



	lock_sock(sk);

	spin_lock_bh(&msk->pm.lock);

	entry = mptcp_userspace_pm_lookup_addr_by_id(msk, addr.addr.id);

	if (!entry) {

		GENL_SET_ERR_MSG(info, "address not found");

		ret = -EINVAL;

		goto unlock_fail;

	}



	ret = mptcp_nl_fill_addr(msg, entry);

	if (ret)

		goto unlock_fail;



	genlmsg_end(msg, reply);

	ret = genlmsg_reply(msg, info);

	spin_unlock_bh(&msk->pm.lock);

	release_sock(sk);

	sock_put(sk);

	return ret;



unlock_fail:

	spin_unlock_bh(&msk->pm.lock);

	release_sock(sk);

fail:

	nlmsg_free(msg);

out:

	sock_put(sk);

	return ret;

}

net/mptcp/protocol.h

+4 −0
Original line number Diff line number Diff line
@@ -1075,6 +1075,10 @@ int mptcp_pm_nl_dump_addr(struct sk_buff *msg, 
			  struct netlink_callback *cb);

int mptcp_userspace_pm_dump_addr(struct sk_buff *msg,

				 struct netlink_callback *cb);

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

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

int mptcp_userspace_pm_get_addr(struct sk_buff *skb,

				struct genl_info *info);



static inline u8 subflow_get_local_id(const struct mptcp_subflow_context *subflow)

{

tools/testing/selftests/net/mptcp/pm_nl_ctl.c

+13 −1
Original line number Diff line number Diff line
@@ -1087,6 +1087,7 @@ int get_addr(int fd, int pm_family, int argc, char *argv[]) 
		  1024];

	struct rtattr *rta, *nest;

	struct nlmsghdr *nh;

	u_int32_t token = 0;

	int nest_start;

	u_int8_t id;

	int off = 0;
@@ -1097,10 +1098,12 @@ int get_addr(int fd, int pm_family, int argc, char *argv[]) 
			    MPTCP_PM_VER);



	/* the only argument is the address id */

	if (argc != 3)

	if (argc != 3 && argc != 5)

		syntax(argv);



	id = atoi(argv[2]);

	if (argc == 5 && !strcmp(argv[3], "token"))

		token = strtoul(argv[4], NULL, 10);



	nest_start = off;

	nest = (void *)(data + off);
@@ -1116,6 +1119,15 @@ int get_addr(int fd, int pm_family, int argc, char *argv[]) 
	off += NLMSG_ALIGN(rta->rta_len);

	nest->rta_len = off - nest_start;



	/* token */

	if (token) {

		rta = (void *)(data + off);

		rta->rta_type = MPTCP_PM_ATTR_TOKEN;

		rta->rta_len = RTA_LENGTH(4);

		memcpy(RTA_DATA(rta), &token, 4);

		off += NLMSG_ALIGN(rta->rta_len);

	}



	print_addrs(nh, pm_family, do_nl_req(fd, nh, off, sizeof(data)));

	return 0;

}