Series comparison

-[PATCH mptcp-next 0/6] BPF path manager, part 3
+[PATCH mptcp-next v5 0/5] BPF path manager, part 3
 From: Geliang Tang <tanggeliang@kylinos.cn>
+v5:
+ - drop "change is_backup interfaces as get_flags"
+ - move "add struct mptcp_pm_addr_id_bitmap" and "hold msk lock before
+removing id 0 address" out of this set.
+ - a new patch "use ipv6_addr_equal in addresses_equal"
+ - patch 4, drop inet6_sk() in mptcp_event_add_subflow() and
+   mptcp_event_pm_listener() too.
+v4:
+ - add a new patch, "add a build check for userspace_pm_dump_addr" as
+   Matt suggested.
+ - patch 4, fix a warning here reported by CI:
+   WARNING: line length of 84 exceeds 80 columns
+   #27: FILE: net/mptcp/pm_userspace.c:468:
+v3:
+ - drop "mptcp: update address type of get_local_id".
+v2:
+ - a new patch "hold msk lock before removing id 0 address"
 Drop the patch "mptcp: reuse sending nlmsg code in dump_addr", add a new
 helper mptcp_pm_genl_fill_addr() to save the duplicated code.
 Define struct mptcp_pm_addr_id_bitmap in protocol.h, instead of defining
-mptcp_pm_addr_id_bitmap_t in include/net/mptcp.h, since dump_addr()
+mptcp_pm_addr_id_bitmap_t in include/net/mptcp.h, since get_addr() and
-interface of bpf userspace pm is dropped as Matt suggested.
+dump_addr() interfaces of BPF userspace pm is dropped as Matt suggested.
-Geliang Tang (6):
+Geliang Tang (5):
   mptcp: add a build check for userspace_pm_dump_addr
   mptcp: add mptcp_pm_genl_fill_addr helper
-  mptcp: add struct mptcp_pm_addr_id_bitmap
-  mptcp: drop inet6_sk in mptcp_nl_find_ssk
   mptcp: drop match in userspace_pm_append_new_local_addr
-  mptcp: update address type of get_local_id
+  mptcp: drop inet6_sk after inet_sk
-  mptcp: change is_backup interfaces as get_flags
+  mptcp: use ipv6_addr_equal in addresses_equal
- net/mptcp/pm.c           | 38 +++++++++++++++++++---
+ net/mptcp/pm.c           | 21 +++++++++++++++++++++
- net/mptcp/pm_netlink.c   | 33 ++++++-------------
+ net/mptcp/pm_netlink.c   | 22 ++++------------------
- net/mptcp/pm_userspace.c | 68 +++++++++++++---------------------------
+ net/mptcp/pm_userspace.c | 29 +++++++----------------------
- net/mptcp/protocol.h     | 19 ++++++++---
+ net/mptcp/protocol.h     |  3 +++
-files changed, 80 insertions(+), 78 deletions(-)
+files changed, 35 insertions(+), 40 deletions(-)
 --
 .43.0

-[PATCH mptcp-next 2/6] mptcp: add struct mptcp_pm_addr_id_bitmap
+[PATCH mptcp-next v5 1/5] mptcp: add a build check for userspace_pm_dump_addr
 From: Geliang Tang <tanggeliang@kylinos.cn>
-To simplify the use of bitmap in BPF, a new type for MPTCP userspace
+This patch adds a build check for mptcp_userspace_pm_dump_addr() to make
-pm id bitmap, struct mptcp_pm_addr_id_bitmap is defined. Because
+sure there is enough space in 'cb->ctx' to store an address id bitmap.
 there's no way to use DECLARE_BITMAP macro in BPF program, and it's
 not easy to reimplement it in BPF.
+Reviewed-by: Matthieu Baerts (NGI0) <matttbe@kernel.org>
 Signed-off-by: Geliang Tang <tanggeliang@kylinos.cn>
 ---
- net/mptcp/pm_userspace.c | 14 ++++++--------
+ net/mptcp/pm_userspace.c | 2 ++
- net/mptcp/protocol.h     |  4 ++++
+file changed, 2 insertions(+)
 files changed, 10 insertions(+), 8 deletions(-)
 diff --git a/net/mptcp/pm_userspace.c b/net/mptcp/pm_userspace.c
 index XXXXXXX..XXXXXXX 100644
 --- a/net/mptcp/pm_userspace.c
 +++ b/net/mptcp/pm_userspace.c
