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: Geliang Tang <tanggeliang@kylinos.cn>
Reviewed-by: Matthieu Baerts (NGI0) <matttbe@kernel.org>
Signed-off-by: Matthieu Baerts (NGI0) <matttbe@kernel.org>
Link: https://lore.kernel.org/r/20240305-upstream-net-next-20240304-mptcp-misc-cleanup-v1-2-c436ba5e569b@kernel.org
Signed-off-by: Jakub Kicinski <kuba@kernel.org>

diff --git a/net/mptcp/pm.c b/net/mptcp/pm.c
index 28e5d514bf20825a18072a67a63ab2bd99c5dced..55406720c607119b0502fe6918bbbcf19a0a355e 100644 (file)
--- a/net/mptcp/pm.c
+++ b/net/mptcp/pm.c
@@ -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);
 }
 
-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)

diff --git a/net/mptcp/pm_netlink.c b/net/mptcp/pm_netlink.c
index a900df9f173ddd1519199e04dc07da4eebedaf1b..c799fe84dfd36bb1c33a0d87445c1a95dc94bc93 100644 (file)
--- a/net/mptcp/pm_netlink.c
+++ b/net/mptcp/pm_netlink.c
@@ -1887,66 +1887,58 @@ next:
        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);
+
+       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;
-               if (!addr->addr.id)
+               if (!addr.addr.id)
                        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_addr(pernet, &addr.addr, lookup_by_id);
        if (!entry) {
                spin_unlock_bh(&pernet->lock);
                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);
                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)

diff --git a/net/mptcp/pm_userspace.c b/net/mptcp/pm_userspace.c
index b9809d988693b9067dd9d32aced9ad1242be93a5..7ef3b69852f002e1b04228c9784d86f04ee24ec8 100644 (file)
--- a/net/mptcp/pm_userspace.c
+++ b/net/mptcp/pm_userspace.c
@@ -546,14 +546,19 @@ destroy_err:
        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);
 
@@ -566,12 +571,27 @@ int mptcp_userspace_pm_set_flags(struct net *net, struct nlattr *token,
        if (!mptcp_pm_is_userspace(msk))
                goto set_flags_err;
 
-       if (loc->addr.family == AF_UNSPEC ||
-           rem->addr.family == AF_UNSPEC)
+       ret = mptcp_pm_parse_entry(attr, info, false, &loc);
+       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;
+       }
+
+       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:

diff --git a/net/mptcp/protocol.h b/net/mptcp/protocol.h
index de9f0ff6dd309c13f0b27277c86b200f85fe6517..f16edef6026a3b7f919fd14c09440854f6c0e602 100644 (file)
--- a/net/mptcp/protocol.h
+++ b/net/mptcp/protocol.h
@@ -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,
                                                   unsigned int id,
                                                   u8 *flags, int *ifindex);
-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_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_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);
 int mptcp_pm_announce_addr(struct mptcp_sock *msk,
                           const struct mptcp_addr_info *addr,
                           bool echo);