From: Geliang Tang <tanggeliang@kylinos.cn>

get_addr() and dump_addr() interfaces of BPF userspace pm are dropped

as Matt suggested.

In order to implement BPF userspace path manager, it is necessary to

unify the interfaces of the path manager. This set contains some

cleanups and refactoring to unify the interfaces in kernel space.

Finally, define a struct mptcp_pm_ops for a userspace path manager

like this:

struct mptcp_pm_ops {

} ____cacheline_aligned_in_smp;

--

2.43.0

Add a set of functions to register, unregister, find and validate a

given struct ops.

Signed-off-by: Geliang Tang <tanggeliang@kylinos.cn>

---

diff --git a/include/net/mptcp.h b/include/net/mptcp.h

index XXXXXXX..XXXXXXX 100644

--- a/include/net/mptcp.h

+++ b/include/net/mptcp.h

@@ -XXX,XX +XXX,XX @@ struct mptcp_sched_ops {

    void (*release)(struct mptcp_sock *msk);

} ____cacheline_aligned_in_smp;

+struct mptcp_pm_ops {

+             struct mptcp_pm_addr_entry *local,

+             struct mptcp_addr_info *remote);

+    int (*get_local_id)(struct mptcp_sock *msk,

+

+    u8            type;

+    struct module        *owner;

+    struct list_head    list;

+

+} ____cacheline_aligned_in_smp;

+

#ifdef CONFIG_MPTCP

void mptcp_init(void);

index XXXXXXX..XXXXXXX 100644

@@ -XXX,XX +XXX,XX @@

+#include <linux/rculist.h>

+#include <linux/spinlock.h>

#include "protocol.h"

#include "mib.h"

#include "mptcp_pm_gen.h"

+static DEFINE_SPINLOCK(mptcp_pm_list_lock);

+static LIST_HEAD(mptcp_pm_list);

+

{

}

+

+/* Must be called with rcu read lock held */

+struct mptcp_pm_ops *mptcp_pm_find(enum mptcp_pm_type type)

+{

+    }

+

+    return NULL;

+}

+

+{

+        pr_err("%u does not implement required ops\n", pm->type);

+        return -EINVAL;

+    }

+

+    return 0;

+}

+

