| 1 | From: Geliang Tang <tanggeliang@kylinos.cn> | 1 | From: Geliang Tang <tanggeliang@kylinos.cn> |
|---|---|---|---|
| 2 | 2 | ||
| 3 | Some path manager related refactoring and cleanups. | 3 | v6: |
| 4 | - add "name" in struct mptcp_pm_ops. | ||
| 5 | - add some "sysctl" patches. | ||
| 6 | - drop "struct mptcp_pm_param". | ||
| 7 | - drop "pm_type" in mptcp_pm_data. | ||
| 4 | 8 | ||
| 5 | Geliang Tang (6): | 9 | v5: |
| 6 | mptcp: pm: in-kernel: avoid access entry without lock | 10 | - use "struct mptcp_pm_param *param" as unified parameters for all |
| 7 | mptcp: pm: in-kernel: reduce parameters of set_flags | 11 | interfaces. |
| 12 | - register in-kernel mptcp_pm_ops too. | ||
| 13 | - only implement two interfaces "get_local_id" and "get_priority" in | ||
| 14 | this set. | ||
| 15 | |||
| 16 | v4: | ||
| 17 | - include a new patch "define BPF path manager type". | ||
| 18 | |||
| 19 | - add new interfaces: | ||
| 20 | created established closed | ||
| 21 | listerner_created listener_closed | ||
| 22 | |||
| 23 | - rename interfaces as: | ||
| 24 | address_announced address_removed | ||
| 25 | subflow_established subflow_closed | ||
| 26 | get_priority set_priority | ||
| 27 | |||
| 28 | - rename functions as: | ||
| 29 | mptcp_pm_validate | ||
| 30 | mptcp_pm_register | ||
| 31 | mptcp_pm_unregister | ||
| 32 | mptcp_pm_initialize | ||
| 33 | mptcp_pm_release | ||
| 34 | |||
| 35 | v3: | ||
| 36 | - rename the 2nd parameter of get_local_id() from 'local' to 'skc'. | ||
| 37 | - keep the 'msk_sport' check in mptcp_userspace_pm_get_local_id(). | ||
| 38 | - return 'err' instead of '0' in userspace_pm_subflow_create(). | ||
| 39 | - drop 'ret' variable inmptcp_pm_data_reset(). | ||
| 40 | - fix typos in commit log. | ||
| 41 | |||
| 42 | v2: | ||
| 43 | - update get_local_id interface in patch 2. | ||
| 44 | |||
| 45 | get_addr() and dump_addr() interfaces of BPF userspace pm are dropped | ||
| 46 | as Matt suggested. | ||
| 47 | |||
| 48 | In order to implement BPF path manager, it's necessary to unify the | ||
| 49 | interfaces of the path manager. This set contains some cleanups and | ||
| 50 | refactoring to unify the interfaces in kernel space. Finally, define | ||
| 51 | a struct mptcp_pm_ops for a path manager. | ||
| 52 | |||
| 53 | Geliang Tang (13): | ||
| 54 | mptcp: sysctl: use index for sysctl table | ||
| 55 | mptcp: sysctl: add path_manager to set pm name | ||
| 8 | mptcp: pm: use addr entry for get_local_id | 56 | mptcp: pm: use addr entry for get_local_id |
| 9 | mptcp: pm: in-kernel: use kmemdup helper | 57 | mptcp: pm: define struct mptcp_pm_ops |
| 10 | sock: add sock_kmemdup helper | 58 | mptcp: pm: in-kernel: register mptcp_in_kernel_pm |
| 11 | mptcp: pm: userspace: use sock_kmemdup helper | 59 | mptcp: pm: userspace: register mptcp_userspace_pm |
| 60 | mptcp: pm: initialize and release mptcp_pm_ops | ||
| 61 | mptcp: pm: drop pm_type in mptcp_pm_data | ||
| 62 | mptcp: sysctl: drop old pm_type sysctl | ||
| 63 | mptcp: sysctl: add available_path_managers | ||
| 64 | mptcp: pm: drop get_local_id helpers | ||
| 65 | mptcp: pm: drop is_backup helpers | ||
| 66 | selftests/mptcp: use path_manager instead of pm_type | ||
| 12 | 67 | ||
| 13 | include/net/sock.h | 1 + | 68 | Documentation/networking/mptcp-sysctl.rst | 14 +- |
| 14 | net/core/sock.c | 23 +++++++++++++++++++++++ | 69 | include/net/mptcp.h | 39 +++++ |
| 15 | net/mptcp/pm.c | 9 ++++++--- | 70 | net/mptcp/ctrl.c | 104 ++++++++++--- |
| 16 | net/mptcp/pm_netlink.c | 30 +++++++++++++----------------- | 71 | net/mptcp/pm.c | 141 ++++++++++++++++-- |
| 17 | net/mptcp/pm_userspace.c | 20 +++++++------------- | 72 | net/mptcp/pm_netlink.c | 24 ++- |
| 18 | net/mptcp/protocol.h | 6 ++++-- | 73 | net/mptcp/pm_userspace.c | 36 +++-- |
| 19 | 6 files changed, 54 insertions(+), 35 deletions(-) | 74 | net/mptcp/protocol.c | 1 + |
| 75 | net/mptcp/protocol.h | 23 ++- | ||
| 76 | .../testing/selftests/net/mptcp/mptcp_join.sh | 26 ++-- | ||
| 77 | .../selftests/net/mptcp/userspace_pm.sh | 4 +- | ||
| 78 | 10 files changed, 324 insertions(+), 88 deletions(-) | ||
| 20 | 79 | ||
| 21 | -- | 80 | -- |
| 22 | 2.43.0 | 81 | 2.43.0 | diff view generated by jsdifflib |
New patch | |||
|---|---|---|---|
| 1 | From: Geliang Tang <tanggeliang@kylinos.cn> | ||
| 1 | 2 | ||
| 3 | The sysctl table needs to be updated when a new sysctl is added or an old | ||
| 4 | sysctl is deleted. It's inconvenient to use fixed index numbers, since the | ||
| 5 | index number that needs to be changed and all subsequent index numbers need | ||
| 6 | to be updated accordingly. | ||
| 7 | |||
| 8 | This patch adds an "i" variable to access each sysctl in the sysctl table | ||
| 9 | incrementally. | ||
| 10 | |||
| 11 | Signed-off-by: Geliang Tang <tanggeliang@kylinos.cn> | ||
| 12 | --- | ||
| 13 | net/mptcp/ctrl.c | 23 ++++++++++++----------- | ||
| 14 | 1 file changed, 12 insertions(+), 11 deletions(-) | ||
| 15 | |||
| 16 | diff --git a/net/mptcp/ctrl.c b/net/mptcp/ctrl.c | ||
| 17 | index XXXXXXX..XXXXXXX 100644 | ||
| 18 | --- a/net/mptcp/ctrl.c | ||
| 19 | +++ b/net/mptcp/ctrl.c | ||
| 20 | @@ -XXX,XX +XXX,XX @@ static int mptcp_pernet_new_table(struct net *net, struct mptcp_pernet *pernet) | ||
| 21 | { | ||
| 22 | struct ctl_table_header *hdr; | ||
| 23 | struct ctl_table *table; | ||
| 24 | + int i = 0; | ||
| 25 | |||
| 26 | table = mptcp_sysctl_table; | ||
| 27 | if (!net_eq(net, &init_net)) { | ||
| 28 | @@ -XXX,XX +XXX,XX @@ static int mptcp_pernet_new_table(struct net *net, struct mptcp_pernet *pernet) | ||
| 29 | goto err_alloc; | ||
| 30 | } | ||
| 31 | |||
| 32 | - table[0].data = &pernet->mptcp_enabled; | ||
| 33 | - table[1].data = &pernet->add_addr_timeout; | ||
| 34 | - table[2].data = &pernet->checksum_enabled; | ||
| 35 | - table[3].data = &pernet->allow_join_initial_addr_port; | ||
| 36 | - table[4].data = &pernet->stale_loss_cnt; | ||
| 37 | - table[5].data = &pernet->pm_type; | ||
| 38 | - table[6].data = &pernet->scheduler; | ||
| 39 | - /* table[7] is for available_schedulers which is read-only info */ | ||
| 40 | - table[8].data = &pernet->close_timeout; | ||
| 41 | - table[9].data = &pernet->blackhole_timeout; | ||
| 42 | - table[10].data = &pernet->syn_retrans_before_tcp_fallback; | ||
| 43 | + table[i++].data = &pernet->mptcp_enabled; | ||
| 44 | + table[i++].data = &pernet->add_addr_timeout; | ||
| 45 | + table[i++].data = &pernet->checksum_enabled; | ||
| 46 | + table[i++].data = &pernet->allow_join_initial_addr_port; | ||
| 47 | + table[i++].data = &pernet->stale_loss_cnt; | ||
| 48 | + table[i++].data = &pernet->pm_type; | ||
| 49 | + table[i++].data = &pernet->scheduler; | ||
| 50 | + i++; /* table[i] is for available_schedulers which is read-only info */ | ||
| 51 | + table[i++].data = &pernet->close_timeout; | ||
| 52 | + table[i++].data = &pernet->blackhole_timeout; | ||
| 53 | + table[i++].data = &pernet->syn_retrans_before_tcp_fallback; | ||
| 54 | |||
| 55 | hdr = register_net_sysctl_sz(net, MPTCP_SYSCTL_PATH, table, | ||
| 56 | ARRAY_SIZE(mptcp_sysctl_table)); | ||
| 57 | -- | ||
| 58 | 2.43.0 | diff view generated by jsdifflib |
New patch | |||
|---|---|---|---|
| 1 | From: Geliang Tang <tanggeliang@kylinos.cn> | ||
| 1 | 2 | ||
| 3 | A new net.mptcp.path_manager sysctl is added to determine which path | ||
| 4 | manager will be used by each newly-created MPTCP socket by setting the | ||
| 5 | name of it. This sysctl will replace the old one pm_type. | ||
| 6 | |||
| 7 | Signed-off-by: Geliang Tang <tanggeliang@kylinos.cn> | ||
| 8 | --- | ||
| 9 | Documentation/networking/mptcp-sysctl.rst | 17 ++++++++ | ||
| 10 | net/mptcp/ctrl.c | 50 +++++++++++++++++++++++ | ||
| 11 | net/mptcp/protocol.h | 1 + | ||
| 12 | 3 files changed, 68 insertions(+) | ||
| 13 | |||
| 14 | diff --git a/Documentation/networking/mptcp-sysctl.rst b/Documentation/networking/mptcp-sysctl.rst | ||
| 15 | index XXXXXXX..XXXXXXX 100644 | ||
| 16 | --- a/Documentation/networking/mptcp-sysctl.rst | ||
| 17 | +++ b/Documentation/networking/mptcp-sysctl.rst | ||
| 18 | @@ -XXX,XX +XXX,XX @@ pm_type - INTEGER | ||
| 19 | |||
| 20 | Default: 0 | ||
| 21 | |||
| 22 | +path_manager - STRING | ||
| 23 | + Set the default path manager name to use for each new MPTCP | ||
| 24 | + socket. In-kernel path management will control subflow | ||
| 25 | + connections and address advertisements according to | ||
| 26 | + per-namespace values configured over the MPTCP netlink | ||
| 27 | + API. Userspace path management puts per-MPTCP-connection subflow | ||
| 28 | + connection decisions and address advertisements under control of | ||
| 29 | + a privileged userspace program, at the cost of more netlink | ||
| 30 | + traffic to propagate all of the related events and commands. | ||
| 31 | + | ||
| 32 | + This is a per-namespace sysctl. | ||
| 33 | + | ||
| 34 | + * "in-kernel" - In-kernel path manager | ||
| 35 | + * "userspace" - Userspace path manager | ||
| 36 | + | ||
| 37 | + Default: "in-kernel" | ||
| 38 | + | ||
| 39 | scheduler - STRING | ||
| 40 | Select the scheduler of your choice. | ||
| 41 | |||
| 42 | diff --git a/net/mptcp/ctrl.c b/net/mptcp/ctrl.c | ||
| 43 | index XXXXXXX..XXXXXXX 100644 | ||
| 44 | --- a/net/mptcp/ctrl.c | ||
| 45 | +++ b/net/mptcp/ctrl.c | ||
| 46 | @@ -XXX,XX +XXX,XX @@ struct mptcp_pernet { | ||
| 47 | u8 checksum_enabled; | ||
| 48 | u8 allow_join_initial_addr_port; | ||
| 49 | u8 pm_type; | ||
| 50 | + char path_manager[MPTCP_PM_NAME_MAX]; | ||
| 51 | char scheduler[MPTCP_SCHED_NAME_MAX]; | ||
| 52 | }; | ||
| 53 | |||
| 54 | @@ -XXX,XX +XXX,XX @@ int mptcp_get_pm_type(const struct net *net) | ||
| 55 | return mptcp_get_pernet(net)->pm_type; | ||
| 56 | } | ||
| 57 | |||
| 58 | +const char *mptcp_get_path_manager(const struct net *net) | ||
| 59 | +{ | ||
| 60 | + return mptcp_get_pernet(net)->path_manager; | ||
| 61 | +} | ||
| 62 | + | ||
| 63 | const char *mptcp_get_scheduler(const struct net *net) | ||
| 64 | { | ||
| 65 | return mptcp_get_pernet(net)->scheduler; | ||
| 66 | @@ -XXX,XX +XXX,XX @@ static void mptcp_pernet_set_defaults(struct mptcp_pernet *pernet) | ||
| 67 | pernet->allow_join_initial_addr_port = 1; | ||
| 68 | pernet->stale_loss_cnt = 4; | ||
| 69 | pernet->pm_type = MPTCP_PM_TYPE_KERNEL; | ||
| 70 | + strscpy(pernet->path_manager, "in-kernel", sizeof(pernet->path_manager)); | ||
| 71 | strscpy(pernet->scheduler, "default", sizeof(pernet->scheduler)); | ||
| 72 | } | ||
| 73 | |||
| 74 | #ifdef CONFIG_SYSCTL | ||
| 75 | +static int mptcp_set_path_manager(char *path_manager, const char *name) | ||
| 76 | +{ | ||
| 77 | + struct mptcp_pm_ops *pm; | ||
| 78 | + int ret = 0; | ||
| 79 | + | ||
| 80 | + rcu_read_lock(); | ||
| 81 | + pm = mptcp_pm_find(name); | ||
| 82 | + if (pm) | ||
| 83 | + strscpy(path_manager, name, MPTCP_PM_NAME_MAX); | ||
| 84 | + else | ||
| 85 | + ret = -ENOENT; | ||
| 86 | + rcu_read_unlock(); | ||
| 87 | + | ||
| 88 | + return ret; | ||
| 89 | +} | ||
| 90 | + | ||
| 91 | +static int proc_path_manager(const struct ctl_table *ctl, int write, | ||
| 92 | + void *buffer, size_t *lenp, loff_t *ppos) | ||
| 93 | +{ | ||
| 94 | + char (*path_manager)[MPTCP_PM_NAME_MAX] = ctl->data; | ||
| 95 | + char val[MPTCP_PM_NAME_MAX]; | ||
| 96 | + const struct ctl_table tbl = { | ||
| 97 | + .data = val, | ||
| 98 | + .maxlen = MPTCP_PM_NAME_MAX, | ||
| 99 | + }; | ||
| 100 | + int ret; | ||
| 101 | + | ||
| 102 | + strscpy(val, *path_manager, MPTCP_PM_NAME_MAX); | ||
| 103 | + | ||
| 104 | + ret = proc_dostring(&tbl, write, buffer, lenp, ppos); | ||
| 105 | + if (write && ret == 0) | ||
| 106 | + ret = mptcp_set_path_manager(*path_manager, val); | ||
| 107 | + | ||
| 108 | + return ret; | ||
| 109 | +} | ||
| 110 | + | ||
| 111 | static int mptcp_set_scheduler(char *scheduler, const char *name) | ||
| 112 | { | ||
| 113 | struct mptcp_sched_ops *sched; | ||
| 114 | @@ -XXX,XX +XXX,XX @@ static struct ctl_table mptcp_sysctl_table[] = { | ||
| 115 | .extra1 = SYSCTL_ZERO, | ||
| 116 | .extra2 = &mptcp_pm_type_max | ||
| 117 | }, | ||
| 118 | + { | ||
| 119 | + .procname = "path_manager", | ||
| 120 | + .maxlen = MPTCP_PM_NAME_MAX, | ||
| 121 | + .mode = 0644, | ||
| 122 | + .proc_handler = proc_path_manager, | ||
| 123 | + }, | ||
| 124 | { | ||
| 125 | .procname = "scheduler", | ||
| 126 | .maxlen = MPTCP_SCHED_NAME_MAX, | ||
| 127 | @@ -XXX,XX +XXX,XX @@ static int mptcp_pernet_new_table(struct net *net, struct mptcp_pernet *pernet) | ||
| 128 | table[i++].data = &pernet->allow_join_initial_addr_port; | ||
| 129 | table[i++].data = &pernet->stale_loss_cnt; | ||
| 130 | table[i++].data = &pernet->pm_type; | ||
| 131 | + table[i++].data = &pernet->path_manager; | ||
| 132 | table[i++].data = &pernet->scheduler; | ||
| 133 | i++; /* table[i] is for available_schedulers which is read-only info */ | ||
| 134 | table[i++].data = &pernet->close_timeout; | ||
| 135 | diff --git a/net/mptcp/protocol.h b/net/mptcp/protocol.h | ||
| 136 | index XXXXXXX..XXXXXXX 100644 | ||
| 137 | --- a/net/mptcp/protocol.h | ||
| 138 | +++ b/net/mptcp/protocol.h | ||
| 139 | @@ -XXX,XX +XXX,XX @@ int mptcp_allow_join_id0(const struct net *net); | ||
| 140 | unsigned int mptcp_stale_loss_cnt(const struct net *net); | ||
| 141 | unsigned int mptcp_close_timeout(const struct sock *sk); | ||
| 142 | int mptcp_get_pm_type(const struct net *net); | ||
| 143 | +const char *mptcp_get_path_manager(const struct net *net); | ||
| 144 | const char *mptcp_get_scheduler(const struct net *net); | ||
| 145 | |||
| 146 | void mptcp_active_disable(struct sock *sk); | ||
| 147 | -- | ||
| 148 | 2.43.0 | diff view generated by jsdifflib |
| 1 | From: Geliang Tang <tanggeliang@kylinos.cn> | 1 | From: Geliang Tang <tanggeliang@kylinos.cn> |
|---|---|---|---|
| 2 | 2 | ||
| 3 | The following code in mptcp_userspace_pm_get_local_id() that assigns "skc" | 3 | The following code in mptcp_userspace_pm_get_local_id() that assigns "skc" |
| 4 | to "new_entry" is not allowed in BPF if we use the same code to implement | 4 | to "new_entry" is not allowed in BPF if we use the same code to implement |
| 5 | the get_local_id() interface of a BFP path manager: | 5 | the get_local_id() interface of a BFP path manager: |
| 6 | 6 | ||
| 7 | memset(&new_entry, 0, sizeof(struct mptcp_pm_addr_entry)); | 7 | memset(&new_entry, 0, sizeof(struct mptcp_pm_addr_entry)); |
| 8 | new_entry.addr = *skc; | 8 | new_entry.addr = *skc; |
| 9 | new_entry.addr.id = 0; | 9 | new_entry.addr.id = 0; |
| 10 | new_entry.flags = MPTCP_PM_ADDR_FLAG_IMPLICIT; | 10 | new_entry.flags = MPTCP_PM_ADDR_FLAG_IMPLICIT; |
| 11 | 11 | ||
| 12 | To solve the issue, this patch moves this assignment to "new_entry" forward | 12 | To solve the issue, this patch moves this assignment to "new_entry" forward |
| 13 | to mptcp_pm_get_local_id(), and then passing "new_entry" as a parameter to | 13 | to mptcp_pm_get_local_id(), and then passing "new_entry" as a parameter to |
| 14 | both mptcp_pm_nl_get_local_id() and mptcp_userspace_pm_get_local_id(). | 14 | both mptcp_pm_nl_get_local_id() and mptcp_userspace_pm_get_local_id(). |
| 15 | 15 | ||
| 16 | Signed-off-by: Geliang Tang <tanggeliang@kylinos.cn> | 16 | Signed-off-by: Geliang Tang <tanggeliang@kylinos.cn> |
| 17 | --- | 17 | --- |
| 18 | net/mptcp/pm.c | 9 ++++++--- | 18 | net/mptcp/pm.c | 9 ++++++--- |
| 19 | net/mptcp/pm_netlink.c | 11 ++++------- | 19 | net/mptcp/pm_netlink.c | 11 ++++------- |
| 20 | net/mptcp/pm_userspace.c | 17 ++++++----------- | 20 | net/mptcp/pm_userspace.c | 17 ++++++----------- |
| 21 | net/mptcp/protocol.h | 6 ++++-- | 21 | net/mptcp/protocol.h | 6 ++++-- |
| 22 | 4 files changed, 20 insertions(+), 23 deletions(-) | 22 | 4 files changed, 20 insertions(+), 23 deletions(-) |
| 23 | 23 | ||
| 24 | diff --git a/net/mptcp/pm.c b/net/mptcp/pm.c | 24 | diff --git a/net/mptcp/pm.c b/net/mptcp/pm.c |
| 25 | index XXXXXXX..XXXXXXX 100644 | 25 | index XXXXXXX..XXXXXXX 100644 |
| 26 | --- a/net/mptcp/pm.c | 26 | --- a/net/mptcp/pm.c |
| 27 | +++ b/net/mptcp/pm.c | 27 | +++ b/net/mptcp/pm.c |
| 28 | @@ -XXX,XX +XXX,XX @@ bool mptcp_pm_rm_addr_signal(struct mptcp_sock *msk, unsigned int remaining, | 28 | @@ -XXX,XX +XXX,XX @@ bool mptcp_pm_rm_addr_signal(struct mptcp_sock *msk, unsigned int remaining, |
| 29 | 29 | ||
| 30 | int mptcp_pm_get_local_id(struct mptcp_sock *msk, struct sock_common *skc) | 30 | int mptcp_pm_get_local_id(struct mptcp_sock *msk, struct sock_common *skc) |
| 31 | { | 31 | { |
| 32 | - struct mptcp_addr_info skc_local; | 32 | - struct mptcp_addr_info skc_local; |
| 33 | + struct mptcp_pm_addr_entry skc_local = { 0 }; | 33 | + struct mptcp_pm_addr_entry skc_local = { 0 }; |
| 34 | struct mptcp_addr_info msk_local; | 34 | struct mptcp_addr_info msk_local; |
| 35 | 35 | ||
| 36 | if (WARN_ON_ONCE(!msk)) | 36 | if (WARN_ON_ONCE(!msk)) |
| 37 | @@ -XXX,XX +XXX,XX @@ int mptcp_pm_get_local_id(struct mptcp_sock *msk, struct sock_common *skc) | 37 | @@ -XXX,XX +XXX,XX @@ int mptcp_pm_get_local_id(struct mptcp_sock *msk, struct sock_common *skc) |
| 38 | * addr | 38 | * addr |
| 39 | */ | 39 | */ |
| 40 | mptcp_local_address((struct sock_common *)msk, &msk_local); | 40 | mptcp_local_address((struct sock_common *)msk, &msk_local); |
| 41 | - mptcp_local_address((struct sock_common *)skc, &skc_local); | 41 | - mptcp_local_address((struct sock_common *)skc, &skc_local); |
| 42 | - if (mptcp_addresses_equal(&msk_local, &skc_local, false)) | 42 | - if (mptcp_addresses_equal(&msk_local, &skc_local, false)) |
| 43 | + mptcp_local_address((struct sock_common *)skc, &skc_local.addr); | 43 | + mptcp_local_address((struct sock_common *)skc, &skc_local.addr); |
| 44 | + if (mptcp_addresses_equal(&msk_local, &skc_local.addr, false)) | 44 | + if (mptcp_addresses_equal(&msk_local, &skc_local.addr, false)) |
| 45 | return 0; | 45 | return 0; |
| 46 | 46 | ||
| 47 | + skc_local.addr.id = 0; | 47 | + skc_local.addr.id = 0; |
| 48 | + skc_local.flags = MPTCP_PM_ADDR_FLAG_IMPLICIT; | 48 | + skc_local.flags = MPTCP_PM_ADDR_FLAG_IMPLICIT; |
| 49 | + | 49 | + |
| 50 | if (mptcp_pm_is_userspace(msk)) | 50 | if (mptcp_pm_is_userspace(msk)) |
| 51 | return mptcp_userspace_pm_get_local_id(msk, &skc_local); | 51 | return mptcp_userspace_pm_get_local_id(msk, &skc_local); |
| 52 | return mptcp_pm_nl_get_local_id(msk, &skc_local); | 52 | return mptcp_pm_nl_get_local_id(msk, &skc_local); |
| 53 | diff --git a/net/mptcp/pm_netlink.c b/net/mptcp/pm_netlink.c | 53 | diff --git a/net/mptcp/pm_netlink.c b/net/mptcp/pm_netlink.c |
| 54 | index XXXXXXX..XXXXXXX 100644 | 54 | index XXXXXXX..XXXXXXX 100644 |
| 55 | --- a/net/mptcp/pm_netlink.c | 55 | --- a/net/mptcp/pm_netlink.c |
| 56 | +++ b/net/mptcp/pm_netlink.c | 56 | +++ b/net/mptcp/pm_netlink.c |
| 57 | @@ -XXX,XX +XXX,XX @@ static int mptcp_pm_nl_create_listen_socket(struct sock *sk, | 57 | @@ -XXX,XX +XXX,XX @@ static int mptcp_pm_nl_create_listen_socket(struct sock *sk, |
| 58 | return err; | 58 | return err; |
| 59 | } | 59 | } |
| 60 | 60 | ||
| 61 | -int mptcp_pm_nl_get_local_id(struct mptcp_sock *msk, struct mptcp_addr_info *skc) | 61 | -int mptcp_pm_nl_get_local_id(struct mptcp_sock *msk, struct mptcp_addr_info *skc) |
| 62 | +int mptcp_pm_nl_get_local_id(struct mptcp_sock *msk, | 62 | +int mptcp_pm_nl_get_local_id(struct mptcp_sock *msk, |
| 63 | + struct mptcp_pm_addr_entry *skc) | 63 | + struct mptcp_pm_addr_entry *skc) |
| 64 | { | 64 | { |
| 65 | struct mptcp_pm_addr_entry *entry; | 65 | struct mptcp_pm_addr_entry *entry; |
| 66 | struct pm_nl_pernet *pernet; | 66 | struct pm_nl_pernet *pernet; |
| 67 | @@ -XXX,XX +XXX,XX @@ int mptcp_pm_nl_get_local_id(struct mptcp_sock *msk, struct mptcp_addr_info *skc | 67 | @@ -XXX,XX +XXX,XX @@ int mptcp_pm_nl_get_local_id(struct mptcp_sock *msk, struct mptcp_addr_info *skc |
| 68 | pernet = pm_nl_get_pernet_from_msk(msk); | 68 | pernet = pm_nl_get_pernet_from_msk(msk); |
| 69 | 69 | ||
| 70 | rcu_read_lock(); | 70 | rcu_read_lock(); |
| 71 | - entry = __lookup_addr(pernet, skc); | 71 | - entry = __lookup_addr(pernet, skc); |
| 72 | + entry = __lookup_addr(pernet, &skc->addr); | 72 | + entry = __lookup_addr(pernet, &skc->addr); |
| 73 | ret = entry ? entry->addr.id : -1; | 73 | ret = entry ? entry->addr.id : -1; |
| 74 | rcu_read_unlock(); | 74 | rcu_read_unlock(); |
| 75 | if (ret >= 0) | 75 | if (ret >= 0) |
| 76 | @@ -XXX,XX +XXX,XX @@ int mptcp_pm_nl_get_local_id(struct mptcp_sock *msk, struct mptcp_addr_info *skc | 76 | @@ -XXX,XX +XXX,XX @@ int mptcp_pm_nl_get_local_id(struct mptcp_sock *msk, struct mptcp_addr_info *skc |
| 77 | if (!entry) | 77 | if (!entry) |
| 78 | return -ENOMEM; | 78 | return -ENOMEM; |
| 79 | 79 | ||
| 80 | - entry->addr = *skc; | 80 | - entry->addr = *skc; |
| 81 | - entry->addr.id = 0; | 81 | - entry->addr.id = 0; |
| 82 | + *entry = *skc; | 82 | + *entry = *skc; |
| 83 | entry->addr.port = 0; | 83 | entry->addr.port = 0; |
| 84 | - entry->ifindex = 0; | 84 | - entry->ifindex = 0; |
| 85 | - entry->flags = MPTCP_PM_ADDR_FLAG_IMPLICIT; | 85 | - entry->flags = MPTCP_PM_ADDR_FLAG_IMPLICIT; |
| 86 | - entry->lsk = NULL; | 86 | - entry->lsk = NULL; |
| 87 | ret = mptcp_pm_nl_append_new_local_addr(pernet, entry, true); | 87 | ret = mptcp_pm_nl_append_new_local_addr(pernet, entry, true); |
| 88 | if (ret < 0) | 88 | if (ret < 0) |
| 89 | kfree(entry); | 89 | kfree(entry); |
| 90 | diff --git a/net/mptcp/pm_userspace.c b/net/mptcp/pm_userspace.c | 90 | diff --git a/net/mptcp/pm_userspace.c b/net/mptcp/pm_userspace.c |
| 91 | index XXXXXXX..XXXXXXX 100644 | 91 | index XXXXXXX..XXXXXXX 100644 |
| 92 | --- a/net/mptcp/pm_userspace.c | 92 | --- a/net/mptcp/pm_userspace.c |
| 93 | +++ b/net/mptcp/pm_userspace.c | 93 | +++ b/net/mptcp/pm_userspace.c |
| 94 | @@ -XXX,XX +XXX,XX @@ mptcp_userspace_pm_lookup_addr_by_id(struct mptcp_sock *msk, unsigned int id) | 94 | @@ -XXX,XX +XXX,XX @@ mptcp_userspace_pm_lookup_addr_by_id(struct mptcp_sock *msk, unsigned int id) |
| 95 | } | 95 | } |
| 96 | 96 | ||
| 97 | int mptcp_userspace_pm_get_local_id(struct mptcp_sock *msk, | 97 | int mptcp_userspace_pm_get_local_id(struct mptcp_sock *msk, |
| 98 | - struct mptcp_addr_info *skc) | 98 | - struct mptcp_addr_info *skc) |
| 99 | + struct mptcp_pm_addr_entry *skc) | 99 | + struct mptcp_pm_addr_entry *skc) |
| 100 | { | 100 | { |
| 101 | - struct mptcp_pm_addr_entry *entry = NULL, new_entry; | 101 | - struct mptcp_pm_addr_entry *entry = NULL, new_entry; |
| 102 | __be16 msk_sport = ((struct inet_sock *) | 102 | __be16 msk_sport = ((struct inet_sock *) |
| 103 | inet_sk((struct sock *)msk))->inet_sport; | 103 | inet_sk((struct sock *)msk))->inet_sport; |
| 104 | + struct mptcp_pm_addr_entry *entry; | 104 | + struct mptcp_pm_addr_entry *entry; |
| 105 | 105 | ||
| 106 | spin_lock_bh(&msk->pm.lock); | 106 | spin_lock_bh(&msk->pm.lock); |
| 107 | - entry = mptcp_userspace_pm_lookup_addr(msk, skc); | 107 | - entry = mptcp_userspace_pm_lookup_addr(msk, skc); |
| 108 | + entry = mptcp_userspace_pm_lookup_addr(msk, &skc->addr); | 108 | + entry = mptcp_userspace_pm_lookup_addr(msk, &skc->addr); |
| 109 | spin_unlock_bh(&msk->pm.lock); | 109 | spin_unlock_bh(&msk->pm.lock); |
| 110 | if (entry) | 110 | if (entry) |
| 111 | return entry->addr.id; | 111 | return entry->addr.id; |
| 112 | 112 | ||
| 113 | - memset(&new_entry, 0, sizeof(struct mptcp_pm_addr_entry)); | 113 | - memset(&new_entry, 0, sizeof(struct mptcp_pm_addr_entry)); |
| 114 | - new_entry.addr = *skc; | 114 | - new_entry.addr = *skc; |
| 115 | - new_entry.addr.id = 0; | 115 | - new_entry.addr.id = 0; |
| 116 | - new_entry.flags = MPTCP_PM_ADDR_FLAG_IMPLICIT; | 116 | - new_entry.flags = MPTCP_PM_ADDR_FLAG_IMPLICIT; |
| 117 | - | 117 | - |
| 118 | - if (new_entry.addr.port == msk_sport) | 118 | - if (new_entry.addr.port == msk_sport) |
| 119 | - new_entry.addr.port = 0; | 119 | - new_entry.addr.port = 0; |
| 120 | + if (skc->addr.port == msk_sport) | 120 | + if (skc->addr.port == msk_sport) |
| 121 | + skc->addr.port = 0; | 121 | + skc->addr.port = 0; |
| 122 | 122 | ||
| 123 | - return mptcp_userspace_pm_append_new_local_addr(msk, &new_entry, true); | 123 | - return mptcp_userspace_pm_append_new_local_addr(msk, &new_entry, true); |
| 124 | + return mptcp_userspace_pm_append_new_local_addr(msk, skc, true); | 124 | + return mptcp_userspace_pm_append_new_local_addr(msk, skc, true); |
| 125 | } | 125 | } |
| 126 | 126 | ||
| 127 | bool mptcp_userspace_pm_is_backup(struct mptcp_sock *msk, | 127 | bool mptcp_userspace_pm_is_backup(struct mptcp_sock *msk, |
| 128 | diff --git a/net/mptcp/protocol.h b/net/mptcp/protocol.h | 128 | diff --git a/net/mptcp/protocol.h b/net/mptcp/protocol.h |
| 129 | index XXXXXXX..XXXXXXX 100644 | 129 | index XXXXXXX..XXXXXXX 100644 |
| 130 | --- a/net/mptcp/protocol.h | 130 | --- a/net/mptcp/protocol.h |
| 131 | +++ b/net/mptcp/protocol.h | 131 | +++ b/net/mptcp/protocol.h |
| 132 | @@ -XXX,XX +XXX,XX @@ bool mptcp_pm_add_addr_signal(struct mptcp_sock *msk, const struct sk_buff *skb, | 132 | @@ -XXX,XX +XXX,XX @@ bool mptcp_pm_add_addr_signal(struct mptcp_sock *msk, const struct sk_buff *skb, |
| 133 | bool mptcp_pm_rm_addr_signal(struct mptcp_sock *msk, unsigned int remaining, | 133 | bool mptcp_pm_rm_addr_signal(struct mptcp_sock *msk, unsigned int remaining, |
| 134 | struct mptcp_rm_list *rm_list); | 134 | struct mptcp_rm_list *rm_list); |
| 135 | int mptcp_pm_get_local_id(struct mptcp_sock *msk, struct sock_common *skc); | 135 | int mptcp_pm_get_local_id(struct mptcp_sock *msk, struct sock_common *skc); |
| 136 | -int mptcp_pm_nl_get_local_id(struct mptcp_sock *msk, struct mptcp_addr_info *skc); | 136 | -int mptcp_pm_nl_get_local_id(struct mptcp_sock *msk, struct mptcp_addr_info *skc); |
| 137 | -int mptcp_userspace_pm_get_local_id(struct mptcp_sock *msk, struct mptcp_addr_info *skc); | 137 | -int mptcp_userspace_pm_get_local_id(struct mptcp_sock *msk, struct mptcp_addr_info *skc); |
| 138 | +int mptcp_pm_nl_get_local_id(struct mptcp_sock *msk, | 138 | +int mptcp_pm_nl_get_local_id(struct mptcp_sock *msk, |
| 139 | + struct mptcp_pm_addr_entry *skc); | 139 | + struct mptcp_pm_addr_entry *skc); |
| 140 | +int mptcp_userspace_pm_get_local_id(struct mptcp_sock *msk, | 140 | +int mptcp_userspace_pm_get_local_id(struct mptcp_sock *msk, |
| 141 | + struct mptcp_pm_addr_entry *skc); | 141 | + struct mptcp_pm_addr_entry *skc); |
| 142 | bool mptcp_pm_is_backup(struct mptcp_sock *msk, struct sock_common *skc); | 142 | bool mptcp_pm_is_backup(struct mptcp_sock *msk, struct sock_common *skc); |
| 143 | bool mptcp_pm_nl_is_backup(struct mptcp_sock *msk, struct mptcp_addr_info *skc); | 143 | bool mptcp_pm_nl_is_backup(struct mptcp_sock *msk, struct mptcp_addr_info *skc); |
| 144 | bool mptcp_userspace_pm_is_backup(struct mptcp_sock *msk, struct mptcp_addr_info *skc); | 144 | bool mptcp_userspace_pm_is_backup(struct mptcp_sock *msk, struct mptcp_addr_info *skc); |
| 145 | -- | 145 | -- |
| 146 | 2.43.0 | 146 | 2.43.0 | diff view generated by jsdifflib |
New patch | |||
|---|---|---|---|
| 1 | From: Geliang Tang <tanggeliang@kylinos.cn> | ||
| 1 | 2 | ||
| 3 | In order to allow users to develop their own BPF-based path manager, | ||
| 4 | this patch defines a struct ops "mptcp_pm_ops" for a userspace path | ||
| 5 | manager, which contains a set of interfaces. | ||
| 6 | |||
| 7 | Add a set of functions to register, unregister, find and validate a | ||
| 8 | given struct ops. | ||
| 9 | |||
| 10 | Signed-off-by: Geliang Tang <tanggeliang@kylinos.cn> | ||
| 11 | --- | ||
| 12 | include/net/mptcp.h | 37 +++++++++++++++++++++++++++++ | ||
| 13 | net/mptcp/pm.c | 55 ++++++++++++++++++++++++++++++++++++++++++++ | ||
| 14 | net/mptcp/protocol.h | 5 ++++ | ||
| 15 | 3 files changed, 97 insertions(+) | ||
| 16 | |||
| 17 | diff --git a/include/net/mptcp.h b/include/net/mptcp.h | ||
| 18 | index XXXXXXX..XXXXXXX 100644 | ||
| 19 | --- a/include/net/mptcp.h | ||
| 20 | +++ b/include/net/mptcp.h | ||
| 21 | @@ -XXX,XX +XXX,XX @@ | ||
| 22 | |||
| 23 | struct mptcp_info; | ||
| 24 | struct mptcp_sock; | ||
| 25 | +struct mptcp_pm_addr_entry; | ||
| 26 | struct seq_file; | ||
| 27 | |||
| 28 | /* MPTCP sk_buff extension data */ | ||
| 29 | @@ -XXX,XX +XXX,XX @@ struct mptcp_sched_ops { | ||
| 30 | void (*release)(struct mptcp_sock *msk); | ||
| 31 | } ____cacheline_aligned_in_smp; | ||
| 32 | |||
| 33 | +#define MPTCP_PM_NAME_MAX 16 | ||
| 34 | + | ||
| 35 | +struct mptcp_pm_ops { | ||
| 36 | + int (*created)(struct mptcp_sock *msk); | ||
| 37 | + int (*established)(struct mptcp_sock *msk); | ||
| 38 | + int (*closed)(struct mptcp_sock *msk); | ||
| 39 | + int (*get_local_id)(struct mptcp_sock *msk, | ||
| 40 | + struct mptcp_pm_addr_entry *skc); | ||
| 41 | + bool (*get_priority)(struct mptcp_sock *msk, | ||
| 42 | + struct mptcp_addr_info *skc); | ||
| 43 | + int (*address_announced)(struct mptcp_sock *msk, | ||
| 44 | + struct mptcp_pm_addr_entry *local); | ||
| 45 | + int (*address_removed)(struct mptcp_sock *msk, | ||
| 46 | + struct mptcp_pm_addr_entry *local); | ||
| 47 | + int (*subflow_established)(struct mptcp_sock *msk, | ||
| 48 | + struct mptcp_pm_addr_entry *local, | ||
| 49 | + struct mptcp_addr_info *remote); | ||
| 50 | + int (*subflow_closed)(struct mptcp_sock *msk, | ||
| 51 | + struct mptcp_pm_addr_entry *local, | ||
| 52 | + struct mptcp_addr_info *remote); | ||
| 53 | + int (*set_priority)(struct mptcp_sock *msk, | ||
| 54 | + struct mptcp_pm_addr_entry *local, | ||
| 55 | + struct mptcp_addr_info *remote, | ||
| 56 | + u8 changed); | ||
| 57 | + int (*listener_created)(struct mptcp_sock *msk); | ||
| 58 | + int (*listener_closed)(struct mptcp_sock *msk); | ||
| 59 | + | ||
| 60 | + u8 type; | ||
| 61 | + char name[MPTCP_PM_NAME_MAX]; | ||
| 62 | + struct module *owner; | ||
| 63 | + struct list_head list; | ||
| 64 | + | ||
| 65 | + void (*init)(struct mptcp_sock *msk); | ||
| 66 | + void (*release)(struct mptcp_sock *msk); | ||
| 67 | +} ____cacheline_aligned_in_smp; | ||
| 68 | + | ||
| 69 | #ifdef CONFIG_MPTCP | ||
| 70 | void mptcp_init(void); | ||
| 71 | |||
| 72 | diff --git a/net/mptcp/pm.c b/net/mptcp/pm.c | ||
| 73 | index XXXXXXX..XXXXXXX 100644 | ||
| 74 | --- a/net/mptcp/pm.c | ||
| 75 | +++ b/net/mptcp/pm.c | ||
| 76 | @@ -XXX,XX +XXX,XX @@ | ||
| 77 | #define pr_fmt(fmt) "MPTCP: " fmt | ||
| 78 | |||
| 79 | #include <linux/kernel.h> | ||
| 80 | +#include <linux/rculist.h> | ||
| 81 | +#include <linux/spinlock.h> | ||
| 82 | #include <net/mptcp.h> | ||
| 83 | #include "protocol.h" | ||
| 84 | |||
| 85 | #include "mib.h" | ||
| 86 | #include "mptcp_pm_gen.h" | ||
| 87 | |||
| 88 | +static DEFINE_SPINLOCK(mptcp_pm_list_lock); | ||
| 89 | +static LIST_HEAD(mptcp_pm_list); | ||
| 90 | + | ||
| 91 | /* path manager command handlers */ | ||
| 92 | |||
| 93 | int mptcp_pm_announce_addr(struct mptcp_sock *msk, | ||
| 94 | @@ -XXX,XX +XXX,XX @@ void __init mptcp_pm_init(void) | ||
| 95 | { | ||
| 96 | mptcp_pm_nl_init(); | ||
| 97 | } | ||
| 98 | + | ||
| 99 | +/* Must be called with rcu read lock held */ | ||
| 100 | +struct mptcp_pm_ops *mptcp_pm_find(const char *name) | ||
| 101 | +{ | ||
| 102 | + struct mptcp_pm_ops *pm; | ||
| 103 | + | ||
| 104 | + list_for_each_entry_rcu(pm, &mptcp_pm_list, list) { | ||
| 105 | + if (!strcmp(pm->name, name)) | ||
| 106 | + return pm; | ||
| 107 | + } | ||
| 108 | + | ||
| 109 | + return NULL; | ||
| 110 | +} | ||
| 111 | + | ||
| 112 | +int mptcp_pm_validate(struct mptcp_pm_ops *pm) | ||
| 113 | +{ | ||
| 114 | + if (!pm->get_local_id || !pm->get_priority) { | ||
| 115 | + pr_err("%u does not implement required ops\n", pm->type); | ||
| 116 | + return -EINVAL; | ||
| 117 | + } | ||
| 118 | + | ||
| 119 | + return 0; | ||
| 120 | +} | ||
| 121 | + | ||
| 122 | +int mptcp_pm_register(struct mptcp_pm_ops *pm) | ||
| 123 | +{ | ||
| 124 | + int ret; | ||
| 125 | + | ||
| 126 | + ret = mptcp_pm_validate(pm); | ||
| 127 | + if (ret) | ||
| 128 | + return ret; | ||
| 129 | + | ||
| 130 | + spin_lock(&mptcp_pm_list_lock); | ||
| 131 | + if (mptcp_pm_find(pm->name)) { | ||
| 132 | + spin_unlock(&mptcp_pm_list_lock); | ||
| 133 | + return -EEXIST; | ||
| 134 | + } | ||
| 135 | + list_add_tail_rcu(&pm->list, &mptcp_pm_list); | ||
| 136 | + spin_unlock(&mptcp_pm_list_lock); | ||
| 137 | + | ||
| 138 | + pr_debug("%s registered\n", pm->name); | ||
| 139 | + return 0; | ||
| 140 | +} | ||
| 141 | + | ||
| 142 | +void mptcp_pm_unregister(struct mptcp_pm_ops *pm) | ||
| 143 | +{ | ||
| 144 | + spin_lock(&mptcp_pm_list_lock); | ||
| 145 | + list_del_rcu(&pm->list); | ||
| 146 | + spin_unlock(&mptcp_pm_list_lock); | ||
| 147 | +} | ||
| 148 | diff --git a/net/mptcp/protocol.h b/net/mptcp/protocol.h | ||
| 149 | index XXXXXXX..XXXXXXX 100644 | ||
| 150 | --- a/net/mptcp/protocol.h | ||
| 151 | +++ b/net/mptcp/protocol.h | ||
| 152 | @@ -XXX,XX +XXX,XX @@ int mptcp_pm_remove_addr(struct mptcp_sock *msk, const struct mptcp_rm_list *rm_ | ||
| 153 | void mptcp_pm_remove_addr_entry(struct mptcp_sock *msk, | ||
| 154 | struct mptcp_pm_addr_entry *entry); | ||
| 155 | |||
| 156 | +struct mptcp_pm_ops *mptcp_pm_find(const char *name); | ||
| 157 | +int mptcp_pm_validate(struct mptcp_pm_ops *pm); | ||
| 158 | +int mptcp_pm_register(struct mptcp_pm_ops *pm); | ||
| 159 | +void mptcp_pm_unregister(struct mptcp_pm_ops *pm); | ||
| 160 | + | ||
| 161 | void mptcp_free_local_addr_list(struct mptcp_sock *msk); | ||
| 162 | |||
| 163 | void mptcp_event(enum mptcp_event_type type, const struct mptcp_sock *msk, | ||
| 164 | -- | ||
| 165 | 2.43.0 | diff view generated by jsdifflib |
| 1 | From: Geliang Tang <tanggeliang@kylinos.cn> | 1 | From: Geliang Tang <tanggeliang@kylinos.cn> |
|---|---|---|---|
| 2 | 2 | ||
| 3 | Instead of using kmalloc() or kzalloc() to allocate an entry and | 3 | This patch defines the original in-kernel netlink path manager as a new |
| 4 | then immediately duplicate another entry to the newly allocated | 4 | struct mptcp_pm_ops named "mptcp_in_kernel_pm", and register it in |
| 5 | one, kmemdup() helper can be used to simplify the code. | 5 | mptcp_pm_nl_init(). |
| 6 | |||
| 7 | This mptcp_pm_ops will be skipped in mptcp_pm_unregister(). | ||
| 8 | |||
| 9 | Only get_local_id() and get_priority() interfaces are implemented here. | ||
| 10 | mptcp_pm_nl_is_backup() becomes a wrapper of get_priority(). | ||
| 6 | 11 | ||
| 7 | Signed-off-by: Geliang Tang <tanggeliang@kylinos.cn> | 12 | Signed-off-by: Geliang Tang <tanggeliang@kylinos.cn> |
| 8 | --- | 13 | --- |
| 9 | net/mptcp/pm_netlink.c | 6 ++---- | 14 | net/mptcp/pm.c | 3 +++ |
| 10 | 1 file changed, 2 insertions(+), 4 deletions(-) | 15 | net/mptcp/pm_netlink.c | 18 +++++++++++++++++- |
| 16 | net/mptcp/protocol.h | 2 ++ | ||
| 17 | 3 files changed, 22 insertions(+), 1 deletion(-) | ||
| 11 | 18 | ||
| 19 | diff --git a/net/mptcp/pm.c b/net/mptcp/pm.c | ||
| 20 | index XXXXXXX..XXXXXXX 100644 | ||
| 21 | --- a/net/mptcp/pm.c | ||
| 22 | +++ b/net/mptcp/pm.c | ||
| 23 | @@ -XXX,XX +XXX,XX @@ int mptcp_pm_register(struct mptcp_pm_ops *pm) | ||
| 24 | |||
| 25 | void mptcp_pm_unregister(struct mptcp_pm_ops *pm) | ||
| 26 | { | ||
| 27 | + if (pm == &mptcp_in_kernel_pm) | ||
| 28 | + return; | ||
| 29 | + | ||
| 30 | spin_lock(&mptcp_pm_list_lock); | ||
| 31 | list_del_rcu(&pm->list); | ||
| 32 | spin_unlock(&mptcp_pm_list_lock); | ||
| 12 | diff --git a/net/mptcp/pm_netlink.c b/net/mptcp/pm_netlink.c | 33 | diff --git a/net/mptcp/pm_netlink.c b/net/mptcp/pm_netlink.c |
| 13 | index XXXXXXX..XXXXXXX 100644 | 34 | index XXXXXXX..XXXXXXX 100644 |
| 14 | --- a/net/mptcp/pm_netlink.c | 35 | --- a/net/mptcp/pm_netlink.c |
| 15 | +++ b/net/mptcp/pm_netlink.c | 36 | +++ b/net/mptcp/pm_netlink.c |
| 16 | @@ -XXX,XX +XXX,XX @@ int mptcp_pm_nl_get_local_id(struct mptcp_sock *msk, | 37 | @@ -XXX,XX +XXX,XX @@ int mptcp_pm_nl_get_local_id(struct mptcp_sock *msk, |
| 17 | return ret; | 38 | return ret; |
| 18 | 39 | } | |
| 19 | /* address not found, add to local list */ | 40 | |
| 20 | - entry = kmalloc(sizeof(*entry), GFP_ATOMIC); | 41 | -bool mptcp_pm_nl_is_backup(struct mptcp_sock *msk, struct mptcp_addr_info *skc) |
| 21 | + entry = kmemdup(skc, sizeof(*skc), GFP_ATOMIC); | 42 | +static bool mptcp_pm_nl_get_priority(struct mptcp_sock *msk, |
| 22 | if (!entry) | 43 | + struct mptcp_addr_info *skc) |
| 23 | return -ENOMEM; | 44 | { |
| 24 | 45 | struct pm_nl_pernet *pernet = pm_nl_get_pernet_from_msk(msk); | |
| 25 | - *entry = *skc; | 46 | struct mptcp_pm_addr_entry *entry; |
| 26 | entry->addr.port = 0; | 47 | @@ -XXX,XX +XXX,XX @@ bool mptcp_pm_nl_is_backup(struct mptcp_sock *msk, struct mptcp_addr_info *skc) |
| 27 | ret = mptcp_pm_nl_append_new_local_addr(pernet, entry, true); | 48 | return backup; |
| 28 | if (ret < 0) | 49 | } |
| 29 | @@ -XXX,XX +XXX,XX @@ int mptcp_pm_nl_add_addr_doit(struct sk_buff *skb, struct genl_info *info) | 50 | |
| 30 | return -EINVAL; | 51 | +bool mptcp_pm_nl_is_backup(struct mptcp_sock *msk, struct mptcp_addr_info *skc) |
| 31 | } | 52 | +{ |
| 32 | 53 | + return mptcp_pm_nl_get_priority(msk, skc); | |
| 33 | - entry = kzalloc(sizeof(*entry), GFP_KERNEL_ACCOUNT); | 54 | +} |
| 34 | + entry = kmemdup(&addr, sizeof(addr), GFP_KERNEL_ACCOUNT); | 55 | + |
| 35 | if (!entry) { | 56 | #define MPTCP_PM_CMD_GRP_OFFSET 0 |
| 36 | GENL_SET_ERR_MSG(info, "can't allocate addr"); | 57 | #define MPTCP_PM_EV_GRP_OFFSET 1 |
| 37 | return -ENOMEM; | 58 | |
| 38 | } | 59 | @@ -XXX,XX +XXX,XX @@ static struct pernet_operations mptcp_pm_pernet_ops = { |
| 39 | 60 | .size = sizeof(struct pm_nl_pernet), | |
| 40 | - *entry = addr; | 61 | }; |
| 41 | if (entry->addr.port) { | 62 | |
| 42 | ret = mptcp_pm_nl_create_listen_socket(skb->sk, entry); | 63 | +struct mptcp_pm_ops mptcp_in_kernel_pm = { |
| 43 | if (ret) { | 64 | + .get_local_id = mptcp_pm_nl_get_local_id, |
| 65 | + .get_priority = mptcp_pm_nl_get_priority, | ||
| 66 | + .type = MPTCP_PM_TYPE_KERNEL, | ||
| 67 | + .name = "in-kernel", | ||
| 68 | + .owner = THIS_MODULE, | ||
| 69 | +}; | ||
| 70 | + | ||
| 71 | void __init mptcp_pm_nl_init(void) | ||
| 72 | { | ||
| 73 | if (register_pernet_subsys(&mptcp_pm_pernet_ops) < 0) | ||
| 74 | @@ -XXX,XX +XXX,XX @@ void __init mptcp_pm_nl_init(void) | ||
| 75 | |||
| 76 | if (genl_register_family(&mptcp_genl_family)) | ||
| 77 | panic("Failed to register MPTCP PM netlink family\n"); | ||
| 78 | + | ||
| 79 | + mptcp_pm_register(&mptcp_in_kernel_pm); | ||
| 80 | } | ||
| 81 | diff --git a/net/mptcp/protocol.h b/net/mptcp/protocol.h | ||
| 82 | index XXXXXXX..XXXXXXX 100644 | ||
| 83 | --- a/net/mptcp/protocol.h | ||
| 84 | +++ b/net/mptcp/protocol.h | ||
| 85 | @@ -XXX,XX +XXX,XX @@ int mptcp_pm_remove_addr(struct mptcp_sock *msk, const struct mptcp_rm_list *rm_ | ||
| 86 | void mptcp_pm_remove_addr_entry(struct mptcp_sock *msk, | ||
| 87 | struct mptcp_pm_addr_entry *entry); | ||
| 88 | |||
| 89 | +extern struct mptcp_pm_ops mptcp_in_kernel_pm; | ||
| 90 | + | ||
| 91 | struct mptcp_pm_ops *mptcp_pm_find(const char *name); | ||
| 92 | int mptcp_pm_validate(struct mptcp_pm_ops *pm); | ||
| 93 | int mptcp_pm_register(struct mptcp_pm_ops *pm); | ||
| 44 | -- | 94 | -- |
| 45 | 2.43.0 | 95 | 2.43.0 | diff view generated by jsdifflib |
| 1 | From: Geliang Tang <tanggeliang@kylinos.cn> | 1 | From: Geliang Tang <tanggeliang@kylinos.cn> |
|---|---|---|---|
| 2 | 2 | ||
| 3 | Instead of using sock_kmalloc() to allocate an entry and then | 3 | This patch defines the original userspace path manager as a new struct |
| 4 | immediately duplicate another entry to the newly allocated one, | 4 | mptcp_pm_ops named "mptcp_userspace_pm", and register it in |
| 5 | sock_kmemdup() helper can be used to simplify the code. | 5 | mptcp_pm_data_init(). |
| 6 | 6 | ||
| 7 | More importantly, the code "*e = *entry;" that assigns "entry" | 7 | Only get_local_id() and get_priority() interfaces are implemented here. |
| 8 | to "e" is not easy to implemented in BPF if we use the same code | 8 | mptcp_userspace_pm_is_backup() becomes a wrapper of get_priority(). |
| 9 | to implement an append_new_local_addr() helper of a BFP path | ||
| 10 | manager. This patch avoids this type of memory assignment | ||
| 11 | operation. | ||
| 12 | 9 | ||
| 13 | Signed-off-by: Geliang Tang <tanggeliang@kylinos.cn> | 10 | Signed-off-by: Geliang Tang <tanggeliang@kylinos.cn> |
| 14 | --- | 11 | --- |
| 15 | net/mptcp/pm_userspace.c | 3 +-- | 12 | net/mptcp/pm.c | 1 + |
| 16 | 1 file changed, 1 insertion(+), 2 deletions(-) | 13 | net/mptcp/pm_userspace.c | 23 +++++++++++++++++++++-- |
| 14 | net/mptcp/protocol.h | 1 + | ||
| 15 | 3 files changed, 23 insertions(+), 2 deletions(-) | ||
| 17 | 16 | ||
| 17 | diff --git a/net/mptcp/pm.c b/net/mptcp/pm.c | ||
| 18 | index XXXXXXX..XXXXXXX 100644 | ||
| 19 | --- a/net/mptcp/pm.c | ||
| 20 | +++ b/net/mptcp/pm.c | ||
| 21 | @@ -XXX,XX +XXX,XX @@ void mptcp_pm_data_init(struct mptcp_sock *msk) | ||
| 22 | void __init mptcp_pm_init(void) | ||
| 23 | { | ||
| 24 | mptcp_pm_nl_init(); | ||
| 25 | + mptcp_userspace_pm_init(); | ||
| 26 | } | ||
| 27 | |||
| 28 | /* Must be called with rcu read lock held */ | ||
| 18 | diff --git a/net/mptcp/pm_userspace.c b/net/mptcp/pm_userspace.c | 29 | diff --git a/net/mptcp/pm_userspace.c b/net/mptcp/pm_userspace.c |
| 19 | index XXXXXXX..XXXXXXX 100644 | 30 | index XXXXXXX..XXXXXXX 100644 |
| 20 | --- a/net/mptcp/pm_userspace.c | 31 | --- a/net/mptcp/pm_userspace.c |
| 21 | +++ b/net/mptcp/pm_userspace.c | 32 | +++ b/net/mptcp/pm_userspace.c |
| 22 | @@ -XXX,XX +XXX,XX @@ static int mptcp_userspace_pm_append_new_local_addr(struct mptcp_sock *msk, | 33 | @@ -XXX,XX +XXX,XX @@ int mptcp_userspace_pm_get_local_id(struct mptcp_sock *msk, |
| 23 | /* Memory for the entry is allocated from the | 34 | return mptcp_userspace_pm_append_new_local_addr(msk, skc, true); |
| 24 | * sock option buffer. | 35 | } |
| 25 | */ | 36 | |
| 26 | - e = sock_kmalloc(sk, sizeof(*e), GFP_ATOMIC); | 37 | -bool mptcp_userspace_pm_is_backup(struct mptcp_sock *msk, |
| 27 | + e = sock_kmemdup(sk, entry, sizeof(*entry), GFP_ATOMIC); | 38 | - struct mptcp_addr_info *skc) |
| 28 | if (!e) { | 39 | +static bool mptcp_userspace_pm_get_priority(struct mptcp_sock *msk, |
| 29 | ret = -ENOMEM; | 40 | + struct mptcp_addr_info *skc) |
| 30 | goto append_err; | 41 | { |
| 31 | } | 42 | struct mptcp_pm_addr_entry *entry; |
| 32 | 43 | bool backup; | |
| 33 | - *e = *entry; | 44 | @@ -XXX,XX +XXX,XX @@ bool mptcp_userspace_pm_is_backup(struct mptcp_sock *msk, |
| 34 | if (!e->addr.id && needs_id) | 45 | return backup; |
| 35 | e->addr.id = find_next_zero_bit(id_bitmap, | 46 | } |
| 36 | MPTCP_PM_MAX_ADDR_ID + 1, | 47 | |
| 48 | +bool mptcp_userspace_pm_is_backup(struct mptcp_sock *msk, | ||
| 49 | + struct mptcp_addr_info *skc) | ||
| 50 | +{ | ||
| 51 | + return mptcp_userspace_pm_get_priority(msk, skc); | ||
| 52 | +} | ||
| 53 | + | ||
| 54 | static struct mptcp_sock *mptcp_userspace_pm_get_sock(const struct genl_info *info) | ||
| 55 | { | ||
| 56 | struct mptcp_sock *msk; | ||
| 57 | @@ -XXX,XX +XXX,XX @@ int mptcp_userspace_pm_get_addr(u8 id, struct mptcp_pm_addr_entry *addr, | ||
| 58 | sock_put(sk); | ||
| 59 | return ret; | ||
| 60 | } | ||
| 61 | + | ||
| 62 | +static struct mptcp_pm_ops mptcp_userspace_pm = { | ||
| 63 | + .get_local_id = mptcp_userspace_pm_get_local_id, | ||
| 64 | + .get_priority = mptcp_userspace_pm_get_priority, | ||
| 65 | + .type = MPTCP_PM_TYPE_USERSPACE, | ||
| 66 | + .name = "userspace", | ||
| 67 | + .owner = THIS_MODULE, | ||
| 68 | +}; | ||
| 69 | + | ||
| 70 | +void __init mptcp_userspace_pm_init(void) | ||
| 71 | +{ | ||
| 72 | + mptcp_pm_register(&mptcp_userspace_pm); | ||
| 73 | +} | ||
| 74 | diff --git a/net/mptcp/protocol.h b/net/mptcp/protocol.h | ||
| 75 | index XXXXXXX..XXXXXXX 100644 | ||
| 76 | --- a/net/mptcp/protocol.h | ||
| 77 | +++ b/net/mptcp/protocol.h | ||
| 78 | @@ -XXX,XX +XXX,XX @@ static inline u8 subflow_get_local_id(const struct mptcp_subflow_context *subflo | ||
| 79 | } | ||
| 80 | |||
| 81 | void __init mptcp_pm_nl_init(void); | ||
| 82 | +void __init mptcp_userspace_pm_init(void); | ||
| 83 | void mptcp_pm_nl_work(struct mptcp_sock *msk); | ||
| 84 | unsigned int mptcp_pm_get_add_addr_signal_max(const struct mptcp_sock *msk); | ||
| 85 | unsigned int mptcp_pm_get_add_addr_accept_max(const struct mptcp_sock *msk); | ||
| 37 | -- | 86 | -- |
| 38 | 2.43.0 | 87 | 2.43.0 | diff view generated by jsdifflib |
New patch | |||
|---|---|---|---|
| 1 | From: Geliang Tang <tanggeliang@kylinos.cn> | ||
| 1 | 2 | ||
| 3 | Add a struct mptcp_pm_ops pointer "ops" in struct mptcp_pm_data, and two | ||
| 4 | functions mptcp_pm_initialize() and mptcp_pm_release(), to set and release | ||
| 5 | this pointer. mptcp_pm_initialize() is invoked in mptcp_pm_data_reset(), | ||
| 6 | while mptcp_pm_release() is invoked in mptcp_destroy_common(). | ||
| 7 | |||
| 8 | Signed-off-by: Geliang Tang <tanggeliang@kylinos.cn> | ||
| 9 | --- | ||
| 10 | net/mptcp/pm.c | 38 ++++++++++++++++++++++++++++++++++++++ | ||
| 11 | net/mptcp/protocol.c | 1 + | ||
| 12 | net/mptcp/protocol.h | 3 +++ | ||
| 13 | 3 files changed, 42 insertions(+) | ||
| 14 | |||
| 15 | diff --git a/net/mptcp/pm.c b/net/mptcp/pm.c | ||
| 16 | index XXXXXXX..XXXXXXX 100644 | ||
| 17 | --- a/net/mptcp/pm.c | ||
| 18 | +++ b/net/mptcp/pm.c | ||
| 19 | @@ -XXX,XX +XXX,XX @@ bool mptcp_pm_addr_families_match(const struct sock *sk, | ||
| 20 | |||
| 21 | void mptcp_pm_data_reset(struct mptcp_sock *msk) | ||
| 22 | { | ||
| 23 | + const char *path_manager = mptcp_get_path_manager(sock_net((struct sock *)msk)); | ||
| 24 | u8 pm_type = mptcp_get_pm_type(sock_net((struct sock *)msk)); | ||
| 25 | struct mptcp_pm_data *pm = &msk->pm; | ||
| 26 | + int ret; | ||
| 27 | |||
| 28 | pm->add_addr_signaled = 0; | ||
| 29 | pm->add_addr_accepted = 0; | ||
| 30 | @@ -XXX,XX +XXX,XX @@ void mptcp_pm_data_reset(struct mptcp_sock *msk) | ||
| 31 | pm->rm_list_rx.nr = 0; | ||
| 32 | WRITE_ONCE(pm->pm_type, pm_type); | ||
| 33 | |||
| 34 | + rcu_read_lock(); | ||
| 35 | + ret = mptcp_pm_initialize(msk, mptcp_pm_find(path_manager)); | ||
| 36 | + rcu_read_unlock(); | ||
| 37 | + if (ret) | ||
| 38 | + return; | ||
| 39 | + | ||
| 40 | if (pm_type == MPTCP_PM_TYPE_KERNEL) { | ||
| 41 | bool subflows_allowed = !!mptcp_pm_get_subflows_max(msk); | ||
| 42 | |||
| 43 | @@ -XXX,XX +XXX,XX @@ void mptcp_pm_unregister(struct mptcp_pm_ops *pm) | ||
| 44 | list_del_rcu(&pm->list); | ||
| 45 | spin_unlock(&mptcp_pm_list_lock); | ||
| 46 | } | ||
| 47 | + | ||
| 48 | +int mptcp_pm_initialize(struct mptcp_sock *msk, struct mptcp_pm_ops *pm) | ||
| 49 | +{ | ||
| 50 | + if (!pm) | ||
| 51 | + pm = &mptcp_in_kernel_pm; | ||
| 52 | + | ||
| 53 | + if (!bpf_try_module_get(pm, pm->owner)) | ||
| 54 | + return -EBUSY; | ||
| 55 | + | ||
| 56 | + msk->pm.ops = pm; | ||
| 57 | + if (msk->pm.ops->init) | ||
| 58 | + msk->pm.ops->init(msk); | ||
| 59 | + | ||
| 60 | + pr_debug("pm %s initialized\n", pm->name); | ||
| 61 | + return 0; | ||
| 62 | +} | ||
| 63 | + | ||
| 64 | +void mptcp_pm_release(struct mptcp_sock *msk) | ||
| 65 | +{ | ||
| 66 | + struct mptcp_pm_ops *pm = msk->pm.ops; | ||
| 67 | + | ||
| 68 | + if (!pm) | ||
| 69 | + return; | ||
| 70 | + | ||
| 71 | + msk->pm.ops = NULL; | ||
| 72 | + if (pm->release) | ||
| 73 | + pm->release(msk); | ||
| 74 | + | ||
| 75 | + bpf_module_put(pm, pm->owner); | ||
| 76 | +} | ||
| 77 | diff --git a/net/mptcp/protocol.c b/net/mptcp/protocol.c | ||
| 78 | index XXXXXXX..XXXXXXX 100644 | ||
| 79 | --- a/net/mptcp/protocol.c | ||
| 80 | +++ b/net/mptcp/protocol.c | ||
| 81 | @@ -XXX,XX +XXX,XX @@ void mptcp_destroy_common(struct mptcp_sock *msk, unsigned int flags) | ||
| 82 | mptcp_token_destroy(msk); | ||
| 83 | mptcp_pm_free_anno_list(msk); | ||
| 84 | mptcp_free_local_addr_list(msk); | ||
| 85 | + mptcp_pm_release(msk); | ||
| 86 | } | ||
| 87 | |||
| 88 | static void mptcp_destroy(struct sock *sk) | ||
| 89 | diff --git a/net/mptcp/protocol.h b/net/mptcp/protocol.h | ||
| 90 | index XXXXXXX..XXXXXXX 100644 | ||
| 91 | --- a/net/mptcp/protocol.h | ||
| 92 | +++ b/net/mptcp/protocol.h | ||
| 93 | @@ -XXX,XX +XXX,XX @@ struct mptcp_pm_data { | ||
| 94 | struct mptcp_addr_info remote; | ||
| 95 | struct list_head anno_list; | ||
| 96 | struct list_head userspace_pm_local_addr_list; | ||
| 97 | + struct mptcp_pm_ops *ops; | ||
| 98 | |||
| 99 | spinlock_t lock; /*protects the whole PM data */ | ||
| 100 | |||
| 101 | @@ -XXX,XX +XXX,XX @@ struct mptcp_pm_ops *mptcp_pm_find(const char *name); | ||
| 102 | int mptcp_pm_validate(struct mptcp_pm_ops *pm); | ||
| 103 | int mptcp_pm_register(struct mptcp_pm_ops *pm); | ||
| 104 | void mptcp_pm_unregister(struct mptcp_pm_ops *pm); | ||
| 105 | +int mptcp_pm_initialize(struct mptcp_sock *msk, struct mptcp_pm_ops *pm); | ||
| 106 | +void mptcp_pm_release(struct mptcp_sock *msk); | ||
| 107 | |||
| 108 | void mptcp_free_local_addr_list(struct mptcp_sock *msk); | ||
| 109 | |||
| 110 | -- | ||
| 111 | 2.43.0 | diff view generated by jsdifflib |
New patch | |||
|---|---|---|---|
| 1 | From: Geliang Tang <tanggeliang@kylinos.cn> | ||
| 1 | 2 | ||
| 3 | Now pm->pm_type can be replaced by pm->ops->type, then "pm_type" filed | ||
| 4 | of struct mptcp_pm_data can be dropped. | ||
| 5 | |||
| 6 | Signed-off-by: Geliang Tang <tanggeliang@kylinos.cn> | ||
| 7 | --- | ||
| 8 | net/mptcp/pm.c | 6 ++---- | ||
| 9 | net/mptcp/protocol.h | 5 ++--- | ||
| 10 | 2 files changed, 4 insertions(+), 7 deletions(-) | ||
| 11 | |||
| 12 | diff --git a/net/mptcp/pm.c b/net/mptcp/pm.c | ||
| 13 | index XXXXXXX..XXXXXXX 100644 | ||
| 14 | --- a/net/mptcp/pm.c | ||
| 15 | +++ b/net/mptcp/pm.c | ||
| 16 | @@ -XXX,XX +XXX,XX @@ bool mptcp_pm_addr_families_match(const struct sock *sk, | ||
| 17 | void mptcp_pm_data_reset(struct mptcp_sock *msk) | ||
| 18 | { | ||
| 19 | const char *path_manager = mptcp_get_path_manager(sock_net((struct sock *)msk)); | ||
| 20 | - u8 pm_type = mptcp_get_pm_type(sock_net((struct sock *)msk)); | ||
| 21 | struct mptcp_pm_data *pm = &msk->pm; | ||
| 22 | int ret; | ||
| 23 | |||
| 24 | @@ -XXX,XX +XXX,XX @@ void mptcp_pm_data_reset(struct mptcp_sock *msk) | ||
| 25 | pm->subflows = 0; | ||
| 26 | pm->rm_list_tx.nr = 0; | ||
| 27 | pm->rm_list_rx.nr = 0; | ||
| 28 | - WRITE_ONCE(pm->pm_type, pm_type); | ||
| 29 | |||
| 30 | rcu_read_lock(); | ||
| 31 | ret = mptcp_pm_initialize(msk, mptcp_pm_find(path_manager)); | ||
| 32 | @@ -XXX,XX +XXX,XX @@ void mptcp_pm_data_reset(struct mptcp_sock *msk) | ||
| 33 | if (ret) | ||
| 34 | return; | ||
| 35 | |||
| 36 | - if (pm_type == MPTCP_PM_TYPE_KERNEL) { | ||
| 37 | + if (pm->ops->type == MPTCP_PM_TYPE_KERNEL) { | ||
| 38 | bool subflows_allowed = !!mptcp_pm_get_subflows_max(msk); | ||
| 39 | |||
| 40 | /* pm->work_pending must be only be set to 'true' when | ||
| 41 | - * pm->pm_type is set to MPTCP_PM_TYPE_KERNEL | ||
| 42 | + * pm->ops->type is set to MPTCP_PM_TYPE_KERNEL | ||
| 43 | */ | ||
| 44 | WRITE_ONCE(pm->work_pending, | ||
| 45 | (!!mptcp_pm_get_local_addr_max(msk) && | ||
| 46 | diff --git a/net/mptcp/protocol.h b/net/mptcp/protocol.h | ||
| 47 | index XXXXXXX..XXXXXXX 100644 | ||
| 48 | --- a/net/mptcp/protocol.h | ||
| 49 | +++ b/net/mptcp/protocol.h | ||
| 50 | @@ -XXX,XX +XXX,XX @@ struct mptcp_pm_data { | ||
| 51 | u8 add_addr_signaled; | ||
| 52 | u8 add_addr_accepted; | ||
| 53 | u8 local_addr_used; | ||
| 54 | - u8 pm_type; | ||
| 55 | u8 subflows; | ||
| 56 | u8 status; | ||
| 57 | DECLARE_BITMAP(id_avail_bitmap, MPTCP_PM_MAX_ADDR_ID + 1); | ||
| 58 | @@ -XXX,XX +XXX,XX @@ static inline bool mptcp_pm_should_rm_signal(struct mptcp_sock *msk) | ||
| 59 | |||
| 60 | static inline bool mptcp_pm_is_userspace(const struct mptcp_sock *msk) | ||
| 61 | { | ||
| 62 | - return READ_ONCE(msk->pm.pm_type) == MPTCP_PM_TYPE_USERSPACE; | ||
| 63 | + return msk->pm.ops->type == MPTCP_PM_TYPE_USERSPACE; | ||
| 64 | } | ||
| 65 | |||
| 66 | static inline bool mptcp_pm_is_kernel(const struct mptcp_sock *msk) | ||
| 67 | { | ||
| 68 | - return READ_ONCE(msk->pm.pm_type) == MPTCP_PM_TYPE_KERNEL; | ||
| 69 | + return msk->pm.ops->type == MPTCP_PM_TYPE_KERNEL; | ||
| 70 | } | ||
| 71 | |||
| 72 | static inline unsigned int mptcp_add_addr_len(int family, bool echo, bool port) | ||
| 73 | -- | ||
| 74 | 2.43.0 | diff view generated by jsdifflib |
New patch | |||
|---|---|---|---|
| 1 | From: Geliang Tang <tanggeliang@kylinos.cn> | ||
| 1 | 2 | ||
| 3 | Old path manager sysctl "pm_type" can be replaced by the newly added | ||
| 4 | "path_manager". Drop it together with mptcp_get_pm_type() helper. | ||
| 5 | |||
| 6 | Signed-off-by: Geliang Tang <tanggeliang@kylinos.cn> | ||
| 7 | --- | ||
| 8 | Documentation/networking/mptcp-sysctl.rst | 17 ----------------- | ||
| 9 | net/mptcp/ctrl.c | 20 -------------------- | ||
| 10 | net/mptcp/protocol.h | 1 - | ||
| 11 | 3 files changed, 38 deletions(-) | ||
| 12 | |||
| 13 | diff --git a/Documentation/networking/mptcp-sysctl.rst b/Documentation/networking/mptcp-sysctl.rst | ||
| 14 | index XXXXXXX..XXXXXXX 100644 | ||
| 15 | --- a/Documentation/networking/mptcp-sysctl.rst | ||
| 16 | +++ b/Documentation/networking/mptcp-sysctl.rst | ||
| 17 | @@ -XXX,XX +XXX,XX @@ enabled - BOOLEAN | ||
| 18 | |||
| 19 | Default: 1 (enabled) | ||
| 20 | |||
| 21 | -pm_type - INTEGER | ||
| 22 | - Set the default path manager type to use for each new MPTCP | ||
| 23 | - socket. In-kernel path management will control subflow | ||
| 24 | - connections and address advertisements according to | ||
| 25 | - per-namespace values configured over the MPTCP netlink | ||
| 26 | - API. Userspace path management puts per-MPTCP-connection subflow | ||
| 27 | - connection decisions and address advertisements under control of | ||
| 28 | - a privileged userspace program, at the cost of more netlink | ||
| 29 | - traffic to propagate all of the related events and commands. | ||
| 30 | - | ||
| 31 | - This is a per-namespace sysctl. | ||
| 32 | - | ||
| 33 | - * 0 - In-kernel path manager | ||
| 34 | - * 1 - Userspace path manager | ||
| 35 | - | ||
| 36 | - Default: 0 | ||
| 37 | - | ||
| 38 | path_manager - STRING | ||
| 39 | Set the default path manager name to use for each new MPTCP | ||
| 40 | socket. In-kernel path management will control subflow | ||
| 41 | diff --git a/net/mptcp/ctrl.c b/net/mptcp/ctrl.c | ||
| 42 | index XXXXXXX..XXXXXXX 100644 | ||
| 43 | --- a/net/mptcp/ctrl.c | ||
| 44 | +++ b/net/mptcp/ctrl.c | ||
| 45 | @@ -XXX,XX +XXX,XX @@ | ||
| 46 | |||
| 47 | static int mptcp_pernet_id; | ||
| 48 | |||
| 49 | -#ifdef CONFIG_SYSCTL | ||
| 50 | -static int mptcp_pm_type_max = __MPTCP_PM_TYPE_MAX; | ||
| 51 | -#endif | ||
| 52 | - | ||
| 53 | struct mptcp_pernet { | ||
| 54 | #ifdef CONFIG_SYSCTL | ||
| 55 | struct ctl_table_header *ctl_table_hdr; | ||
| 56 | @@ -XXX,XX +XXX,XX @@ struct mptcp_pernet { | ||
| 57 | u8 mptcp_enabled; | ||
| 58 | u8 checksum_enabled; | ||
| 59 | u8 allow_join_initial_addr_port; | ||
| 60 | - u8 pm_type; | ||
| 61 | char path_manager[MPTCP_PM_NAME_MAX]; | ||
| 62 | char scheduler[MPTCP_SCHED_NAME_MAX]; | ||
| 63 | }; | ||
| 64 | @@ -XXX,XX +XXX,XX @@ unsigned int mptcp_close_timeout(const struct sock *sk) | ||
| 65 | return mptcp_get_pernet(sock_net(sk))->close_timeout; | ||
| 66 | } | ||
| 67 | |||
| 68 | -int mptcp_get_pm_type(const struct net *net) | ||
| 69 | -{ | ||
| 70 | - return mptcp_get_pernet(net)->pm_type; | ||
| 71 | -} | ||
| 72 | - | ||
| 73 | const char *mptcp_get_path_manager(const struct net *net) | ||
| 74 | { | ||
| 75 | return mptcp_get_pernet(net)->path_manager; | ||
| 76 | @@ -XXX,XX +XXX,XX @@ static void mptcp_pernet_set_defaults(struct mptcp_pernet *pernet) | ||
| 77 | pernet->checksum_enabled = 0; | ||
| 78 | pernet->allow_join_initial_addr_port = 1; | ||
| 79 | pernet->stale_loss_cnt = 4; | ||
| 80 | - pernet->pm_type = MPTCP_PM_TYPE_KERNEL; | ||
| 81 | strscpy(pernet->path_manager, "in-kernel", sizeof(pernet->path_manager)); | ||
| 82 | strscpy(pernet->scheduler, "default", sizeof(pernet->scheduler)); | ||
| 83 | } | ||
| 84 | @@ -XXX,XX +XXX,XX @@ static struct ctl_table mptcp_sysctl_table[] = { | ||
| 85 | .mode = 0644, | ||
| 86 | .proc_handler = proc_douintvec_minmax, | ||
| 87 | }, | ||
| 88 | - { | ||
| 89 | - .procname = "pm_type", | ||
| 90 | - .maxlen = sizeof(u8), | ||
| 91 | - .mode = 0644, | ||
| 92 | - .proc_handler = proc_dou8vec_minmax, | ||
| 93 | - .extra1 = SYSCTL_ZERO, | ||
| 94 | - .extra2 = &mptcp_pm_type_max | ||
| 95 | - }, | ||
| 96 | { | ||
| 97 | .procname = "path_manager", | ||
| 98 | .maxlen = MPTCP_PM_NAME_MAX, | ||
| 99 | @@ -XXX,XX +XXX,XX @@ static int mptcp_pernet_new_table(struct net *net, struct mptcp_pernet *pernet) | ||
| 100 | table[i++].data = &pernet->checksum_enabled; | ||
| 101 | table[i++].data = &pernet->allow_join_initial_addr_port; | ||
| 102 | table[i++].data = &pernet->stale_loss_cnt; | ||
| 103 | - table[i++].data = &pernet->pm_type; | ||
| 104 | table[i++].data = &pernet->path_manager; | ||
| 105 | table[i++].data = &pernet->scheduler; | ||
| 106 | i++; /* table[i] is for available_schedulers which is read-only info */ | ||
| 107 | diff --git a/net/mptcp/protocol.h b/net/mptcp/protocol.h | ||
| 108 | index XXXXXXX..XXXXXXX 100644 | ||
| 109 | --- a/net/mptcp/protocol.h | ||
| 110 | +++ b/net/mptcp/protocol.h | ||
| 111 | @@ -XXX,XX +XXX,XX @@ int mptcp_is_checksum_enabled(const struct net *net); | ||
| 112 | int mptcp_allow_join_id0(const struct net *net); | ||
| 113 | unsigned int mptcp_stale_loss_cnt(const struct net *net); | ||
| 114 | unsigned int mptcp_close_timeout(const struct sock *sk); | ||
| 115 | -int mptcp_get_pm_type(const struct net *net); | ||
| 116 | const char *mptcp_get_path_manager(const struct net *net); | ||
| 117 | const char *mptcp_get_scheduler(const struct net *net); | ||
| 118 | |||
| 119 | -- | ||
| 120 | 2.43.0 | diff view generated by jsdifflib |
New patch | |||
|---|---|---|---|
| 1 | From: Geliang Tang <tanggeliang@kylinos.cn> | ||
| 1 | 2 | ||
| 3 | Similarly to net.mptcp.available_schedulers, this patch adds a new one | ||
| 4 | net.mptcp.available_path_managers to list the available path mangers. | ||
| 5 | |||
| 6 | Signed-off-by: Geliang Tang <tanggeliang@kylinos.cn> | ||
| 7 | --- | ||
| 8 | Documentation/networking/mptcp-sysctl.rst | 4 ++++ | ||
| 9 | include/net/mptcp.h | 2 ++ | ||
| 10 | net/mptcp/ctrl.c | 25 +++++++++++++++++++++++ | ||
| 11 | net/mptcp/pm.c | 20 ++++++++++++++++++ | ||
| 12 | net/mptcp/protocol.h | 1 + | ||
| 13 | 5 files changed, 52 insertions(+) | ||
| 14 | |||
| 15 | diff --git a/Documentation/networking/mptcp-sysctl.rst b/Documentation/networking/mptcp-sysctl.rst | ||
| 16 | index XXXXXXX..XXXXXXX 100644 | ||
| 17 | --- a/Documentation/networking/mptcp-sysctl.rst | ||
| 18 | +++ b/Documentation/networking/mptcp-sysctl.rst | ||
| 19 | @@ -XXX,XX +XXX,XX @@ path_manager - STRING | ||
| 20 | |||
| 21 | Default: "in-kernel" | ||
| 22 | |||
| 23 | +available_path_managers - STRING | ||
| 24 | + Shows the available path managers choices that are registered. More | ||
| 25 | + path managers may be available, but not loaded. | ||
| 26 | + | ||
| 27 | scheduler - STRING | ||
| 28 | Select the scheduler of your choice. | ||
| 29 | |||
| 30 | diff --git a/include/net/mptcp.h b/include/net/mptcp.h | ||
| 31 | index XXXXXXX..XXXXXXX 100644 | ||
| 32 | --- a/include/net/mptcp.h | ||
| 33 | +++ b/include/net/mptcp.h | ||
| 34 | @@ -XXX,XX +XXX,XX @@ struct mptcp_sched_ops { | ||
| 35 | } ____cacheline_aligned_in_smp; | ||
| 36 | |||
| 37 | #define MPTCP_PM_NAME_MAX 16 | ||
| 38 | +#define MPTCP_PM_MAX 128 | ||
| 39 | +#define MPTCP_PM_BUF_MAX (MPTCP_PM_NAME_MAX * MPTCP_PM_MAX) | ||
| 40 | |||
| 41 | struct mptcp_pm_ops { | ||
| 42 | int (*created)(struct mptcp_sock *msk); | ||
| 43 | diff --git a/net/mptcp/ctrl.c b/net/mptcp/ctrl.c | ||
| 44 | index XXXXXXX..XXXXXXX 100644 | ||
| 45 | --- a/net/mptcp/ctrl.c | ||
| 46 | +++ b/net/mptcp/ctrl.c | ||
| 47 | @@ -XXX,XX +XXX,XX @@ static int proc_path_manager(const struct ctl_table *ctl, int write, | ||
| 48 | return ret; | ||
| 49 | } | ||
| 50 | |||
| 51 | +static int proc_available_path_managers(const struct ctl_table *ctl, | ||
| 52 | + int write, void *buffer, | ||
| 53 | + size_t *lenp, loff_t *ppos) | ||
| 54 | +{ | ||
| 55 | + struct ctl_table tbl = { .maxlen = MPTCP_PM_BUF_MAX, }; | ||
| 56 | + int ret; | ||
| 57 | + | ||
| 58 | + tbl.data = kmalloc(tbl.maxlen, GFP_USER); | ||
| 59 | + if (!tbl.data) | ||
| 60 | + return -ENOMEM; | ||
| 61 | + | ||
| 62 | + mptcp_pm_get_available(tbl.data, MPTCP_PM_BUF_MAX); | ||
| 63 | + ret = proc_dostring(&tbl, write, buffer, lenp, ppos); | ||
| 64 | + kfree(tbl.data); | ||
| 65 | + | ||
| 66 | + return ret; | ||
| 67 | +} | ||
| 68 | + | ||
| 69 | static int mptcp_set_scheduler(char *scheduler, const char *name) | ||
| 70 | { | ||
| 71 | struct mptcp_sched_ops *sched; | ||
| 72 | @@ -XXX,XX +XXX,XX @@ static struct ctl_table mptcp_sysctl_table[] = { | ||
| 73 | .mode = 0644, | ||
| 74 | .proc_handler = proc_path_manager, | ||
| 75 | }, | ||
| 76 | + { | ||
| 77 | + .procname = "available_path_managers", | ||
| 78 | + .maxlen = MPTCP_PM_BUF_MAX, | ||
| 79 | + .mode = 0444, | ||
| 80 | + .proc_handler = proc_available_path_managers, | ||
| 81 | + }, | ||
| 82 | { | ||
| 83 | .procname = "scheduler", | ||
| 84 | .maxlen = MPTCP_SCHED_NAME_MAX, | ||
| 85 | @@ -XXX,XX +XXX,XX @@ static int mptcp_pernet_new_table(struct net *net, struct mptcp_pernet *pernet) | ||
| 86 | table[i++].data = &pernet->allow_join_initial_addr_port; | ||
| 87 | table[i++].data = &pernet->stale_loss_cnt; | ||
| 88 | table[i++].data = &pernet->path_manager; | ||
| 89 | + i++; /* table[i] is for available_path_managers which is read-only info */ | ||
| 90 | table[i++].data = &pernet->scheduler; | ||
| 91 | i++; /* table[i] is for available_schedulers which is read-only info */ | ||
| 92 | table[i++].data = &pernet->close_timeout; | ||
| 93 | diff --git a/net/mptcp/pm.c b/net/mptcp/pm.c | ||
| 94 | index XXXXXXX..XXXXXXX 100644 | ||
| 95 | --- a/net/mptcp/pm.c | ||
| 96 | +++ b/net/mptcp/pm.c | ||
| 97 | @@ -XXX,XX +XXX,XX @@ struct mptcp_pm_ops *mptcp_pm_find(const char *name) | ||
| 98 | return NULL; | ||
| 99 | } | ||
| 100 | |||
| 101 | +/* Build string with list of available path manager values. | ||
| 102 | + * Similar to tcp_get_available_congestion_control() | ||
| 103 | + */ | ||
| 104 | +void mptcp_pm_get_available(char *buf, size_t maxlen) | ||
| 105 | +{ | ||
| 106 | + struct mptcp_pm_ops *pm; | ||
| 107 | + size_t offs = 0; | ||
| 108 | + | ||
| 109 | + rcu_read_lock(); | ||
| 110 | + list_for_each_entry_rcu(pm, &mptcp_pm_list, list) { | ||
| 111 | + offs += snprintf(buf + offs, maxlen - offs, | ||
| 112 | + "%s%s", | ||
| 113 | + offs == 0 ? "" : " ", pm->name); | ||
| 114 | + | ||
| 115 | + if (WARN_ON_ONCE(offs >= maxlen)) | ||
| 116 | + break; | ||
| 117 | + } | ||
| 118 | + rcu_read_unlock(); | ||
| 119 | +} | ||
| 120 | + | ||
| 121 | int mptcp_pm_validate(struct mptcp_pm_ops *pm) | ||
| 122 | { | ||
| 123 | if (!pm->get_local_id || !pm->get_priority) { | ||
| 124 | diff --git a/net/mptcp/protocol.h b/net/mptcp/protocol.h | ||
| 125 | index XXXXXXX..XXXXXXX 100644 | ||
| 126 | --- a/net/mptcp/protocol.h | ||
| 127 | +++ b/net/mptcp/protocol.h | ||
| 128 | @@ -XXX,XX +XXX,XX @@ void mptcp_pm_remove_addr_entry(struct mptcp_sock *msk, | ||
| 129 | extern struct mptcp_pm_ops mptcp_in_kernel_pm; | ||
| 130 | |||
| 131 | struct mptcp_pm_ops *mptcp_pm_find(const char *name); | ||
| 132 | +void mptcp_pm_get_available(char *buf, size_t maxlen); | ||
| 133 | int mptcp_pm_validate(struct mptcp_pm_ops *pm); | ||
| 134 | int mptcp_pm_register(struct mptcp_pm_ops *pm); | ||
| 135 | void mptcp_pm_unregister(struct mptcp_pm_ops *pm); | ||
| 136 | -- | ||
| 137 | 2.43.0 | diff view generated by jsdifflib |
| 1 | From: Geliang Tang <tanggeliang@kylinos.cn> | 1 | From: Geliang Tang <tanggeliang@kylinos.cn> |
|---|---|---|---|
| 2 | 2 | ||
| 3 | The number of parameters in mptcp_nl_set_flags() can be reduced. | 3 | Now mptcp_pm_nl_get_local_id() and mptcp_userspace_pm_get_local_id() |
| 4 | Only need to pass a "local" parameter to it instead of "local->addr" | 4 | helpers can be dropped, and mptcp_pm_get_local_id() can directly invoke |
| 5 | and "local->flags". | 5 | get_local_id() interface through "ops" of "msk->pm". |
| 6 | 6 | ||
| 7 | Signed-off-by: Geliang Tang <tanggeliang@kylinos.cn> | 7 | Signed-off-by: Geliang Tang <tanggeliang@kylinos.cn> |
| 8 | --- | 8 | --- |
| 9 | net/mptcp/pm_netlink.c | 15 ++++++++------- | 9 | net/mptcp/pm.c | 4 +--- |
| 10 | 1 file changed, 8 insertions(+), 7 deletions(-) | 10 | net/mptcp/pm_netlink.c | 4 ++-- |
| 11 | net/mptcp/pm_userspace.c | 4 ++-- | ||
| 12 | net/mptcp/protocol.h | 4 ---- | ||
| 13 | 4 files changed, 5 insertions(+), 11 deletions(-) | ||
| 11 | 14 | ||
| 15 | diff --git a/net/mptcp/pm.c b/net/mptcp/pm.c | ||
| 16 | index XXXXXXX..XXXXXXX 100644 | ||
| 17 | --- a/net/mptcp/pm.c | ||
| 18 | +++ b/net/mptcp/pm.c | ||
| 19 | @@ -XXX,XX +XXX,XX @@ int mptcp_pm_get_local_id(struct mptcp_sock *msk, struct sock_common *skc) | ||
| 20 | skc_local.addr.id = 0; | ||
| 21 | skc_local.flags = MPTCP_PM_ADDR_FLAG_IMPLICIT; | ||
| 22 | |||
| 23 | - if (mptcp_pm_is_userspace(msk)) | ||
| 24 | - return mptcp_userspace_pm_get_local_id(msk, &skc_local); | ||
| 25 | - return mptcp_pm_nl_get_local_id(msk, &skc_local); | ||
| 26 | + return msk->pm.ops->get_local_id(msk, &skc_local); | ||
| 27 | } | ||
| 28 | |||
| 29 | bool mptcp_pm_is_backup(struct mptcp_sock *msk, struct sock_common *skc) | ||
| 12 | diff --git a/net/mptcp/pm_netlink.c b/net/mptcp/pm_netlink.c | 30 | diff --git a/net/mptcp/pm_netlink.c b/net/mptcp/pm_netlink.c |
| 13 | index XXXXXXX..XXXXXXX 100644 | 31 | index XXXXXXX..XXXXXXX 100644 |
| 14 | --- a/net/mptcp/pm_netlink.c | 32 | --- a/net/mptcp/pm_netlink.c |
| 15 | +++ b/net/mptcp/pm_netlink.c | 33 | +++ b/net/mptcp/pm_netlink.c |
| 16 | @@ -XXX,XX +XXX,XX @@ static void mptcp_pm_nl_fullmesh(struct mptcp_sock *msk, | 34 | @@ -XXX,XX +XXX,XX @@ static int mptcp_pm_nl_create_listen_socket(struct sock *sk, |
| 17 | spin_unlock_bh(&msk->pm.lock); | 35 | return err; |
| 18 | } | 36 | } |
| 19 | 37 | ||
| 20 | -static void mptcp_nl_set_flags(struct net *net, struct mptcp_addr_info *addr, | 38 | -int mptcp_pm_nl_get_local_id(struct mptcp_sock *msk, |
| 21 | - u8 flags, u8 changed) | 39 | - struct mptcp_pm_addr_entry *skc) |
| 22 | +static void mptcp_nl_set_flags(struct net *net, | 40 | +static int mptcp_pm_nl_get_local_id(struct mptcp_sock *msk, |
| 23 | + struct mptcp_pm_addr_entry *local, | 41 | + struct mptcp_pm_addr_entry *skc) |
| 24 | + u8 changed) | ||
| 25 | { | 42 | { |
| 26 | - u8 is_subflow = !!(flags & MPTCP_PM_ADDR_FLAG_SUBFLOW); | 43 | struct mptcp_pm_addr_entry *entry; |
| 27 | - u8 bkup = !!(flags & MPTCP_PM_ADDR_FLAG_BACKUP); | 44 | struct pm_nl_pernet *pernet; |
| 28 | + u8 is_subflow = !!(local->flags & MPTCP_PM_ADDR_FLAG_SUBFLOW); | 45 | diff --git a/net/mptcp/pm_userspace.c b/net/mptcp/pm_userspace.c |
| 29 | + u8 bkup = !!(local->flags & MPTCP_PM_ADDR_FLAG_BACKUP); | 46 | index XXXXXXX..XXXXXXX 100644 |
| 30 | long s_slot = 0, s_num = 0; | 47 | --- a/net/mptcp/pm_userspace.c |
| 31 | struct mptcp_sock *msk; | 48 | +++ b/net/mptcp/pm_userspace.c |
| 32 | 49 | @@ -XXX,XX +XXX,XX @@ mptcp_userspace_pm_lookup_addr_by_id(struct mptcp_sock *msk, unsigned int id) | |
| 33 | @@ -XXX,XX +XXX,XX @@ static void mptcp_nl_set_flags(struct net *net, struct mptcp_addr_info *addr, | 50 | return NULL; |
| 34 | |||
| 35 | lock_sock(sk); | ||
| 36 | if (changed & MPTCP_PM_ADDR_FLAG_BACKUP) | ||
| 37 | - mptcp_pm_nl_mp_prio_send_ack(msk, addr, NULL, bkup); | ||
| 38 | + mptcp_pm_nl_mp_prio_send_ack(msk, &local->addr, NULL, bkup); | ||
| 39 | /* Subflows will only be recreated if the SUBFLOW flag is set */ | ||
| 40 | if (is_subflow && (changed & MPTCP_PM_ADDR_FLAG_FULLMESH)) | ||
| 41 | - mptcp_pm_nl_fullmesh(msk, addr); | ||
| 42 | + mptcp_pm_nl_fullmesh(msk, &local->addr); | ||
| 43 | release_sock(sk); | ||
| 44 | |||
| 45 | next: | ||
| 46 | @@ -XXX,XX +XXX,XX @@ int mptcp_pm_nl_set_flags(struct mptcp_pm_addr_entry *local, | ||
| 47 | *local = *entry; | ||
| 48 | spin_unlock_bh(&pernet->lock); | ||
| 49 | |||
| 50 | - mptcp_nl_set_flags(net, &local->addr, local->flags, changed); | ||
| 51 | + mptcp_nl_set_flags(net, local, changed); | ||
| 52 | return 0; | ||
| 53 | } | 51 | } |
| 54 | 52 | ||
| 53 | -int mptcp_userspace_pm_get_local_id(struct mptcp_sock *msk, | ||
| 54 | - struct mptcp_pm_addr_entry *skc) | ||
| 55 | +static int mptcp_userspace_pm_get_local_id(struct mptcp_sock *msk, | ||
| 56 | + struct mptcp_pm_addr_entry *skc) | ||
| 57 | { | ||
| 58 | __be16 msk_sport = ((struct inet_sock *) | ||
| 59 | inet_sk((struct sock *)msk))->inet_sport; | ||
| 60 | diff --git a/net/mptcp/protocol.h b/net/mptcp/protocol.h | ||
| 61 | index XXXXXXX..XXXXXXX 100644 | ||
| 62 | --- a/net/mptcp/protocol.h | ||
| 63 | +++ b/net/mptcp/protocol.h | ||
| 64 | @@ -XXX,XX +XXX,XX @@ bool mptcp_pm_add_addr_signal(struct mptcp_sock *msk, const struct sk_buff *skb, | ||
| 65 | bool mptcp_pm_rm_addr_signal(struct mptcp_sock *msk, unsigned int remaining, | ||
| 66 | struct mptcp_rm_list *rm_list); | ||
| 67 | int mptcp_pm_get_local_id(struct mptcp_sock *msk, struct sock_common *skc); | ||
| 68 | -int mptcp_pm_nl_get_local_id(struct mptcp_sock *msk, | ||
| 69 | - struct mptcp_pm_addr_entry *skc); | ||
| 70 | -int mptcp_userspace_pm_get_local_id(struct mptcp_sock *msk, | ||
| 71 | - struct mptcp_pm_addr_entry *skc); | ||
| 72 | bool mptcp_pm_is_backup(struct mptcp_sock *msk, struct sock_common *skc); | ||
| 73 | bool mptcp_pm_nl_is_backup(struct mptcp_sock *msk, struct mptcp_addr_info *skc); | ||
| 74 | bool mptcp_userspace_pm_is_backup(struct mptcp_sock *msk, struct mptcp_addr_info *skc); | ||
| 55 | -- | 75 | -- |
| 56 | 2.43.0 | 76 | 2.43.0 | diff view generated by jsdifflib |
| 1 | From: Geliang Tang <tanggeliang@kylinos.cn> | 1 | From: Geliang Tang <tanggeliang@kylinos.cn> |
|---|---|---|---|
| 2 | 2 | ||
| 3 | In mptcp_pm_nl_set_flags(), "entry" is copied to "local" when pernet->lock | 3 | Now mptcp_pm_nl_is_backup() and mptcp_userspace_pm_is_backup() |
| 4 | is held to avoid direct access to entry without pernet->lock. | 4 | helpers can be dropped, and mptcp_pm_is_backup() can directly |
| 5 | 5 | invoke get_priority() interface through "ops" of "msk->pm". | |
| 6 | Therefore, "local->flags" should be passed to mptcp_nl_set_flags instead | ||
| 7 | of "entry->flags" when pernet->lock is not held, so as to avoid access to | ||
| 8 | entry. | ||
| 9 | 6 | ||
| 10 | Signed-off-by: Geliang Tang <tanggeliang@kylinos.cn> | 7 | Signed-off-by: Geliang Tang <tanggeliang@kylinos.cn> |
| 11 | --- | 8 | --- |
| 12 | net/mptcp/pm_netlink.c | 2 +- | 9 | net/mptcp/pm.c | 5 +---- |
| 13 | 1 file changed, 1 insertion(+), 1 deletion(-) | 10 | net/mptcp/pm_netlink.c | 5 ----- |
| 11 | net/mptcp/pm_userspace.c | 6 ------ | ||
| 12 | net/mptcp/protocol.h | 2 -- | ||
| 13 | 4 files changed, 1 insertion(+), 17 deletions(-) | ||
| 14 | 14 | ||
| 15 | diff --git a/net/mptcp/pm.c b/net/mptcp/pm.c | ||
| 16 | index XXXXXXX..XXXXXXX 100644 | ||
| 17 | --- a/net/mptcp/pm.c | ||
| 18 | +++ b/net/mptcp/pm.c | ||
| 19 | @@ -XXX,XX +XXX,XX @@ bool mptcp_pm_is_backup(struct mptcp_sock *msk, struct sock_common *skc) | ||
| 20 | |||
| 21 | mptcp_local_address((struct sock_common *)skc, &skc_local); | ||
| 22 | |||
| 23 | - if (mptcp_pm_is_userspace(msk)) | ||
| 24 | - return mptcp_userspace_pm_is_backup(msk, &skc_local); | ||
| 25 | - | ||
| 26 | - return mptcp_pm_nl_is_backup(msk, &skc_local); | ||
| 27 | + return msk->pm.ops->get_priority(msk, &skc_local); | ||
| 28 | } | ||
| 29 | |||
| 30 | static int mptcp_pm_get_addr(u8 id, struct mptcp_pm_addr_entry *addr, | ||
| 15 | diff --git a/net/mptcp/pm_netlink.c b/net/mptcp/pm_netlink.c | 31 | diff --git a/net/mptcp/pm_netlink.c b/net/mptcp/pm_netlink.c |
| 16 | index XXXXXXX..XXXXXXX 100644 | 32 | index XXXXXXX..XXXXXXX 100644 |
| 17 | --- a/net/mptcp/pm_netlink.c | 33 | --- a/net/mptcp/pm_netlink.c |
| 18 | +++ b/net/mptcp/pm_netlink.c | 34 | +++ b/net/mptcp/pm_netlink.c |
| 19 | @@ -XXX,XX +XXX,XX @@ int mptcp_pm_nl_set_flags(struct mptcp_pm_addr_entry *local, | 35 | @@ -XXX,XX +XXX,XX @@ static bool mptcp_pm_nl_get_priority(struct mptcp_sock *msk, |
| 20 | *local = *entry; | 36 | return backup; |
| 21 | spin_unlock_bh(&pernet->lock); | ||
| 22 | |||
| 23 | - mptcp_nl_set_flags(net, &local->addr, entry->flags, changed); | ||
| 24 | + mptcp_nl_set_flags(net, &local->addr, local->flags, changed); | ||
| 25 | return 0; | ||
| 26 | } | 37 | } |
| 27 | 38 | ||
| 39 | -bool mptcp_pm_nl_is_backup(struct mptcp_sock *msk, struct mptcp_addr_info *skc) | ||
| 40 | -{ | ||
| 41 | - return mptcp_pm_nl_get_priority(msk, skc); | ||
| 42 | -} | ||
| 43 | - | ||
| 44 | #define MPTCP_PM_CMD_GRP_OFFSET 0 | ||
| 45 | #define MPTCP_PM_EV_GRP_OFFSET 1 | ||
| 46 | |||
| 47 | diff --git a/net/mptcp/pm_userspace.c b/net/mptcp/pm_userspace.c | ||
| 48 | index XXXXXXX..XXXXXXX 100644 | ||
| 49 | --- a/net/mptcp/pm_userspace.c | ||
| 50 | +++ b/net/mptcp/pm_userspace.c | ||
| 51 | @@ -XXX,XX +XXX,XX @@ static bool mptcp_userspace_pm_get_priority(struct mptcp_sock *msk, | ||
| 52 | return backup; | ||
| 53 | } | ||
| 54 | |||
| 55 | -bool mptcp_userspace_pm_is_backup(struct mptcp_sock *msk, | ||
| 56 | - struct mptcp_addr_info *skc) | ||
| 57 | -{ | ||
| 58 | - return mptcp_userspace_pm_get_priority(msk, skc); | ||
| 59 | -} | ||
| 60 | - | ||
| 61 | static struct mptcp_sock *mptcp_userspace_pm_get_sock(const struct genl_info *info) | ||
| 62 | { | ||
| 63 | struct mptcp_sock *msk; | ||
| 64 | diff --git a/net/mptcp/protocol.h b/net/mptcp/protocol.h | ||
| 65 | index XXXXXXX..XXXXXXX 100644 | ||
| 66 | --- a/net/mptcp/protocol.h | ||
| 67 | +++ b/net/mptcp/protocol.h | ||
| 68 | @@ -XXX,XX +XXX,XX @@ bool mptcp_pm_rm_addr_signal(struct mptcp_sock *msk, unsigned int remaining, | ||
| 69 | struct mptcp_rm_list *rm_list); | ||
| 70 | int mptcp_pm_get_local_id(struct mptcp_sock *msk, struct sock_common *skc); | ||
| 71 | bool mptcp_pm_is_backup(struct mptcp_sock *msk, struct sock_common *skc); | ||
| 72 | -bool mptcp_pm_nl_is_backup(struct mptcp_sock *msk, struct mptcp_addr_info *skc); | ||
| 73 | -bool mptcp_userspace_pm_is_backup(struct mptcp_sock *msk, struct mptcp_addr_info *skc); | ||
| 74 | int mptcp_pm_nl_dump_addr(struct sk_buff *msg, | ||
| 75 | struct netlink_callback *cb); | ||
| 76 | int mptcp_userspace_pm_dump_addr(struct sk_buff *msg, | ||
| 28 | -- | 77 | -- |
| 29 | 2.43.0 | 78 | 2.43.0 | diff view generated by jsdifflib |
| 1 | From: Geliang Tang <tanggeliang@kylinos.cn> | 1 | From: Geliang Tang <tanggeliang@kylinos.cn> |
|---|---|---|---|
| 2 | 2 | ||
| 3 | This patch adds the sock version of kmemdup() helper, named sock_kmemdup(), | 3 | This patch uses the newly added net.mptcp.path_manager instead of the |
| 4 | to duplicate a memory block using the socket's option memory buffer. | 4 | old net.mptcp.pm_type for all path manager selftests in mptcp_join.sh |
| 5 | and userspace_pm.sh. | ||
| 5 | 6 | ||
| 6 | Signed-off-by: Geliang Tang <tanggeliang@kylinos.cn> | 7 | Signed-off-by: Geliang Tang <tanggeliang@kylinos.cn> |
| 7 | --- | 8 | --- |
| 8 | include/net/sock.h | 1 + | 9 | .../testing/selftests/net/mptcp/mptcp_join.sh | 26 +++++++++---------- |
| 9 | net/core/sock.c | 23 +++++++++++++++++++++++ | 10 | .../selftests/net/mptcp/userspace_pm.sh | 4 +-- |
| 10 | 2 files changed, 24 insertions(+) | 11 | 2 files changed, 15 insertions(+), 15 deletions(-) |
| 11 | 12 | ||
| 12 | diff --git a/include/net/sock.h b/include/net/sock.h | 13 | diff --git a/tools/testing/selftests/net/mptcp/mptcp_join.sh b/tools/testing/selftests/net/mptcp/mptcp_join.sh |
| 13 | index XXXXXXX..XXXXXXX 100644 | 14 | index XXXXXXX..XXXXXXX 100755 |
| 14 | --- a/include/net/sock.h | 15 | --- a/tools/testing/selftests/net/mptcp/mptcp_join.sh |
| 15 | +++ b/include/net/sock.h | 16 | +++ b/tools/testing/selftests/net/mptcp/mptcp_join.sh |
| 16 | @@ -XXX,XX +XXX,XX @@ static inline struct sk_buff *sock_alloc_send_skb(struct sock *sk, | 17 | @@ -XXX,XX +XXX,XX @@ init_partial() |
| 18 | |||
| 19 | local netns | ||
| 20 | for netns in "$ns1" "$ns2"; do | ||
| 21 | - ip netns exec $netns sysctl -q net.mptcp.pm_type=0 2>/dev/null || true | ||
| 22 | + ip netns exec $netns sysctl -q net.mptcp.path_manager="in-kernel" 2>/dev/null || true | ||
| 23 | if $checksum; then | ||
| 24 | ip netns exec $netns sysctl -q net.mptcp.checksum_enabled=1 | ||
| 25 | fi | ||
| 26 | @@ -XXX,XX +XXX,XX @@ set_userspace_pm() | ||
| 27 | { | ||
| 28 | local ns=$1 | ||
| 29 | |||
| 30 | - ip netns exec $ns sysctl -q net.mptcp.pm_type=1 | ||
| 31 | + ip netns exec $ns sysctl -q net.mptcp.path_manager="userspace" | ||
| 17 | } | 32 | } |
| 18 | 33 | ||
| 19 | void *sock_kmalloc(struct sock *sk, int size, gfp_t priority); | 34 | subflows_tests() |
| 20 | +void *sock_kmemdup(struct sock *sk, const void *src, int size, gfp_t priority); | 35 | @@ -XXX,XX +XXX,XX @@ userspace_tests() |
| 21 | void sock_kfree_s(struct sock *sk, void *mem, int size); | 36 | { |
| 22 | void sock_kzfree_s(struct sock *sk, void *mem, int size); | 37 | # userspace pm type prevents add_addr |
| 23 | void sk_send_sigurg(struct sock *sk); | 38 | if reset "userspace pm type prevents add_addr" && |
| 24 | diff --git a/net/core/sock.c b/net/core/sock.c | 39 | - continue_if mptcp_lib_has_file '/proc/sys/net/mptcp/pm_type'; then |
| 25 | index XXXXXXX..XXXXXXX 100644 | 40 | + continue_if mptcp_lib_has_file '/proc/sys/net/mptcp/path_manager'; then |
| 26 | --- a/net/core/sock.c | 41 | set_userspace_pm $ns1 |
| 27 | +++ b/net/core/sock.c | 42 | pm_nl_set_limits $ns1 0 2 |
| 28 | @@ -XXX,XX +XXX,XX @@ void *sock_kmalloc(struct sock *sk, int size, gfp_t priority) | 43 | pm_nl_set_limits $ns2 0 2 |
| 29 | } | 44 | @@ -XXX,XX +XXX,XX @@ userspace_tests() |
| 30 | EXPORT_SYMBOL(sock_kmalloc); | 45 | |
| 31 | 46 | # userspace pm type does not echo add_addr without daemon | |
| 32 | +/* | 47 | if reset "userspace pm no echo w/o daemon" && |
| 33 | + * Duplicate a memory block using the socket's option memory buffer. | 48 | - continue_if mptcp_lib_has_file '/proc/sys/net/mptcp/pm_type'; then |
| 34 | + */ | 49 | + continue_if mptcp_lib_has_file '/proc/sys/net/mptcp/path_manager'; then |
| 35 | +void *sock_kmemdup(struct sock *sk, const void *src, int size, gfp_t priority) | 50 | set_userspace_pm $ns2 |
| 36 | +{ | 51 | pm_nl_set_limits $ns1 0 2 |
| 37 | + int optmem_max = READ_ONCE(sock_net(sk)->core.sysctl_optmem_max); | 52 | pm_nl_set_limits $ns2 0 2 |
| 38 | + | 53 | @@ -XXX,XX +XXX,XX @@ userspace_tests() |
| 39 | + if ((unsigned int)size <= optmem_max && | 54 | |
| 40 | + atomic_read(&sk->sk_omem_alloc) + size < optmem_max) { | 55 | # userspace pm type rejects join |
| 41 | + void *mem; | 56 | if reset "userspace pm type rejects join" && |
| 42 | + /* First do the add, to avoid the race if kmalloc | 57 | - continue_if mptcp_lib_has_file '/proc/sys/net/mptcp/pm_type'; then |
| 43 | + * might sleep. | 58 | + continue_if mptcp_lib_has_file '/proc/sys/net/mptcp/path_manager'; then |
| 44 | + */ | 59 | set_userspace_pm $ns1 |
| 45 | + atomic_add(size, &sk->sk_omem_alloc); | 60 | pm_nl_set_limits $ns1 1 1 |
| 46 | + mem = kmemdup(src, size, priority); | 61 | pm_nl_set_limits $ns2 1 1 |
| 47 | + if (mem) | 62 | @@ -XXX,XX +XXX,XX @@ userspace_tests() |
| 48 | + return mem; | 63 | |
| 49 | + atomic_sub(size, &sk->sk_omem_alloc); | 64 | # userspace pm type does not send join |
| 50 | + } | 65 | if reset "userspace pm type does not send join" && |
| 51 | + return NULL; | 66 | - continue_if mptcp_lib_has_file '/proc/sys/net/mptcp/pm_type'; then |
| 52 | +} | 67 | + continue_if mptcp_lib_has_file '/proc/sys/net/mptcp/path_manager'; then |
| 53 | +EXPORT_SYMBOL(sock_kmemdup); | 68 | set_userspace_pm $ns2 |
| 54 | + | 69 | pm_nl_set_limits $ns1 1 1 |
| 55 | /* Free an option memory block. Note, we actually want the inline | 70 | pm_nl_set_limits $ns2 1 1 |
| 56 | * here as this allows gcc to detect the nullify and fold away the | 71 | @@ -XXX,XX +XXX,XX @@ userspace_tests() |
| 57 | * condition entirely. | 72 | |
| 73 | # userspace pm type prevents mp_prio | ||
| 74 | if reset "userspace pm type prevents mp_prio" && | ||
| 75 | - continue_if mptcp_lib_has_file '/proc/sys/net/mptcp/pm_type'; then | ||
| 76 | + continue_if mptcp_lib_has_file '/proc/sys/net/mptcp/path_manager'; then | ||
| 77 | set_userspace_pm $ns1 | ||
| 78 | pm_nl_set_limits $ns1 1 1 | ||
| 79 | pm_nl_set_limits $ns2 1 1 | ||
| 80 | @@ -XXX,XX +XXX,XX @@ userspace_tests() | ||
| 81 | |||
| 82 | # userspace pm type prevents rm_addr | ||
| 83 | if reset "userspace pm type prevents rm_addr" && | ||
| 84 | - continue_if mptcp_lib_has_file '/proc/sys/net/mptcp/pm_type'; then | ||
| 85 | + continue_if mptcp_lib_has_file '/proc/sys/net/mptcp/path_manager'; then | ||
| 86 | set_userspace_pm $ns1 | ||
| 87 | set_userspace_pm $ns2 | ||
| 88 | pm_nl_set_limits $ns1 0 1 | ||
| 89 | @@ -XXX,XX +XXX,XX @@ userspace_tests() | ||
| 90 | |||
| 91 | # userspace pm add & remove address | ||
| 92 | if reset_with_events "userspace pm add & remove address" && | ||
| 93 | - continue_if mptcp_lib_has_file '/proc/sys/net/mptcp/pm_type'; then | ||
| 94 | + continue_if mptcp_lib_has_file '/proc/sys/net/mptcp/path_manager'; then | ||
| 95 | set_userspace_pm $ns1 | ||
| 96 | pm_nl_set_limits $ns2 2 2 | ||
| 97 | { speed=5 \ | ||
| 98 | @@ -XXX,XX +XXX,XX @@ userspace_tests() | ||
| 99 | |||
| 100 | # userspace pm create destroy subflow | ||
| 101 | if reset_with_events "userspace pm create destroy subflow" && | ||
| 102 | - continue_if mptcp_lib_has_file '/proc/sys/net/mptcp/pm_type'; then | ||
| 103 | + continue_if mptcp_lib_has_file '/proc/sys/net/mptcp/path_manager'; then | ||
| 104 | set_userspace_pm $ns2 | ||
| 105 | pm_nl_set_limits $ns1 0 1 | ||
| 106 | { speed=5 \ | ||
| 107 | @@ -XXX,XX +XXX,XX @@ userspace_tests() | ||
| 108 | |||
| 109 | # userspace pm create id 0 subflow | ||
| 110 | if reset_with_events "userspace pm create id 0 subflow" && | ||
| 111 | - continue_if mptcp_lib_has_file '/proc/sys/net/mptcp/pm_type'; then | ||
| 112 | + continue_if mptcp_lib_has_file '/proc/sys/net/mptcp/path_manager'; then | ||
| 113 | set_userspace_pm $ns2 | ||
| 114 | pm_nl_set_limits $ns1 0 1 | ||
| 115 | { speed=5 \ | ||
| 116 | @@ -XXX,XX +XXX,XX @@ userspace_tests() | ||
| 117 | |||
| 118 | # userspace pm remove initial subflow | ||
| 119 | if reset_with_events "userspace pm remove initial subflow" && | ||
| 120 | - continue_if mptcp_lib_has_file '/proc/sys/net/mptcp/pm_type'; then | ||
| 121 | + continue_if mptcp_lib_has_file '/proc/sys/net/mptcp/path_manager'; then | ||
| 122 | set_userspace_pm $ns2 | ||
| 123 | pm_nl_set_limits $ns1 0 1 | ||
| 124 | { speed=5 \ | ||
| 125 | @@ -XXX,XX +XXX,XX @@ userspace_tests() | ||
| 126 | |||
| 127 | # userspace pm send RM_ADDR for ID 0 | ||
| 128 | if reset_with_events "userspace pm send RM_ADDR for ID 0" && | ||
| 129 | - continue_if mptcp_lib_has_file '/proc/sys/net/mptcp/pm_type'; then | ||
| 130 | + continue_if mptcp_lib_has_file '/proc/sys/net/mptcp/path_manager'; then | ||
| 131 | set_userspace_pm $ns1 | ||
| 132 | pm_nl_set_limits $ns2 1 1 | ||
| 133 | { speed=5 \ | ||
| 134 | diff --git a/tools/testing/selftests/net/mptcp/userspace_pm.sh b/tools/testing/selftests/net/mptcp/userspace_pm.sh | ||
| 135 | index XXXXXXX..XXXXXXX 100755 | ||
| 136 | --- a/tools/testing/selftests/net/mptcp/userspace_pm.sh | ||
| 137 | +++ b/tools/testing/selftests/net/mptcp/userspace_pm.sh | ||
| 138 | @@ -XXX,XX +XXX,XX @@ | ||
| 139 | mptcp_lib_check_mptcp | ||
| 140 | mptcp_lib_check_kallsyms | ||
| 141 | |||
| 142 | -if ! mptcp_lib_has_file '/proc/sys/net/mptcp/pm_type'; then | ||
| 143 | +if ! mptcp_lib_has_file '/proc/sys/net/mptcp/path_manager'; then | ||
| 144 | echo "userspace pm tests are not supported by the kernel: SKIP" | ||
| 145 | exit ${KSFT_SKIP} | ||
| 146 | fi | ||
| 147 | @@ -XXX,XX +XXX,XX @@ trap cleanup EXIT | ||
| 148 | # Create and configure network namespaces for testing | ||
| 149 | mptcp_lib_ns_init ns1 ns2 | ||
| 150 | for i in "$ns1" "$ns2" ;do | ||
| 151 | - ip netns exec "$i" sysctl -q net.mptcp.pm_type=1 | ||
| 152 | + ip netns exec "$i" sysctl -q net.mptcp.path_manager="userspace" | ||
| 153 | done | ||
| 154 | |||
| 155 | # "$ns1" ns2 | ||
| 58 | -- | 156 | -- |
| 59 | 2.43.0 | 157 | 2.43.0 | diff view generated by jsdifflib |