mptcp: APIs and self-tests for userspace path management
Subsystems (3)
v6 cover mptcp: APIs and self-tests for userspace path management
This patch series brings together the base functionality and new netlink APIs for flexible path management from userspace. Further it extends the MPTCP self-testing framework to support the new netlink APIs along with the ability to capture MPTCP netlink events to aid in functional/behavioral validations. Lastly, it adds a self-testing script with a suite of test cases covering the entire range of the new userspace path management capabilities.
Note: This series depends on the prior patchset "mptcp: fixes and enhancements related to path management".
v5:
-Primary change over v4 is the reliance on userspace managed listener sockets for receiving MPJ requests. -Addressed CI reported issues.
v6:
-Put all distinct userspace PM related code into a separate compilation
unit: pm_userspace.c.
-Made a few internal helpers non-static (now declared in protocol.h) to facilitate the above change.
-Use the pm spinlock instead of mptcp_data_lock() to synchronize access to the per-msk local_addr_list.
Florian Westphal (2):
mptcp: netlink: split mptcp_pm_parse_addr into two functions
mptcp: netlink: allow userspace-driven subflow establishment
Kishen Maloor (12):
mptcp: allow ADD_ADDR reissuance by userspace PMs
mptcp: handle local addrs announced by userspace PMs
mptcp: read attributes of addr entries managed by userspace PMs
mptcp: netlink: Add MPTCP_PM_CMD_ANNOUNCE
selftests: mptcp: support MPTCP_PM_CMD_ANNOUNCE
mptcp: netlink: Add MPTCP_PM_CMD_REMOVE
selftests: mptcp: support MPTCP_PM_CMD_REMOVE
selftests: mptcp: support MPTCP_PM_CMD_SUBFLOW_CREATE
selftests: mptcp: support MPTCP_PM_CMD_SUBFLOW_DESTROY
selftests: mptcp: capture netlink events
selftests: mptcp: create listeners to receive MPJs
selftests: mptcp: functional tests for the userspace PM type
include/uapi/linux/mptcp.h | 7 + net/mptcp/Makefile | 2 +- net/mptcp/pm.c | 1 + net/mptcp/pm_netlink.c | 249 ++++-- net/mptcp/pm_userspace.c | 368 +++++++++ net/mptcp/protocol.c | 1 + net/mptcp/protocol.h | 35 +- net/mptcp/subflow.c | 2 +- tools/testing/selftests/net/mptcp/pm_nl_ctl.c | 645 ++++++++++++++- .../selftests/net/mptcp/userspace_pm.sh | 771 ++++++++++++++++++ 10 files changed, 1989 insertions(+), 92 deletions(-) create mode 100644 net/mptcp/pm_userspace.c create mode 100755 tools/testing/selftests/net/mptcp/userspace_pm.sh
base-commit: 8e1fca01ac83e646133bd647abdae74d6d6449ba
prerequisite-patch-id: ae42506131e46e03f020b722a856ace3304d53cc
prerequisite-patch-id: 5b76b4bf6d57927ad5590a1a9252fafda8d2a71a
prerequisite-patch-id: 4b1b25e0f761f6adf36c3d270faf86723019c2b4
prerequisite-patch-id: f7595549285182f6af1e46cb58e5ec317306a203
prerequisite-patch-id: 60e0fae2bad56928af787f76cfbf80a6e4a0f790
prerequisite-patch-id: a347386be396a7513fa37db5655441d459230ac6 --
2.31.1
PATCH v6 1/14 mptcp: allow ADD_ADDR reissuance by userspace PMs
This change allows userspace PM implementations to reissue ADD_ADDR announcements (if necessary) based on their chosen policy.
--- net/mptcp/pm_netlink.c | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-)
net/mptcp/pm_netlink.c +10 -2
@@ -362,8 +362,16 @@ static bool mptcp_pm_alloc_anno_list(struct mptcp_sock *msk,lockdep_assert_held (&msk->pm.lock); -if (mptcp_lookup_anno_list_by_saddr (msk, &entry->addr)) -return false; + add_entry =mptcp_lookup_anno_list_by_saddr (msk, &entry->addr); + +if (add_entry) { +if (mptcp_pm_is_kernel (msk)) +return false; + +sk_reset_timer (sk, &add_entry->add_timer, + jiffies +mptcp_get_add_addr_timeout (net)); +return true; + } add_entry =kmalloc (sizeof (*add_entry),GFP_ATOMIC );if (!add_entry)
Signature · 1 line
2.31.1
PATCH v6 2/14 mptcp: handle local addrs announced by userspace PMs
In reply to Kishen MaloorThis change adds an internal function to store/retrieve local addrs announced by userspace PM implementations to/from its kernel context. The function addresses the requirements of three scenarios:
1) ADD_ADDR announcements (which require that a local id be provided), 2) retrieving the local id associated with an address, and also where one may need to be assigned, and 3) reissuance of ADD_ADDRs when there's a successful match of addr/id.
The list of all stored local addr entries is held under the MPTCP sock structure. Memory for these entries is allocated from the sock option buffer, so the list of addrs is bounded by optmem_max. The list if not released via REMOVE_ADDR signals is ultimately freed when the sock is destructed.
---
v6:
-Move local_addr_list into struct mptcp_pm_data. -Replace mptcp_data_lock() with the pm spinlock. -Move mptcp_userspace_pm_append_new_local_addr() and mptcp_free_local_addr_list() into a new pm_userspace.c. -Make addresses_equal() helper non-static and rename to mptcp_addresses_equal().
--- net/mptcp/Makefile | 2 +- net/mptcp/pm.c | 1 + net/mptcp/pm_netlink.c | 34 +++++++++--------- net/mptcp/pm_userspace.c | 74 ++++++++++++++++++++++++++++++++++++++++ net/mptcp/protocol.c | 1 + net/mptcp/protocol.h | 7 ++++ 6 files changed, 101 insertions(+), 18 deletions(-) create mode 100644 net/mptcp/pm_userspace.c
net/mptcp/Makefile +1 -1
@@ -2,7 +2,7 @@ obj-$(CONFIG_MPTCP) += mptcp.o mptcp-y := protocol.o subflow.o options.o token.o crypto.o ctrl.o pm.o diag.o \ - mib.o pm_netlink.o sockopt.o + mib.o pm_netlink.o sockopt.o pm_userspace.o obj-$(CONFIG_SYN_COOKIES) += syncookies.o obj-$(CONFIG_INET_MPTCP_DIAG) += mptcp_diag.o
net/mptcp/pm.c +1 -0
@@ -469,6 +469,7 @@ void mptcp_pm_data_init(struct mptcp_sock *msk) {spin_lock_init (&msk->pm.lock);INIT_LIST_HEAD (&msk->pm.anno_list); +INIT_LIST_HEAD (&msk->pm.userspace_pm_local_addr_list);mptcp_pm_data_reset (msk); }
net/mptcp/pm_netlink.c +17 -17
@@ -55,8 +55,8 @@ struct pm_nl_pernet {#define MPTCP_PM_ADDR_MAX 8#define ADD_ADDR_RETRANS_MAX 3 -static bool addresses_equal (const struct mptcp_addr_info *a, -const struct mptcp_addr_info *b,bool use_port) +bool mptcp_addresses_equal (const struct mptcp_addr_info *a, +const struct mptcp_addr_info *b,bool use_port) {bool addr_equals = false;
@@ -120,7 +120,7 @@ static bool lookup_subflow_by_saddr(const struct list_head *list, skc = (struct sock_common *)mptcp_subflow_tcp_sock (subflow);local_address (skc, &cur); -if (addresses_equal (&cur, saddr, saddr->port)) +if (mptcp_addresses_equal (&cur, saddr, saddr->port))return true; }
@@ -138,7 +138,7 @@ static bool lookup_subflow_by_daddr(const struct list_head *list, skc = (struct sock_common *)mptcp_subflow_tcp_sock (subflow);remote_address (skc, &cur); -if (addresses_equal (&cur, daddr, daddr->port)) +if (mptcp_addresses_equal (&cur, daddr, daddr->port))return true; }
@@ -262,7 +262,7 @@ mptcp_lookup_anno_list_by_saddr(const struct mptcp_sock *msk,lockdep_assert_held (&msk->pm.lock);list_for_each_entry (entry, &msk->pm.anno_list, list) { -if (addresses_equal (&entry->addr, addr, true)) +if (mptcp_addresses_equal (&entry->addr, addr, true))return entry; }
@@ -279,7 +279,7 @@ bool mptcp_pm_sport_in_anno_list(struct mptcp_sock *msk, const struct sock *sk)spin_lock_bh (&msk->pm.lock);list_for_each_entry (entry, &msk->pm.anno_list, list) { -if (addresses_equal (&entry->addr, &saddr, true)) { +if (mptcp_addresses_equal (&entry->addr, &saddr, true)) { ret = true; goto out; }
@@ -414,7 +414,7 @@ static bool lookup_address_in_vec(const struct mptcp_addr_info *addrs, unsignedint i;for (i =0 ; i < nr; i++) { -if (addresses_equal (&addrs[i], addr, addr->port)) +if (mptcp_addresses_equal (&addrs[i], addr, addr->port))return true; }
@@ -450,7 +450,7 @@ static unsigned int fill_remote_addresses_vec(struct mptcp_sock *msk, bool fullmmptcp_for_each_subflow (msk, subflow) { ssk =mptcp_subflow_tcp_sock (subflow);remote_address ((struct sock_common *)ssk, &addrs[i]); -if (deny_id0 &&addresses_equal (&addrs[i], &remote, false)) +if (deny_id0 &&mptcp_addresses_equal (&addrs[i], &remote, false))continue ; if (!lookup_address_in_vec(addrs, i, &addrs[i]) &&
@@ -483,7 +483,7 @@ __lookup_addr(struct pm_nl_pernet *pernet, const struct mptcp_addr_info *info,struct mptcp_pm_addr_entry *entry;list_for_each_entry (entry, &pernet->local_addr_list, list) { -if ((!lookup_by_id &&addresses_equal (&entry->addr, info, true)) || +if ((!lookup_by_id &&mptcp_addresses_equal (&entry->addr, info, true)) || (lookup_by_id && entry->addr.id == info->id))return entry; }
@@ -498,7 +498,7 @@ lookup_id_by_addr(const struct pm_nl_pernet *pernet, const struct mptcp_addr_infrcu_read_lock ();list_for_each_entry (entry, &pernet->local_addr_list, list) { -if (addresses_equal (&entry->addr, addr, entry->addr.port)) { +if (mptcp_addresses_equal (&entry->addr, addr, entry->addr.port)) { ret = entry->addr.id;break ; }
@@ -732,7 +732,7 @@ static int mptcp_pm_nl_mp_prio_send_ack(struct mptcp_sock *msk,struct mptcp_addr_info local;local_address ((struct sock_common *)ssk, &local); -if (!addresses_equal (&local, addr, addr->port)) +if (!mptcp_addresses_equal (&local, addr, addr->port))continue ;if (subflow->backup != bkup)
@@ -902,9 +902,9 @@ static int mptcp_pm_nl_append_new_local_addr(struct pm_nl_pernet *pernet,* singled addresses */ list_for_each_entry (cur, &pernet->local_addr_list, list) { -if (addresses_equal (&cur->addr, &entry->addr, -address_use_port (entry) && -address_use_port (cur))) { +if (mptcp_addresses_equal (&cur->addr, &entry->addr, +address_use_port (entry) && +address_use_port (cur))) {/* allow replacing the exiting endpoint only if such * endpoint is an implicit one and the user-space * did not provide an endpoint id
@@ -1031,14 +1031,14 @@ int mptcp_pm_nl_get_local_id(struct mptcp_sock *msk, struct sock_common *skc)*/ local_address ((struct sock_common *)msk, &msk_local);local_address ((struct sock_common *)skc, &skc_local); -if (addresses_equal (&msk_local, &skc_local, false)) +if (mptcp_addresses_equal (&msk_local, &skc_local, false))return 0 ; pernet =net_generic (sock_net ((struct sock *)msk), pm_nl_pernet_id);rcu_read_lock ();list_for_each_entry_rcu (entry, &pernet->local_addr_list, list) { -if (addresses_equal (&entry->addr, &skc_local, entry->addr.port)) { +if (mptcp_addresses_equal (&entry->addr, &skc_local, entry->addr.port)) { ret = entry->addr.id;break ; }
@@ -1409,7 +1409,7 @@ static int mptcp_nl_remove_id_zero_address(struct net *net, goto next;local_address ((struct sock_common *)msk, &msk_local); -if (!addresses_equal (&msk_local, addr, addr->port)) +if (!mptcp_addresses_equal (&msk_local, addr, addr->port)) goto next;lock_sock (sk);
net/mptcp/pm_userspace.c new file +74 -0
74 lines not on this page · raw message
net/mptcp/protocol.c +1 -0
@@ -3103,6 +3103,7 @@ void mptcp_destroy_common(struct mptcp_sock *msk) msk->rmem_fwd_alloc =0 ;mptcp_token_destroy (msk);mptcp_pm_free_anno_list (msk); +mptcp_free_local_addr_list (msk); }static void mptcp_destroy (struct sock *sk)
net/mptcp/protocol.h +7 -0
@@ -208,6 +208,7 @@ struct mptcp_pm_data {struct mptcp_addr_info local;struct mptcp_addr_info remote;struct list_head anno_list; +struct list_head userspace_pm_local_addr_list;spinlock_t lock;/*protects the whole PM data */
@@ -601,6 +602,9 @@ void mptcp_subflow_reset(struct sock *ssk);void mptcp_sock_graft (struct sock *sk,struct socket *parent);struct socket *__mptcp_nmpc_socket (const struct mptcp_sock *msk); +bool mptcp_addresses_equal (const struct mptcp_addr_info *a, +const struct mptcp_addr_info *b,bool use_port); +/* called with sk socket lock held */ int __mptcp_subflow_connect (struct sock *sk,const struct mptcp_addr_info *loc,const struct mptcp_addr_info *remote);
@@ -779,6 +783,9 @@ int mptcp_pm_announce_addr(struct mptcp_sock *msk, bool echo);int mptcp_pm_remove_addr (struct mptcp_sock *msk,const struct mptcp_rm_list *rm_list);int mptcp_pm_remove_subflow (struct mptcp_sock *msk,const struct mptcp_rm_list *rm_list); +int mptcp_userspace_pm_append_new_local_addr (struct mptcp_sock *msk, +struct mptcp_pm_addr_entry *entry); +void mptcp_free_local_addr_list (struct mptcp_sock *msk);void mptcp_event (enum mptcp_event_type type,const struct mptcp_sock *msk,const struct sock *ssk,gfp_t gfp);
Signature · 1 line
2.31.1
Paolo Abeni
maintainerRe: [PATCH mptcp-next v6 02/14] mptcp: handle local addrs announced by userspace PMs
Quoted 290 lines · Kishen Maloor
This change adds an internal function to store/retrieve local addrs announced by userspace PM implementations to/from its kernel context. The function addresses the requirements of three scenarios:
1)ADD_ADDRannouncements (which require that a local id be provided), 2) retrieving the local id associated with an address, and also where one may need to be assigned, and 3) reissuance ofADD_ADDRswhen there's a successful match of addr/id.The list of all stored local addr entries is held under the MPTCP sock structure. Memory for these entries is allocated from the sock option buffer, so the list of addrs is bounded by
optmem_max. The list if not released viaREMOVE_ADDRsignals is ultimately freed when the sock is destructed.Signed-off-by Kishen Maloor <[email protected]>---
v6:(quoted diff) +0
-3-Move local_addr_list into struct mptcp_pm_data. -Replace mptcp_data_lock() with the pm spinlock. -Move mptcp_userspace_pm_append_new_local_addr() and
mptcp_free_local_addr_list()into a newpm_userspace.c. -Makeaddresses_equal()helper non-static and rename tomptcp_addresses_equal().--- net/mptcp/Makefile | 2 +- net/mptcp/pm.c | 1 + net/mptcp/pm_netlink.c | 34 +++++++++--------- net/mptcp/pm_userspace.c | 74 ++++++++++++++++++++++++++++++++++++++++ net/mptcp/protocol.c | 1 + net/mptcp/protocol.h | 7 ++++ 6 files changed, 101 insertions(+), 18 deletions(-) create mode 100644 net/mptcp/pm_userspace.cnet/mptcp/Makefile +1
-1@@ -2,7 +2,7 @@ obj-$(CONFIG_MPTCP) += mptcp.o mptcp-y := protocol.o subflow.o options.o token.o crypto.o ctrl.o pm.o diag.o \ - mib.o pm_netlink.o sockopt.o + mib.o pm_netlink.o sockopt.o pm_userspace.o obj-$(CONFIG_SYN_COOKIES) += syncookies.o obj-$(CONFIG_INET_MPTCP_DIAG) += mptcp_diag.onet/mptcp/pm.c +1
-0@@ -469,6 +469,7 @@ void mptcp_pm_data_init(struct mptcp_sock *msk) {spin_lock_init (&msk->pm.lock);INIT_LIST_HEAD (&msk->pm.anno_list); +INIT_LIST_HEAD (&msk->pm.userspace_pm_local_addr_list);mptcp_pm_data_reset (msk); }net/mptcp/pm_netlink.c +17
-17@@ -55,8 +55,8 @@ struct pm_nl_pernet {#define MPTCP_PM_ADDR_MAX 8#define ADD_ADDR_RETRANS_MAX 3 -static bool addresses_equal (const struct mptcp_addr_info *a, -const struct mptcp_addr_info *b,bool use_port) +bool mptcp_addresses_equal (const struct mptcp_addr_info *a, +const struct mptcp_addr_info *b,bool use_port) {bool addr_equals = false;@@ -120,7 +120,7 @@ static bool lookup_subflow_by_saddr(const struct list_head *list, skc = (struct sock_common *)mptcp_subflow_tcp_sock (subflow);local_address (skc, &cur); -if (addresses_equal (&cur, saddr, saddr->port)) +if (mptcp_addresses_equal (&cur, saddr, saddr->port))return true; }@@ -138,7 +138,7 @@ static bool lookup_subflow_by_daddr(const struct list_head *list, skc = (struct sock_common *)mptcp_subflow_tcp_sock (subflow);remote_address (skc, &cur); -if (addresses_equal (&cur, daddr, daddr->port)) +if (mptcp_addresses_equal (&cur, daddr, daddr->port))return true; }@@ -262,7 +262,7 @@ mptcp_lookup_anno_list_by_saddr(const struct mptcp_sock *msk,lockdep_assert_held (&msk->pm.lock);list_for_each_entry (entry, &msk->pm.anno_list, list) { -if (addresses_equal (&entry->addr, addr, true)) +if (mptcp_addresses_equal (&entry->addr, addr, true))return entry; }@@ -279,7 +279,7 @@ bool mptcp_pm_sport_in_anno_list(struct mptcp_sock *msk, const struct sock *sk)spin_lock_bh (&msk->pm.lock);list_for_each_entry (entry, &msk->pm.anno_list, list) { -if (addresses_equal (&entry->addr, &saddr, true)) { +if (mptcp_addresses_equal (&entry->addr, &saddr, true)) { ret = true; goto out; }@@ -414,7 +414,7 @@ static bool lookup_address_in_vec(const struct mptcp_addr_info *addrs, unsignedint i;for (i =0 ; i < nr; i++) { -if (addresses_equal (&addrs[i], addr, addr->port)) +if (mptcp_addresses_equal (&addrs[i], addr, addr->port))return true; }@@ -450,7 +450,7 @@ static unsigned int fill_remote_addresses_vec(struct mptcp_sock *msk, bool fullmmptcp_for_each_subflow (msk, subflow) { ssk =mptcp_subflow_tcp_sock (subflow);remote_address ((struct sock_common *)ssk, &addrs[i]); -if (deny_id0 &&addresses_equal (&addrs[i], &remote, false)) +if (deny_id0 &&mptcp_addresses_equal (&addrs[i], &remote, false))continue ; if (!lookup_address_in_vec(addrs, i, &addrs[i]) &&@@ -483,7 +483,7 @@ __lookup_addr(struct pm_nl_pernet *pernet, const struct mptcp_addr_info *info,struct mptcp_pm_addr_entry *entry;list_for_each_entry (entry, &pernet->local_addr_list, list) { -if ((!lookup_by_id &&addresses_equal (&entry->addr, info, true)) || +if ((!lookup_by_id &&mptcp_addresses_equal (&entry->addr, info, true)) || (lookup_by_id && entry->addr.id == info->id))return entry; }@@ -498,7 +498,7 @@ lookup_id_by_addr(const struct pm_nl_pernet *pernet, const struct mptcp_addr_infrcu_read_lock ();list_for_each_entry (entry, &pernet->local_addr_list, list) { -if (addresses_equal (&entry->addr, addr, entry->addr.port)) { +if (mptcp_addresses_equal (&entry->addr, addr, entry->addr.port)) { ret = entry->addr.id;break ; }@@ -732,7 +732,7 @@ static int mptcp_pm_nl_mp_prio_send_ack(struct mptcp_sock *msk,struct mptcp_addr_info local;local_address ((struct sock_common *)ssk, &local); -if (!addresses_equal (&local, addr, addr->port)) +if (!mptcp_addresses_equal (&local, addr, addr->port))continue ;if (subflow->backup != bkup)@@ -902,9 +902,9 @@ static int mptcp_pm_nl_append_new_local_addr(struct pm_nl_pernet *pernet,* singled addresses */ list_for_each_entry (cur, &pernet->local_addr_list, list) { -if (addresses_equal (&cur->addr, &entry->addr, -address_use_port (entry) && -address_use_port (cur))) { +if (mptcp_addresses_equal (&cur->addr, &entry->addr, +address_use_port (entry) && +address_use_port (cur))) {/* allow replacing the exiting endpoint only if such * endpoint is an implicit one and the user-space * did not provide an endpoint id @@ -1031,14 +1031,14 @@ int mptcp_pm_nl_get_local_id(struct mptcp_sock *msk, struct sock_common *skc)*/ local_address ((struct sock_common *)msk, &msk_local);local_address ((struct sock_common *)skc, &skc_local); -if (addresses_equal (&msk_local, &skc_local, false)) +if (mptcp_addresses_equal (&msk_local, &skc_local, false))return 0 ; pernet =net_generic (sock_net ((struct sock *)msk), pm_nl_pernet_id);rcu_read_lock ();list_for_each_entry_rcu (entry, &pernet->local_addr_list, list) { -if (addresses_equal (&entry->addr, &skc_local, entry->addr.port)) { +if (mptcp_addresses_equal (&entry->addr, &skc_local, entry->addr.port)) { ret = entry->addr.id;break ; }@@ -1409,7 +1409,7 @@ static int mptcp_nl_remove_id_zero_address(struct net *net, goto next;local_address ((struct sock_common *)msk, &msk_local); -if (!addresses_equal (&msk_local, addr, addr->port)) +if (!mptcp_addresses_equal (&msk_local, addr, addr->port)) goto next;lock_sock (sk);net/mptcp/pm_userspace.c new file +74
-0@@ -0,0 +1,74 @@ +// SPDX-License-Identifier: GPL-2.0 + +#include "protocol.h" + +void mptcp_free_local_addr_list (struct mptcp_sock *msk) +{ +struct mptcp_pm_addr_entry *entry, *tmp; +struct sock *sk = (struct sock *)msk; +LIST_HEAD (free_list); + +if (!mptcp_pm_is_userspace (msk)) +return ; + +spin_lock_bh (&msk->pm.lock); +list_splice_init (&msk->pm.userspace_pm_local_addr_list, &free_list); +spin_unlock_bh (&msk->pm.lock); + +list_for_each_entry_safe (entry, tmp, &free_list, list) { +sock_kfree_s (sk, entry,sizeof (*entry)); + } +} + +int mptcp_userspace_pm_append_new_local_addr (struct mptcp_sock *msk, +struct mptcp_pm_addr_entry *entry) +{ +DECLARE_BITMAP (id_bitmap,MPTCP_PM_MAX_ADDR_ID +1 ); +struct mptcp_pm_addr_entry *match =NULL ; +struct sock *sk = (struct sock *)msk; +struct mptcp_pm_addr_entry *e; +bool addr_match = false; +bool id_match = false; +int ret = -EINVAL ; + +bitmap_zero (id_bitmap,MPTCP_PM_MAX_ADDR_ID +1 ); + +spin_lock_bh (&msk->pm.lock); +list_for_each_entry (e, &msk->pm.userspace_pm_local_addr_list, list) { + addr_match =mptcp_addresses_equal (&e->addr, &entry->addr, true); +if (addr_match && entry->addr.id ==0 ) + entry->addr.id = e->addr.id; + id_match = (e->addr.id == entry->addr.id); +if (addr_match && id_match) { + match = e; +break ; + }else if (addr_match || id_match) { +break ; + } +__set_bit (e->addr.id, id_bitmap); + } + +if (!match && !addr_match && !id_match) { +/* Memory for the entry is allocated from the +* sock option buffer. +*/ + e =sock_kmalloc (sk,sizeof (*e),GFP_ATOMIC ); +if (!e) { +spin_unlock_bh (&msk->pm.lock); +return -ENOMEM ; + } + + *e = *entry; +if (!e->addr.id) + e->addr.id =find_next_zero_bit (id_bitmap, +MPTCP_PM_MAX_ADDR_ID +1 , +1 ); +list_add_tail_rcu (&e->list, &msk->pm.userspace_pm_local_addr_list); + ret = e->addr.id; + }else if (match) { + ret = entry->addr.id; + } + +spin_unlock_bh (&msk->pm.lock); +return ret; +}net/mptcp/protocol.c +1
-0@@ -3103,6 +3103,7 @@ void mptcp_destroy_common(struct mptcp_sock *msk) msk->rmem_fwd_alloc =0 ;mptcp_token_destroy (msk);mptcp_pm_free_anno_list (msk); +mptcp_free_local_addr_list (msk); }static void mptcp_destroy (struct sock *sk)net/mptcp/protocol.h +0
-0
net/mptcp/protocol.h struct mptcp_pm_data { · line 211
Quoted 4 lines
net/mptcp/protocol.h +1
-0@@ -208,6 +208,7 @@ struct mptcp_pm_data {struct mptcp_addr_info local;struct mptcp_addr_info remote;struct list_head anno_list; +struct list_head userspace_pm_local_addr_list;
It looks like anno_list is never used when the user-space PM is enabled
- and userspace_pm_local_addr_list is never used by the NL PM.
What about reusing the same, single field? Ev. using an union, but not strictly needed, since in both case this contains addresses [to be] announced, right?
I really think we should avoid adding more data to the msk struct for user-space PM consumption only, it's really counterintuitive.
Thanks
Paolo
Re: [PATCH mptcp-next v6 02/14] mptcp: handle local addrs announced by userspace PMs
Quoted 299 lines · Paolo Abeni
Quoted 290 lines · Kishen Maloor
This change adds an internal function to store/retrieve local addrs announced by userspace PM implementations to/from its kernel context. The function addresses the requirements of three scenarios:
1)ADD_ADDRannouncements (which require that a local id be provided), 2) retrieving the local id associated with an address, and also where one may need to be assigned, and 3) reissuance ofADD_ADDRswhen there's a successful match of addr/id.The list of all stored local addr entries is held under the MPTCP sock structure. Memory for these entries is allocated from the sock option buffer, so the list of addrs is bounded by
optmem_max. The list if not released viaREMOVE_ADDRsignals is ultimately freed when the sock is destructed.Signed-off-by Kishen Maloor <[email protected]>---
v6:(quoted diff) +0
-3-Move local_addr_list into struct mptcp_pm_data. -Replace mptcp_data_lock() with the pm spinlock. -Move mptcp_userspace_pm_append_new_local_addr() and
mptcp_free_local_addr_list()into a newpm_userspace.c. -Makeaddresses_equal()helper non-static and rename tomptcp_addresses_equal().--- net/mptcp/Makefile | 2 +- net/mptcp/pm.c | 1 + net/mptcp/pm_netlink.c | 34 +++++++++--------- net/mptcp/pm_userspace.c | 74 ++++++++++++++++++++++++++++++++++++++++ net/mptcp/protocol.c | 1 + net/mptcp/protocol.h | 7 ++++ 6 files changed, 101 insertions(+), 18 deletions(-) create mode 100644 net/mptcp/pm_userspace.cnet/mptcp/Makefile +1
-1@@ -2,7 +2,7 @@ obj-$(CONFIG_MPTCP) += mptcp.o mptcp-y := protocol.o subflow.o options.o token.o crypto.o ctrl.o pm.o diag.o \ - mib.o pm_netlink.o sockopt.o + mib.o pm_netlink.o sockopt.o pm_userspace.o obj-$(CONFIG_SYN_COOKIES) += syncookies.o obj-$(CONFIG_INET_MPTCP_DIAG) += mptcp_diag.onet/mptcp/pm.c +1
-0@@ -469,6 +469,7 @@ void mptcp_pm_data_init(struct mptcp_sock *msk) {spin_lock_init (&msk->pm.lock);INIT_LIST_HEAD (&msk->pm.anno_list); +INIT_LIST_HEAD (&msk->pm.userspace_pm_local_addr_list);mptcp_pm_data_reset (msk); }net/mptcp/pm_netlink.c +17
-17@@ -55,8 +55,8 @@ struct pm_nl_pernet {#define MPTCP_PM_ADDR_MAX 8#define ADD_ADDR_RETRANS_MAX 3 -static bool addresses_equal (const struct mptcp_addr_info *a, -const struct mptcp_addr_info *b,bool use_port) +bool mptcp_addresses_equal (const struct mptcp_addr_info *a, +const struct mptcp_addr_info *b,bool use_port) {bool addr_equals = false;@@ -120,7 +120,7 @@ static bool lookup_subflow_by_saddr(const struct list_head *list, skc = (struct sock_common *)mptcp_subflow_tcp_sock (subflow);local_address (skc, &cur); -if (addresses_equal (&cur, saddr, saddr->port)) +if (mptcp_addresses_equal (&cur, saddr, saddr->port))return true; }@@ -138,7 +138,7 @@ static bool lookup_subflow_by_daddr(const struct list_head *list, skc = (struct sock_common *)mptcp_subflow_tcp_sock (subflow);remote_address (skc, &cur); -if (addresses_equal (&cur, daddr, daddr->port)) +if (mptcp_addresses_equal (&cur, daddr, daddr->port))return true; }@@ -262,7 +262,7 @@ mptcp_lookup_anno_list_by_saddr(const struct mptcp_sock *msk,lockdep_assert_held (&msk->pm.lock);list_for_each_entry (entry, &msk->pm.anno_list, list) { -if (addresses_equal (&entry->addr, addr, true)) +if (mptcp_addresses_equal (&entry->addr, addr, true))return entry; }@@ -279,7 +279,7 @@ bool mptcp_pm_sport_in_anno_list(struct mptcp_sock *msk, const struct sock *sk)spin_lock_bh (&msk->pm.lock);list_for_each_entry (entry, &msk->pm.anno_list, list) { -if (addresses_equal (&entry->addr, &saddr, true)) { +if (mptcp_addresses_equal (&entry->addr, &saddr, true)) { ret = true; goto out; }@@ -414,7 +414,7 @@ static bool lookup_address_in_vec(const struct mptcp_addr_info *addrs, unsignedint i;for (i =0 ; i < nr; i++) { -if (addresses_equal (&addrs[i], addr, addr->port)) +if (mptcp_addresses_equal (&addrs[i], addr, addr->port))return true; }@@ -450,7 +450,7 @@ static unsigned int fill_remote_addresses_vec(struct mptcp_sock *msk, bool fullmmptcp_for_each_subflow (msk, subflow) { ssk =mptcp_subflow_tcp_sock (subflow);remote_address ((struct sock_common *)ssk, &addrs[i]); -if (deny_id0 &&addresses_equal (&addrs[i], &remote, false)) +if (deny_id0 &&mptcp_addresses_equal (&addrs[i], &remote, false))continue ; if (!lookup_address_in_vec(addrs, i, &addrs[i]) &&@@ -483,7 +483,7 @@ __lookup_addr(struct pm_nl_pernet *pernet, const struct mptcp_addr_info *info,struct mptcp_pm_addr_entry *entry;list_for_each_entry (entry, &pernet->local_addr_list, list) { -if ((!lookup_by_id &&addresses_equal (&entry->addr, info, true)) || +if ((!lookup_by_id &&mptcp_addresses_equal (&entry->addr, info, true)) || (lookup_by_id && entry->addr.id == info->id))return entry; }@@ -498,7 +498,7 @@ lookup_id_by_addr(const struct pm_nl_pernet *pernet, const struct mptcp_addr_infrcu_read_lock ();list_for_each_entry (entry, &pernet->local_addr_list, list) { -if (addresses_equal (&entry->addr, addr, entry->addr.port)) { +if (mptcp_addresses_equal (&entry->addr, addr, entry->addr.port)) { ret = entry->addr.id;break ; }@@ -732,7 +732,7 @@ static int mptcp_pm_nl_mp_prio_send_ack(struct mptcp_sock *msk,struct mptcp_addr_info local;local_address ((struct sock_common *)ssk, &local); -if (!addresses_equal (&local, addr, addr->port)) +if (!mptcp_addresses_equal (&local, addr, addr->port))continue ;if (subflow->backup != bkup)@@ -902,9 +902,9 @@ static int mptcp_pm_nl_append_new_local_addr(struct pm_nl_pernet *pernet,* singled addresses */ list_for_each_entry (cur, &pernet->local_addr_list, list) { -if (addresses_equal (&cur->addr, &entry->addr, -address_use_port (entry) && -address_use_port (cur))) { +if (mptcp_addresses_equal (&cur->addr, &entry->addr, +address_use_port (entry) && +address_use_port (cur))) {/* allow replacing the exiting endpoint only if such * endpoint is an implicit one and the user-space * did not provide an endpoint id @@ -1031,14 +1031,14 @@ int mptcp_pm_nl_get_local_id(struct mptcp_sock *msk, struct sock_common *skc)*/ local_address ((struct sock_common *)msk, &msk_local);local_address ((struct sock_common *)skc, &skc_local); -if (addresses_equal (&msk_local, &skc_local, false)) +if (mptcp_addresses_equal (&msk_local, &skc_local, false))return 0 ; pernet =net_generic (sock_net ((struct sock *)msk), pm_nl_pernet_id);rcu_read_lock ();list_for_each_entry_rcu (entry, &pernet->local_addr_list, list) { -if (addresses_equal (&entry->addr, &skc_local, entry->addr.port)) { +if (mptcp_addresses_equal (&entry->addr, &skc_local, entry->addr.port)) { ret = entry->addr.id;break ; }@@ -1409,7 +1409,7 @@ static int mptcp_nl_remove_id_zero_address(struct net *net, goto next;local_address ((struct sock_common *)msk, &msk_local); -if (!addresses_equal (&msk_local, addr, addr->port)) +if (!mptcp_addresses_equal (&msk_local, addr, addr->port)) goto next;lock_sock (sk);net/mptcp/pm_userspace.c new file +74
-0@@ -0,0 +1,74 @@ +// SPDX-License-Identifier: GPL-2.0 + +#include "protocol.h" + +void mptcp_free_local_addr_list (struct mptcp_sock *msk) +{ +struct mptcp_pm_addr_entry *entry, *tmp; +struct sock *sk = (struct sock *)msk; +LIST_HEAD (free_list); + +if (!mptcp_pm_is_userspace (msk)) +return ; + +spin_lock_bh (&msk->pm.lock); +list_splice_init (&msk->pm.userspace_pm_local_addr_list, &free_list); +spin_unlock_bh (&msk->pm.lock); + +list_for_each_entry_safe (entry, tmp, &free_list, list) { +sock_kfree_s (sk, entry,sizeof (*entry)); + } +} + +int mptcp_userspace_pm_append_new_local_addr (struct mptcp_sock *msk, +struct mptcp_pm_addr_entry *entry) +{ +DECLARE_BITMAP (id_bitmap,MPTCP_PM_MAX_ADDR_ID +1 ); +struct mptcp_pm_addr_entry *match =NULL ; +struct sock *sk = (struct sock *)msk; +struct mptcp_pm_addr_entry *e; +bool addr_match = false; +bool id_match = false; +int ret = -EINVAL ; + +bitmap_zero (id_bitmap,MPTCP_PM_MAX_ADDR_ID +1 ); + +spin_lock_bh (&msk->pm.lock); +list_for_each_entry (e, &msk->pm.userspace_pm_local_addr_list, list) { + addr_match =mptcp_addresses_equal (&e->addr, &entry->addr, true); +if (addr_match && entry->addr.id ==0 ) + entry->addr.id = e->addr.id; + id_match = (e->addr.id == entry->addr.id); +if (addr_match && id_match) { + match = e; +break ; + }else if (addr_match || id_match) { +break ; + } +__set_bit (e->addr.id, id_bitmap); + } + +if (!match && !addr_match && !id_match) { +/* Memory for the entry is allocated from the +* sock option buffer. +*/ + e =sock_kmalloc (sk,sizeof (*e),GFP_ATOMIC ); +if (!e) { +spin_unlock_bh (&msk->pm.lock); +return -ENOMEM ; + } + + *e = *entry; +if (!e->addr.id) + e->addr.id =find_next_zero_bit (id_bitmap, +MPTCP_PM_MAX_ADDR_ID +1 , +1 ); +list_add_tail_rcu (&e->list, &msk->pm.userspace_pm_local_addr_list); + ret = e->addr.id; + }else if (match) { + ret = entry->addr.id; + } + +spin_unlock_bh (&msk->pm.lock); +return ret; +}net/mptcp/protocol.c +1
-0@@ -3103,6 +3103,7 @@ void mptcp_destroy_common(struct mptcp_sock *msk) msk->rmem_fwd_alloc =0 ;mptcp_token_destroy (msk);mptcp_pm_free_anno_list (msk); +mptcp_free_local_addr_list (msk); }static void mptcp_destroy (struct sock *sk)net/mptcp/protocol.h +0
-0net/mptcp/protocol.h struct mptcp_pm_data { · line 211
Quoted 4 lines
net/mptcp/protocol.h +1
-0@@ -208,6 +208,7 @@ struct mptcp_pm_data {struct mptcp_addr_info local;struct mptcp_addr_info remote;struct list_head anno_list; +struct list_head userspace_pm_local_addr_list;It looks like
anno_listis never used when the user-space PM is enabled
- anduserspace_pm_local_addr_listis never used by the NL PM.
Quoted 6 lines
What about reusing the same, single field? Ev. using an union, but not strictly needed, since in both case this contains addresses [to be] announced, right?
I really think we should avoid adding more data to the msk struct for user-space PM consumption only, it's really counterintuitive.
anno_list is used by both PMs to store struct mptcp_pm_add_entry entries.
userspace_pm_local_addr_list is used only to store per-msk struct mptcp_pm_addr_entry entries that were populated by the userspace PM.
Unfortunately the local_addr_list used by the in-kernel PM is in the pm_nl_pernet structure.
Re: [PATCH mptcp-next v6 02/14] mptcp: handle local addrs announced by userspace PMs
In reply to Kishen MaloorQuoted 63 lines · Kishen Maloor
This change adds an internal function to store/retrieve local addrs announced by userspace PM implementations to/from its kernel context. The function addresses the requirements of three scenarios:
1)ADD_ADDRannouncements (which require that a local id be provided), 2) retrieving the local id associated with an address, and also where one may need to be assigned, and 3) reissuance ofADD_ADDRswhen there's a successful match of addr/id.The list of all stored local addr entries is held under the MPTCP sock structure. Memory for these entries is allocated from the sock option buffer, so the list of addrs is bounded by
optmem_max. The list if not released viaREMOVE_ADDRsignals is ultimately freed when the sock is destructed.Signed-off-by Kishen Maloor <[email protected]>---
v6:(quoted diff) +0
-3-Move local_addr_list into struct mptcp_pm_data. -Replace mptcp_data_lock() with the pm spinlock. -Move mptcp_userspace_pm_append_new_local_addr() and
mptcp_free_local_addr_list()into a newpm_userspace.c. -Makeaddresses_equal()helper non-static and rename tomptcp_addresses_equal().
---net/mptcp/Makefile | 2 +- net/mptcp/pm.c | 1 + net/mptcp/pm_netlink.c | 34 +++++++++--------- net/mptcp/pm_userspace.c | 74 ++++++++++++++++++++++++++++++++++++++++ net/mptcp/protocol.c | 1 + net/mptcp/protocol.h | 7 ++++ 6 files changed, 101 insertions(+), 18 deletions(-)create mode 100644
net/mptcp/pm_userspace.cnet/mptcp/Makefile +0
-0@@ -2,7 +2,7 @@obj-$(CONFIG_MPTCP) += mptcp.o
mptcp-y := protocol.o subflow.o options.o token.o crypto.o ctrl.o pm.o diag.o \
net/mptcp/Makefile +1
-1- mib.o pm_netlink.o sockopt.o + mib.o pm_netlink.o sockopt.o pm_userspace.oobj-$(CONFIG_SYN_COOKIES) += syncookies.o
obj-$(CONFIG_INET_MPTCP_DIAG) += mptcp_diag.onet/mptcp/pm.c +1
-0@@ -469,6 +469,7 @@ void mptcp_pm_data_init(struct mptcp_sock *msk) {spin_lock_init (&msk->pm.lock);INIT_LIST_HEAD (&msk->pm.anno_list); +INIT_LIST_HEAD (&msk->pm.userspace_pm_local_addr_list);mptcp_pm_data_reset (msk); }net/mptcp/pm_netlink.c +0
-0
net/mptcp/pm_netlink.c struct pm_nl_pernet { · line 59
Quoted 7 lines
net/mptcp/pm_netlink.c +2
-2@@ -55,8 +55,8 @@ struct pm_nl_pernet {#define MPTCP_PM_ADDR_MAX 8#define ADD_ADDR_RETRANS_MAX 3 -static bool addresses_equal (const struct mptcp_addr_info *a, -const struct mptcp_addr_info *b,bool use_port) +bool mptcp_addresses_equal (const struct mptcp_addr_info *a, +const struct mptcp_addr_info *b,bool use_port)
There's a minor conflict with the export branch here after the get_pernet helpers were added. I know you're planning a rebase but figured I'd capture it here on the ML.
--
Mat Martineau
Intel
PATCH v6 3/14 mptcp: read attributes of addr entries managed by userspace PMs
In reply to Kishen MaloorThis change introduces a parallel path in the kernel for retrieving the local id, flags, if_index for an addr entry in the context of an MPTCP connection that's being managed by a userspace PM. The userspace and in-kernel PM modes deviate in their procedures for obtaining this information.
--- net/mptcp/pm_netlink.c | 95 ++++++++++++++++++++++++++++-------------- net/mptcp/protocol.h | 3 +- net/mptcp/subflow.c | 2 +- 3 files changed, 67 insertions(+), 33 deletions(-)
net/mptcp/pm_netlink.c +64 -31
@@ -1036,31 +1036,47 @@ int mptcp_pm_nl_get_local_id(struct mptcp_sock *msk, struct sock_common *skc) pernet =net_generic (sock_net ((struct sock *)msk), pm_nl_pernet_id); -rcu_read_lock (); -list_for_each_entry_rcu (entry, &pernet->local_addr_list, list) { -if (mptcp_addresses_equal (&entry->addr, &skc_local, entry->addr.port)) { - ret = entry->addr.id; -break ; +if (mptcp_pm_is_kernel (msk)) { +rcu_read_lock (); +list_for_each_entry_rcu (entry, &pernet->local_addr_list, list) { +if (mptcp_addresses_equal (&entry->addr, &skc_local, entry->addr.port)) { + ret = entry->addr.id; +break ; + } } +rcu_read_unlock (); +if (ret >=0 ) +return ret; + +/* address not found, add to local list */ + entry =kmalloc (sizeof (*entry),GFP_ATOMIC ); +if (!entry) +return -ENOMEM ; + + entry->addr = skc_local; + entry->addr.id =0 ; + entry->addr.port =0 ; + entry->ifindex =0 ; + entry->flags =MPTCP_PM_ADDR_FLAG_IMPLICIT ; + entry->lsk =NULL ; + ret =mptcp_pm_nl_append_new_local_addr (pernet, entry); +if (ret <0 ) +kfree (entry); + }else if (mptcp_pm_is_userspace (msk)) { +struct mptcp_pm_addr_entry new_entry; +__be16 msk_sport = ((struct inet_sock *) +inet_sk ((struct sock *)msk))->inet_sport; + +memset (&new_entry,0 ,sizeof (struct mptcp_pm_addr_entry )); + new_entry.addr = skc_local; + new_entry.addr.id =0 ; + new_entry.flags =MPTCP_PM_ADDR_FLAG_IMPLICIT ; + +if (new_entry.addr.port == msk_sport) + new_entry.addr.port =0 ; + + ret =mptcp_userspace_pm_append_new_local_addr (msk, &new_entry); } -rcu_read_unlock (); -if (ret >=0 ) -return ret; - -/* address not found, add to local list */ - entry =kmalloc (sizeof (*entry),GFP_ATOMIC ); -if (!entry) -return -ENOMEM ; - - entry->addr = skc_local; - entry->addr.id =0 ; - entry->addr.port =0 ; - entry->ifindex =0 ; - entry->flags =MPTCP_PM_ADDR_FLAG_IMPLICIT ; - entry->lsk =NULL ; - ret =mptcp_pm_nl_append_new_local_addr (pernet, entry); -if (ret <0 ) -kfree (entry);return ret; }
@@ -1298,22 +1314,39 @@ static int mptcp_nl_cmd_add_addr(struct sk_buff *skb, struct genl_info *info)return 0 ; } -int mptcp_pm_get_flags_and_ifindex_by_id (struct net *net,unsigned int id, +int mptcp_pm_get_flags_and_ifindex_by_id (struct mptcp_sock *msk,unsigned int id,u8 *flags,int *ifindex) { -struct mptcp_pm_addr_entry *entry; +struct mptcp_pm_addr_entry *entry, *match =NULL ; +struct sock *sk = (struct sock *)msk; +struct net *net =sock_net (sk); *flags =0 ; *ifindex =0 ;if (id) { -rcu_read_lock (); - entry =__lookup_addr_by_id (net_generic (net, pm_nl_pernet_id), id); -if (entry) { - *flags = entry->flags; - *ifindex = entry->ifindex; +if (mptcp_pm_is_kernel (msk)) { +rcu_read_lock (); + entry =__lookup_addr_by_id (net_generic (net, pm_nl_pernet_id), id); +if (entry) { + *flags = entry->flags; + *ifindex = entry->ifindex; + } +rcu_read_unlock (); + }else { +spin_lock_bh (&msk->pm.lock); +list_for_each_entry (entry, &msk->pm.userspace_pm_local_addr_list, list) { +if (id == entry->addr.id) { + match = entry; +break ; + } + } +spin_unlock_bh (&msk->pm.lock); +if (match) { + *flags = match->flags; + *ifindex = match->ifindex; + } } -rcu_read_unlock (); }return 0 ;
net/mptcp/protocol.h +2 -1
@@ -775,7 +775,8 @@ mptcp_pm_del_add_timer(struct mptcp_sock *msk,struct mptcp_pm_add_entry *mptcp_lookup_anno_list_by_saddr (const struct mptcp_sock *msk,const struct mptcp_addr_info *addr); -int mptcp_pm_get_flags_and_ifindex_by_id (struct net *net,unsigned int id, +int mptcp_pm_get_flags_and_ifindex_by_id (struct mptcp_sock *msk, +unsigned int id,u8 *flags,int *ifindex); int mptcp_pm_announce_addr(struct mptcp_sock *msk,
net/mptcp/subflow.c +1 -1
@@ -1468,7 +1468,7 @@ int __mptcp_subflow_connect(struct sock *sk, const struct mptcp_addr_info *loc,if (local_id)subflow_set_local_id (subflow, local_id); -mptcp_pm_get_flags_and_ifindex_by_id (sock_net (sk), local_id, +mptcp_pm_get_flags_and_ifindex_by_id (msk, local_id, &flags, &ifindex); subflow->remote_key = msk->remote_key; subflow->local_key = msk->local_key;
Signature · 1 line
2.31.1
Paolo Abeni
maintainerRe: [PATCH mptcp-next v6 03/14] mptcp: read attributes of addr entries managed by userspace PMs
Quoted 5 lines · Kishen Maloor
This change introduces a parallel path in the kernel for retrieving the local id, flags,
if_indexfor an addr entry in the context of an MPTCP connection that's being managed by a userspace PM. The userspace and in-kernel PM modes deviate in their procedures for obtaining this information.
I'm sorry, but I was not able to give feedback earlier. I really think it would be better do the 'if (mptcp_pm_is_kernel(msk))' in a thin layer, and add the new code into pm_userspace.c
e.g. this patch has a relatively large diffstat because quite a bit of existing code is just re-indented, with the proposed schema that will be avoided.
Thanks!
Paolo
Re: [PATCH mptcp-next v6 03/14] mptcp: read attributes of addr entries managed by userspace PMs
Quoted 7 lines · Paolo Abeni
Quoted 5 lines · Kishen Maloor
This change introduces a parallel path in the kernel for retrieving the local id, flags,
if_indexfor an addr entry in the context of an MPTCP connection that's being managed by a userspace PM. The userspace and in-kernel PM modes deviate in their procedures for obtaining this information.
Quoted 7 lines
I'm sorry, but I was not able to give feedback earlier. I really think it would be better do the 'if (
mptcp_pm_is_kernel(msk))' in a thin layer, and add the new code intopm_userspace.ce.g. this patch has a relatively large diffstat because quite a bit of existing code is just re-indented, with the proposed schema that will be avoided.
I have moved code from the 2 functions that had explicit in-kernel vs userspace PM branches into matching functions inside pm_userspace.c. Hopefully that makes it cleaner.
Quoted 5 lines
Thanks!
Paolo
Re: [PATCH mptcp-next v6 03/14] mptcp: read attributes of addr entries managed by userspace PMs
In reply to Kishen MaloorQuoted 103 lines · Kishen Maloor
This change introduces a parallel path in the kernel for retrieving the local id, flags,
if_indexfor an addr entry in the context of an MPTCP connection that's being managed by a userspace PM. The userspace and in-kernel PM modes deviate in their procedures for obtaining this information.Signed-off-by Kishen Maloor <[email protected]>---
net/mptcp/pm_netlink.c | 95 ++++++++++++++++++++++++++++-------------- net/mptcp/protocol.h | 3 +- net/mptcp/subflow.c | 2 +- 3 files changed, 67 insertions(+), 33 deletions(-)net/mptcp/pm_netlink.c +43
-25@@ -1036,31 +1036,47 @@ int mptcp_pm_nl_get_local_id(struct mptcp_sock *msk, struct sock_common *skc) pernet =net_generic (sock_net ((struct sock *)msk), pm_nl_pernet_id); -rcu_read_lock (); -list_for_each_entry_rcu (entry, &pernet->local_addr_list, list) { -if (mptcp_addresses_equal (&entry->addr, &skc_local, entry->addr.port)) { - ret = entry->addr.id; -break ; +if (mptcp_pm_is_kernel (msk)) { +rcu_read_lock (); +list_for_each_entry_rcu (entry, &pernet->local_addr_list, list) { +if (mptcp_addresses_equal (&entry->addr, &skc_local, entry->addr.port)) { + ret = entry->addr.id; +break ; + } } +rcu_read_unlock (); +if (ret >=0 ) +return ret; + +/* address not found, add to local list */ + entry =kmalloc (sizeof (*entry),GFP_ATOMIC ); +if (!entry) +return -ENOMEM ; + + entry->addr = skc_local; + entry->addr.id =0 ; + entry->addr.port =0 ; + entry->ifindex =0 ; + entry->flags =MPTCP_PM_ADDR_FLAG_IMPLICIT ; + entry->lsk =NULL ; + ret =mptcp_pm_nl_append_new_local_addr (pernet, entry); +if (ret <0 ) +kfree (entry); + }else if (mptcp_pm_is_userspace (msk)) { +struct mptcp_pm_addr_entry new_entry; +__be16 msk_sport = ((struct inet_sock *) +inet_sk ((struct sock *)msk))->inet_sport; + +memset (&new_entry,0 ,sizeof (struct mptcp_pm_addr_entry )); + new_entry.addr = skc_local; + new_entry.addr.id =0 ; + new_entry.flags =MPTCP_PM_ADDR_FLAG_IMPLICIT ; + +if (new_entry.addr.port == msk_sport) + new_entry.addr.port =0 ; + + ret =mptcp_userspace_pm_append_new_local_addr (msk, &new_entry); } -rcu_read_unlock (); -if (ret >=0 ) -return ret; - -/* address not found, add to local list */ - entry =kmalloc (sizeof (*entry),GFP_ATOMIC ); -if (!entry) -return -ENOMEM ; - - entry->addr = skc_local; - entry->addr.id =0 ; - entry->addr.port =0 ; - entry->ifindex =0 ; - entry->flags =MPTCP_PM_ADDR_FLAG_IMPLICIT ; - entry->lsk =NULL ; - ret =mptcp_pm_nl_append_new_local_addr (pernet, entry); -if (ret <0 ) -kfree (entry);return ret; }@@ -1298,22 +1314,39 @@ static int mptcp_nl_cmd_add_addr(struct sk_buff *skb, struct genl_info *info)return 0 ; } -int mptcp_pm_get_flags_and_ifindex_by_id (struct net *net,unsigned int id, +int mptcp_pm_get_flags_and_ifindex_by_id (struct mptcp_sock *msk,unsigned int id,u8 *flags,int *ifindex) { -struct mptcp_pm_addr_entry *entry; +struct mptcp_pm_addr_entry *entry, *match =NULL ; +struct sock *sk = (struct sock *)msk; +struct net *net =sock_net (sk); *flags =0 ; *ifindex =0 ;
net/mptcp/pm_netlink.c static int mptcp_nl_cmd_add_addr(struct sk_buff *skb, struct genl_info *info) · line 1330
Quoted 10 lines
net/mptcp/pm_netlink.c +3
-5if (id) { -rcu_read_lock (); - entry =__lookup_addr_by_id (net_generic (net, pm_nl_pernet_id), id); -if (entry) { - *flags = entry->flags; - *ifindex = entry->ifindex; +if (mptcp_pm_is_kernel (msk)) { +rcu_read_lock (); + entry =__lookup_addr_by_id (net_generic (net, pm_nl_pernet_id), id);
Another conflict here due to the "mptcp: add pm_nl_pernet helpers" commit, the changes in existing code would be avoided with Paolo's suggestion to add a thin layer to call this function (unmodified) or a separate version for the userspace PM.
But also be sure to use the new pm_nl_pernet helpers in the new userspace PM code.
--
Mat Martineau
Intel
PATCH v6 4/14 mptcp: netlink: split mptcp_pm_parse_addr into two functions
In reply to Kishen MaloorFrom: Florian Westphal <[email protected]>
Next patch will need to parse MPTCP_PM_ATTR_ADDR attributes and fill an mptcp_addr_info structure from a different genl command callback.
To avoid copy-paste, split the existing function to a helper that does the common part and then call the helper from the (renamed)mptcp_pm_parse_entry function.
--- net/mptcp/pm_netlink.c | 60 +++++++++++++++++++++++++++--------------- 1 file changed, 39 insertions(+), 21 deletions(-)
net/mptcp/pm_netlink.c +39 -21
@@ -1156,11 +1156,12 @@ static int mptcp_pm_family_to_addr(int family)return MPTCP_PM_ADDR_ATTR_ADDR4 ; } -static int mptcp_pm_parse_addr (struct nlattr *attr,struct genl_info *info, -bool require_family, -struct mptcp_pm_addr_entry *entry) +static int mptcp_pm_parse_pm_addr_attr (struct nlattr *tb[], +const struct nlattr *attr, +struct genl_info *info, +struct mptcp_addr_info *addr, +bool require_family) { -struct nlattr *tb[MPTCP_PM_ADDR_ATTR_MAX +1 ];int err, addr_addr;if (!attr) {
@@ -1174,27 +1175,29 @@ static int mptcp_pm_parse_addr(struct nlattr *attr, struct genl_info *info,if (err)return err; -memset (entry,0 ,sizeof (*entry)); +if (tb[MPTCP_PM_ADDR_ATTR_ID ]) + addr->id =nla_get_u8 (tb[MPTCP_PM_ADDR_ATTR_ID ]); +if (!tb[MPTCP_PM_ADDR_ATTR_FAMILY ]) {if (!require_family) - goto skip_family; +return err;NL_SET_ERR_MSG_ATTR (info->extack, attr,"missing family" );return -EINVAL ; } - entry->addr.family =nla_get_u16 (tb[MPTCP_PM_ADDR_ATTR_FAMILY ]); - if (entry->addr.family != AF_INET + addr->family =nla_get_u16 (tb[MPTCP_PM_ADDR_ATTR_FAMILY ]); + if (addr->family != AF_INET #if IS_ENABLED(CONFIG_MPTCP_IPV6) - && entry->addr.family !=AF_INET6 + && addr->family !=AF_INET6 #endif ) {NL_SET_ERR_MSG_ATTR (info->extack, attr,"unknown address family" );return -EINVAL ; } - addr_addr =mptcp_pm_family_to_addr (entry->addr.family); + addr_addr =mptcp_pm_family_to_addr (addr->family);if (!tb[addr_addr]) {NL_SET_ERR_MSG_ATTR (info->extack, attr,"missing address data" );
@@ -1202,22 +1205,37 @@ static int mptcp_pm_parse_addr(struct nlattr *attr, struct genl_info *info, }#if IS_ENABLED (CONFIG_MPTCP_IPV6 ) -if (entry->addr.family ==AF_INET6 ) - entry->addr.addr6 =nla_get_in6_addr (tb[addr_addr]); +if (addr->family ==AF_INET6 ) + addr->addr6 =nla_get_in6_addr (tb[addr_addr]); else#endif - entry->addr.addr.s_addr =nla_get_in_addr (tb[addr_addr]); + addr->addr.s_addr =nla_get_in_addr (tb[addr_addr]); + +if (tb[MPTCP_PM_ADDR_ATTR_PORT ]) + addr->port =htons (nla_get_u16 (tb[MPTCP_PM_ADDR_ATTR_PORT ])); + +return err; +} + +static int mptcp_pm_parse_entry (struct nlattr *attr,struct genl_info *info, +bool require_family, +struct mptcp_pm_addr_entry *entry) +{ +struct nlattr *tb[MPTCP_PM_ADDR_ATTR_MAX +1 ]; +int err; + +memset (entry,0 ,sizeof (*entry)); + + err =mptcp_pm_parse_pm_addr_attr (tb, attr, info, &entry->addr, require_family); +if (err) +return err; -skip_family:if (tb[MPTCP_PM_ADDR_ATTR_IF_IDX ]) {u32 val =nla_get_s32 (tb[MPTCP_PM_ADDR_ATTR_IF_IDX ]); entry->ifindex = val; } -if (tb[MPTCP_PM_ADDR_ATTR_ID ]) - entry->addr.id =nla_get_u8 (tb[MPTCP_PM_ADDR_ATTR_ID ]); -if (tb[MPTCP_PM_ADDR_ATTR_FLAGS ]) entry->flags =nla_get_u32 (tb[MPTCP_PM_ADDR_ATTR_FLAGS ]);
@@ -1265,7 +1283,7 @@ static int mptcp_nl_cmd_add_addr(struct sk_buff *skb, struct genl_info *info)struct mptcp_pm_addr_entry addr, *entry;int ret; - ret =mptcp_pm_parse_addr (attr, info, true, &addr); + ret =mptcp_pm_parse_entry (attr, info, true, &addr);if (ret <0 )return ret;
@@ -1468,7 +1486,7 @@ static int mptcp_nl_cmd_del_addr(struct sk_buff *skb, struct genl_info *info)unsigned int addr_max;int ret; - ret =mptcp_pm_parse_addr (attr, info, false, &addr); + ret =mptcp_pm_parse_entry (attr, info, false, &addr);if (ret <0 )return ret;
@@ -1642,7 +1660,7 @@ static int mptcp_nl_cmd_get_addr(struct sk_buff *skb, struct genl_info *info)void *reply;int ret; - ret =mptcp_pm_parse_addr (attr, info, false, &addr); + ret =mptcp_pm_parse_entry (attr, info, false, &addr);if (ret <0 )return ret;
@@ -1853,7 +1871,7 @@ static int mptcp_nl_cmd_set_flags(struct sk_buff *skb, struct genl_info *info)u8 bkup =0 , lookup_by_id =0 ;int ret; - ret =mptcp_pm_parse_addr (attr, info, false, &addr); + ret =mptcp_pm_parse_entry (attr, info, false, &addr);if (ret <0 )return ret;
Signature · 1 line
2.31.1
PATCH v6 5/14 mptcp: netlink: Add MPTCP_PM_CMD_ANNOUNCE
In reply to Kishen MaloorThis change adds a MPTCP netlink interface for issuing ADD_ADDR advertisements over the chosen MPTCP connection from a userspace path manager.
The command requires the following parameters:
{ token, { loc_id, family, daddr4 | daddr6 [, dport] } [, if_idx], flags[signal] }.
---
v6:
-Move struct mptcp_pm_addr_entry into protocol.h. -Make mptcp_pm_alloc_anno_list() and mptcp_pm_parse_entry() non-static.
-Move mptcp_nl_cmd_announce() into pm_userspace.c.
--- include/uapi/linux/mptcp.h | 2 ++ net/mptcp/pm_netlink.c | 24 ++++++++-------- net/mptcp/pm_userspace.c | 58 ++++++++++++++++++++++++++++++++++++++ net/mptcp/protocol.h | 17 +++++++++++ 4 files changed, 88 insertions(+), 13 deletions(-)
include/uapi/linux/mptcp.h +2 -0
@@ -55,6 +55,7 @@ enum {MPTCP_PM_ATTR_ADDR ,/* nested address */ MPTCP_PM_ATTR_RCV_ADD_ADDRS ,/* u32 */ MPTCP_PM_ATTR_SUBFLOWS ,/* u32 */ +MPTCP_PM_ATTR_TOKEN ,/* u32 */ __MPTCP_PM_ATTR_MAX };
@@ -93,6 +94,7 @@ enum {MPTCP_PM_CMD_SET_LIMITS ,MPTCP_PM_CMD_GET_LIMITS ,MPTCP_PM_CMD_SET_FLAGS , +MPTCP_PM_CMD_ANNOUNCE , __MPTCP_PM_CMD_AFTER_LAST };
net/mptcp/pm_netlink.c +11 -13
@@ -22,14 +22,6 @@ static struct genl_family mptcp_genl_family;static int pm_nl_pernet_id; -struct mptcp_pm_addr_entry { -struct list_head list; -struct mptcp_addr_info addr; -u8 flags; -int ifindex; -struct socket *lsk; -}; -struct mptcp_pm_add_entry {struct list_head list;struct mptcp_addr_info addr;
@@ -353,8 +345,8 @@ mptcp_pm_del_add_timer(struct mptcp_sock *msk,return entry; } -static bool mptcp_pm_alloc_anno_list (struct mptcp_sock *msk, -const struct mptcp_pm_addr_entry *entry) +bool mptcp_pm_alloc_anno_list (struct mptcp_sock *msk, +const struct mptcp_pm_addr_entry *entry) {struct mptcp_pm_add_entry *add_entry =NULL ;struct sock *sk = (struct sock *)msk;
@@ -1108,6 +1100,7 @@ static const struct nla_policy mptcp_pm_policy[MPTCP_PM_ATTR_MAX + 1] = { NLA_POLICY_NESTED(mptcp_pm_addr_policy), [MPTCP_PM_ATTR_RCV_ADD_ADDRS] = { .type = NLA_U32, }, [MPTCP_PM_ATTR_SUBFLOWS] = { .type = NLA_U32, }, + [MPTCP_PM_ATTR_TOKEN] = { .type = NLA_U32, }, };void mptcp_pm_nl_subflow_chk_stale (const struct mptcp_sock *msk,struct sock *ssk)
@@ -1217,9 +1210,9 @@ static int mptcp_pm_parse_pm_addr_attr(struct nlattr *tb[],return err; } -static int mptcp_pm_parse_entry (struct nlattr *attr,struct genl_info *info, -bool require_family, -struct mptcp_pm_addr_entry *entry) +int mptcp_pm_parse_entry (struct nlattr *attr,struct genl_info *info, +bool require_family, +struct mptcp_pm_addr_entry *entry) {struct nlattr *tb[MPTCP_PM_ADDR_ATTR_MAX +1 ];int err;
@@ -2221,6 +2214,11 @@ static const struct genl_small_ops mptcp_pm_ops[] = { .doit = mptcp_nl_cmd_set_flags, .flags = GENL_ADMIN_PERM, }, + { + .cmd = MPTCP_PM_CMD_ANNOUNCE, + .doit = mptcp_nl_cmd_announce, + .flags = GENL_ADMIN_PERM, + }, };static struct genl_family mptcp_genl_family__ro_after_init = {
net/mptcp/pm_userspace.c +58 -0
61 lines not on this page · raw message
net/mptcp/protocol.h +17 -0
@@ -11,6 +11,7 @@#include <net/tcp.h> #include <net/inet_connection_sock.h> #include <uapi/linux/mptcp.h> +#include <net/genetlink.h> #define MPTCP_SUPPORTED_VERSION 1
@@ -747,6 +748,19 @@ u16 __mptcp_make_csum(u64 data_seq, u32 subflow_seq, u16 data_len, __wsum sum);void __init mptcp_pm_init (void );void mptcp_pm_data_init (struct mptcp_sock *msk);void mptcp_pm_data_reset (struct mptcp_sock *msk); + +struct mptcp_pm_addr_entry { +struct list_head list; +struct mptcp_addr_info addr; +u8 flags; +int ifindex; +struct socket *lsk; +}; + +int mptcp_pm_parse_entry (struct nlattr *attr,struct genl_info *info, +bool require_family, +struct mptcp_pm_addr_entry *entry); +void mptcp_pm_subflow_chk_stale (const struct mptcp_sock *msk,struct sock *ssk);void mptcp_pm_nl_subflow_chk_stale (const struct mptcp_sock *msk,struct sock *ssk);void mptcp_pm_new_connection (struct mptcp_sock *msk,const struct sock *ssk,int server_side);
@@ -767,6 +781,8 @@ void mptcp_pm_rm_addr_received(struct mptcp_sock *msk, const struct mptcp_rm_list *rm_list);void mptcp_pm_mp_prio_received (struct sock *sk,u8 bkup);void mptcp_pm_mp_fail_received (struct sock *sk,u64 fail_seq); +bool mptcp_pm_alloc_anno_list (struct mptcp_sock *msk, +const struct mptcp_pm_addr_entry *entry);void mptcp_pm_free_anno_list (struct mptcp_sock *msk);bool mptcp_pm_sport_in_anno_list (struct mptcp_sock *msk,const struct sock *sk); struct mptcp_pm_add_entry *
@@ -787,6 +803,7 @@ int mptcp_pm_remove_subflow(struct mptcp_sock *msk, const struct mptcp_rm_list *int mptcp_userspace_pm_append_new_local_addr (struct mptcp_sock *msk,struct mptcp_pm_addr_entry *entry);void mptcp_free_local_addr_list (struct mptcp_sock *msk); +int mptcp_nl_cmd_announce (struct sk_buff *skb,struct genl_info *info);void mptcp_event (enum mptcp_event_type type,const struct mptcp_sock *msk,const struct sock *ssk,gfp_t gfp);
Signature · 1 line
2.31.1
PATCH v6 6/14 selftests: mptcp: support MPTCP_PM_CMD_ANNOUNCE
In reply to Kishen MaloorThis change updates the "pm_nl_ctl" testing sample with an "ann" (announce) option to support the newly added netlink interface command MPTCP_PM_CMD_ANNOUNCE to issue ADD_ADDR advertisements over the chosen MPTCP connection.
E.g. ./pm_nl_ctl ann 192.168.122.75 token 823274047 id 25 dev enp1s0
--- tools/testing/selftests/net/mptcp/pm_nl_ctl.c | 131 ++++++++++++++++++ 1 file changed, 131 insertions(+)
tools/testing/selftests/net/mptcp/pm_nl_ctl.c +131 -0
@@ -6,6 +6,7 @@#include <stdlib.h> #include <string.h> #include <unistd.h> +#include <limits.h> #include <sys/socket.h> #include <sys/types.h>
@@ -26,6 +27,7 @@ static void syntax(char *argv[]) {fprintf (stderr,"%s add|get|set|del|flush|dump|accept [<args>]\n" , argv[0 ]);fprintf (stderr,"\tadd [flags signal|subflow|backup|fullmesh] [id <nr>] [dev <name>] <ip>\n" ); +fprintf (stderr,"\tann <local-ip> id <local-id> token <token> [port <local-port>] [dev <name>]\n" );fprintf (stderr,"\tdel <id> [<ip>]\n" );fprintf (stderr,"\tget <id>\n" );fprintf (stderr,"\tset [<ip>] [id <nr>] flags [no]backup|[no]fullmesh [port <nr>]\n" );
@@ -170,6 +172,133 @@ static int resolve_mptcp_pm_netlink(int fd)return genl_parse_getfamily ((void *)data); } +int announce_addr (int fd,int pm_family,int argc,char *argv[]) +{ +char data[NLMSG_ALIGN (sizeof (struct nlmsghdr )) + +NLMSG_ALIGN (sizeof (struct genlmsghdr )) + +1024 ]; +u_int32_t flags =MPTCP_PM_ADDR_FLAG_SIGNAL ; +u_int32_t token =UINT_MAX ; +struct rtattr *rta, *addr; +u_int32_t id =UINT_MAX ; +struct nlmsghdr *nh; +u_int16_t family; +int addr_start; +int off =0 ; +int arg; + +memset (data,0 ,sizeof (data)); + nh = (void *)data; + off =init_genl_req (data, pm_family,MPTCP_PM_CMD_ANNOUNCE , +MPTCP_PM_VER ); + +if (argc <7 ) +syntax (argv); + +/* local-ip header */ + addr_start = off; + addr = (void *)(data + off); + addr->rta_type =NLA_F_NESTED |MPTCP_PM_ATTR_ADDR ; + addr->rta_len =RTA_LENGTH (0 ); + off +=NLMSG_ALIGN (addr->rta_len); + +/* local-ip data */ +/* record addr type */ + rta = (void *)(data + off); +if (inet_pton (AF_INET , argv[2 ],RTA_DATA (rta))) { + family =AF_INET ; + rta->rta_type =MPTCP_PM_ADDR_ATTR_ADDR4 ; + rta->rta_len =RTA_LENGTH (4 ); + }else if (inet_pton (AF_INET6 , argv[2 ],RTA_DATA (rta))) { + family =AF_INET6 ; + rta->rta_type =MPTCP_PM_ADDR_ATTR_ADDR6 ; + rta->rta_len =RTA_LENGTH (16 ); + }else +error (1 , errno,"can't parse ip %s" , argv[2 ]); + off +=NLMSG_ALIGN (rta->rta_len); + +/* addr family */ + rta = (void *)(data + off); + rta->rta_type =MPTCP_PM_ADDR_ATTR_FAMILY ; + rta->rta_len =RTA_LENGTH (2 ); +memcpy (RTA_DATA (rta), &family,2 ); + off +=NLMSG_ALIGN (rta->rta_len); + +for (arg =3 ; arg < argc; arg++) { +if (!strcmp (argv[arg],"id" )) { +/* local-id */ +if (++arg >= argc) +error (1 ,0 ," missing id value" ); + + id =atoi (argv[arg]); + rta = (void *)(data + off); + rta->rta_type =MPTCP_PM_ADDR_ATTR_ID ; + rta->rta_len =RTA_LENGTH (1 ); +memcpy (RTA_DATA (rta), &id,1 ); + off +=NLMSG_ALIGN (rta->rta_len); + }else if (!strcmp (argv[arg],"dev" )) { +/* for the if_index */ +int32_t ifindex; + +if (++arg >= argc) +error (1 ,0 ," missing dev name" ); + + ifindex =if_nametoindex (argv[arg]); +if (!ifindex) +error (1 , errno,"unknown device %s" , argv[arg]); + + rta = (void *)(data + off); + rta->rta_type =MPTCP_PM_ADDR_ATTR_IF_IDX ; + rta->rta_len =RTA_LENGTH (4 ); +memcpy (RTA_DATA (rta), &ifindex,4 ); + off +=NLMSG_ALIGN (rta->rta_len); + }else if (!strcmp (argv[arg],"port" )) { +/* local-port (optional) */ +u_int16_t port; + +if (++arg >= argc) +error (1 ,0 ," missing port value" ); + + port =atoi (argv[arg]); + rta = (void *)(data + off); + rta->rta_type =MPTCP_PM_ADDR_ATTR_PORT ; + rta->rta_len =RTA_LENGTH (2 ); +memcpy (RTA_DATA (rta), &port,2 ); + off +=NLMSG_ALIGN (rta->rta_len); + }else if (!strcmp (argv[arg],"token" )) { +/* MPTCP connection token */ +if (++arg >= argc) +error (1 ,0 ," missing token value" ); + + token =atoi (argv[arg]); + }else +error (1 ,0 ,"unknown keyword %s" , argv[arg]); + } + +/* addr flags */ + rta = (void *)(data + off); + rta->rta_type =MPTCP_PM_ADDR_ATTR_FLAGS ; + rta->rta_len =RTA_LENGTH (4 ); +memcpy (RTA_DATA (rta), &flags,4 ); + off +=NLMSG_ALIGN (rta->rta_len); + + addr->rta_len = off - addr_start; + +if (id ==UINT_MAX || token ==UINT_MAX ) +error (1 ,0 ," missing mandatory inputs" ); + +/* token */ + rta = (void *)(data + off); + rta->rta_type =MPTCP_PM_ATTR_TOKEN ; + rta->rta_len =RTA_LENGTH (4 ); +memcpy (RTA_DATA (rta), &token,4 ); + off +=NLMSG_ALIGN (rta->rta_len); + +do_nl_req (fd, nh, off,0 ); + +return 0 ; +} +int add_addr (int fd,int pm_family,int argc,char *argv[]) { char data[NLMSG_ALIGN(sizeof(struct nlmsghdr)) +
@@ -786,6 +915,8 @@ int main(int argc, char *argv[])if (!strcmp (argv[1 ],"add" ))return add_addr (fd, pm_family, argc, argv); +else if (!strcmp (argv[1 ],"ann" )) +return announce_addr (fd, pm_family, argc, argv);else if (!strcmp (argv[1 ],"del" ))return del_addr (fd, pm_family, argc, argv);else if (!strcmp (argv[1 ],"flush" ))
Signature · 1 line
2.31.1
PATCH v6 7/14 mptcp: netlink: Add MPTCP_PM_CMD_REMOVE
In reply to Kishen MaloorThis change adds a MPTCP netlink command for issuing a REMOVE_ADDR signal for an address over the chosen MPTCP connection from a userspace path manager.
The command requires the following parameters: {token, loc_id}.
---
v6:
-Make mptcp_pm_remove_addrs_and_subflows() non-static. -Move mptcp_nl_cmd_remove() into pm_userspace.c.
--- include/uapi/linux/mptcp.h | 2 ++ net/mptcp/pm_netlink.c | 10 +++++-- net/mptcp/pm_userspace.c | 57 ++++++++++++++++++++++++++++++++++++++ net/mptcp/protocol.h | 4 +++ 4 files changed, 71 insertions(+), 2 deletions(-)
include/uapi/linux/mptcp.h +2 -0
@@ -56,6 +56,7 @@ enum {MPTCP_PM_ATTR_RCV_ADD_ADDRS ,/* u32 */ MPTCP_PM_ATTR_SUBFLOWS ,/* u32 */ MPTCP_PM_ATTR_TOKEN ,/* u32 */ +MPTCP_PM_ATTR_LOC_ID ,/* u8 */ __MPTCP_PM_ATTR_MAX };
@@ -95,6 +96,7 @@ enum {MPTCP_PM_CMD_GET_LIMITS ,MPTCP_PM_CMD_SET_FLAGS ,MPTCP_PM_CMD_ANNOUNCE , +MPTCP_PM_CMD_REMOVE , __MPTCP_PM_CMD_AFTER_LAST };
net/mptcp/pm_netlink.c +8 -2
@@ -1101,6 +1101,7 @@ static const struct nla_policy mptcp_pm_policy[MPTCP_PM_ATTR_MAX + 1] = { [MPTCP_PM_ATTR_RCV_ADD_ADDRS] = { .type = NLA_U32, }, [MPTCP_PM_ATTR_SUBFLOWS] = { .type = NLA_U32, }, [MPTCP_PM_ATTR_TOKEN] = { .type = NLA_U32, }, + [MPTCP_PM_ATTR_LOC_ID] = { .type = NLA_U8, }, };void mptcp_pm_nl_subflow_chk_stale (const struct mptcp_sock *msk,struct sock *ssk)
@@ -1519,8 +1520,8 @@ static int mptcp_nl_cmd_del_addr(struct sk_buff *skb, struct genl_info *info)return ret; } -static void mptcp_pm_remove_addrs_and_subflows (struct mptcp_sock *msk, -struct list_head *rm_list) +void mptcp_pm_remove_addrs_and_subflows (struct mptcp_sock *msk, +struct list_head *rm_list) {struct mptcp_rm_list alist = { .nr =0 }, slist = { .nr =0 };struct mptcp_pm_addr_entry *entry;
@@ -2219,6 +2220,11 @@ static const struct genl_small_ops mptcp_pm_ops[] = { .doit = mptcp_nl_cmd_announce, .flags = GENL_ADMIN_PERM, }, + { + .cmd = MPTCP_PM_CMD_REMOVE, + .doit = mptcp_nl_cmd_remove, + .flags = GENL_ADMIN_PERM, + }, };static struct genl_family mptcp_genl_family__ro_after_init = {
net/mptcp/pm_userspace.c +57 -0
60 lines not on this page · raw message
net/mptcp/protocol.h +4 -0
@@ -800,10 +800,14 @@ int mptcp_pm_announce_addr(struct mptcp_sock *msk, bool echo);int mptcp_pm_remove_addr (struct mptcp_sock *msk,const struct mptcp_rm_list *rm_list);int mptcp_pm_remove_subflow (struct mptcp_sock *msk,const struct mptcp_rm_list *rm_list); +void mptcp_pm_remove_addrs_and_subflows (struct mptcp_sock *msk, +struct list_head *rm_list); +int mptcp_userspace_pm_append_new_local_addr (struct mptcp_sock *msk,struct mptcp_pm_addr_entry *entry);void mptcp_free_local_addr_list (struct mptcp_sock *msk);int mptcp_nl_cmd_announce (struct sk_buff *skb,struct genl_info *info); +int mptcp_nl_cmd_remove (struct sk_buff *skb,struct genl_info *info);void mptcp_event (enum mptcp_event_type type,const struct mptcp_sock *msk,const struct sock *ssk,gfp_t gfp);
Signature · 1 line
2.31.1
PATCH v6 8/14 selftests: mptcp: support MPTCP_PM_CMD_REMOVE
In reply to Kishen MaloorThis change updates the "pm_nl_ctl" testing sample with a "rem" (remove) option to support the newly added netlink interface command MPTCP_PM_CMD_REMOVE to issue a REMOVE_ADDR signal over the chosen MPTCP connection.
E.g. ./pm_nl_ctl rem token 823274047 id 23
--- tools/testing/selftests/net/mptcp/pm_nl_ctl.c | 52 +++++++++++++++++++ 1 file changed, 52 insertions(+)
tools/testing/selftests/net/mptcp/pm_nl_ctl.c +52 -0
@@ -28,6 +28,7 @@ static void syntax(char *argv[])fprintf (stderr,"%s add|get|set|del|flush|dump|accept [<args>]\n" , argv[0 ]);fprintf (stderr,"\tadd [flags signal|subflow|backup|fullmesh] [id <nr>] [dev <name>] <ip>\n" );fprintf (stderr,"\tann <local-ip> id <local-id> token <token> [port <local-port>] [dev <name>]\n" ); +fprintf (stderr,"\trem id <local-id> token <token>\n" );fprintf (stderr,"\tdel <id> [<ip>]\n" );fprintf (stderr,"\tget <id>\n" );fprintf (stderr,"\tset [<ip>] [id <nr>] flags [no]backup|[no]fullmesh [port <nr>]\n" );
@@ -172,6 +173,55 @@ static int resolve_mptcp_pm_netlink(int fd)return genl_parse_getfamily ((void *)data); } +int remove_addr (int fd,int pm_family,int argc,char *argv[]) +{ +char data[NLMSG_ALIGN (sizeof (struct nlmsghdr )) + +NLMSG_ALIGN (sizeof (struct genlmsghdr )) + +1024 ]; +struct nlmsghdr *nh; +struct rtattr *rta; +u_int32_t token; +u_int8_t id; +int off =0 ; +int arg; + +memset (data,0 ,sizeof (data)); + nh = (void *)data; + off =init_genl_req (data, pm_family,MPTCP_PM_CMD_REMOVE , +MPTCP_PM_VER ); + +if (argc <6 ) +syntax (argv); + +for (arg =2 ; arg < argc; arg++) { +if (!strcmp (argv[arg],"id" )) { +if (++arg >= argc) +error (1 ,0 ," missing id value" ); + + id =atoi (argv[arg]); + rta = (void *)(data + off); + rta->rta_type =MPTCP_PM_ATTR_LOC_ID ; + rta->rta_len =RTA_LENGTH (1 ); +memcpy (RTA_DATA (rta), &id,1 ); + off +=NLMSG_ALIGN (rta->rta_len); + }else if (!strcmp (argv[arg],"token" )) { +if (++arg >= argc) +error (1 ,0 ," missing token value" ); + + token =atoi (argv[arg]); + rta = (void *)(data + off); + rta->rta_type =MPTCP_PM_ATTR_TOKEN ; + rta->rta_len =RTA_LENGTH (4 ); +memcpy (RTA_DATA (rta), &token,4 ); + off +=NLMSG_ALIGN (rta->rta_len); + }else +error (1 ,0 ,"unknown keyword %s" , argv[arg]); + } + +do_nl_req (fd, nh, off,0 ); +return 0 ; +} +int announce_addr (int fd,int pm_family,int argc,char *argv[]) { char data[NLMSG_ALIGN(sizeof(struct nlmsghdr)) +
@@ -917,6 +967,8 @@ int main(int argc, char *argv[])return add_addr (fd, pm_family, argc, argv); else if (!strcmp(argv[1], "ann")) return announce_addr(fd, pm_family, argc, argv); + else if (!strcmp(argv[1], "rem")) + return remove_addr(fd, pm_family, argc, argv); else if (!strcmp(argv[1], "del")) return del_addr(fd, pm_family, argc, argv); else if (!strcmp(argv[1], "flush"))
Signature · 1 line
2.31.1
PATCH v6 9/14 mptcp: netlink: allow userspace-driven subflow establishment
In reply to Kishen MaloorFrom: Florian Westphal <[email protected]>
This allows userspace to tell kernel to add a new subflow to an existing mptcp connection.
Userspace provides the token to identify the mptcp-level connection that needs a change in active subflows and the local and remote addresses of the new or the to-be-removed subflow.
MPTCP_PM_CMD_SUBFLOW_CREATE requires the following parameters:
{ token, { loc_id, family, loc_addr4 | loc_addr6 }, { family, rem_addr4 | rem_addr6, rem_port }
MPTCP_PM_CMD_SUBFLOW_DESTROY requires the following parameters:
{ token, { family, loc_addr4 | loc_addr6, loc_port }, { family, rem_addr4 | rem_addr6, rem_port }
---
v6:
-Make mptcp_pm_parse_addr() non-static.
-Move mptcp_nl_cmd_sf_create(), mptcp_nl_find_ssk() and mptcp_nl_cmd_sf_destroy() into pm_userspace.c.
--- include/uapi/linux/mptcp.h | 3 + net/mptcp/pm_netlink.c | 22 +++++ net/mptcp/pm_userspace.c | 179 +++++++++++++++++++++++++++++++++++++ net/mptcp/protocol.h | 4 + 4 files changed, 208 insertions(+)
include/uapi/linux/mptcp.h +3 -0
@@ -57,6 +57,7 @@ enum {MPTCP_PM_ATTR_SUBFLOWS ,/* u32 */ MPTCP_PM_ATTR_TOKEN ,/* u32 */ MPTCP_PM_ATTR_LOC_ID ,/* u8 */ +MPTCP_PM_ATTR_ADDR_REMOTE ,/* nested address */ __MPTCP_PM_ATTR_MAX };
@@ -97,6 +98,8 @@ enum {MPTCP_PM_CMD_SET_FLAGS ,MPTCP_PM_CMD_ANNOUNCE ,MPTCP_PM_CMD_REMOVE , +MPTCP_PM_CMD_SUBFLOW_CREATE , +MPTCP_PM_CMD_SUBFLOW_DESTROY , __MPTCP_PM_CMD_AFTER_LAST };
net/mptcp/pm_netlink.c +22 -0
@@ -1102,6 +1102,8 @@ static const struct nla_policy mptcp_pm_policy[MPTCP_PM_ATTR_MAX + 1] = { [MPTCP_PM_ATTR_SUBFLOWS] = { .type = NLA_U32, }, [MPTCP_PM_ATTR_TOKEN] = { .type = NLA_U32, }, [MPTCP_PM_ATTR_LOC_ID] = { .type = NLA_U8, }, + [MPTCP_PM_ATTR_ADDR_REMOTE ] = + NLA_POLICY_NESTED(mptcp_pm_addr_policy), };void mptcp_pm_nl_subflow_chk_stale (const struct mptcp_sock *msk,struct sock *ssk)
@@ -1211,6 +1213,16 @@ static int mptcp_pm_parse_pm_addr_attr(struct nlattr *tb[],return err; } +int mptcp_pm_parse_addr (struct nlattr *attr,struct genl_info *info, +struct mptcp_addr_info *addr) +{ +struct nlattr *tb[MPTCP_PM_ADDR_ATTR_MAX +1 ]; + +memset (addr,0 ,sizeof (*addr)); + +return mptcp_pm_parse_pm_addr_attr (tb, attr, info, addr, true); +} +int mptcp_pm_parse_entry (struct nlattr *attr,struct genl_info *info,bool require_family,struct mptcp_pm_addr_entry *entry)
@@ -2225,6 +2237,16 @@ static const struct genl_small_ops mptcp_pm_ops[] = { .doit = mptcp_nl_cmd_remove, .flags = GENL_ADMIN_PERM, }, + { + .cmd = MPTCP_PM_CMD_SUBFLOW_CREATE, + .doit = mptcp_nl_cmd_sf_create, + .flags = GENL_ADMIN_PERM, + }, + { + .cmd = MPTCP_PM_CMD_SUBFLOW_DESTROY, + .doit = mptcp_nl_cmd_sf_destroy, + .flags = GENL_ADMIN_PERM, + }, }; static struct genl_family mptcp_genl_family __ro_after_init = {
net/mptcp/pm_userspace.c +179 -0
182 lines not on this page · raw message
net/mptcp/protocol.h +4 -0
@@ -757,6 +757,8 @@ struct mptcp_pm_addr_entry {struct socket *lsk; }; +int mptcp_pm_parse_addr (struct nlattr *attr,struct genl_info *info, +struct mptcp_addr_info *addr);int mptcp_pm_parse_entry (struct nlattr *attr,struct genl_info *info,bool require_family,struct mptcp_pm_addr_entry *entry);
@@ -808,6 +810,8 @@ int mptcp_userspace_pm_append_new_local_addr(struct mptcp_sock *msk,void mptcp_free_local_addr_list (struct mptcp_sock *msk);int mptcp_nl_cmd_announce (struct sk_buff *skb,struct genl_info *info);int mptcp_nl_cmd_remove (struct sk_buff *skb,struct genl_info *info); +int mptcp_nl_cmd_sf_create (struct sk_buff *skb,struct genl_info *info); +int mptcp_nl_cmd_sf_destroy (struct sk_buff *skb,struct genl_info *info);void mptcp_event (enum mptcp_event_type type,const struct mptcp_sock *msk,const struct sock *ssk,gfp_t gfp);
Signature · 1 line
2.31.1
PATCH v6 10/14 selftests: mptcp: support MPTCP_PM_CMD_SUBFLOW_CREATE
In reply to Kishen MaloorThis change updates the "pm_nl_ctl" testing sample with a "csf" (create subflow) option to support the newly added netlink interface command MPTCP_PM_CMD_SUBFLOW_CREATE over the chosen MPTCP connection.
E.g. ./pm_nl_ctl csf lip 10.0.2.1 lid 23 rip 10.0.2.2 rport 56789 token 823274047
--- tools/testing/selftests/net/mptcp/pm_nl_ctl.c | 129 ++++++++++++++++++ 1 file changed, 129 insertions(+)
tools/testing/selftests/net/mptcp/pm_nl_ctl.c +129 -0
@@ -29,6 +29,7 @@ static void syntax(char *argv[])fprintf (stderr,"\tadd [flags signal|subflow|backup|fullmesh] [id <nr>] [dev <name>] <ip>\n" );fprintf (stderr,"\tann <local-ip> id <local-id> token <token> [port <local-port>] [dev <name>]\n" );fprintf (stderr,"\trem id <local-id> token <token>\n" ); +fprintf (stderr,"\tcsf lip <local-ip> lid <local-id> rip <remote-ip> rport <remote-port> token <token>\n" );fprintf (stderr,"\tdel <id> [<ip>]\n" );fprintf (stderr,"\tget <id>\n" );fprintf (stderr,"\tset [<ip>] [id <nr>] flags [no]backup|[no]fullmesh [port <nr>]\n" );
@@ -173,6 +174,132 @@ static int resolve_mptcp_pm_netlink(int fd)return genl_parse_getfamily ((void *)data); } +int csf (int fd,int pm_family,int argc,char *argv[]) +{ +char data[NLMSG_ALIGN (sizeof (struct nlmsghdr )) + +NLMSG_ALIGN (sizeof (struct genlmsghdr )) + +1024 ]; +const char *params[5 ]; +struct nlmsghdr *nh; +struct rtattr *addr; +struct rtattr *rta; +u_int16_t family; +u_int32_t token; +u_int16_t port; +int addr_start; +u_int8_t id; +int off =0 ; +int arg; + +memset (params,0 ,5 *sizeof (const char *)); + +memset (data,0 ,sizeof (data)); + nh = (void *)data; + off =init_genl_req (data, pm_family,MPTCP_PM_CMD_SUBFLOW_CREATE , +MPTCP_PM_VER ); + +if (argc <12 ) +syntax (argv); + +/* Params recorded in this order: +* <local-ip>, <local-id>, <remote-ip>, <remote-port>, <token> +*/ +for (arg =2 ; arg < argc; arg++) { +if (!strcmp (argv[arg],"lip" )) { +if (++arg >= argc) +error (1 ,0 ," missing local IP" ); + + params[0 ] = argv[arg]; + }else if (!strcmp (argv[arg],"lid" )) { +if (++arg >= argc) +error (1 ,0 ," missing local id" ); + + params[1 ] = argv[arg]; + }else if (!strcmp (argv[arg],"rip" )) { +if (++arg >= argc) +error (1 ,0 ," missing remote ip" ); + + params[2 ] = argv[arg]; + }else if (!strcmp (argv[arg],"rport" )) { +if (++arg >= argc) +error (1 ,0 ," missing remote port" ); + + params[3 ] = argv[arg]; + }else if (!strcmp (argv[arg],"token" )) { +if (++arg >= argc) +error (1 ,0 ," missing token" ); + + params[4 ] = argv[arg]; + }else +error (1 ,0 ,"unknown param %s" , argv[arg]); + } + +for (arg =0 ; arg <4 ; arg = arg +2 ) { +/* addr header */ + addr_start = off; + addr = (void *)(data + off); + addr->rta_type =NLA_F_NESTED | + ((arg ==0 ) ?MPTCP_PM_ATTR_ADDR :MPTCP_PM_ATTR_ADDR_REMOTE ); + addr->rta_len =RTA_LENGTH (0 ); + off +=NLMSG_ALIGN (addr->rta_len); + +/* addr data */ + rta = (void *)(data + off); +if (inet_pton (AF_INET , params[arg],RTA_DATA (rta))) { + family =AF_INET ; + rta->rta_type =MPTCP_PM_ADDR_ATTR_ADDR4 ; + rta->rta_len =RTA_LENGTH (4 ); + }else if (inet_pton (AF_INET6 , params[arg],RTA_DATA (rta))) { + family =AF_INET6 ; + rta->rta_type =MPTCP_PM_ADDR_ATTR_ADDR6 ; + rta->rta_len =RTA_LENGTH (16 ); + }else +error (1 , errno,"can't parse ip %s" , params[arg]); + off +=NLMSG_ALIGN (rta->rta_len); + +/* family */ + rta = (void *)(data + off); + rta->rta_type =MPTCP_PM_ADDR_ATTR_FAMILY ; + rta->rta_len =RTA_LENGTH (2 ); +memcpy (RTA_DATA (rta), &family,2 ); + off +=NLMSG_ALIGN (rta->rta_len); + +if (arg ==2 ) { +/* port */ + port =atoi (params[arg +1 ]); + rta = (void *)(data + off); + rta->rta_type =MPTCP_PM_ADDR_ATTR_PORT ; + rta->rta_len =RTA_LENGTH (2 ); +memcpy (RTA_DATA (rta), &port,2 ); + off +=NLMSG_ALIGN (rta->rta_len); + } + +if (arg ==0 ) { +/* id */ + id =atoi (params[arg +1 ]); + rta = (void *)(data + off); + rta->rta_type =MPTCP_PM_ADDR_ATTR_ID ; + rta->rta_len =RTA_LENGTH (1 ); +memcpy (RTA_DATA (rta), &id,1 ); + off +=NLMSG_ALIGN (rta->rta_len); + } + + addr->rta_len = off - addr_start; + } + +/* token */ + token =atoi (params[4 ]); + rta = (void *)(data + off); + rta->rta_type =MPTCP_PM_ATTR_TOKEN ; + rta->rta_len =RTA_LENGTH (4 ); +memcpy (RTA_DATA (rta), &token,4 ); + off +=NLMSG_ALIGN (rta->rta_len); + +do_nl_req (fd, nh, off,0 ); + +return 0 ; +} +int remove_addr (int fd,int pm_family,int argc,char *argv[]) { char data[NLMSG_ALIGN(sizeof(struct nlmsghdr)) +
@@ -969,6 +1096,8 @@ int main(int argc, char *argv[])return announce_addr (fd, pm_family, argc, argv); else if (!strcmp(argv[1], "rem")) return remove_addr(fd, pm_family, argc, argv); + else if (!strcmp(argv[1], "csf")) + return csf(fd, pm_family, argc, argv); else if (!strcmp(argv[1], "del")) return del_addr(fd, pm_family, argc, argv); else if (!strcmp(argv[1], "flush"))
Signature · 1 line
2.31.1
PATCH v6 11/14 selftests: mptcp: support MPTCP_PM_CMD_SUBFLOW_DESTROY
In reply to Kishen MaloorThis change updates the "pm_nl_ctl" testing sample with a "dsf" (destroy subflow) option to support the newly added netlink interface command MPTCP_PM_CMD_SUBFLOW_DESTROY over the chosen MPTCP connection.
E.g. ./pm_nl_ctl dsf lip 10.0.2.1 lport 44567 rip 10.0.2.2 rport 56789 token 823274047
--- tools/testing/selftests/net/mptcp/pm_nl_ctl.c | 115 ++++++++++++++++++ 1 file changed, 115 insertions(+)
tools/testing/selftests/net/mptcp/pm_nl_ctl.c +115 -0
@@ -30,6 +30,7 @@ static void syntax(char *argv[])fprintf (stderr,"\tann <local-ip> id <local-id> token <token> [port <local-port>] [dev <name>]\n" );fprintf (stderr,"\trem id <local-id> token <token>\n" );fprintf (stderr,"\tcsf lip <local-ip> lid <local-id> rip <remote-ip> rport <remote-port> token <token>\n" ); +fprintf (stderr,"\tdsf lip <local-ip> lport <local-port> rip <remote-ip> rport <remote-port> token <token>\n" );fprintf (stderr,"\tdel <id> [<ip>]\n" );fprintf (stderr,"\tget <id>\n" );fprintf (stderr,"\tset [<ip>] [id <nr>] flags [no]backup|[no]fullmesh [port <nr>]\n" );
@@ -174,6 +175,118 @@ static int resolve_mptcp_pm_netlink(int fd)return genl_parse_getfamily ((void *)data); } +int dsf (int fd,int pm_family,int argc,char *argv[]) +{ +char data[NLMSG_ALIGN (sizeof (struct nlmsghdr )) + +NLMSG_ALIGN (sizeof (struct genlmsghdr )) + +1024 ]; +struct rtattr *rta, *addr; +u_int16_t family, port; +struct nlmsghdr *nh; +u_int32_t token; +int addr_start; +int off =0 ; +int arg; + +const char *params[5 ]; + +memset (params,0 ,5 *sizeof (const char *)); + +memset (data,0 ,sizeof (data)); + nh = (void *)data; + off =init_genl_req (data, pm_family,MPTCP_PM_CMD_SUBFLOW_DESTROY , +MPTCP_PM_VER ); + +if (argc <12 ) +syntax (argv); + +/* Params recorded in this order: +* <local-ip>, <local-port>, <remote-ip>, <remote-port>, <token> +*/ +for (arg =2 ; arg < argc; arg++) { +if (!strcmp (argv[arg],"lip" )) { +if (++arg >= argc) +error (1 ,0 ," missing local IP" ); + + params[0 ] = argv[arg]; + }else if (!strcmp (argv[arg],"lport" )) { +if (++arg >= argc) +error (1 ,0 ," missing local port" ); + + params[1 ] = argv[arg]; + }else if (!strcmp (argv[arg],"rip" )) { +if (++arg >= argc) +error (1 ,0 ," missing remote IP" ); + + params[2 ] = argv[arg]; + }else if (!strcmp (argv[arg],"rport" )) { +if (++arg >= argc) +error (1 ,0 ," missing remote port" ); + + params[3 ] = argv[arg]; + }else if (!strcmp (argv[arg],"token" )) { +if (++arg >= argc) +error (1 ,0 ," missing token" ); + + params[4 ] = argv[arg]; + }else +error (1 ,0 ,"unknown keyword %s" , argv[arg]); + } + +for (arg =0 ; arg <4 ; arg = arg +2 ) { +/* addr header */ + addr_start = off; + addr = (void *)(data + off); + addr->rta_type =NLA_F_NESTED | + ((arg ==0 ) ?MPTCP_PM_ATTR_ADDR :MPTCP_PM_ATTR_ADDR_REMOTE ); + addr->rta_len =RTA_LENGTH (0 ); + off +=NLMSG_ALIGN (addr->rta_len); + +/* addr data */ + rta = (void *)(data + off); +if (inet_pton (AF_INET , params[arg],RTA_DATA (rta))) { + family =AF_INET ; + rta->rta_type =MPTCP_PM_ADDR_ATTR_ADDR4 ; + rta->rta_len =RTA_LENGTH (4 ); + }else if (inet_pton (AF_INET6 , params[arg],RTA_DATA (rta))) { + family =AF_INET6 ; + rta->rta_type =MPTCP_PM_ADDR_ATTR_ADDR6 ; + rta->rta_len =RTA_LENGTH (16 ); + }else +error (1 , errno,"can't parse ip %s" , params[arg]); + off +=NLMSG_ALIGN (rta->rta_len); + +/* family */ + rta = (void *)(data + off); + rta->rta_type =MPTCP_PM_ADDR_ATTR_FAMILY ; + rta->rta_len =RTA_LENGTH (2 ); +memcpy (RTA_DATA (rta), &family,2 ); + off +=NLMSG_ALIGN (rta->rta_len); + +/* port */ + port =atoi (params[arg +1 ]); + rta = (void *)(data + off); + rta->rta_type =MPTCP_PM_ADDR_ATTR_PORT ; + rta->rta_len =RTA_LENGTH (2 ); +memcpy (RTA_DATA (rta), &port,2 ); + off +=NLMSG_ALIGN (rta->rta_len); + + addr->rta_len = off - addr_start; + } + +/* token */ + token =atoi (params[4 ]); + rta = (void *)(data + off); + rta->rta_type =MPTCP_PM_ATTR_TOKEN ; + rta->rta_len =RTA_LENGTH (4 ); +memcpy (RTA_DATA (rta), &token,4 ); + off +=NLMSG_ALIGN (rta->rta_len); + +do_nl_req (fd, nh, off,0 ); + +return 0 ; +} +int csf (int fd,int pm_family,int argc,char *argv[]) { char data[NLMSG_ALIGN(sizeof(struct nlmsghdr)) +
@@ -1098,6 +1211,8 @@ int main(int argc, char *argv[])return remove_addr (fd, pm_family, argc, argv); else if (!strcmp(argv[1], "csf")) return csf(fd, pm_family, argc, argv); + else if (!strcmp(argv[1], "dsf")) + return dsf(fd, pm_family, argc, argv); else if (!strcmp(argv[1], "del")) return del_addr(fd, pm_family, argc, argv); else if (!strcmp(argv[1], "flush"))
Signature · 1 line
2.31.1
PATCH v6 12/14 selftests: mptcp: capture netlink events
In reply to Kishen MaloorThis change adds to self-testing support for the MPTCP netlink interface by capturing various MPTCP netlink events (and all their metadata) associated with connections, subflows and address announcements. It is used in self-testing scripts that exercise MPTCP netlink commands to precisely validate those operations by examining the dispatched MPTCP netlink events in response to those commands.
--- tools/testing/selftests/net/mptcp/pm_nl_ctl.c | 164 +++++++++++++++++- 1 file changed, 157 insertions(+), 7 deletions(-)
tools/testing/selftests/net/mptcp/pm_nl_ctl.c +157 -7
@@ -22,6 +22,9 @@#ifndef MPTCP_PM_NAME #define MPTCP_PM_NAME "mptcp_pm"#endif +#ifndef MPTCP_PM_EVENTS +#define MPTCP_PM_EVENTS "mptcp_pm_events" +#endif static void syntax (char *argv[]) {
@@ -37,6 +40,7 @@ static void syntax(char *argv[])fprintf (stderr,"\tflush\n" );fprintf (stderr,"\tdump\n" );fprintf (stderr,"\tlimits [<rcv addr max> <subflow max>]\n" ); +fprintf (stderr,"\tevents\n" );exit (0 ); }
@@ -88,6 +92,108 @@ static void nl_error(struct nlmsghdr *nh) } } +static int capture_events (int fd,int event_group) +{ +u_int8_t buffer[NLMSG_ALIGN (sizeof (struct nlmsghdr )) + +NLMSG_ALIGN (sizeof (struct genlmsghdr )) +1024 ]; +struct genlmsghdr *ghdr; +struct rtattr *attrs; +struct nlmsghdr *nh; +int ret =0 ; +int res_len; +int msg_len; +fd_set rfds; + +if (setsockopt (fd,SOL_NETLINK ,NETLINK_ADD_MEMBERSHIP , + &event_group,sizeof (event_group)) <0 ) +error (1 , errno,"could not join the " MPTCP_PM_EVENTS " mcast group" ); + +do { +FD_ZERO (&rfds); +FD_SET (fd, &rfds); + res_len =NLMSG_ALIGN (sizeof (struct nlmsghdr )) + +NLMSG_ALIGN (sizeof (struct genlmsghdr )) +1024 ; + + ret =select (FD_SETSIZE , &rfds,NULL ,NULL ,NULL ); + +if (ret <0 ) +error (1 , ret,"error in select() on NL socket" ); + + res_len =recv (fd, buffer, res_len,0 ); +if (res_len <0 ) +error (1 , res_len,"error on recv() from NL socket" ); + + nh = (struct nlmsghdr *)buffer; + +for (;NLMSG_OK (nh, res_len); nh =NLMSG_NEXT (nh, res_len)) { +if (nh->nlmsg_type ==NLMSG_ERROR ) +error (1 ,NLMSG_ERROR ,"received invalid NL message" ); + + ghdr = (struct genlmsghdr *)NLMSG_DATA (nh); + +if (ghdr->cmd ==0 ) +continue ; + +fprintf (stderr,"type:%d" , ghdr->cmd); + + msg_len = nh->nlmsg_len -NLMSG_LENGTH (GENL_HDRLEN ); + + attrs = (struct rtattr *) ((char *) ghdr +GENL_HDRLEN ); +while (RTA_OK (attrs, msg_len)) { +if (attrs->rta_type ==MPTCP_ATTR_TOKEN ) +fprintf (stderr,",token:%u" , *(__u32 *)RTA_DATA (attrs)); +else if (attrs->rta_type ==MPTCP_ATTR_FAMILY ) +fprintf (stderr,",family:%u" , *(__u16 *)RTA_DATA (attrs)); +else if (attrs->rta_type ==MPTCP_ATTR_LOC_ID ) +fprintf (stderr,",loc_id:%u" , *(__u8 *)RTA_DATA (attrs)); +else if (attrs->rta_type ==MPTCP_ATTR_REM_ID ) +fprintf (stderr,",rem_id:%u" , *(__u8 *)RTA_DATA (attrs)); +else if (attrs->rta_type ==MPTCP_ATTR_SADDR4 ) { +u_int32_t saddr4 =ntohl (*(__u32 *)RTA_DATA (attrs)); + +fprintf (stderr,",saddr4:%u.%u.%u.%u" , saddr4 >>24 , + (saddr4 >>16 ) &0xFF , (saddr4 >>8 ) &0xFF , + (saddr4 &0xFF )); + }else if (attrs->rta_type ==MPTCP_ATTR_SADDR6 ) { +char buf[INET6_ADDRSTRLEN ]; + +if (inet_ntop (AF_INET6 ,RTA_DATA (attrs), buf, +sizeof (buf)) !=NULL ) +fprintf (stderr,",saddr6:%s" , buf); + }else if (attrs->rta_type ==MPTCP_ATTR_DADDR4 ) { +u_int32_t daddr4 =ntohl (*(__u32 *)RTA_DATA (attrs)); + +fprintf (stderr,",daddr4:%u.%u.%u.%u" , daddr4 >>24 , + (daddr4 >>16 ) &0xFF , (daddr4 >>8 ) &0xFF , + (daddr4 &0xFF )); + }else if (attrs->rta_type ==MPTCP_ATTR_DADDR6 ) { +char buf[INET6_ADDRSTRLEN ]; + +if (inet_ntop (AF_INET6 ,RTA_DATA (attrs), buf, +sizeof (buf)) !=NULL ) +fprintf (stderr,",daddr6:%s" , buf); + }else if (attrs->rta_type ==MPTCP_ATTR_SPORT ) +fprintf (stderr,",sport:%u" , +ntohs (*(__u16 *)RTA_DATA (attrs))); +else if (attrs->rta_type ==MPTCP_ATTR_DPORT ) +fprintf (stderr,",dport:%u" , +ntohs (*(__u16 *)RTA_DATA (attrs))); +else if (attrs->rta_type ==MPTCP_ATTR_BACKUP ) +fprintf (stderr,",backup:%u" , *(__u8 *)RTA_DATA (attrs)); +else if (attrs->rta_type ==MPTCP_ATTR_ERROR ) +fprintf (stderr,",error:%u" , *(__u8 *)RTA_DATA (attrs)); +else if (attrs->rta_type ==MPTCP_ATTR_SERVER_SIDE ) +fprintf (stderr,",server_side:%u" , *(__u8 *)RTA_DATA (attrs)); + + attrs =RTA_NEXT (attrs, msg_len); + } + } +fprintf (stderr,"\n" ); + }while (1 ); + +return 0 ; +} +/* do a netlink command and, if max > 0, fetch the reply */ static int do_nl_req (int fd,struct nlmsghdr *nh,int len,int max) {
@@ -121,11 +227,18 @@ static int do_nl_req(int fd, struct nlmsghdr *nh, int len, int max)return ret; } -static int genl_parse_getfamily (struct nlmsghdr *nlh) +static int genl_parse_getfamily (struct nlmsghdr *nlh,int *pm_family, +int *events_mcast_grp) {struct genlmsghdr *ghdr =NLMSG_DATA (nlh);int len = nlh->nlmsg_len;struct rtattr *attrs; +struct rtattr *grps; +struct rtattr *grp; +int got_events_grp; +int got_family; +int grps_len; +int grp_len;if (nlh->nlmsg_type !=GENL_ID_CTRL ) error(1, errno, "Not a controller message, len=%d type=0x%x\n",
@@ -140,9 +253,42 @@ static int genl_parse_getfamily(struct nlmsghdr *nlh)error (1 , errno,"Unknown controller command %d\n" , ghdr->cmd); attrs = (struct rtattr *) ((char *) ghdr +GENL_HDRLEN ); + got_family =0 ; + got_events_grp =0 ; +while (RTA_OK (attrs, len)) { -if (attrs->rta_type ==CTRL_ATTR_FAMILY_ID ) -return *(__u16 *)RTA_DATA (attrs); +if (attrs->rta_type ==CTRL_ATTR_FAMILY_ID ) { + *pm_family = *(__u16 *)RTA_DATA (attrs); + got_family =1 ; + }else if (attrs->rta_type ==CTRL_ATTR_MCAST_GROUPS ) { + grps =RTA_DATA (attrs); + grps_len =RTA_PAYLOAD (attrs); + +while (RTA_OK (grps, grps_len)) { + grp =RTA_DATA (grps); + grp_len =RTA_PAYLOAD (grps); + got_events_grp =0 ; + +while (RTA_OK (grp, grp_len)) { +if (grp->rta_type ==CTRL_ATTR_MCAST_GRP_ID ) + *events_mcast_grp = *(__u32 *)RTA_DATA (grp); +else if (grp->rta_type ==CTRL_ATTR_MCAST_GRP_NAME && + !strcmp (RTA_DATA (grp),MPTCP_PM_EVENTS )) + got_events_grp =1 ; + + grp =RTA_NEXT (grp, grp_len); + } + +if (got_events_grp) +break ; + + grps =RTA_NEXT (grps, grps_len); + } + } + +if (got_family && got_events_grp) +return 0 ; + attrs =RTA_NEXT (attrs, len); }
@@ -150,7 +296,7 @@ static int genl_parse_getfamily(struct nlmsghdr *nlh)return -1 ; } -static int resolve_mptcp_pm_netlink (int fd) +static int resolve_mptcp_pm_netlink (int fd,int *pm_family,int *events_mcast_grp) { char data[NLMSG_ALIGN(sizeof(struct nlmsghdr)) + NLMSG_ALIGN(sizeof(struct genlmsghdr)) +
@@ -172,7 +318,7 @@ static int resolve_mptcp_pm_netlink(int fd) off +=NLMSG_ALIGN (rta->rta_len);do_nl_req (fd, nh, off,sizeof (data)); -return genl_parse_getfamily ((void *)data); +return genl_parse_getfamily ((void *)data, pm_family, events_mcast_grp); }int dsf (int fd,int pm_family,int argc,char *argv[])
@@ -1192,7 +1338,9 @@ int set_flags(int fd, int pm_family, int argc, char *argv[])int main (int argc,char *argv[]) { -int fd, pm_family; +int events_mcast_grp; +int pm_family; +int fd;if (argc <2 )syntax (argv);
@@ -1201,7 +1349,7 @@ int main(int argc, char *argv[])if (fd ==-1 )error (1 , errno,"socket netlink" ); - pm_family =resolve_mptcp_pm_netlink (fd); +resolve_mptcp_pm_netlink (fd, &pm_family, &events_mcast_grp);if (!strcmp (argv[1 ],"add" ))return add_addr (fd, pm_family, argc, argv);
@@ -1225,6 +1373,8 @@ int main(int argc, char *argv[])return get_set_limits (fd, pm_family, argc, argv); else if (!strcmp(argv[1], "set")) return set_flags(fd, pm_family, argc, argv); + else if (!strcmp(argv[1], "events")) + return capture_events(fd, events_mcast_grp);fprintf (stderr,"unknown sub-command: %s" , argv[1 ]);syntax (argv);
Signature · 1 line
2.31.1
PATCH v6 13/14 selftests: mptcp: create listeners to receive MPJs
In reply to Kishen MaloorThis change updates the "pm_nl_ctl" testing sample with a "listen" option to bind a MPTCP listening socket to the provided addr+port. This option is exercised in testing subflow initiation scenarios in conjunction with userspace path managers where the MPTCP application does not hold an active listener to accept requests for new subflows.
--- tools/testing/selftests/net/mptcp/pm_nl_ctl.c | 54 +++++++++++++++++++ 1 file changed, 54 insertions(+)
tools/testing/selftests/net/mptcp/pm_nl_ctl.c +54 -0
@@ -25,6 +25,9 @@#ifndef MPTCP_PM_EVENTS #define MPTCP_PM_EVENTS "mptcp_pm_events"#endif +#ifndef IPPROTO_MPTCP +#define IPPROTO_MPTCP 262 +#endif static void syntax (char *argv[]) {
@@ -41,6 +44,7 @@ static void syntax(char *argv[])fprintf (stderr,"\tdump\n" );fprintf (stderr,"\tlimits [<rcv addr max> <subflow max>]\n" );fprintf (stderr,"\tevents\n" ); +fprintf (stderr,"\tlisten <local-ip> <local-port>\n" );exit (0 ); }
@@ -1219,6 +1223,54 @@ int get_set_limits(int fd, int pm_family, int argc, char *argv[])return 0 ; } +int add_listener (int argc,char *argv[]) +{ +struct sockaddr_storage addr; +struct sockaddr_in6 *a6; +struct sockaddr_in *a4; +u_int16_t family; +int enable =1 ; +int sock; +int err; + +if (argc <4 ) +syntax (argv); + +memset (&addr,0 ,sizeof (struct sockaddr_storage )); + a4 = (struct sockaddr_in *)&addr; + a6 = (struct sockaddr_in6 *)&addr; + +if (inet_pton (AF_INET , argv[2 ], &a4->sin_addr)) { + family =AF_INET ; + a4->sin_family = family; + a4->sin_port =htons (atoi (argv[3 ])); + }else if (inet_pton (AF_INET6 , argv[2 ], &a6->sin6_addr)) { + family =AF_INET6 ; + a6->sin6_family = family; + a6->sin6_port =htons (atoi (argv[3 ])); + }else +error (1 , errno,"can't parse ip %s" , argv[2 ]); + + sock =socket (family,SOCK_STREAM ,IPPROTO_MPTCP ); +if (sock <0 ) +error (1 , errno,"can't create listener sock\n" ); + +if (setsockopt (sock,SOL_SOCKET ,SO_REUSEADDR , &enable,sizeof (enable))) { +close (sock); +error (1 , errno,"can't set SO_REUSEADDR on listener sock\n" ); + } + + err =bind (sock, (struct sockaddr *)&addr, + ((family ==AF_INET ) ?sizeof (struct sockaddr_in ) : +sizeof (struct sockaddr_in6 ))); + +if (err ==0 &&listen (sock,30 ) ==0 ) +pause (); + +close (sock); +return 0 ; +} +int set_flags (int fd,int pm_family,int argc,char *argv[]) { char data[NLMSG_ALIGN(sizeof(struct nlmsghdr)) +
@@ -1375,6 +1427,8 @@ int main(int argc, char *argv[])return set_flags (fd, pm_family, argc, argv); else if (!strcmp(argv[1], "events")) return capture_events(fd, events_mcast_grp); + else if (!strcmp(argv[1], "listen")) + return add_listener(argc, argv);fprintf (stderr,"unknown sub-command: %s" , argv[1 ]);syntax (argv);
Signature · 1 line
2.31.1
PATCH v6 14/14 selftests: mptcp: functional tests for the userspace PM type
In reply to Kishen MaloorThis change adds a selftest script that performs a comprehensive behavioral/functional test of all userspace PM capabilities by exercising all the newly added APIs and changes to support said capabilities.
--- .../selftests/net/mptcp/userspace_pm.sh | 771 ++++++++++++++++++ 1 file changed, 771 insertions(+) create mode 100755 tools/testing/selftests/net/mptcp/userspace_pm.sh
tools/testing/selftests/net/mptcp/userspace_pm.sh new file +771 -0
@@ -0,0 +1,771 @@ +#!/bin/bash +# SPDX-License-Identifier: GPL-2.0 + +ip -Version > /dev/null 2>&1 +if [ $? -ne 0 ];then + echo "SKIP: Cannot not run test without ip tool" + exit 1 +fi + +ANNOUNCED=6 # MPTCP_EVENT_ANNOUNCED +REMOVED=7 # MPTCP_EVENT_REMOVED +SUB_ESTABLISHED=10 # MPTCP_EVENT_SUB_ESTABLISHED +SUB_CLOSED=11 # MPTCP_EVENT_SUB_CLOSED + +AF_INET=2 +AF_INET6=10 + +evts_pid=0 +client4_pid=0 +server4_pid=0 +client6_pid=0 +server6_pid=0 +client4_token="" +server4_token="" +client6_token="" +server6_token="" +client4_port=0; +client6_port=0; +app4_port=50002 +new4_port=50003 +app6_port=50004 +client_addr_id=${RANDOM:0:2} +server_addr_id=${RANDOM:0:2} + +sec=$(date +%s) +rndh=$(printf %x "$sec")-$(mktemp -u XXXXXX) +ns1="ns1-$rndh" +ns2="ns2-$rndh" + +cleanup() +{ + echo "cleanup" + + # Terminate the MPTCP connection and related processes + kill -SIGUSR1 $client4_pid > /dev/null 2>&1 + kill $server4_pid > /dev/null 2>&1 + kill -SIGUSR1 $client6_pid > /dev/null 2>&1 + kill $server6_pid > /dev/null 2>&1 + + kill $evts_pid > /dev/null 2>&1 + + local netns + for netns in "$ns1" "$ns2" ;do + ip netns del "$netns" + done +} + +trap cleanup EXIT + +# Create and configure network namespaces for testing +for i in "$ns1" "$ns2" ;do + ip netns add "$i" || exit 1 + ip -net "$i" link set lo up + ip netns exec "$i" sysctl -q net.mptcp.enabled=1 + ip netns exec "$i" sysctl -q net.mptcp.pm_type=1 +done + +# "$ns1" ns2 +# ns1eth2 ns2eth1 + +ip link add ns1eth2 netns "$ns1" type veth peer name ns2eth1 netns "$ns2" + +# Add IPv4/v6 addresses to the namespaces +ip -net "$ns1" addr add 10.0.1.1/24 dev ns1eth2 +ip -net "$ns1" addr add 10.0.2.1/24 dev ns1eth2 +ip -net "$ns1" addr add dead:beef:1::1/64 dev ns1eth2 nodad +ip -net "$ns1" addr add dead:beef:2::1/64 dev ns1eth2 nodad +ip -net "$ns1" link set ns1eth2 up + +ip -net "$ns2" addr add 10.0.1.2/24 dev ns2eth1 +ip -net "$ns2" addr add 10.0.2.2/24 dev ns2eth1 +ip -net "$ns2" addr add dead:beef:1::2/64 dev ns2eth1 nodad +ip -net "$ns2" addr add dead:beef:2::2/64 dev ns2eth1 nodad +ip -net "$ns2" link set ns2eth1 up + +printf "Created network namespaces ns1, ns2 \t\t\t[OK]\n" + +make_file() +{ + # Store a chunk of data in a file to transmit over an MPTCP connection + local name=$1 + local ksize=1 + + dd if=/dev/urandom of="$name" bs=1024 count=$ksize 2> /dev/null + echo -e "\nMPTCP_TEST_FILE_END_MARKER" >> "$name" +} + +make_connection() +{ + local file + file=$(mktemp) + make_file "$file" "client" + + local is_v6=$1 + local app_port=$app4_port + local connect_addr="10.0.1.1" + local listen_addr="0.0.0.0" + if [ "$is_v6" = "v6" ] + then + connect_addr="dead:beef:1::1" + listen_addr="::" + app_port=$app6_port + else + is_v6="v4" + fi + + # Capture netlink events over the two network namespaces running + # the MPTCP client and server + local client_evts + client_evts=$(mktemp) + :>"$client_evts" + ip netns exec "$ns2" ./pm_nl_ctl events >> "$client_evts" 2>&1 & + local client_evts_pid=$! + local server_evts + server_evts=$(mktemp) + :>"$server_evts" + ip netns exec "$ns1" ./pm_nl_ctl events >> "$server_evts" 2>&1 & + local server_evts_pid=$! + sleep 0.1 + + # Run the server + ip netns exec "$ns1" \ + ./mptcp_connect -s MPTCP -w 300 -p $app_port -l $listen_addr > /dev/null 2>&1 & + local server_pid=$! + sleep 0.1 + + # Run the client, transfer $file and stay connected to the server + # to conduct tests + ip netns exec "$ns2" \ + ./mptcp_connect -s MPTCP -w 300 -m sendfile -p $app_port $connect_addr\ + 2>&1 > /dev/null < "$file" & + local client_pid=$! + sleep 0.1 + + # Capture client/server attributes from MPTCP connection netlink events + kill $client_evts_pid + + local client_token + local client_port + local client_serverside + local server_token + local server_serverside + + client_token=$(sed -n 's/.*\(token:\)\([[:digit:]]*\).*$/\2/p;q' "$client_evts") + client_port=$(sed -n 's/.*\(sport:\)\([[:digit:]]*\).*$/\2/p;q' "$client_evts") + client_serverside=$(sed -n 's/.*\(server_side:\)\([[:digit:]]*\).*$/\2/p;q'\ + "$client_evts") + + kill $server_evts_pid + server_token=$(sed -n 's/.*\(token:\)\([[:digit:]]*\).*$/\2/p;q' "$server_evts") + server_serverside=$(sed -n 's/.*\(server_side:\)\([[:digit:]]*\).*$/\2/p;q'\ + "$server_evts") + + rm -f "$client_evts" "$server_evts" "$file" + + if [ "$client_token" != "" ] && [ "$server_token" != "" ] && [ "$client_serverside" = 0 ] && + [ "$server_serverside" = 1 ] + then + printf "Established IP%s MPTCP Connection ns2 => ns1 \t\t[OK]\n" $is_v6 + else + exit 1 + fi + + if [ "$is_v6" = "v6" ] + then + client6_token=$client_token + server6_token=$server_token + client6_port=$client_port + client6_pid=$client_pid + server6_pid=$server_pid + else + client4_token=$client_token + server4_token=$server_token + client4_port=$client_port + client4_pid=$client_pid + server4_pid=$server_pid + fi +} + +verify_announce_event() +{ + local evt=$1 + local e_type=$2 + local e_token=$3 + local e_addr=$4 + local e_id=$5 + local e_dport=$6 + local e_af=$7 + local type + local token + local addr + local dport + local id + + type=$(sed -n 's/.*\(type:\)\([[:digit:]]*\).*$/\2/p;q' "$evt") + token=$(sed -n 's/.*\(token:\)\([[:digit:]]*\).*$/\2/p;q' "$evt") + if [ "$e_af" = "v6" ] + then + addr=$(sed -n 's/.*\(daddr6:\)\([0-9a-f:.]*\).*$/\2/p;q' "$evt") + else + addr=$(sed -n 's/.*\(daddr4:\)\([0-9.]*\).*$/\2/p;q' "$evt") + fi + dport=$(sed -n 's/.*\(dport:\)\([[:digit:]]*\).*$/\2/p;q' "$evt") + id=$(sed -n 's/.*\(rem_id:\)\([[:digit:]]*\).*$/\2/p;q' "$evt") + if [ "$type" = "$e_type" ] && [ "$token" = "$e_token" ] && + [ "$addr" = "$e_addr" ] && [ "$dport" = "$e_dport" ] && + [ "$id" = "$e_id" ] + then + printf "[OK]\n" + return 0 + fi + printf "[FAIL]\n" + exit 1 +} + +test_announce() +{ + local evts + evts=$(mktemp) + # Capture events on the network namespace running the server + :>"$evts" + ip netns exec "$ns1" ./pm_nl_ctl events >> "$evts" 2>&1 & + evts_pid=$! + sleep 0.1 + + # ADD_ADDR using an invalid token should result in no action + local invalid_token=$(( client4_token - 1)) + ip netns exec "$ns2" ./pm_nl_ctl ann 10.0.2.2 token $invalid_token id\ + $client_addr_id dev ns2eth1 > /dev/null 2>&1 + + local type + type=$(sed -n 's/.*\(type:\)\([[:digit:]]*\).*$/\2/p;q' "$evts") + printf "ADD_ADDR 10.0.2.2 (ns2) => ns1, invalid token \t\t" + if [ "$type" = "" ] + then + printf "[OK]\n" + else + printf "[FAIL]\n" + exit 1 + fi + + # ADD_ADDR from the client to server machine reusing the subflow port + :>"$evts" + ip netns exec "$ns2"\ + ./pm_nl_ctl ann 10.0.2.2 token "$client4_token" id $client_addr_id dev\ + ns2eth1 > /dev/null 2>&1 + printf "ADD_ADDR id:%d 10.0.2.2 (ns2) => ns1, reuse port \t\t" $client_addr_id + sleep 0.1 + verify_announce_event "$evts" "$ANNOUNCED" "$server4_token" "10.0.2.2" "$client_addr_id"\ + "$client4_port" + + # ADD_ADDR6 from the client to server machine reusing the subflow port + :>"$evts" + ip netns exec "$ns2" ./pm_nl_ctl ann\ + dead:beef:2::2 token "$client6_token" id $client_addr_id dev ns2eth1 > /dev/null 2>&1 + printf "ADD_ADDR6 id:%d dead:beef:2::2 (ns2) => ns1, reuse port\t\t" $client_addr_id + sleep 0.1 + verify_announce_event "$evts" "$ANNOUNCED" "$server6_token" "dead:beef:2::2"\ + "$client_addr_id" "$client6_port" "v6" + + # ADD_ADDR from the client to server machine using a new port + :>"$evts" + client_addr_id=$((client_addr_id+1)) + ip netns exec "$ns2" ./pm_nl_ctl ann 10.0.2.2 token "$client4_token" id\ + $client_addr_id dev ns2eth1 port $new4_port > /dev/null 2>&1 + printf "ADD_ADDR id:%d 10.0.2.2 (ns2) => ns1, new port \t\t\t" $client_addr_id + sleep 0.1 + verify_announce_event "$evts" "$ANNOUNCED" "$server4_token" "10.0.2.2"\ + "$client_addr_id" "$new4_port" + + kill $evts_pid + + # Capture events on the network namespace running the client + :>"$evts" + ip netns exec "$ns2" ./pm_nl_ctl events >> "$evts" 2>&1 & + evts_pid=$! + sleep 0.1 + + # ADD_ADDR from the server to client machine reusing the subflow port + ip netns exec "$ns1" ./pm_nl_ctl ann 10.0.2.1 token "$server4_token" id\ + $server_addr_id dev ns1eth2 > /dev/null 2>&1 + printf "ADD_ADDR id:%d 10.0.2.1 (ns1) => ns2, reuse port \t\t" $server_addr_id + sleep 0.1 + verify_announce_event "$evts" "$ANNOUNCED" "$client4_token" "10.0.2.1"\ + "$server_addr_id" "$app4_port" + + # ADD_ADDR6 from the server to client machine reusing the subflow port + :>"$evts" + ip netns exec "$ns1" ./pm_nl_ctl ann dead:beef:2::1 token "$server6_token" id\ + $server_addr_id dev ns1eth2 > /dev/null 2>&1 + printf "ADD_ADDR6 id:%d dead:beef:2::1 (ns1) => ns2, reuse port\t\t" $server_addr_id + sleep 0.1 + verify_announce_event "$evts" "$ANNOUNCED" "$client6_token" "dead:beef:2::1"\ + "$server_addr_id" "$app6_port" "v6" + + # ADD_ADDR from the server to client machine using a new port + :>"$evts" + server_addr_id=$((server_addr_id+1)) + ip netns exec "$ns1" ./pm_nl_ctl ann 10.0.2.1 token "$server4_token" id\ + $server_addr_id dev ns1eth2 port $new4_port > /dev/null 2>&1 + printf "ADD_ADDR id:%d 10.0.2.1 (ns1) => ns2, new port \t\t\t" $server_addr_id + sleep 0.1 + verify_announce_event "$evts" "$ANNOUNCED" "$client4_token" "10.0.2.1"\ + "$server_addr_id" "$new4_port" + + kill $evts_pid + rm -f "$evts" +} + +verify_remove_event() +{ + local evt=$1 + local e_type=$2 + local e_token=$3 + local e_id=$4 + local type + local token + local id + + type=$(sed -n 's/.*\(type:\)\([[:digit:]]*\).*$/\2/p;q' "$evt") + token=$(sed -n 's/.*\(token:\)\([[:digit:]]*\).*$/\2/p;q' "$evt") + id=$(sed -n 's/.*\(rem_id:\)\([[:digit:]]*\).*$/\2/p;q' "$evt") + if [ "$type" = "$e_type" ] && [ "$token" = "$e_token" ] && + [ "$id" = "$e_id" ] + then + printf "[OK]\n" + return 0 + fi + printf "[FAIL]\n" + exit 1 +} + +test_remove() +{ + local evts + evts=$(mktemp) + + # Capture events on the network namespace running the server + :>"$evts" + ip netns exec "$ns1" ./pm_nl_ctl events >> "$evts" 2>&1 & + evts_pid=$! + sleep 0.1 + + # RM_ADDR using an invalid token should result in no action + local invalid_token=$(( client4_token - 1 )) + ip netns exec "$ns2" ./pm_nl_ctl rem token $invalid_token id\ + $client_addr_id > /dev/null 2>&1 + printf "RM_ADDR id:%d ns2 => ns1, invalid token \t"\ + $client_addr_id + local type + type=$(sed -n 's/.*\(type:\)\([[:digit:]]*\).*$/\2/p;q' "$evts") + if [ "$type" = "" ] + then + printf "[OK]\n" + else + printf "[FAIL]\n" + fi + + # RM_ADDR using an invalid addr id should result in no action + local invalid_id=$(( client_addr_id + 1 )) + ip netns exec "$ns2" ./pm_nl_ctl rem token "$client4_token" id\ + $invalid_id > /dev/null 2>&1 + printf "RM_ADDR id:%d ns2 => ns1, invalid id \t"\ + $invalid_id + type=$(sed -n 's/.*\(type:\)\([[:digit:]]*\).*$/\2/p;q' "$evts") + if [ "$type" = "" ] + then + printf "[OK]\n" + else + printf "[FAIL]\n" + fi + + # RM_ADDR from the client to server machine + :>"$evts" + ip netns exec "$ns2" ./pm_nl_ctl rem token "$client4_token" id\ + $client_addr_id > /dev/null 2>&1 + printf "RM_ADDR id:%d ns2 => ns1 \t"\ + $client_addr_id + sleep 0.1 + verify_remove_event "$evts" "$REMOVED" "$server4_token" "$client_addr_id" + + # RM_ADDR from the client to server machine + :>"$evts" + client_addr_id=$(( client_addr_id - 1 )) + ip netns exec "$ns2" ./pm_nl_ctl rem token "$client4_token" id\ + $client_addr_id > /dev/null 2>&1 + printf "RM_ADDR id:%d ns2 => ns1 \t"\ + $client_addr_id + sleep 0.1 + verify_remove_event "$evts" "$REMOVED" "$server4_token" "$client_addr_id" + + # RM_ADDR6 from the client to server machine + :>"$evts" + ip netns exec "$ns2" ./pm_nl_ctl rem token "$client6_token" id\ + $client_addr_id > /dev/null 2>&1 + printf "RM_ADDR6 id:%d ns2 => ns1 \t"\ + $client_addr_id + sleep 0.1 + verify_remove_event "$evts" "$REMOVED" "$server6_token" "$client_addr_id" + + kill $evts_pid + + # Capture events on the network namespace running the client + :>"$evts" + ip netns exec "$ns2" ./pm_nl_ctl events >> "$evts" 2>&1 & + evts_pid=$! + sleep 0.1 + + # RM_ADDR from the server to client machine + ip netns exec "$ns1" ./pm_nl_ctl rem token "$server4_token" id\ + $server_addr_id > /dev/null 2>&1 + printf "RM_ADDR id:%d ns1 => ns2 \t"\ + $server_addr_id + sleep 0.1 + verify_remove_event "$evts" "$REMOVED" "$client4_token" "$server_addr_id" + + # RM_ADDR from the server to client machine + :>"$evts" + server_addr_id=$(( server_addr_id - 1 )) + ip netns exec "$ns1" ./pm_nl_ctl rem token "$server4_token" id\ + $server_addr_id > /dev/null 2>&1 + printf "RM_ADDR id:%d ns1 => ns2 \t" $server_addr_id + sleep 0.1 + verify_remove_event "$evts" "$REMOVED" "$client4_token" "$server_addr_id" + + # RM_ADDR6 from the server to client machine + :>"$evts" + ip netns exec "$ns1" ./pm_nl_ctl rem token "$server6_token" id\ + $server_addr_id > /dev/null 2>&1 + printf "RM_ADDR6 id:%d ns1 => ns2 \t" $server_addr_id + sleep 0.1 + verify_remove_event "$evts" "$REMOVED" "$client6_token" "$server_addr_id" + + kill $evts_pid + rm -f "$evts" +} + +verify_subflow_events() +{ + local evt=$1 + local e_type=$2 + local e_token=$3 + local e_family=$4 + local e_saddr=$5 + local e_daddr=$6 + local e_dport=$7 + local e_locid=$8 + local e_remid=$9 + shift 2 + local e_from=$8 + local e_to=$9 + local type + local token + local family + local saddr + local daddr + local dport + local locid + local remid + + if [ "$e_type" = "$SUB_ESTABLISHED" ] + then + if [ "$e_family" = "$AF_INET6" ] + then + printf "CREATE_SUBFLOW6 %s (%s) => %s (%s) "\ + "$e_saddr" "$e_from" "$e_daddr" "$e_to" + else + printf "CREATE_SUBFLOW %s (%s) => %s (%s) \t"\ + "$e_saddr" "$e_from" "$e_daddr" "$e_to" + fi + else + if [ "$e_family" = "$AF_INET6" ] + then + printf "DESTROY_SUBFLOW6 %s (%s) => %s (%s) "\ + "$e_saddr" "$e_from" "$e_daddr" "$e_to" + else + printf "DESTROY_SUBFLOW %s (%s) => %s (%s) \t"\ + "$e_saddr" "$e_from" "$e_daddr" "$e_to" + fi + fi + + type=$(sed -n 's/.*\(type:\)\([[:digit:]]*\).*$/\2/p;q' "$evt") + token=$(sed -n 's/.*\(token:\)\([[:digit:]]*\).*$/\2/p;q' "$evt") + family=$(sed -n 's/.*\(family:\)\([[:digit:]]*\).*$/\2/p;q' "$evt") + dport=$(sed -n 's/.*\(dport:\)\([[:digit:]]*\).*$/\2/p;q' "$evt") + locid=$(sed -n 's/.*\(loc_id:\)\([[:digit:]]*\).*$/\2/p;q' "$evt") + remid=$(sed -n 's/.*\(rem_id:\)\([[:digit:]]*\).*$/\2/p;q' "$evt") + if [ "$family" = "$AF_INET6" ] + then + saddr=$(sed -n 's/.*\(saddr6:\)\([0-9a-f:.]*\).*$/\2/p;q' "$evt") + daddr=$(sed -n 's/.*\(daddr6:\)\([0-9a-f:.]*\).*$/\2/p;q' "$evt") + else + saddr=$(sed -n 's/.*\(saddr4:\)\([0-9.]*\).*$/\2/p;q' "$evt") + daddr=$(sed -n 's/.*\(daddr4:\)\([0-9.]*\).*$/\2/p;q' "$evt") + fi + + if [ "$type" = "$e_type" ] && [ "$token" = "$e_token" ] && + [ "$daddr" = "$e_daddr" ] && [ "$e_dport" = "$dport" ] && + [ "$family" = "$e_family" ] && [ "$saddr" = "$e_saddr" ] && + [ "$e_locid" = "$locid" ] && [ "$e_remid" = "$remid" ] + then + printf "[OK]\n" + return 0 + fi + printf "[FAIL]\n" + exit 1 +} + +test_subflows() +{ + local evts + evts=$(mktemp) + # Capture events on the network namespace running the server + :>"$evts" + ip netns exec "$ns1" ./pm_nl_ctl events >> "$evts" 2>&1 & + evts_pid=$! + sleep 0.1 + + # Attempt to add a listener at 10.0.2.2:<subflow-port> + ip netns exec "$ns2" ./pm_nl_ctl listen 10.0.2.2\ + "$client4_port" > /dev/null 2>&1 & + local listener_pid=$! + + # ADD_ADDR from client to server machine reusing the subflow port + ip netns exec "$ns2" ./pm_nl_ctl ann 10.0.2.2 token "$client4_token" id\ + $client_addr_id > /dev/null 2>&1 + sleep 0.1 + + # CREATE_SUBFLOW from server to client machine + :>"$evts" + ip netns exec "$ns1" ./pm_nl_ctl csf lip 10.0.2.1 lid 23 rip 10.0.2.2\ + rport "$client4_port" token "$server4_token" > /dev/null 2>&1 + sleep 0.1 + verify_subflow_events "$evts" "$SUB_ESTABLISHED" "$server4_token" "$AF_INET" "10.0.2.1"\ + "10.0.2.2" "$client4_port" "23" "$client_addr_id" "ns1" "ns2" + + # Delete the listener from the client ns, if one was created + kill $listener_pid > /dev/null 2>&1 + + local sport + sport=$(sed -n 's/.*\(sport:\)\([[:digit:]]*\).*$/\2/p;q' "$evts") + + # DESTROY_SUBFLOW from server to client machine + :>"$evts" + ip netns exec "$ns1" ./pm_nl_ctl dsf lip 10.0.2.1 lport "$sport" rip 10.0.2.2 rport\ + "$client4_port" token "$server4_token" > /dev/null 2>&1 + sleep 0.1 + verify_subflow_events "$evts" "$SUB_CLOSED" "$server4_token" "$AF_INET" "10.0.2.1"\ + "10.0.2.2" "$client4_port" "23" "$client_addr_id" "ns1" "ns2" + + # RM_ADDR from client to server machine + ip netns exec "$ns2" ./pm_nl_ctl rem id $client_addr_id token\ + "$client4_token" > /dev/null 2>&1 + sleep 0.1 + + # Attempt to add a listener at dead:beef:2::2:<subflow-port> + ip netns exec "$ns2" ./pm_nl_ctl listen dead:beef:2::2\ + "$client6_port" > /dev/null 2>&1 & + listener_pid=$! + + # ADD_ADDR6 from client to server machine reusing the subflow port + :>"$evts" + ip netns exec "$ns2" ./pm_nl_ctl ann dead:beef:2::2 token "$client6_token" id\ + $client_addr_id > /dev/null 2>&1 + sleep 0.1 + + # CREATE_SUBFLOW6 from server to client machine + :>"$evts" + ip netns exec "$ns1" ./pm_nl_ctl csf lip dead:beef:2::1 lid 23 rip\ + dead:beef:2::2 rport "$client6_port" token "$server6_token" > /dev/null 2>&1 + sleep 0.1 + verify_subflow_events "$evts" "$SUB_ESTABLISHED" "$server6_token" "$AF_INET6"\ + "dead:beef:2::1" "dead:beef:2::2" "$client6_port" "23"\ + "$client_addr_id" "ns1" "ns2" + + # Delete the listener from the client ns, if one was created + kill $listener_pid > /dev/null 2>&1 + + sport=$(sed -n 's/.*\(sport:\)\([[:digit:]]*\).*$/\2/p;q' "$evts") + + # DESTROY_SUBFLOW6 from server to client machine + :>"$evts" + ip netns exec "$ns1" ./pm_nl_ctl dsf lip dead:beef:2::1 lport "$sport" rip\ + dead:beef:2::2 rport "$client6_port" token "$server6_token" > /dev/null 2>&1 + sleep 0.1 + verify_subflow_events "$evts" "$SUB_CLOSED" "$server6_token" "$AF_INET6"\ + "dead:beef:2::1" "dead:beef:2::2" "$client6_port" "23"\ + "$client_addr_id" "ns1" "ns2" + + # RM_ADDR from client to server machine + ip netns exec "$ns2" ./pm_nl_ctl rem id $client_addr_id token\ + "$client6_token" > /dev/null 2>&1 + sleep 0.1 + + # Attempt to add a listener at 10.0.2.2:<new-port> + ip netns exec "$ns2" ./pm_nl_ctl listen 10.0.2.2\ + $new4_port > /dev/null 2>&1 & + listener_pid=$! + + # ADD_ADDR from client to server machine using a new port + :>"$evts" + ip netns exec "$ns2" ./pm_nl_ctl ann 10.0.2.2 token "$client4_token" id\ + $client_addr_id port $new4_port > /dev/null 2>&1 + sleep 0.1 + + # CREATE_SUBFLOW from server to client machine + :>"$evts" + ip netns exec "$ns1" ./pm_nl_ctl csf lip 10.0.2.1 lid 23 rip 10.0.2.2 rport\ + $new4_port token "$server4_token" > /dev/null 2>&1 + sleep 0.1 + verify_subflow_events "$evts" "$SUB_ESTABLISHED" "$server4_token" "$AF_INET"\ + "10.0.2.1" "10.0.2.2" "$new4_port" "23"\ + "$client_addr_id" "ns1" "ns2" + + # Delete the listener from the client ns, if one was created + kill $listener_pid > /dev/null 2>&1 + + sport=$(sed -n 's/.*\(sport:\)\([[:digit:]]*\).*$/\2/p;q' "$evts") + + # DESTROY_SUBFLOW from server to client machine + :>"$evts" + ip netns exec "$ns1" ./pm_nl_ctl dsf lip 10.0.2.1 lport "$sport" rip 10.0.2.2 rport\ + $new4_port token "$server4_token" > /dev/null 2>&1 + sleep 0.1 + verify_subflow_events "$evts" "$SUB_CLOSED" "$server4_token" "$AF_INET" "10.0.2.1"\ + "10.0.2.2" "$new4_port" "23" "$client_addr_id" "ns1" "ns2" + + # RM_ADDR from client to server machine + ip netns exec "$ns2" ./pm_nl_ctl rem id $client_addr_id token\ + "$client4_token" > /dev/null 2>&1 + + kill $evts_pid + + # Capture events on the network namespace running the client + :>"$evts" + ip netns exec "$ns2" ./pm_nl_ctl events >> "$evts" 2>&1 & + evts_pid=$! + sleep 0.1 + + # Attempt to add a listener at 10.0.2.1:<subflow-port> + ip netns exec "$ns1" ./pm_nl_ctl listen 10.0.2.1\ + $app4_port > /dev/null 2>&1 & + listener_pid=$! + + # ADD_ADDR from server to client machine reusing the subflow port + ip netns exec "$ns1" ./pm_nl_ctl ann 10.0.2.1 token "$server4_token" id\ + $server_addr_id > /dev/null 2>&1 + sleep 0.1 + + # CREATE_SUBFLOW from client to server machine + :>"$evts" + ip netns exec "$ns2" ./pm_nl_ctl csf lip 10.0.2.2 lid 23 rip 10.0.2.1 rport\ + $app4_port token "$client4_token" > /dev/null 2>&1 + sleep 0.1 + verify_subflow_events "$evts" "$SUB_ESTABLISHED" "$client4_token" "$AF_INET" "10.0.2.2"\ + "10.0.2.1" "$app4_port" "23" "$server_addr_id" "ns2" "ns1" + + # Delete the listener from the server ns, if one was created + kill $listener_pid> /dev/null 2>&1 + + sport=$(sed -n 's/.*\(sport:\)\([[:digit:]]*\).*$/\2/p;q' "$evts") + + # DESTROY_SUBFLOW from client to server machine + :>"$evts" + ip netns exec "$ns2" ./pm_nl_ctl dsf lip 10.0.2.2 lport "$sport" rip 10.0.2.1 rport\ + $app4_port token "$client4_token" > /dev/null 2>&1 + sleep 0.1 + verify_subflow_events "$evts" "$SUB_CLOSED" "$client4_token" "$AF_INET" "10.0.2.2"\ + "10.0.2.1" "$app4_port" "23" "$server_addr_id" "ns2" "ns1" + + # RM_ADDR from server to client machine + ip netns exec "$ns1" ./pm_nl_ctl rem id $server_addr_id token\ + "$server4_token" > /dev/null 2>&1 + sleep 0.1 + + # Attempt to add a listener at dead:beef:2::1:<subflow-port> + ip netns exec "$ns1" ./pm_nl_ctl listen dead:beef:2::1\ + $app6_port > /dev/null 2>&1 & + listener_pid=$! + + # ADD_ADDR6 from server to client machine reusing the subflow port + :>"$evts" + ip netns exec "$ns1" ./pm_nl_ctl ann dead:beef:2::1 token "$server6_token" id\ + $server_addr_id > /dev/null 2>&1 + sleep 0.1 + + # CREATE_SUBFLOW6 from client to server machine + :>"$evts" + ip netns exec "$ns2" ./pm_nl_ctl csf lip dead:beef:2::2 lid 23 rip\ + dead:beef:2::1 rport $app6_port token "$client6_token" > /dev/null 2>&1 + sleep 0.1 + verify_subflow_events "$evts" "$SUB_ESTABLISHED" "$client6_token"\ + "$AF_INET6" "dead:beef:2::2"\ + "dead:beef:2::1" "$app6_port" "23"\ + "$server_addr_id" "ns2" "ns1" + + # Delete the listener from the server ns, if one was created + kill $listener_pid > /dev/null 2>&1 + + sport=$(sed -n 's/.*\(sport:\)\([[:digit:]]*\).*$/\2/p;q' "$evts") + + # DESTROY_SUBFLOW6 from client to server machine + :>"$evts" + ip netns exec "$ns2" ./pm_nl_ctl dsf lip dead:beef:2::2 lport "$sport" rip\ + dead:beef:2::1 rport $app6_port token "$client6_token" > /dev/null 2>&1 + sleep 0.1 + verify_subflow_events "$evts" "$SUB_CLOSED" "$client6_token" "$AF_INET6" "dead:beef:2::2"\ + "dead:beef:2::1" "$app6_port" "23" "$server_addr_id" "ns2" "ns1" + + # RM_ADDR6 from server to client machine + ip netns exec "$ns1" ./pm_nl_ctl rem id $server_addr_id token\ + "$server6_token" > /dev/null 2>&1 + sleep 0.1 + + # Attempt to add a listener at 10.0.2.1:<new-port> + ip netns exec "$ns1" ./pm_nl_ctl listen 10.0.2.1\ + $new4_port > /dev/null 2>&1 & + listener_pid=$! + + # ADD_ADDR from server to client machine using a new port + :>"$evts" + ip netns exec "$ns1" ./pm_nl_ctl ann 10.0.2.1 token "$server4_token" id\ + $server_addr_id port $new4_port > /dev/null 2>&1 + sleep 0.1 + + # CREATE_SUBFLOW from client to server machine + :>"$evts" + ip netns exec "$ns2" ./pm_nl_ctl csf lip 10.0.2.2 lid 23 rip 10.0.2.1 rport\ + $new4_port token "$client4_token" > /dev/null 2>&1 + sleep 0.1 + verify_subflow_events "$evts" "$SUB_ESTABLISHED" "$client4_token" "$AF_INET"\ + "10.0.2.2" "10.0.2.1" "$new4_port" "23" "$server_addr_id" "ns2" "ns1" + + # Delete the listener from the server ns, if one was created + kill $listener_pid > /dev/null 2>&1 + + sport=$(sed -n 's/.*\(sport:\)\([[:digit:]]*\).*$/\2/p;q' "$evts") + + # DESTROY_SUBFLOW from client to server machine + :>"$evts" + ip netns exec "$ns2" ./pm_nl_ctl dsf lip 10.0.2.2 lport "$sport" rip 10.0.2.1 rport\ + $new4_port token "$client4_token" > /dev/null 2>&1 + sleep 0.1 + verify_subflow_events "$evts" "$SUB_CLOSED" "$client4_token" "$AF_INET" "10.0.2.2"\ + "10.0.2.1" "$new4_port" "23" "$server_addr_id" "ns2" "ns1" + + # RM_ADDR from server to client machine + ip netns exec "$ns1" ./pm_nl_ctl rem id $server_addr_id token\ + "$server4_token" > /dev/null 2>&1 + + kill $evts_pid + rm -f "$evts" +} + +make_connection +make_connection "v6" +test_announce +test_remove +test_subflows + +exit 0
Signature · 1 line
2.31.1