-@@ -XXX,XX +XXX,XX @@ static int mptcp_userspace_pm_append_new_local_addr(struct mptcp_sock *msk,
+@@ -XXX,XX +XXX,XX @@ int mptcp_userspace_pm_dump_addr(struct sk_buff *msg,
                              struct mptcp_pm_addr_entry *entry,
                              bool needs_id)
  {
 -    DECLARE_BITMAP(id_bitmap, MPTCP_PM_MAX_ADDR_ID + 1);
 +    struct mptcp_pm_addr_id_bitmap id_bitmap;
      struct mptcp_pm_addr_entry *match = NULL;
      struct sock *sk = (struct sock *)msk;
      struct mptcp_pm_addr_entry *e;
@@ -XXX,XX +XXX,XX @@ static int mptcp_userspace_pm_append_new_local_addr(struct mptcp_sock *msk,
      bool id_match = false;
      int ret = -EINVAL;
 -    bitmap_zero(id_bitmap, MPTCP_PM_MAX_ADDR_ID + 1);
 +    bitmap_zero(id_bitmap.map, MPTCP_PM_MAX_ADDR_ID + 1);
      spin_lock_bh(&msk->pm.lock);
      mptcp_for_each_userspace_pm_addr(msk, e) {
@@ -XXX,XX +XXX,XX @@ static int mptcp_userspace_pm_append_new_local_addr(struct mptcp_sock *msk,
          } else if (addr_match || id_match) {
              break;
          }
 -        __set_bit(e->addr.id, id_bitmap);
 +        __set_bit(e->addr.id, id_bitmap.map);
      }
      if (!match && !addr_match && !id_match) {
@@ -XXX,XX +XXX,XX @@ static int mptcp_userspace_pm_append_new_local_addr(struct mptcp_sock *msk,
          *e = *entry;
          if (!e->addr.id && needs_id)
 -            e->addr.id = find_next_zero_bit(id_bitmap,
 +            e->addr.id = find_next_zero_bit(id_bitmap.map,
                              MPTCP_PM_MAX_ADDR_ID + 1,
 );
          list_add_tail_rcu(&e->list, &msk->pm.userspace_pm_local_addr_list);
@@ -XXX,XX +XXX,XX @@ int mptcp_userspace_pm_set_flags(struct mptcp_pm_addr_entry *local,
  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 mptcp_pm_addr_id_bitmap *bitmap;
      struct mptcp_pm_addr_entry *entry;
      struct mptcp_sock *msk;
      int ret = -EINVAL;
      struct sock *sk;
+     void *hdr;
--    bitmap = (struct id_bitmap *)cb->ctx;
-+    bitmap = (struct mptcp_pm_addr_id_bitmap *)cb->ctx;
++    BUILD_BUG_ON(sizeof(struct id_bitmap) > sizeof(cb->ctx));
 +
      bitmap = (struct id_bitmap *)cb->ctx;
      msk = mptcp_userspace_pm_get_sock(info);
-     if (!msk)
-diff --git a/net/mptcp/protocol.h b/net/mptcp/protocol.h
-index XXXXXXX..XXXXXXX 100644
---- a/net/mptcp/protocol.h
-+++ b/net/mptcp/protocol.h
-@@ -XXX,XX +XXX,XX @@ enum mptcp_addr_signal_status {
- /* max value of mptcp_addr_info.id */
- #define MPTCP_PM_MAX_ADDR_ID        U8_MAX
-+struct mptcp_pm_addr_id_bitmap {
-+    DECLARE_BITMAP(map, MPTCP_PM_MAX_ADDR_ID + 1);
-+};
-+
- struct mptcp_pm_data {
-     struct mptcp_addr_info local;
-     struct mptcp_addr_info remote;
 --
 .43.0

-[PATCH mptcp-next 1/6] mptcp: add mptcp_pm_genl_fill_addr helper
+[PATCH mptcp-next v5 2/5] mptcp: add mptcp_pm_genl_fill_addr helper
 From: Geliang Tang <tanggeliang@kylinos.cn>
 To save some redundant code in dump_addr() interfaces of both the
 netlink PM and userspace PM, the code that calls netlink message
 helpers (genlmsg_put/cancel/end) and mptcp_nl_fill_addr() is wrapped
 into a new helper mptcp_pm_genl_fill_addr().
-This helper will also be used in BPF path managers.
 Signed-off-by: Geliang Tang <tanggeliang@kylinos.cn>
 ---
  net/mptcp/pm.c           | 21 +++++++++++++++++++++
  net/mptcp/pm_netlink.c   | 12 +-----------
 ...
 -            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)
-+            if (mptcp_pm_genl_fill_addr(msg, cb, entry))
++            if (mptcp_pm_genl_fill_addr(msg, cb, entry) < 0)
                  break;
 -            if (mptcp_nl_fill_addr(msg, entry) < 0) {
 -                genlmsg_cancel(msg, hdr);
 -                break;
 ...
      struct mptcp_sock *msk;
      int ret = -EINVAL;
      struct sock *sk;
 -    void *hdr;
-     bitmap = (struct id_bitmap *)cb->ctx;
+     BUILD_BUG_ON(sizeof(struct id_bitmap) > sizeof(cb->ctx));
 @@ -XXX,XX +XXX,XX @@ int mptcp_userspace_pm_dump_addr(struct sk_buff *msg,
          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)
-+        if (mptcp_pm_genl_fill_addr(msg, cb, entry))
++        if (mptcp_pm_genl_fill_addr(msg, cb, entry) < 0)
              break;
 -        if (mptcp_nl_fill_addr(msg, entry) < 0) {
 -            genlmsg_cancel(msg, hdr);
 -            break;
 ...
      release_sock(sk);
 diff --git a/net/mptcp/protocol.h b/net/mptcp/protocol.h
 index XXXXXXX..XXXXXXX 100644
 --- a/net/mptcp/protocol.h
 +++ b/net/mptcp/protocol.h
-@@ -XXX,XX +XXX,XX @@ int mptcp_pm_nl_dump_addr(struct sk_buff *msg,
+@@ -XXX,XX +XXX,XX @@ void mptcp_fastopen_subflow_synack_set_params(struct mptcp_subflow_context *subf
-               struct netlink_callback *cb);
+                           struct request_sock *req);
- int mptcp_userspace_pm_dump_addr(struct sk_buff *msg,
+ int mptcp_nl_fill_addr(struct sk_buff *skb,
-                  struct netlink_callback *cb);
+                struct mptcp_pm_addr_entry *entry);
 +int mptcp_pm_genl_fill_addr(struct sk_buff *msg,
 +                struct netlink_callback *cb,
 +                struct mptcp_pm_addr_entry *entry);
- int mptcp_pm_nl_get_addr(u8 id, struct mptcp_pm_addr_entry *addr,
-              struct genl_info *info);
+ static inline bool mptcp_pm_should_add_signal(struct mptcp_sock *msk)
- int mptcp_userspace_pm_get_addr(u8 id, struct mptcp_pm_addr_entry *addr,
+ {
 --
 .43.0

-[PATCH mptcp-next 4/6] mptcp: drop match in userspace_pm_append_new_local_addr
+[PATCH mptcp-next v5 3/5] mptcp: drop match in userspace_pm_append_new_local_addr
 ...
 a Boolean one.
 Also other variables 'addr_match' and 'id_match' make 'match' a redundant
 one, which can be replaced by directly checking 'addr_match && id_match'.
+Reviewed-by: Matthieu Baerts (NGI0) <matttbe@kernel.org>
 Signed-off-by: Geliang Tang <tanggeliang@kylinos.cn>
 ---
  net/mptcp/pm_userspace.c | 11 +++--------
 file changed, 3 insertions(+), 8 deletions(-)
 ...
 --- a/net/mptcp/pm_userspace.c
 +++ b/net/mptcp/pm_userspace.c
 @@ -XXX,XX +XXX,XX @@ static int mptcp_userspace_pm_append_new_local_addr(struct mptcp_sock *msk,
                              bool needs_id)
  {
-     struct mptcp_pm_addr_id_bitmap id_bitmap;
+     DECLARE_BITMAP(id_bitmap, MPTCP_PM_MAX_ADDR_ID + 1);
 -    struct mptcp_pm_addr_entry *match = NULL;
      struct sock *sk = (struct sock *)msk;
      struct mptcp_pm_addr_entry *e;
      bool addr_match = false;
 @@ -XXX,XX +XXX,XX @@ static int mptcp_userspace_pm_append_new_local_addr(struct mptcp_sock *msk,
 ...
 +        if (addr_match || id_match)
              break;
 -        } else if (addr_match || id_match) {
 -            break;
 -        }
-         __set_bit(e->addr.id, id_bitmap.map);
+         __set_bit(e->addr.id, id_bitmap);
      }
 -    if (!match && !addr_match && !id_match) {
 +    if (!addr_match && !id_match) {
          /* Memory for the entry is allocated from the
 ...

-[PATCH mptcp-next 3/6] mptcp: drop inet6_sk in mptcp_nl_find_ssk
+[PATCH mptcp-next v5 4/5] mptcp: drop inet6_sk after inet_sk
 From: Geliang Tang <tanggeliang@kylinos.cn>
-In mptcp_nl_find_ssk(), 'issk' has already been got through inet_sk(). No
+In mptcp_event_add_subflow(), mptcp_event_pm_listener() and
-need to use inet6_sk() to get 'pinfo' again, just use issk->pinet6 instead.
+mptcp_nl_find_ssk(), 'issk' has already been got through inet_sk().
-This patch also drops this 'pinfo' variable.
+No need to use inet6_sk() to get 'ipv6_pinfo' again, just use
 issk->pinet6 instead. This patch also drops these 'ipv6_pinfo'
 variables.
+Reviewed-by: Matthieu Baerts (NGI0) <matttbe@kernel.org>
 Signed-off-by: Geliang Tang <tanggeliang@kylinos.cn>
 ---
+v2:
+ - drop inet6_sk() in mptcp_event_add_subflow() and
+   mptcp_event_pm_listener() too.
+---
+ net/mptcp/pm_netlink.c   | 8 ++------
  net/mptcp/pm_userspace.c | 4 +---
-file changed, 1 insertion(+), 3 deletions(-)
+files changed, 3 insertions(+), 9 deletions(-)
+diff --git a/net/mptcp/pm_netlink.c b/net/mptcp/pm_netlink.c
+index XXXXXXX..XXXXXXX 100644
+--- a/net/mptcp/pm_netlink.c
++++ b/net/mptcp/pm_netlink.c
+@@ -XXX,XX +XXX,XX @@ static int mptcp_event_add_subflow(struct sk_buff *skb, const struct sock *ssk)
+         break;
+ #if IS_ENABLED(CONFIG_MPTCP_IPV6)
+     case AF_INET6: {
+-        const struct ipv6_pinfo *np = inet6_sk(ssk);
+-
+-        if (nla_put_in6_addr(skb, MPTCP_ATTR_SADDR6, &np->saddr))
++        if (nla_put_in6_addr(skb, MPTCP_ATTR_SADDR6, &issk->pinet6->saddr))
+             return -EMSGSIZE;
+         if (nla_put_in6_addr(skb, MPTCP_ATTR_DADDR6, &ssk->sk_v6_daddr))
+             return -EMSGSIZE;
+@@ -XXX,XX +XXX,XX @@ void mptcp_event_pm_listener(const struct sock *ssk,
+         break;
+ #if IS_ENABLED(CONFIG_MPTCP_IPV6)
+     case AF_INET6: {
+-        const struct ipv6_pinfo *np = inet6_sk(ssk);
+-
+-        if (nla_put_in6_addr(skb, MPTCP_ATTR_SADDR6, &np->saddr))
++        if (nla_put_in6_addr(skb, MPTCP_ATTR_SADDR6, &issk->pinet6->saddr))
+             goto nla_put_failure;
+         break;
+     }
 diff --git a/net/mptcp/pm_userspace.c b/net/mptcp/pm_userspace.c
 index XXXXXXX..XXXXXXX 100644
 --- a/net/mptcp/pm_userspace.c
 +++ b/net/mptcp/pm_userspace.c
 @@ -XXX,XX +XXX,XX @@ static struct sock *mptcp_nl_find_ssk(struct mptcp_sock *msk,
 ...

-[PATCH mptcp-next 5/6] mptcp: update address type of get_local_id
+Deleted patch
-From: Geliang Tang <tanggeliang@kylinos.cn>
-The following code in mptcp_userspace_pm_get_local_id() that assigns 'skc'
-to 'new_entry' is not allowed in BPF if we use the same code to implement
-get_local_id() interface of a BFP path manager:
-        memset(&new_entry, 0, sizeof(struct mptcp_pm_addr_entry));
-        new_entry.addr = *skc;
-        new_entry.addr.id = 0;
-        new_entry.flags = MPTCP_PM_ADDR_FLAG_IMPLICIT;
-To solve the issue, this patch moves this assignment to 'new_entry' forward
-to mptcp_pm_get_local_id(), and then passing 'new_entry' as a parameter to
-both mptcp_pm_nl_get_local_id() and mptcp_userspace_pm_get_local_id().
-Signed-off-by: Geliang Tang <tanggeliang@kylinos.cn>
----
- net/mptcp/pm.c           | 10 +++++++---
- net/mptcp/pm_netlink.c   | 12 ++++--------
- net/mptcp/pm_userspace.c | 17 ++++++-----------
- net/mptcp/protocol.h     |  6 ++++--
-files changed, 21 insertions(+), 24 deletions(-)
-diff --git a/net/mptcp/pm.c b/net/mptcp/pm.c
-index XXXXXXX..XXXXXXX 100644
---- a/net/mptcp/pm.c
-+++ b/net/mptcp/pm.c
-@@ -XXX,XX +XXX,XX @@ 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)
- {
--    struct mptcp_addr_info skc_local;
-+    struct mptcp_pm_addr_entry skc_local = { 0 };
-     struct mptcp_addr_info msk_local;
-     if (WARN_ON_ONCE(!msk))
-@@ -XXX,XX +XXX,XX @@ int mptcp_pm_get_local_id(struct mptcp_sock *msk, struct sock_common *skc)
-      * addr
-      */
-     mptcp_local_address((struct sock_common *)msk, &msk_local);
--    mptcp_local_address((struct sock_common *)skc, &skc_local);
--    if (mptcp_addresses_equal(&msk_local, &skc_local, false))
-+    mptcp_local_address((struct sock_common *)skc, &skc_local.addr);
-+    if (mptcp_addresses_equal(&msk_local, &skc_local.addr, false))
-         return 0;
-+    skc_local.addr.id = 0;
-+    skc_local.flags = MPTCP_PM_ADDR_FLAG_IMPLICIT;
-+
-     if (mptcp_pm_is_userspace(msk))
-         return mptcp_userspace_pm_get_local_id(msk, &skc_local);
-+    skc_local.addr.port = 0;
-     return mptcp_pm_nl_get_local_id(msk, &skc_local);
- }
-diff --git a/net/mptcp/pm_netlink.c b/net/mptcp/pm_netlink.c
-index XXXXXXX..XXXXXXX 100644
---- a/net/mptcp/pm_netlink.c
-+++ b/net/mptcp/pm_netlink.c
-@@ -XXX,XX +XXX,XX @@ static int mptcp_pm_nl_create_listen_socket(struct sock *sk,
-     return err;
- }
--int mptcp_pm_nl_get_local_id(struct mptcp_sock *msk, struct mptcp_addr_info *skc)
-+int mptcp_pm_nl_get_local_id(struct mptcp_sock *msk,
-+                 struct mptcp_pm_addr_entry *local)
- {
-     struct mptcp_pm_addr_entry *entry;
-     struct pm_nl_pernet *pernet;
-@@ -XXX,XX +XXX,XX @@ int mptcp_pm_nl_get_local_id(struct mptcp_sock *msk, struct mptcp_addr_info *skc
-     pernet = pm_nl_get_pernet_from_msk(msk);
-     rcu_read_lock();
--    entry = __lookup_addr(pernet, skc);
-+    entry = __lookup_addr(pernet, &local->addr);
-     ret = entry ? entry->addr.id : -1;
-     rcu_read_unlock();
-     if (ret >= 0)
-@@ -XXX,XX +XXX,XX @@ int mptcp_pm_nl_get_local_id(struct mptcp_sock *msk, struct mptcp_addr_info *skc
-     if (!entry)
-         return -ENOMEM;
--    entry->addr = *skc;
--    entry->addr.id = 0;
--    entry->addr.port = 0;
--    entry->ifindex = 0;
--    entry->flags = MPTCP_PM_ADDR_FLAG_IMPLICIT;
--    entry->lsk = NULL;
-+    *entry = *local;
-     ret = mptcp_pm_nl_append_new_local_addr(pernet, entry, true);
-     if (ret < 0)
-         kfree(entry);
-diff --git a/net/mptcp/pm_userspace.c b/net/mptcp/pm_userspace.c
-index XXXXXXX..XXXXXXX 100644
---- a/net/mptcp/pm_userspace.c
-+++ b/net/mptcp/pm_userspace.c
-@@ -XXX,XX +XXX,XX @@ mptcp_userspace_pm_lookup_addr_by_id(struct mptcp_sock *msk, unsigned int id)
- }
- int mptcp_userspace_pm_get_local_id(struct mptcp_sock *msk,
--                    struct mptcp_addr_info *skc)
-+                    struct mptcp_pm_addr_entry *local)
- {
--    struct mptcp_pm_addr_entry *entry = NULL, new_entry;
-     __be16 msk_sport =  ((struct inet_sock *)
-                  inet_sk((struct sock *)msk))->inet_sport;
-+    struct mptcp_pm_addr_entry *entry;
-     spin_lock_bh(&msk->pm.lock);
--    entry = mptcp_userspace_pm_lookup_addr(msk, skc);
-+    entry = mptcp_userspace_pm_lookup_addr(msk, &local->addr);
-     spin_unlock_bh(&msk->pm.lock);
-     if (entry)
-         return entry->addr.id;
--    memset(&new_entry, 0, sizeof(struct mptcp_pm_addr_entry));
--    new_entry.addr = *skc;
--    new_entry.addr.id = 0;
--    new_entry.flags = MPTCP_PM_ADDR_FLAG_IMPLICIT;
--
--    if (new_entry.addr.port == msk_sport)
--        new_entry.addr.port = 0;
-+    if (local->addr.port == msk_sport)
-+        local->addr.port = 0;
--    return mptcp_userspace_pm_append_new_local_addr(msk, &new_entry, true);
-+    return mptcp_userspace_pm_append_new_local_addr(msk, local, true);
- }
- bool mptcp_userspace_pm_is_backup(struct mptcp_sock *msk,
-diff --git a/net/mptcp/protocol.h b/net/mptcp/protocol.h
-index XXXXXXX..XXXXXXX 100644
---- a/net/mptcp/protocol.h
-+++ b/net/mptcp/protocol.h
-@@ -XXX,XX +XXX,XX @@ bool mptcp_pm_add_addr_signal(struct mptcp_sock *msk, const struct sk_buff *skb,
- bool mptcp_pm_rm_addr_signal(struct mptcp_sock *msk, unsigned int remaining,
-                  struct mptcp_rm_list *rm_list);
- 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_pm_nl_get_local_id(struct mptcp_sock *msk,
-+                 struct mptcp_pm_addr_entry *local);
-+int mptcp_userspace_pm_get_local_id(struct mptcp_sock *msk,
-+                    struct mptcp_pm_addr_entry *local);
- bool mptcp_pm_is_backup(struct mptcp_sock *msk, struct sock_common *skc);
- bool mptcp_pm_nl_is_backup(struct mptcp_sock *msk, struct mptcp_addr_info *skc);
- bool mptcp_userspace_pm_is_backup(struct mptcp_sock *msk, struct mptcp_addr_info *skc);
---
-.43.0

-[PATCH mptcp-next 6/6] mptcp: change is_backup interfaces as get_flags
+[PATCH mptcp-next v5 5/5] mptcp: use ipv6_addr_equal in addresses_equal
 From: Geliang Tang <tanggeliang@kylinos.cn>
-is_backup() interface of the path managers is not very common. A more
+Use ipv6_addr_equal() to check whether two IPv6 addresses are equal in
-common approach is to add a get_flags() interface to obtain the flags
+mptcp_addresses_equal() is more appropriate than using ipv6_addr_cmp().
 value of a given address. Then is_backup() can be implemented through
 get_flags() by test whether backup flag is set in the flags value.
 Signed-off-by: Geliang Tang <tanggeliang@kylinos.cn>
 ---
- net/mptcp/pm.c           |  7 +++++--
+ net/mptcp/pm_netlink.c | 2 +-
- net/mptcp/pm_netlink.c   |  9 +++++----
+file changed, 1 insertion(+), 1 deletion(-)
  net/mptcp/pm_userspace.c | 10 +++++-----
  net/mptcp/protocol.h     |  6 ++++--
 files changed, 19 insertions(+), 13 deletions(-)
-diff --git a/net/mptcp/pm.c b/net/mptcp/pm.c
-index XXXXXXX..XXXXXXX 100644
---- a/net/mptcp/pm.c
-+++ b/net/mptcp/pm.c
-@@ -XXX,XX +XXX,XX @@ int mptcp_pm_get_local_id(struct mptcp_sock *msk, struct sock_common *skc)
- bool mptcp_pm_is_backup(struct mptcp_sock *msk, struct sock_common *skc)
- {
-     struct mptcp_addr_info skc_local;
-+    u8 flags;
-     mptcp_local_address((struct sock_common *)skc, &skc_local);
-     if (mptcp_pm_is_userspace(msk))
--        return mptcp_userspace_pm_is_backup(msk, &skc_local);
-+        flags = mptcp_userspace_pm_get_flags(msk, &skc_local);
-+    else
-+        flags = mptcp_pm_nl_get_flags(msk, &skc_local);
--    return mptcp_pm_nl_is_backup(msk, &skc_local);
-+    return !!(flags & MPTCP_PM_ADDR_FLAG_BACKUP);
- }
- static int mptcp_pm_get_addr(u8 id, struct mptcp_pm_addr_entry *addr,
 diff --git a/net/mptcp/pm_netlink.c b/net/mptcp/pm_netlink.c
 index XXXXXXX..XXXXXXX 100644
 --- a/net/mptcp/pm_netlink.c
 +++ b/net/mptcp/pm_netlink.c
-@@ -XXX,XX +XXX,XX @@ int mptcp_pm_nl_get_local_id(struct mptcp_sock *msk,
+@@ -XXX,XX +XXX,XX @@ bool mptcp_addresses_equal(const struct mptcp_addr_info *a,
-     return ret;
+             addr_equals = a->addr.s_addr == b->addr.s_addr;
- }
+ #if IS_ENABLED(CONFIG_MPTCP_IPV6)
+         else
--bool mptcp_pm_nl_is_backup(struct mptcp_sock *msk, struct mptcp_addr_info *skc)
+-            addr_equals = !ipv6_addr_cmp(&a->addr6, &b->addr6);
-+u8 mptcp_pm_nl_get_flags(struct mptcp_sock *msk,
++            addr_equals = ipv6_addr_equal(&a->addr6, &b->addr6);
-+             struct mptcp_addr_info *skc)
+     } else if (a->family == AF_INET) {
- {
+         if (ipv6_addr_v4mapped(&b->addr6))
-     struct pm_nl_pernet *pernet = pm_nl_get_pernet_from_msk(msk);
+             addr_equals = a->addr.s_addr == b->addr6.s6_addr32[3];
      struct mptcp_pm_addr_entry *entry;
 -    bool backup;
 +    u8 flags;
      rcu_read_lock();
      entry = __lookup_addr(pernet, skc);
 -    backup = entry && !!(entry->flags & MPTCP_PM_ADDR_FLAG_BACKUP);
 +    flags = entry ? entry->flags : 0;
      rcu_read_unlock();
 -    return backup;
 +    return flags;
  }
  #define MPTCP_PM_CMD_GRP_OFFSET       0
 diff --git a/net/mptcp/pm_userspace.c b/net/mptcp/pm_userspace.c
 index XXXXXXX..XXXXXXX 100644
 --- a/net/mptcp/pm_userspace.c
 +++ b/net/mptcp/pm_userspace.c
@@ -XXX,XX +XXX,XX @@ int mptcp_userspace_pm_get_local_id(struct mptcp_sock *msk,
      return mptcp_userspace_pm_append_new_local_addr(msk, local, true);
  }
 -bool mptcp_userspace_pm_is_backup(struct mptcp_sock *msk,
 -                  struct mptcp_addr_info *skc)
 +u8 mptcp_userspace_pm_get_flags(struct mptcp_sock *msk,
 +                struct mptcp_addr_info *skc)
  {
      struct mptcp_pm_addr_entry *entry;
 -    bool backup;
 +    u8 flags;
      spin_lock_bh(&msk->pm.lock);
      entry = mptcp_userspace_pm_lookup_addr(msk, skc);
 -    backup = entry && !!(entry->flags & MPTCP_PM_ADDR_FLAG_BACKUP);
 +    flags = entry ? entry->flags : 0;
      spin_unlock_bh(&msk->pm.lock);
 -    return backup;
 +    return flags;
  }
  static struct mptcp_sock *mptcp_userspace_pm_get_sock(const struct genl_info *info)
 diff --git a/net/mptcp/protocol.h b/net/mptcp/protocol.h
 index XXXXXXX..XXXXXXX 100644
 --- a/net/mptcp/protocol.h
 +++ b/net/mptcp/protocol.h
@@ -XXX,XX +XXX,XX @@ int mptcp_pm_nl_get_local_id(struct mptcp_sock *msk,
  int mptcp_userspace_pm_get_local_id(struct mptcp_sock *msk,
                      struct mptcp_pm_addr_entry *local);
  bool mptcp_pm_is_backup(struct mptcp_sock *msk, struct sock_common *skc);
 -bool mptcp_pm_nl_is_backup(struct mptcp_sock *msk, struct mptcp_addr_info *skc);
 -bool mptcp_userspace_pm_is_backup(struct mptcp_sock *msk, struct mptcp_addr_info *skc);
 +u8 mptcp_pm_nl_get_flags(struct mptcp_sock *msk,
 +             struct mptcp_addr_info *skc);
 +u8 mptcp_userspace_pm_get_flags(struct mptcp_sock *msk,
 +                struct mptcp_addr_info *skc);
  int mptcp_pm_nl_dump_addr(struct sk_buff *msg,
                struct netlink_callback *cb);
  int mptcp_userspace_pm_dump_addr(struct sk_buff *msg,
 --
 .43.0

From: Geliang Tang <tanggeliang@kylinos.cn>

To save some redundant code in dump_addr() interfaces of both the
netlink PM and userspace PM, the code that calls netlink message
helpers (genlmsg_put/cancel/end) and mptcp_nl_fill_addr() is wrapped
into a new helper mptcp_pm_genl_fill_addr().

This helper will also be used in BPF path managers.

Signed-off-by: Geliang Tang <tanggeliang@kylinos.cn>
---
 net/mptcp/pm.c           | 21 +++++++++++++++++++++
 net/mptcp/pm_netlink.c   | 12 +-----------
 net/mptcp/pm_userspace.c | 12 +-----------
 net/mptcp/protocol.h     |  3 +++
 4 files changed, 26 insertions(+), 22 deletions(-)

diff --git a/net/mptcp/pm.c b/net/mptcp/pm.c
index XXXXXXX..XXXXXXX 100644
--- a/net/mptcp/pm.c
+++ b/net/mptcp/pm.c
@@ -XXX,XX +XXX,XX @@ int mptcp_pm_nl_get_addr_doit(struct sk_buff *skb, struct genl_info *info)
 	return ret;
 }
 
+int mptcp_pm_genl_fill_addr(struct sk_buff *msg,
+			    struct netlink_callback *cb,
+			    struct mptcp_pm_addr_entry *entry)
+{
+	void *hdr;
+
+	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)
+		return -EINVAL;
+
+	if (mptcp_nl_fill_addr(msg, entry) < 0) {
+		genlmsg_cancel(msg, hdr);
+		return -EINVAL;
+	}
+
+	genlmsg_end(msg, hdr);
+	return 0;
+}
+
 static int mptcp_pm_dump_addr(struct sk_buff *msg, struct netlink_callback *cb)
 {
 	const struct genl_info *info = genl_info_dump(cb);
diff --git a/net/mptcp/pm_netlink.c b/net/mptcp/pm_netlink.c
index XXXXXXX..XXXXXXX 100644
--- a/net/mptcp/pm_netlink.c
+++ b/net/mptcp/pm_netlink.c
@@ -XXX,XX +XXX,XX @@ int mptcp_pm_nl_dump_addr(struct sk_buff *msg,
 	struct mptcp_pm_addr_entry *entry;
 	struct pm_nl_pernet *pernet;
 	int id = cb->args[0];
-	void *hdr;
 	int i;
 
 	pernet = pm_nl_get_pernet(net);
@@ -XXX,XX +XXX,XX @@ int mptcp_pm_nl_dump_addr(struct sk_buff *msg,
 			if (entry->addr.id <= id)
 				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)
+			if (mptcp_pm_genl_fill_addr(msg, cb, entry))
 				break;
 
-			if (mptcp_nl_fill_addr(msg, entry) < 0) {
-				genlmsg_cancel(msg, hdr);
-				break;
-			}
-
 			id = entry->addr.id;
-			genlmsg_end(msg, hdr);
 		}
 	}
 	rcu_read_unlock();
diff --git a/net/mptcp/pm_userspace.c b/net/mptcp/pm_userspace.c
index XXXXXXX..XXXXXXX 100644
--- a/net/mptcp/pm_userspace.c
+++ b/net/mptcp/pm_userspace.c
@@ -XXX,XX +XXX,XX @@ int mptcp_userspace_pm_dump_addr(struct sk_buff *msg,
 	struct mptcp_sock *msk;
 	int ret = -EINVAL;
 	struct sock *sk;
-	void *hdr;
 
 	bitmap = (struct id_bitmap *)cb->ctx;
 
@@ -XXX,XX +XXX,XX @@ int mptcp_userspace_pm_dump_addr(struct sk_buff *msg,
 		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)
+		if (mptcp_pm_genl_fill_addr(msg, cb, entry))
 			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);
diff --git a/net/mptcp/protocol.h b/net/mptcp/protocol.h
index XXXXXXX..XXXXXXX 100644
--- a/net/mptcp/protocol.h
+++ b/net/mptcp/protocol.h
@@ -XXX,XX +XXX,XX @@ 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_genl_fill_addr(struct sk_buff *msg,
+			    struct netlink_callback *cb,
+			    struct mptcp_pm_addr_entry *entry);
 int mptcp_pm_nl_get_addr(u8 id, struct mptcp_pm_addr_entry *addr,
 			 struct genl_info *info);
 int mptcp_userspace_pm_get_addr(u8 id, struct mptcp_pm_addr_entry *addr,
-- 
2.43.0

From: Geliang Tang <tanggeliang@kylinos.cn>

To simplify the use of bitmap in BPF, a new type for MPTCP userspace
pm id bitmap, struct mptcp_pm_addr_id_bitmap is defined. Because
there's no way to use DECLARE_BITMAP macro in BPF program, and it's
not easy to reimplement it in BPF.

Signed-off-by: Geliang Tang <tanggeliang@kylinos.cn>
---
 net/mptcp/pm_userspace.c | 14 ++++++--------
 net/mptcp/protocol.h     |  4 ++++
 2 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/net/mptcp/pm_userspace.c b/net/mptcp/pm_userspace.c
index XXXXXXX..XXXXXXX 100644
--- a/net/mptcp/pm_userspace.c
+++ b/net/mptcp/pm_userspace.c
@@ -XXX,XX +XXX,XX @@ static int mptcp_userspace_pm_append_new_local_addr(struct mptcp_sock *msk,
 						    struct mptcp_pm_addr_entry *entry,
 						    bool needs_id)
 {
-	DECLARE_BITMAP(id_bitmap, MPTCP_PM_MAX_ADDR_ID + 1);
+	struct mptcp_pm_addr_id_bitmap id_bitmap;
 	struct mptcp_pm_addr_entry *match = NULL;
 	struct sock *sk = (struct sock *)msk;
 	struct mptcp_pm_addr_entry *e;
@@ -XXX,XX +XXX,XX @@ static int mptcp_userspace_pm_append_new_local_addr(struct mptcp_sock *msk,
 	bool id_match = false;
 	int ret = -EINVAL;
 
-	bitmap_zero(id_bitmap, MPTCP_PM_MAX_ADDR_ID + 1);
+	bitmap_zero(id_bitmap.map, MPTCP_PM_MAX_ADDR_ID + 1);
 
 	spin_lock_bh(&msk->pm.lock);
 	mptcp_for_each_userspace_pm_addr(msk, e) {
@@ -XXX,XX +XXX,XX @@ static int mptcp_userspace_pm_append_new_local_addr(struct mptcp_sock *msk,
 		} else if (addr_match || id_match) {
 			break;
 		}
-		__set_bit(e->addr.id, id_bitmap);
+		__set_bit(e->addr.id, id_bitmap.map);
 	}
 
 	if (!match && !addr_match && !id_match) {
@@ -XXX,XX +XXX,XX @@ static int mptcp_userspace_pm_append_new_local_addr(struct mptcp_sock *msk,
 
 		*e = *entry;
 		if (!e->addr.id && needs_id)
-			e->addr.id = find_next_zero_bit(id_bitmap,
+			e->addr.id = find_next_zero_bit(id_bitmap.map,
 							MPTCP_PM_MAX_ADDR_ID + 1,
 							1);
 		list_add_tail_rcu(&e->list, &msk->pm.userspace_pm_local_addr_list);
@@ -XXX,XX +XXX,XX @@ int mptcp_userspace_pm_set_flags(struct mptcp_pm_addr_entry *local,
 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 mptcp_pm_addr_id_bitmap *bitmap;
 	struct mptcp_pm_addr_entry *entry;
 	struct mptcp_sock *msk;
 	int ret = -EINVAL;
 	struct sock *sk;
 
-	bitmap = (struct id_bitmap *)cb->ctx;
+	bitmap = (struct mptcp_pm_addr_id_bitmap *)cb->ctx;
 
 	msk = mptcp_userspace_pm_get_sock(info);
 	if (!msk)
diff --git a/net/mptcp/protocol.h b/net/mptcp/protocol.h
index XXXXXXX..XXXXXXX 100644
--- a/net/mptcp/protocol.h
+++ b/net/mptcp/protocol.h
@@ -XXX,XX +XXX,XX @@ enum mptcp_addr_signal_status {
 /* max value of mptcp_addr_info.id */
 #define MPTCP_PM_MAX_ADDR_ID		U8_MAX
 
+struct mptcp_pm_addr_id_bitmap {
+	DECLARE_BITMAP(map, MPTCP_PM_MAX_ADDR_ID + 1);
+};
+
 struct mptcp_pm_data {
 	struct mptcp_addr_info local;
 	struct mptcp_addr_info remote;
-- 
2.43.0

From: Geliang Tang <tanggeliang@kylinos.cn>

The variable 'match' in mptcp_userspace_pm_append_new_local_addr() is a
redundant one, and this patch drops it.

No need to define 'match' as 'struct mptcp_pm_addr_entry *' type. In this
function, it's only used to check whether it's NULL. It can be defined as
a Boolean one.

Also other variables 'addr_match' and 'id_match' make 'match' a redundant
one, which can be replaced by directly checking 'addr_match && id_match'.

Signed-off-by: Geliang Tang <tanggeliang@kylinos.cn>
---
 net/mptcp/pm_userspace.c | 11 +++--------
 1 file changed, 3 insertions(+), 8 deletions(-)

From: Geliang Tang <tanggeliang@kylinos.cn>

The following code in mptcp_userspace_pm_get_local_id() that assigns 'skc'
to 'new_entry' is not allowed in BPF if we use the same code to implement
get_local_id() interface of a BFP path manager:

memset(&new_entry, 0, sizeof(struct mptcp_pm_addr_entry));
        new_entry.addr = *skc;
        new_entry.addr.id = 0;
        new_entry.flags = MPTCP_PM_ADDR_FLAG_IMPLICIT;

To solve the issue, this patch moves this assignment to 'new_entry' forward
to mptcp_pm_get_local_id(), and then passing 'new_entry' as a parameter to
both mptcp_pm_nl_get_local_id() and mptcp_userspace_pm_get_local_id().

Signed-off-by: Geliang Tang <tanggeliang@kylinos.cn>
---
 net/mptcp/pm.c           | 10 +++++++---
 net/mptcp/pm_netlink.c   | 12 ++++--------
 net/mptcp/pm_userspace.c | 17 ++++++-----------
 net/mptcp/protocol.h     |  6 ++++--
 4 files changed, 21 insertions(+), 24 deletions(-)

diff --git a/net/mptcp/pm.c b/net/mptcp/pm.c
index XXXXXXX..XXXXXXX 100644
--- a/net/mptcp/pm.c
+++ b/net/mptcp/pm.c
@@ -XXX,XX +XXX,XX @@ 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)
 {
-	struct mptcp_addr_info skc_local;
+	struct mptcp_pm_addr_entry skc_local = { 0 };
 	struct mptcp_addr_info msk_local;
 
 	if (WARN_ON_ONCE(!msk))
@@ -XXX,XX +XXX,XX @@ int mptcp_pm_get_local_id(struct mptcp_sock *msk, struct sock_common *skc)
 	 * addr
 	 */
 	mptcp_local_address((struct sock_common *)msk, &msk_local);
-	mptcp_local_address((struct sock_common *)skc, &skc_local);
-	if (mptcp_addresses_equal(&msk_local, &skc_local, false))
+	mptcp_local_address((struct sock_common *)skc, &skc_local.addr);
+	if (mptcp_addresses_equal(&msk_local, &skc_local.addr, false))
 		return 0;
 
+	skc_local.addr.id = 0;
+	skc_local.flags = MPTCP_PM_ADDR_FLAG_IMPLICIT;
+
 	if (mptcp_pm_is_userspace(msk))
 		return mptcp_userspace_pm_get_local_id(msk, &skc_local);
+	skc_local.addr.port = 0;
 	return mptcp_pm_nl_get_local_id(msk, &skc_local);
 }
 
diff --git a/net/mptcp/pm_netlink.c b/net/mptcp/pm_netlink.c
index XXXXXXX..XXXXXXX 100644
--- a/net/mptcp/pm_netlink.c
+++ b/net/mptcp/pm_netlink.c
@@ -XXX,XX +XXX,XX @@ static int mptcp_pm_nl_create_listen_socket(struct sock *sk,
 	return err;
 }
 
-int mptcp_pm_nl_get_local_id(struct mptcp_sock *msk, struct mptcp_addr_info *skc)
+int mptcp_pm_nl_get_local_id(struct mptcp_sock *msk,
+			     struct mptcp_pm_addr_entry *local)
 {
 	struct mptcp_pm_addr_entry *entry;
 	struct pm_nl_pernet *pernet;
@@ -XXX,XX +XXX,XX @@ int mptcp_pm_nl_get_local_id(struct mptcp_sock *msk, struct mptcp_addr_info *skc
 	pernet = pm_nl_get_pernet_from_msk(msk);
 
 	rcu_read_lock();
-	entry = __lookup_addr(pernet, skc);
+	entry = __lookup_addr(pernet, &local->addr);
 	ret = entry ? entry->addr.id : -1;
 	rcu_read_unlock();
 	if (ret >= 0)
@@ -XXX,XX +XXX,XX @@ int mptcp_pm_nl_get_local_id(struct mptcp_sock *msk, struct mptcp_addr_info *skc
 	if (!entry)
 		return -ENOMEM;
 
-	entry->addr = *skc;
-	entry->addr.id = 0;
-	entry->addr.port = 0;
-	entry->ifindex = 0;
-	entry->flags = MPTCP_PM_ADDR_FLAG_IMPLICIT;
-	entry->lsk = NULL;
+	*entry = *local;
 	ret = mptcp_pm_nl_append_new_local_addr(pernet, entry, true);
 	if (ret < 0)
 		kfree(entry);
diff --git a/net/mptcp/pm_userspace.c b/net/mptcp/pm_userspace.c
index XXXXXXX..XXXXXXX 100644
--- a/net/mptcp/pm_userspace.c
+++ b/net/mptcp/pm_userspace.c
@@ -XXX,XX +XXX,XX @@ mptcp_userspace_pm_lookup_addr_by_id(struct mptcp_sock *msk, unsigned int id)
 }
 
 int mptcp_userspace_pm_get_local_id(struct mptcp_sock *msk,
-				    struct mptcp_addr_info *skc)
+				    struct mptcp_pm_addr_entry *local)
 {
-	struct mptcp_pm_addr_entry *entry = NULL, new_entry;
 	__be16 msk_sport =  ((struct inet_sock *)
 			     inet_sk((struct sock *)msk))->inet_sport;
+	struct mptcp_pm_addr_entry *entry;
 
 	spin_lock_bh(&msk->pm.lock);
-	entry = mptcp_userspace_pm_lookup_addr(msk, skc);
+	entry = mptcp_userspace_pm_lookup_addr(msk, &local->addr);
 	spin_unlock_bh(&msk->pm.lock);
 	if (entry)
 		return entry->addr.id;
 
-	memset(&new_entry, 0, sizeof(struct mptcp_pm_addr_entry));
-	new_entry.addr = *skc;
-	new_entry.addr.id = 0;
-	new_entry.flags = MPTCP_PM_ADDR_FLAG_IMPLICIT;
-
-	if (new_entry.addr.port == msk_sport)
-		new_entry.addr.port = 0;
+	if (local->addr.port == msk_sport)
+		local->addr.port = 0;
 
-	return mptcp_userspace_pm_append_new_local_addr(msk, &new_entry, true);
+	return mptcp_userspace_pm_append_new_local_addr(msk, local, true);
 }
 
 bool mptcp_userspace_pm_is_backup(struct mptcp_sock *msk,
diff --git a/net/mptcp/protocol.h b/net/mptcp/protocol.h
index XXXXXXX..XXXXXXX 100644
--- a/net/mptcp/protocol.h
+++ b/net/mptcp/protocol.h
@@ -XXX,XX +XXX,XX @@ bool mptcp_pm_add_addr_signal(struct mptcp_sock *msk, const struct sk_buff *skb,
 bool mptcp_pm_rm_addr_signal(struct mptcp_sock *msk, unsigned int remaining,
 			     struct mptcp_rm_list *rm_list);
 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_pm_nl_get_local_id(struct mptcp_sock *msk,
+			     struct mptcp_pm_addr_entry *local);
+int mptcp_userspace_pm_get_local_id(struct mptcp_sock *msk,
+				    struct mptcp_pm_addr_entry *local);
 bool mptcp_pm_is_backup(struct mptcp_sock *msk, struct sock_common *skc);
 bool mptcp_pm_nl_is_backup(struct mptcp_sock *msk, struct mptcp_addr_info *skc);
 bool mptcp_userspace_pm_is_backup(struct mptcp_sock *msk, struct mptcp_addr_info *skc);
-- 
2.43.0

From: Geliang Tang <tanggeliang@kylinos.cn>

is_backup() interface of the path managers is not very common. A more
common approach is to add a get_flags() interface to obtain the flags
value of a given address. Then is_backup() can be implemented through
get_flags() by test whether backup flag is set in the flags value.

Signed-off-by: Geliang Tang <tanggeliang@kylinos.cn>
---
 net/mptcp/pm.c           |  7 +++++--
 net/mptcp/pm_netlink.c   |  9 +++++----
 net/mptcp/pm_userspace.c | 10 +++++-----
 net/mptcp/protocol.h     |  6 ++++--
 4 files changed, 19 insertions(+), 13 deletions(-)

diff --git a/net/mptcp/pm.c b/net/mptcp/pm.c
index XXXXXXX..XXXXXXX 100644
--- a/net/mptcp/pm.c
+++ b/net/mptcp/pm.c
@@ -XXX,XX +XXX,XX @@ int mptcp_pm_get_local_id(struct mptcp_sock *msk, struct sock_common *skc)
 bool mptcp_pm_is_backup(struct mptcp_sock *msk, struct sock_common *skc)
 {
 	struct mptcp_addr_info skc_local;
+	u8 flags;
 
 	mptcp_local_address((struct sock_common *)skc, &skc_local);
 
 	if (mptcp_pm_is_userspace(msk))
-		return mptcp_userspace_pm_is_backup(msk, &skc_local);
+		flags = mptcp_userspace_pm_get_flags(msk, &skc_local);
+	else
+		flags = mptcp_pm_nl_get_flags(msk, &skc_local);
 
-	return mptcp_pm_nl_is_backup(msk, &skc_local);
+	return !!(flags & MPTCP_PM_ADDR_FLAG_BACKUP);
 }
 
 static int mptcp_pm_get_addr(u8 id, struct mptcp_pm_addr_entry *addr,
diff --git a/net/mptcp/pm_netlink.c b/net/mptcp/pm_netlink.c
index XXXXXXX..XXXXXXX 100644
--- a/net/mptcp/pm_netlink.c
+++ b/net/mptcp/pm_netlink.c
@@ -XXX,XX +XXX,XX @@ int mptcp_pm_nl_get_local_id(struct mptcp_sock *msk,
 	return ret;
 }
 
-bool mptcp_pm_nl_is_backup(struct mptcp_sock *msk, struct mptcp_addr_info *skc)
+u8 mptcp_pm_nl_get_flags(struct mptcp_sock *msk,
+			 struct mptcp_addr_info *skc)
 {
 	struct pm_nl_pernet *pernet = pm_nl_get_pernet_from_msk(msk);
 	struct mptcp_pm_addr_entry *entry;
-	bool backup;
+	u8 flags;
 
 	rcu_read_lock();
 	entry = __lookup_addr(pernet, skc);
-	backup = entry && !!(entry->flags & MPTCP_PM_ADDR_FLAG_BACKUP);
+	flags = entry ? entry->flags : 0;
 	rcu_read_unlock();
 
-	return backup;
+	return flags;
 }
 
 #define MPTCP_PM_CMD_GRP_OFFSET       0
diff --git a/net/mptcp/pm_userspace.c b/net/mptcp/pm_userspace.c
index XXXXXXX..XXXXXXX 100644
--- a/net/mptcp/pm_userspace.c
+++ b/net/mptcp/pm_userspace.c
@@ -XXX,XX +XXX,XX @@ int mptcp_userspace_pm_get_local_id(struct mptcp_sock *msk,
 	return mptcp_userspace_pm_append_new_local_addr(msk, local, true);
 }
 
-bool mptcp_userspace_pm_is_backup(struct mptcp_sock *msk,
-				  struct mptcp_addr_info *skc)
+u8 mptcp_userspace_pm_get_flags(struct mptcp_sock *msk,
+				struct mptcp_addr_info *skc)
 {
 	struct mptcp_pm_addr_entry *entry;
-	bool backup;
+	u8 flags;
 
 	spin_lock_bh(&msk->pm.lock);
 	entry = mptcp_userspace_pm_lookup_addr(msk, skc);
-	backup = entry && !!(entry->flags & MPTCP_PM_ADDR_FLAG_BACKUP);
+	flags = entry ? entry->flags : 0;
 	spin_unlock_bh(&msk->pm.lock);
 
-	return backup;
+	return flags;
 }
 
 static struct mptcp_sock *mptcp_userspace_pm_get_sock(const struct genl_info *info)
diff --git a/net/mptcp/protocol.h b/net/mptcp/protocol.h
index XXXXXXX..XXXXXXX 100644
--- a/net/mptcp/protocol.h
+++ b/net/mptcp/protocol.h
@@ -XXX,XX +XXX,XX @@ int mptcp_pm_nl_get_local_id(struct mptcp_sock *msk,
 int mptcp_userspace_pm_get_local_id(struct mptcp_sock *msk,
 				    struct mptcp_pm_addr_entry *local);
 bool mptcp_pm_is_backup(struct mptcp_sock *msk, struct sock_common *skc);
-bool mptcp_pm_nl_is_backup(struct mptcp_sock *msk, struct mptcp_addr_info *skc);
-bool mptcp_userspace_pm_is_backup(struct mptcp_sock *msk, struct mptcp_addr_info *skc);
+u8 mptcp_pm_nl_get_flags(struct mptcp_sock *msk,
+			 struct mptcp_addr_info *skc);
+u8 mptcp_userspace_pm_get_flags(struct mptcp_sock *msk,
+				struct mptcp_addr_info *skc);
 int mptcp_pm_nl_dump_addr(struct sk_buff *msg,
 			  struct netlink_callback *cb);
 int mptcp_userspace_pm_dump_addr(struct sk_buff *msg,
-- 
2.43.0

From: Geliang Tang <tanggeliang@kylinos.cn>

v5:
 - drop "change is_backup interfaces as get_flags"
 - move "add struct mptcp_pm_addr_id_bitmap" and "hold msk lock before
removing id 0 address" out of this set.
 - a new patch "use ipv6_addr_equal in addresses_equal"
 - patch 4, drop inet6_sk() in mptcp_event_add_subflow() and
   mptcp_event_pm_listener() too.

v4:
 - add a new patch, "add a build check for userspace_pm_dump_addr" as
   Matt suggested.
 - patch 4, fix a warning here reported by CI:
   WARNING: line length of 84 exceeds 80 columns
   #27: FILE: net/mptcp/pm_userspace.c:468:

v3:
 - drop "mptcp: update address type of get_local_id".

v2:
 - a new patch "hold msk lock before removing id 0 address"

Drop the patch "mptcp: reuse sending nlmsg code in dump_addr", add a new
helper mptcp_pm_genl_fill_addr() to save the duplicated code.

Define struct mptcp_pm_addr_id_bitmap in protocol.h, instead of defining
mptcp_pm_addr_id_bitmap_t in include/net/mptcp.h, since get_addr() and
dump_addr() interfaces of BPF userspace pm is dropped as Matt suggested.

Geliang Tang (5):
  mptcp: add a build check for userspace_pm_dump_addr
  mptcp: add mptcp_pm_genl_fill_addr helper
  mptcp: drop match in userspace_pm_append_new_local_addr
  mptcp: drop inet6_sk after inet_sk
  mptcp: use ipv6_addr_equal in addresses_equal

net/mptcp/pm.c           | 21 +++++++++++++++++++++
 net/mptcp/pm_netlink.c   | 22 ++++------------------
 net/mptcp/pm_userspace.c | 29 +++++++----------------------
 net/mptcp/protocol.h     |  3 +++
 4 files changed, 35 insertions(+), 40 deletions(-)

-- 
2.43.0

From: Geliang Tang <tanggeliang@kylinos.cn>

diff --git a/net/mptcp/pm.c b/net/mptcp/pm.c
index XXXXXXX..XXXXXXX 100644
--- a/net/mptcp/pm.c
+++ b/net/mptcp/pm.c
@@ -XXX,XX +XXX,XX @@ int mptcp_pm_nl_get_addr_doit(struct sk_buff *skb, struct genl_info *info)
 	return ret;
 }
 
+int mptcp_pm_genl_fill_addr(struct sk_buff *msg,
+			    struct netlink_callback *cb,
+			    struct mptcp_pm_addr_entry *entry)
+{
+	void *hdr;
+
+	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)
+		return -EINVAL;
+
+	if (mptcp_nl_fill_addr(msg, entry) < 0) {
+		genlmsg_cancel(msg, hdr);
+		return -EINVAL;
+	}
+
+	genlmsg_end(msg, hdr);
+	return 0;
+}
+
 static int mptcp_pm_dump_addr(struct sk_buff *msg, struct netlink_callback *cb)
 {
 	const struct genl_info *info = genl_info_dump(cb);
diff --git a/net/mptcp/pm_netlink.c b/net/mptcp/pm_netlink.c
index XXXXXXX..XXXXXXX 100644
--- a/net/mptcp/pm_netlink.c
+++ b/net/mptcp/pm_netlink.c
@@ -XXX,XX +XXX,XX @@ int mptcp_pm_nl_dump_addr(struct sk_buff *msg,
 	struct mptcp_pm_addr_entry *entry;
 	struct pm_nl_pernet *pernet;
 	int id = cb->args[0];
-	void *hdr;
 	int i;
 
 	pernet = pm_nl_get_pernet(net);
@@ -XXX,XX +XXX,XX @@ int mptcp_pm_nl_dump_addr(struct sk_buff *msg,
 			if (entry->addr.id <= id)
 				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)
+			if (mptcp_pm_genl_fill_addr(msg, cb, entry) < 0)
 				break;
 
-			if (mptcp_nl_fill_addr(msg, entry) < 0) {
-				genlmsg_cancel(msg, hdr);
-				break;
-			}
-
 			id = entry->addr.id;
-			genlmsg_end(msg, hdr);
 		}
 	}
 	rcu_read_unlock();
diff --git a/net/mptcp/pm_userspace.c b/net/mptcp/pm_userspace.c
index XXXXXXX..XXXXXXX 100644
--- a/net/mptcp/pm_userspace.c
+++ b/net/mptcp/pm_userspace.c
@@ -XXX,XX +XXX,XX @@ int mptcp_userspace_pm_dump_addr(struct sk_buff *msg,
 	struct mptcp_sock *msk;
 	int ret = -EINVAL;
 	struct sock *sk;
-	void *hdr;
 
 	BUILD_BUG_ON(sizeof(struct id_bitmap) > sizeof(cb->ctx));
 
@@ -XXX,XX +XXX,XX @@ int mptcp_userspace_pm_dump_addr(struct sk_buff *msg,
 		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)
+		if (mptcp_pm_genl_fill_addr(msg, cb, entry) < 0)
 			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);
diff --git a/net/mptcp/protocol.h b/net/mptcp/protocol.h
index XXXXXXX..XXXXXXX 100644
--- a/net/mptcp/protocol.h
+++ b/net/mptcp/protocol.h
@@ -XXX,XX +XXX,XX @@ void mptcp_fastopen_subflow_synack_set_params(struct mptcp_subflow_context *subf
 					      struct request_sock *req);
 int mptcp_nl_fill_addr(struct sk_buff *skb,
 		       struct mptcp_pm_addr_entry *entry);
+int mptcp_pm_genl_fill_addr(struct sk_buff *msg,
+			    struct netlink_callback *cb,
+			    struct mptcp_pm_addr_entry *entry);
 
 static inline bool mptcp_pm_should_add_signal(struct mptcp_sock *msk)
 {
-- 
2.43.0

From: Geliang Tang <tanggeliang@kylinos.cn>

The variable 'match' in mptcp_userspace_pm_append_new_local_addr() is a
redundant one, and this patch drops it.

No need to define 'match' as 'struct mptcp_pm_addr_entry *' type. In this
function, it's only used to check whether it's NULL. It can be defined as
a Boolean one.

Also other variables 'addr_match' and 'id_match' make 'match' a redundant
one, which can be replaced by directly checking 'addr_match && id_match'.

Reviewed-by: Matthieu Baerts (NGI0) <matttbe@kernel.org>
Signed-off-by: Geliang Tang <tanggeliang@kylinos.cn>
---
 net/mptcp/pm_userspace.c | 11 +++--------
 1 file changed, 3 insertions(+), 8 deletions(-)

From: Geliang Tang <tanggeliang@kylinos.cn>

In mptcp_event_add_subflow(), mptcp_event_pm_listener() and
mptcp_nl_find_ssk(), 'issk' has already been got through inet_sk().
No need to use inet6_sk() to get 'ipv6_pinfo' again, just use
issk->pinet6 instead. This patch also drops these 'ipv6_pinfo'
variables.

Reviewed-by: Matthieu Baerts (NGI0) <matttbe@kernel.org>
Signed-off-by: Geliang Tang <tanggeliang@kylinos.cn>
---
v2:
 - drop inet6_sk() in mptcp_event_add_subflow() and
   mptcp_event_pm_listener() too.
---
 net/mptcp/pm_netlink.c   | 8 ++------
 net/mptcp/pm_userspace.c | 4 +---
 2 files changed, 3 insertions(+), 9 deletions(-)

diff --git a/net/mptcp/pm_netlink.c b/net/mptcp/pm_netlink.c
index XXXXXXX..XXXXXXX 100644
--- a/net/mptcp/pm_netlink.c
+++ b/net/mptcp/pm_netlink.c
@@ -XXX,XX +XXX,XX @@ static int mptcp_event_add_subflow(struct sk_buff *skb, const struct sock *ssk)
 		break;
 #if IS_ENABLED(CONFIG_MPTCP_IPV6)
 	case AF_INET6: {
-		const struct ipv6_pinfo *np = inet6_sk(ssk);
-
-		if (nla_put_in6_addr(skb, MPTCP_ATTR_SADDR6, &np->saddr))
+		if (nla_put_in6_addr(skb, MPTCP_ATTR_SADDR6, &issk->pinet6->saddr))
 			return -EMSGSIZE;
 		if (nla_put_in6_addr(skb, MPTCP_ATTR_DADDR6, &ssk->sk_v6_daddr))
 			return -EMSGSIZE;
@@ -XXX,XX +XXX,XX @@ void mptcp_event_pm_listener(const struct sock *ssk,
 		break;
 #if IS_ENABLED(CONFIG_MPTCP_IPV6)
 	case AF_INET6: {
-		const struct ipv6_pinfo *np = inet6_sk(ssk);
-
-		if (nla_put_in6_addr(skb, MPTCP_ATTR_SADDR6, &np->saddr))
+		if (nla_put_in6_addr(skb, MPTCP_ATTR_SADDR6, &issk->pinet6->saddr))
 			goto nla_put_failure;
 		break;
 	}
diff --git a/net/mptcp/pm_userspace.c b/net/mptcp/pm_userspace.c
index XXXXXXX..XXXXXXX 100644
--- a/net/mptcp/pm_userspace.c
+++ b/net/mptcp/pm_userspace.c
@@ -XXX,XX +XXX,XX @@ static struct sock *mptcp_nl_find_ssk(struct mptcp_sock *msk,
 			break;
 #if IS_ENABLED(CONFIG_MPTCP_IPV6)
 		case AF_INET6: {
-			const struct ipv6_pinfo *pinfo = inet6_sk(ssk);
-
-			if (!ipv6_addr_equal(&local->addr6, &pinfo->saddr) ||
+			if (!ipv6_addr_equal(&local->addr6, &issk->pinet6->saddr) ||
 			    !ipv6_addr_equal(&remote->addr6, &ssk->sk_v6_daddr))
 				continue;
 			break;
-- 
2.43.0