Unverified Commit 35881c90 authored by openeuler-ci-bot's avatar openeuler-ci-bot Committed by Gitee
Browse files

!13111 MPTCP Upstream part 20 

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

 

Reviewed-by: default avatarYue Haibing <yuehaibing@huawei.com>
Signed-off-by: default avatarZhang Peng <zhangpeng362@huawei.com>
parents 73c47e90 c4fd1f6a

net/mptcp/diag.c

+0 −1
Original line number Diff line number Diff line
@@ -10,7 +10,6 @@ 
#include <linux/net.h>

#include <linux/inet_diag.h>

#include <net/netlink.h>

#include <uapi/linux/mptcp.h>

#include "protocol.h"



static int subflow_get_info(struct sock *sk, struct sk_buff *skb)

net/mptcp/mptcp_diag.c

+0 −1
Original line number Diff line number Diff line
@@ -10,7 +10,6 @@ 
#include <linux/net.h>

#include <linux/inet_diag.h>

#include <net/netlink.h>

#include <uapi/linux/mptcp.h>

#include "protocol.h"



static int sk_diag_dump(struct sock *sk, struct sk_buff *skb,

net/mptcp/pm.c

+4 −7
Original line number Diff line number Diff line
@@ -6,7 +6,6 @@ 
#define pr_fmt(fmt) "MPTCP: " fmt



#include <linux/kernel.h>

#include <net/tcp.h>

#include <net/mptcp.h>

#include "protocol.h"
@@ -446,13 +445,11 @@ int mptcp_pm_dump_addr(struct sk_buff *msg, struct netlink_callback *cb) 
	return mptcp_pm_nl_dump_addr(msg, cb);

}



int mptcp_pm_set_flags(struct net *net, struct nlattr *token,

		       struct mptcp_pm_addr_entry *loc,

		       struct mptcp_pm_addr_entry *rem, u8 bkup)

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

{

	if (token)

		return mptcp_userspace_pm_set_flags(net, token, loc, rem, bkup);

	return mptcp_pm_nl_set_flags(net, loc, bkup);

	if (info->attrs[MPTCP_PM_ATTR_TOKEN])

		return mptcp_userspace_pm_set_flags(skb, info);

	return mptcp_pm_nl_set_flags(skb, info);

}



void mptcp_pm_subflow_chk_stale(const struct mptcp_sock *msk, struct sock *ssk)

net/mptcp/pm_netlink.c

+33 −42
Original line number Diff line number Diff line
@@ -8,12 +8,9 @@ 


#include <linux/inet.h>

#include <linux/kernel.h>

#include <net/tcp.h>

#include <net/inet_common.h>

#include <net/netns/generic.h>

#include <net/mptcp.h>

#include <net/genetlink.h>

#include <uapi/linux/mptcp.h>



#include "protocol.h"

#include "mib.h"
@@ -518,15 +515,12 @@ __lookup_addr_by_id(struct pm_nl_pernet *pernet, unsigned int id) 
}



static struct mptcp_pm_addr_entry *

__lookup_addr(struct pm_nl_pernet *pernet, const struct mptcp_addr_info *info,

	      bool lookup_by_id)

__lookup_addr(struct pm_nl_pernet *pernet, const struct mptcp_addr_info *info)