+{

+    int ret;

+

+    if (ret)

+        return ret;

+

+    spin_lock(&mptcp_pm_list_lock);

+    if (mptcp_pm_find(pm->type)) {

+

+    pr_debug("userspace_pm type %u registered\n", pm->type);

+    return 0;

+}

+

+{

+    spin_lock(&mptcp_pm_list_lock);

+    list_del_rcu(&pm->list);

+    spin_unlock(&mptcp_pm_list_lock);

+}

@@ -XXX,XX +XXX,XX @@ int mptcp_pm_remove_addr(struct mptcp_sock *msk, const struct mptcp_rm_list *rm_

void mptcp_pm_remove_addr_entry(struct mptcp_sock *msk,

                struct mptcp_pm_addr_entry *entry);

+struct mptcp_pm_ops *mptcp_pm_find(enum mptcp_pm_type type);

+

void mptcp_free_local_addr_list(struct mptcp_sock *msk);

void mptcp_event(enum mptcp_event_type type, const struct mptcp_sock *msk,

--

2.43.0

From: Geliang Tang <tanggeliang@kylinos.cn>

This patch defines the original userspace pm as the default path manager,

named mptcp_userspace_pm, and register it in mptcp_pm_data_init().

Extract address_announce() interface of the userspace PM from the handler

leave the code for obtaining msk through "info" and parsing address entry

in the handler.

Extract address_remove() interface of the userspace PM from the handler

leave the code for parsing address id and obtaining msk through "info"

in the handler.

Extract subflow_create() interface of the userspace PM from the handler of

    mptcp_pm_nl_subflow_create_doit(),

only leave the code for obtaining msk through "info", parsing local address

entry and parsing remote address info in the handler.

Extract subflow_destroy() interface of the userspace PM from the handler of

    mptcp_pm_nl_subflow_destroy_doit(),

only leave the code for obtaining msk through "info", parsing local address

entry and parsing remote address info in the handler.

mptcp_userspace_pm_set_flags(), only leave the code for obtaining

msk through "info" in this function.

All fives interfaces are invoked under holding the msk socket lock.

Signed-off-by: Geliang Tang <tanggeliang@kylinos.cn>

---

net/mptcp/pm.c | 1 +

net/mptcp/protocol.h | 1 +

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 @@ void mptcp_pm_data_init(struct mptcp_sock *msk)

void __init mptcp_pm_init(void)

{

    mptcp_pm_nl_init();

+    mptcp_userspace_pm_init();

}

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)

    return NULL;

}

-int mptcp_userspace_pm_get_local_id(struct mptcp_sock *msk,

+static int userspace_pm_get_local_id(struct mptcp_sock *msk,

@@ -XXX,XX +XXX,XX @@ int mptcp_userspace_pm_get_local_id(struct mptcp_sock *msk,

{

    struct mptcp_pm_addr_entry *entry;

+}

+

static struct mptcp_sock *mptcp_userspace_pm_get_sock(const struct genl_info *info)

{

    struct mptcp_sock *msk;

@@ -XXX,XX +XXX,XX @@ static struct mptcp_sock *mptcp_userspace_pm_get_sock(const struct genl_info *in

    return msk;

}

+{

+    int err;

+

+    err = mptcp_userspace_pm_append_new_local_addr(msk, local, false);

+    if (err < 0)

-        mptcp_pm_announce_addr(msk, &addr_val.addr, false);

-        mptcp_pm_nl_addr_send_ack(msk);

-    }

-

-    spin_unlock_bh(&msk->pm.lock);

    release_sock(sk);

+    if (err)

+        NL_SET_ERR_MSG_ATTR(info->extack, addr,

+                 "did not match address and id");

-    err = 0;

announce_err:

    sock_put(sk);

    return err;

@@ -XXX,XX +XXX,XX @@ void mptcp_pm_remove_addr_entry(struct mptcp_sock *msk,

    spin_unlock_bh(&msk->pm.lock);

}

+{

+    struct mptcp_pm_addr_entry *entry;

+

+    if (id == 0)

+        return mptcp_userspace_pm_remove_id_zero_address(msk);

-    struct mptcp_pm_addr_entry *match;

    struct mptcp_sock *msk;

    struct nlattr *id;

    int err = -EINVAL;

@@ -XXX,XX +XXX,XX @@ int mptcp_pm_nl_remove_doit(struct sk_buff *skb, struct genl_info *info)

    sk = (struct sock *)msk;

-    if (id_val == 0) {

-        err = mptcp_userspace_pm_remove_id_zero_address(msk);

-        goto out;

-    }

-

-    spin_lock_bh(&msk->pm.lock);

-    match = mptcp_userspace_pm_lookup_addr_by_id(msk, id_val);

-    if (!match) {

-        spin_unlock_bh(&msk->pm.lock);

-    list_del_rcu(&match->list);

-    spin_unlock_bh(&msk->pm.lock);

-

-    mptcp_pm_remove_addr_entry(msk, match);

-

    release_sock(sk);

-

-    sock_kfree_s(sk, match, sizeof(*match));

-

-    err = 0;

                    "address with id %u not found",

@@ -XXX,XX +XXX,XX @@ int mptcp_pm_nl_remove_doit(struct sk_buff *skb, struct genl_info *info)

    return err;

}

+{

+    struct sock *sk = (struct sock *)msk;

+    struct mptcp_pm_local local;

+    int err;

+

+        mptcp_userspace_pm_delete_local_addr(msk, entry);

+    else

+        msk->pm.subflows++;

+    spin_unlock_bh(&msk->pm.lock);

+

+}

+

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

{

    struct mptcp_pm_addr_entry entry = { 0 };

-    local.flags = entry.flags;

-    local.ifindex = entry.ifindex;

-

    lock_sock(sk);

-    err = __mptcp_subflow_connect(sk, &local, &addr_r);

    release_sock(sk);

    if (err)

        GENL_SET_ERR_MSG_FMT(info, "connect error: %d", err);

    return err;

@@ -XXX,XX +XXX,XX @@ static struct sock *mptcp_nl_find_ssk(struct mptcp_sock *msk,

    return NULL;

}

+{

+    struct sock *ssk, *sk = (struct sock *)msk;

+

+    ssk = mptcp_nl_find_ssk(msk, &local->addr, remote);

+    if (!ssk)

-    spin_unlock_bh(&msk->pm.lock);

-    mptcp_subflow_shutdown(sk, ssk, RCV_SHUTDOWN | SEND_SHUTDOWN);

-    mptcp_close_ssk(sk, ssk, mptcp_subflow_ctx(ssk));

-    MPTCP_INC_STATS(sock_net(sk), MPTCP_MIB_RMSUBFLOW);

-release_sock:

    release_sock(sk);

+    if (err)

+        GENL_SET_ERR_MSG(info, "subflow not found");

destroy_err:

    sock_put(sk);

    return err;

}

+{

+    struct mptcp_pm_addr_entry *entry;

+    u8 bkup = 0;

+

+    if (local->flags & MPTCP_PM_ADDR_FLAG_BACKUP)

-    }

-    spin_unlock_bh(&msk->pm.lock);

-

    lock_sock(sk);

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

    release_sock(sk);

    /* mptcp_pm_nl_mp_prio_send_ack() only fails in one case */

@@ -XXX,XX +XXX,XX @@ int mptcp_userspace_pm_get_addr(u8 id, struct mptcp_pm_addr_entry *addr,

    return ret;

}

+static struct mptcp_pm_ops mptcp_userspace_pm = {

+    .get_local_id        = userspace_pm_get_local_id,

+    .type            = MPTCP_PM_TYPE_USERSPACE,

+    .owner            = THIS_MODULE,

+};

+

+void __init mptcp_userspace_pm_init(void)

+{

+}

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

From: Geliang Tang <tanggeliang@kylinos.cn>

Add a struct mptcp_pm_ops pointer "ops" in struct mptcp_pm_data, and two

In this way, different userspace path managers can be initialized through

the pm_type sysctl, and then called into their respective interfaces

through "ops" of "msk->pm".

Signed-off-by: Geliang Tang <tanggeliang@kylinos.cn>

---

net/mptcp/protocol.h | 3 +++

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 @@ void mptcp_pm_data_reset(struct mptcp_sock *msk)

        WRITE_ONCE(pm->work_pending, 0);

        WRITE_ONCE(pm->accept_addr, 0);

        WRITE_ONCE(pm->accept_subflow, 0);

+

+        rcu_read_lock();

+        rcu_read_unlock();

    WRITE_ONCE(pm->addr_signal, 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

{

static struct mptcp_sock *mptcp_userspace_pm_get_sock(const struct genl_info *info)

@@ -XXX,XX +XXX,XX @@ int mptcp_pm_nl_announce_doit(struct sk_buff *skb, struct genl_info *info)

    }

    lock_sock(sk);

    release_sock(sk);

    if (err)

        NL_SET_ERR_MSG_ATTR(info->extack, addr,

@@ -XXX,XX +XXX,XX @@ int mptcp_pm_nl_remove_doit(struct sk_buff *skb, struct genl_info *info)

    sk = (struct sock *)msk;

    lock_sock(sk);

    release_sock(sk);

    if (err)

        NL_SET_ERR_MSG_ATTR_FMT(info->extack, id,

@@ -XXX,XX +XXX,XX @@ int mptcp_pm_nl_subflow_create_doit(struct sk_buff *skb, struct genl_info *info)

    }

    lock_sock(sk);

    if (err)

@@ -XXX,XX +XXX,XX @@ int mptcp_pm_nl_subflow_destroy_doit(struct sk_buff *skb, struct genl_info *info

    }

    lock_sock(sk);

    release_sock(sk);

    if (err)

        GENL_SET_ERR_MSG(info, "subflow not found");

@@ -XXX,XX +XXX,XX @@ int mptcp_userspace_pm_set_flags(struct mptcp_pm_addr_entry *local,

    }

    lock_sock(sk);

    /* mptcp_pm_nl_mp_prio_send_ack() only fails in one case */

diff --git a/net/mptcp/protocol.c b/net/mptcp/protocol.c

index XXXXXXX..XXXXXXX 100644

--- a/net/mptcp/protocol.c

+++ b/net/mptcp/protocol.c

@@ -XXX,XX +XXX,XX @@ static void __mptcp_destroy_sock(struct sock *sk)

    sk_stop_timer(sk, &sk->sk_timer);

    msk->pm.status = 0;

    mptcp_release_sched(msk);

    sk->sk_prot->destroy(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 @@ struct mptcp_pm_data {

+    struct mptcp_pm_ops *ops;

    spinlock_t    lock;        /*protects the whole PM data */

@@ -XXX,XX +XXX,XX @@ struct mptcp_pm_ops *mptcp_pm_find(enum mptcp_pm_type type);

void mptcp_free_local_addr_list(struct mptcp_sock *msk);

--

2.43.0