Skip to content

L
linux
Commit 6a42477f authored by Geliang Tang's avatar Geliang Tang Committed by Jakub Kicinski
Browse files
Options

mptcp: update set_flags interfaces 

This patch updates set_flags interfaces, make it more similar to the
interfaces of dump_addr and get_addr:

 mptcp_pm_set_flags(struct sk_buff *skb, struct genl_info *info)
 mptcp_pm_nl_set_flags(struct sk_buff *skb, struct genl_info *info)
 mptcp_userspace_pm_set_flags(struct sk_buff *skb, struct genl_info *info)
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://lore.kernel.org/r/20240305-upstream-net-next-20240304-mptcp-misc-cleanup-v1-2-c436ba5e569b@kernel.orgSigned-off-by: default avatarJakub Kicinski <kuba@kernel.org>
parent d5dfbfa2
Hide whitespace changes
Inline Side-by-side
Showing with 58 additions and 52 deletions
net/mptcp/pm.c
View file @ 6a42477f
...@@ -456,13 +456,11 @@ int mptcp_pm_dump_addr(struct sk_buff *msg, struct netlink_callback *cb) ...@@ -456,13 +456,11 @@ int mptcp_pm_dump_addr(struct sk_buff *msg, struct netlink_callback *cb)
return mptcp_pm_nl_dump_addr(msg, cb); return mptcp_pm_nl_dump_addr(msg, cb);
} }
int mptcp_pm_set_flags(struct net *net, struct nlattr *token, int mptcp_pm_set_flags(struct sk_buff *skb, struct genl_info *info)
struct mptcp_pm_addr_entry *loc,
struct mptcp_pm_addr_entry *rem, u8 bkup)
{ {
if (token) if (info->attrs[MPTCP_PM_ATTR_TOKEN])
return mptcp_userspace_pm_set_flags(net, token, loc, rem, bkup); return mptcp_userspace_pm_set_flags(skb, info);
return mptcp_pm_nl_set_flags(net, loc, bkup); return mptcp_pm_nl_set_flags(skb, info);
} }
void mptcp_pm_subflow_chk_stale(const struct mptcp_sock *msk, struct sock *ssk) void mptcp_pm_subflow_chk_stale(const struct mptcp_sock *msk, struct sock *ssk)
......
net/mptcp/pm_netlink.c
View file @ 6a42477f
...@@ -1887,66 +1887,58 @@ static int mptcp_nl_set_flags(struct net *net, ...@@ -1887,66 +1887,58 @@ static int mptcp_nl_set_flags(struct net *net,
return ret; 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 | u8 changed, mask = MPTCP_PM_ADDR_FLAG_BACKUP |
MPTCP_PM_ADDR_FLAG_FULLMESH; MPTCP_PM_ADDR_FLAG_FULLMESH;
struct net *net = sock_net(skb->sk);
struct mptcp_pm_addr_entry *entry; struct mptcp_pm_addr_entry *entry;
struct pm_nl_pernet *pernet;
u8 lookup_by_id = 0; u8 lookup_by_id = 0;
u8 bkup = 0;
int ret;
pernet = pm_nl_get_pernet(net);
ret = mptcp_pm_parse_entry(attr, info, false, &addr);
if (ret < 0)
return ret;
if (addr->addr.family == AF_UNSPEC) { if (addr.addr.family == AF_UNSPEC) {
lookup_by_id = 1; lookup_by_id = 1;
if (!addr->addr.id) if (!addr.addr.id)
return -EOPNOTSUPP; return -EOPNOTSUPP;
} }
if (addr.flags & MPTCP_PM_ADDR_FLAG_BACKUP)
bkup = 1;
spin_lock_bh(&pernet->lock); spin_lock_bh(&pernet->lock);
entry = __lookup_addr(pernet, &addr->addr, lookup_by_id); entry = __lookup_addr(pernet, &addr.addr, lookup_by_id);
if (!entry) { if (!entry) {
spin_unlock_bh(&pernet->lock); spin_unlock_bh(&pernet->lock);
return -EINVAL; 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)) { (entry->flags & MPTCP_PM_ADDR_FLAG_SIGNAL)) {
spin_unlock_bh(&pernet->lock); spin_unlock_bh(&pernet->lock);
return -EINVAL; return -EINVAL;
} }
changed = (addr->flags ^ entry->flags) & mask; changed = (addr.flags ^ entry->flags) & mask;
entry->flags = (entry->flags & ~mask) | (addr->flags & mask); entry->flags = (entry->flags & ~mask) | (addr.flags & mask);
*addr = *entry; addr = *entry;
spin_unlock_bh(&pernet->lock); 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; return 0;
} }
int mptcp_pm_nl_set_flags_doit(struct sk_buff *skb, struct genl_info *info) 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 }, }; return mptcp_pm_set_flags(skb, info);
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);
} }
static void mptcp_nl_mcast_send(struct net *net, struct sk_buff *nlskb, gfp_t gfp) static void mptcp_nl_mcast_send(struct net *net, struct sk_buff *nlskb, gfp_t gfp)
......
net/mptcp/pm_userspace.c
View file @ 6a42477f
...@@ -546,14 +546,19 @@ int mptcp_pm_nl_subflow_destroy_doit(struct sk_buff *skb, struct genl_info *info ...@@ -546,14 +546,19 @@ int mptcp_pm_nl_subflow_destroy_doit(struct sk_buff *skb, struct genl_info *info
return err; return err;
} }
int mptcp_userspace_pm_set_flags(struct net *net, struct nlattr *token, int mptcp_userspace_pm_set_flags(struct sk_buff *skb, struct genl_info *info)
struct mptcp_pm_addr_entry *loc,
struct mptcp_pm_addr_entry *rem, u8 bkup)
{ {
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; struct mptcp_sock *msk;
int ret = -EINVAL; int ret = -EINVAL;
struct sock *sk; struct sock *sk;
u32 token_val; u32 token_val;
u8 bkup = 0;
token_val = nla_get_u32(token); token_val = nla_get_u32(token);
...@@ -566,12 +571,27 @@ int mptcp_userspace_pm_set_flags(struct net *net, struct nlattr *token, ...@@ -566,12 +571,27 @@ int mptcp_userspace_pm_set_flags(struct net *net, struct nlattr *token,
if (!mptcp_pm_is_userspace(msk)) if (!mptcp_pm_is_userspace(msk))
goto set_flags_err; goto set_flags_err;
if (loc->addr.family == AF_UNSPEC || ret = mptcp_pm_parse_entry(attr, info, false, &loc);
rem->addr.family == AF_UNSPEC) if (ret < 0)
goto set_flags_err;
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) {
ret = -EINVAL;
goto set_flags_err; goto set_flags_err;
}
if (loc.flags & MPTCP_PM_ADDR_FLAG_BACKUP)
bkup = 1;
lock_sock(sk); 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); release_sock(sk);
set_flags_err: set_flags_err:
......
net/mptcp/protocol.h
View file @ 6a42477f
...@@ -970,13 +970,9 @@ int mptcp_pm_nl_get_flags_and_ifindex_by_id(struct mptcp_sock *msk, unsigned int ...@@ -970,13 +970,9 @@ int mptcp_pm_nl_get_flags_and_ifindex_by_id(struct mptcp_sock *msk, unsigned int
int mptcp_userspace_pm_get_flags_and_ifindex_by_id(struct mptcp_sock *msk, int mptcp_userspace_pm_get_flags_and_ifindex_by_id(struct mptcp_sock *msk,
unsigned int id, unsigned int id,
u8 *flags, int *ifindex); u8 *flags, int *ifindex);
int mptcp_pm_set_flags(struct net *net, struct nlattr *token, int mptcp_pm_set_flags(struct sk_buff *skb, struct genl_info *info);
struct mptcp_pm_addr_entry *loc, int mptcp_pm_nl_set_flags(struct sk_buff *skb, struct genl_info *info);
struct mptcp_pm_addr_entry *rem, u8 bkup); int mptcp_userspace_pm_set_flags(struct sk_buff *skb, struct genl_info *info);
int mptcp_pm_nl_set_flags(struct net *net, struct mptcp_pm_addr_entry *addr, u8 bkup);
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_pm_announce_addr(struct mptcp_sock *msk, int mptcp_pm_announce_addr(struct mptcp_sock *msk,
const struct mptcp_addr_info *addr, const struct mptcp_addr_info *addr,
bool echo); bool echo);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7