{

	struct mptcp_pm_addr_entry *entry;



	list_for_each_entry(entry, &pernet->local_addr_list, list) {

		if ((!lookup_by_id &&

		     mptcp_addresses_equal(&entry->addr, info, entry->addr.port)) ||

		    (lookup_by_id && entry->addr.id == info->id))

		if (mptcp_addresses_equal(&entry->addr, info, entry->addr.port))

			return entry;

	}

	return NULL;
@@ -557,7 +551,7 @@ static void mptcp_pm_create_subflow_or_signal_addr(struct mptcp_sock *msk) 


		mptcp_local_address((struct sock_common *)msk->first, &mpc_addr);

		rcu_read_lock();

		entry = __lookup_addr(pernet, &mpc_addr, false);

		entry = __lookup_addr(pernet, &mpc_addr);

		if (entry) {

			__clear_bit(entry->addr.id, msk->pm.id_avail_bitmap);

			msk->mpc_endpoint_id = entry->addr.id;
@@ -2014,66 +2008,63 @@ static int mptcp_nl_set_flags(struct net *net, 
	return ret;

}



int mptcp_pm_nl_set_flags(struct net *net, struct mptcp_pm_addr_entry *addr, u8 bkup)

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

{

	struct pm_nl_pernet *pernet = pm_nl_get_pernet(net);

	struct mptcp_pm_addr_entry addr = { .addr = { .family = AF_UNSPEC }, };

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

	u8 changed, mask = MPTCP_PM_ADDR_FLAG_BACKUP |

			   MPTCP_PM_ADDR_FLAG_FULLMESH;

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

	struct mptcp_pm_addr_entry *entry;

	struct pm_nl_pernet *pernet;

	u8 lookup_by_id = 0;

	u8 bkup = 0;

	int ret;



	pernet = pm_nl_get_pernet(net);



	if (addr->addr.family == AF_UNSPEC) {

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

	if (ret < 0)

		return ret;



	if (addr.addr.family == AF_UNSPEC) {

		lookup_by_id = 1;

		if (!addr->addr.id)

		if (!addr.addr.id) {

			GENL_SET_ERR_MSG(info, "missing required inputs");

			return -EOPNOTSUPP;

		}

	}



	if (addr.flags & MPTCP_PM_ADDR_FLAG_BACKUP)

		bkup = 1;



	spin_lock_bh(&pernet->lock);

	entry = __lookup_addr(pernet, &addr->addr, lookup_by_id);

	entry = lookup_by_id ? __lookup_addr_by_id(pernet, addr.addr.id) :

			       __lookup_addr(pernet, &addr.addr);

	if (!entry) {

		spin_unlock_bh(&pernet->lock);

		GENL_SET_ERR_MSG(info, "address not found");

		return -EINVAL;

	}

	if ((addr->flags & MPTCP_PM_ADDR_FLAG_FULLMESH) &&

	if ((addr.flags & MPTCP_PM_ADDR_FLAG_FULLMESH) &&

	    (entry->flags & MPTCP_PM_ADDR_FLAG_SIGNAL)) {

		spin_unlock_bh(&pernet->lock);

		GENL_SET_ERR_MSG(info, "invalid addr flags");

		return -EINVAL;

	}



	changed = (addr->flags ^ entry->flags) & mask;

	entry->flags = (entry->flags & ~mask) | (addr->flags & mask);

	*addr = *entry;

	changed = (addr.flags ^ entry->flags) & mask;

	entry->flags = (entry->flags & ~mask) | (addr.flags & mask);

	addr = *entry;

	spin_unlock_bh(&pernet->lock);



	mptcp_nl_set_flags(net, &addr->addr, bkup, changed);

	mptcp_nl_set_flags(net, &addr.addr, bkup, changed);

	return 0;

}



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

{

	struct mptcp_pm_addr_entry remote = { .addr = { .family = AF_UNSPEC }, };

	struct mptcp_pm_addr_entry addr = { .addr = { .family = AF_UNSPEC }, };

	struct nlattr *attr_rem = info->attrs[MPTCP_PM_ATTR_ADDR_REMOTE];

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

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

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

	u8 bkup = 0;

	int ret;



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

	if (ret < 0)

		return ret;



	if (attr_rem) {

		ret = mptcp_pm_parse_entry(attr_rem, info, false, &remote);

		if (ret < 0)

			return ret;

	}



	if (addr.flags & MPTCP_PM_ADDR_FLAG_BACKUP)

		bkup = 1;



	return mptcp_pm_set_flags(net, token, &addr, &remote, bkup);

	return mptcp_pm_set_flags(skb, info);

}



static void mptcp_nl_mcast_send(struct net *net, struct sk_buff *nlskb, gfp_t gfp)

net/mptcp/pm_userspace.c

+33 −8
Original line number Diff line number Diff line
@@ -546,32 +546,57 @@ int mptcp_pm_nl_subflow_destroy_doit(struct sk_buff *skb, struct genl_info *info 
	return err;

}



int mptcp_userspace_pm_set_flags(struct net *net, struct nlattr *token,

				 struct mptcp_pm_addr_entry *loc,

				 struct mptcp_pm_addr_entry *rem, u8 bkup)

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

{

	struct mptcp_pm_addr_entry loc = { .addr = { .family = AF_UNSPEC }, };

	struct mptcp_pm_addr_entry rem = { .addr = { .family = AF_UNSPEC }, };

	struct nlattr *attr_rem = info->attrs[MPTCP_PM_ATTR_ADDR_REMOTE];

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

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

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

	struct mptcp_sock *msk;

	int ret = -EINVAL;

	struct sock *sk;

	u32 token_val;

	u8 bkup = 0;



	token_val = nla_get_u32(token);



	msk = mptcp_token_get_sock(net, token_val);

	if (!msk)

	if (!msk) {

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

		return ret;

	}



	sk = (struct sock *)msk;



	if (!mptcp_pm_is_userspace(msk))

	if (!mptcp_pm_is_userspace(msk)) {

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

		goto set_flags_err;

	}



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

	if (ret < 0)

		goto set_flags_err;



	if (loc->addr.family == AF_UNSPEC ||

	    rem->addr.family == AF_UNSPEC)

	if (attr_rem) {

		ret = mptcp_pm_parse_entry(attr_rem, info, false, &rem);

		if (ret < 0)

			goto set_flags_err;

	}



	if (loc.addr.family == AF_UNSPEC ||

	    rem.addr.family == AF_UNSPEC) {

		GENL_SET_ERR_MSG(info, "invalid address families");

		ret = -EINVAL;

		goto set_flags_err;

	}



	if (loc.flags & MPTCP_PM_ADDR_FLAG_BACKUP)

		bkup = 1;



	lock_sock(sk);

	ret = mptcp_pm_nl_mp_prio_send_ack(msk, &loc->addr, &rem->addr, bkup);

	ret = mptcp_pm_nl_mp_prio_send_ack(msk, &loc.addr, &rem.addr, bkup);

	release_sock(sk);



set_flags_err: