dump for userspace pm
Subsystems (4)
v6 cover dump for userspace pm
v6:
- patches 1-5, fixes for -net
- patches 6, 15, selftests for "fixes for -net".
- patches 7-14, 16-21, update "dump for userspace pm v5"
- patches 22, 23, cleanups for set_flags
- patch 24, flush selftest.
v5:
- patch 2, save bitmap instead of id.
- patch 3, drop token in reply.
- update patch 4 and patch 12, add mptcp_pm_dump_addr and mptcp_pm_get_addr wrappers in pm.c
v4:
- update patch 2, patch 3 and patch 12.
- fix the warnings reported by CI in v3:
Unable to validate one commit: 7633a101a mptcp: get addr in userspace pm list
Unable to compile mptcp source code with make W=1 net/mptcp/pm_netlink.o
Unable to compile mptcp source code with make C=1 net/mptcp/pm_netlink.o: net/mptcp/pm_netlink.c:1656:5: warning: symbol 'mptcp_pm_nl_get_addr' was not declared. Should it be static?
v3:
- fix the errors reported by CI in v2:
[10:55:51.288] [ 897.523894][ T5664] BUG: sleeping function called from invalid context at include/linux/sched/mm.h:306 [10:55:51.288] [ 897.532157][ T5664] in_atomic(): 1, irqs_disabled(): 0, non_block: 0, pid: 5664, name: pm_nl_ctl [10:55:51.289] [ 897.539503][ T5664] preempt_count: 201, expected: 0
- drop mptcp_pm_nl_put_entry_msg and mptcp_pm_nl_put_entry_info helpers.
v2:
Address Mat's comments in v1:
- patch 2: pass token to dump_addr too.
- patch 2: add back id in mptcp_userspace_pm_dump_addr().
- patch 5: update mptcp.yaml
v1:
Address Mat's comments in "userspace pm enhancements" v14.
Geliang Tang (24):
mptcp: set set_id flag when parsing addr
mptcp: parse userspace pm entry to get flags
mptcp: test set_id flag when appending addr
mptcp: check addrs list in userspace_pm_get_local_id
mptcp: map v4 address to v6 when destroying subflow
selftests: mptcp: rm subflow with v4/v4mapped addr
mptcp: export mptcp_genl_family & mptcp_nl_fill_addr
mptcp: implement mptcp_userspace_pm_dump_addr
mptcp: add token for get-addr in yaml
mptcp: dump addrs in userspace pm list
mptcp: check userspace pm subflow flag
selftests: mptcp: add userspace pm subflow flag
selftests: mptcp: add token for dump_addr
selftests: mptcp: add check_output helper
selftests: mptcp: dump after creating id 0 subflow
selftests: mptcp: dump userspace addrs list
mptcp: add userspace_pm_lookup_addr_by_id helper
mptcp: implement mptcp_userspace_pm_get_addr
mptcp: get addr in userspace pm list
selftests: mptcp: add token for get_addr
selftests: mptcp: userspace pm get addr tests
mptcp: update set_flags interfaces
mptcp: set error messages for set_flags
selftests: mptcp: flush userspace addrs list
Documentation/netlink/specs/mptcp_pm.yaml | 3 +- include/uapi/linux/mptcp.h | 1 + net/mptcp/mptcp_pm_gen.c | 7 +- net/mptcp/mptcp_pm_gen.h | 2 +- net/mptcp/pm.c | 29 ++- net/mptcp/pm_netlink.c | 112 ++++---- net/mptcp/pm_userspace.c | 242 ++++++++++++++++-- net/mptcp/protocol.h | 23 +- .../testing/selftests/net/mptcp/mptcp_join.sh | 150 ++++++++++- tools/testing/selftests/net/mptcp/pm_nl_ctl.c | 39 ++- 10 files changed, 510 insertions(+), 98 deletions(-)
Signature · 1 line
2.39.2
PATCH v6 1/24 mptcp: set set_id flag when parsing addr
When userspace PM requires to create an ID 0 subflow in "userspace pm create id 0 subflow" test like this:
userspace_pm_add_sf $ns2 10.0.3.2 0
An ID 1 subflow, in fact, is created.
Since in mptcp_pm_nl_append_new_local_addr(), 'id 0' will be treated as no ID is set by userspace, and will allocate a new ID immediately:
if (!e->addr.id)
e->addr.id = find_next_zero_bit(pernet->id_bitmap,
MPTCP_PM_MAX_ADDR_ID + 1,
1);To solve this issue, a new flag 'MPTCP_PM_ADDR_FLAG_SET_ID' is added to distinguish between whether userspace has set an ID 0 or whether userspace has not set any address.
Add a new parameter 'set_id' for mptcp_pm_parse_pm_addr_attr(), and pass a 'set_id' flag to them. If an address id is set from userspace, this 'set_id' will be set as true. If 'set_id' is set, then the newly added flag MPTCP_PM_ADDR_FLAG_SET_ID wiil be set.
--- include/uapi/linux/mptcp.h | 1 + net/mptcp/pm_netlink.c | 17 +++++++++++++---- 2 files changed, 14 insertions(+), 4 deletions(-)
include/uapi/linux/mptcp.h +1 -0
@@ -36,6 +36,7 @@#define MPTCP_PM_ADDR_FLAG_BACKUP (1 << 2)#define MPTCP_PM_ADDR_FLAG_FULLMESH (1 << 3)#define MPTCP_PM_ADDR_FLAG_IMPLICIT (1 << 4) +#define MPTCP_PM_ADDR_FLAG_SET_ID (1 << 5)struct mptcp_info {__u8 mptcpi_subflows;
net/mptcp/pm_netlink.c +13 -4
@@ -1159,7 +1159,8 @@ 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) + bool require_family, + bool *set_id) { int err, addr_addr;
@@ -1174,8 +1175,11 @@ static int mptcp_pm_parse_pm_addr_attr(struct nlattr *tb[],if (err)return err; -if (tb[MPTCP_PM_ADDR_ATTR_ID ]) +if (tb[MPTCP_PM_ADDR_ATTR_ID ]) { addr->id =nla_get_u8 (tb[MPTCP_PM_ADDR_ATTR_ID ]); +if (set_id) + *set_id = true; + }if (!tb[MPTCP_PM_ADDR_ATTR_FAMILY ]) {if (!require_family)
@@ -1223,7 +1227,7 @@ int mptcp_pm_parse_addr(struct nlattr *attr, struct genl_info *info,memset (addr,0 ,sizeof (*addr)); -return mptcp_pm_parse_pm_addr_attr (tb, attr, info, addr, true); +return mptcp_pm_parse_pm_addr_attr (tb, attr, info, addr, true,NULL ); } int mptcp_pm_parse_entry(struct nlattr *attr, struct genl_info *info,
@@ -1231,11 +1235,13 @@ int mptcp_pm_parse_entry(struct nlattr *attr, struct genl_info *info, struct mptcp_pm_addr_entry *entry) {struct nlattr *tb[MPTCP_PM_ADDR_ATTR_MAX +1 ]; +bool set_id = false;int err;memset (entry,0 ,sizeof (*entry)); - err =mptcp_pm_parse_pm_addr_attr (tb, attr, info, &entry->addr, require_family); + err =mptcp_pm_parse_pm_addr_attr (tb, attr, info, &entry->addr, + require_family, &set_id);if (err)return err;
@@ -1248,6 +1254,9 @@ int mptcp_pm_parse_entry(struct nlattr *attr, struct genl_info *info,if (tb[MPTCP_PM_ADDR_ATTR_FLAGS ]) entry->flags =nla_get_u32 (tb[MPTCP_PM_ADDR_ATTR_FLAGS ]); +if (set_id) + entry->flags |=MPTCP_PM_ADDR_FLAG_SET_ID ; +if (tb[MPTCP_PM_ADDR_ATTR_PORT ]) entry->addr.port =htons (nla_get_u16 (tb[MPTCP_PM_ADDR_ATTR_PORT ]));
Signature · 1 line
2.39.2
PATCH v6 2/24 mptcp: parse userspace pm entry to get flags
In reply to Geliang TangThis patch uses mptcp_pm_parse_entry() to parse the local entry to get the flags of this entry, instead of using mptcp_pm_parse_addr() to parse the addr_l address when creating a subflow in userspace PM.
--- net/mptcp/pm_userspace.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
net/mptcp/pm_userspace.c +2 -2
@@ -348,11 +348,12 @@ int mptcp_pm_nl_subflow_create_doit(struct sk_buff *skb, struct genl_info *info) goto create_err; } - err =mptcp_pm_parse_addr (laddr, info, &addr_l); + err =mptcp_pm_parse_entry (laddr, info, true, &local);if (err <0 ) {NL_SET_ERR_MSG_ATTR (info->extack, laddr,"error parsing local addr" ); goto create_err; } + addr_l = local.addr; err =mptcp_pm_parse_addr (raddr, info, &addr_r);if (err <0 ) {
@@ -366,7 +367,6 @@ int mptcp_pm_nl_subflow_create_doit(struct sk_buff *skb, struct genl_info *info) goto create_err; } - local.addr = addr_l; err =mptcp_userspace_pm_append_new_local_addr (msk, &local);if (err <0 ) {GENL_SET_ERR_MSG (info,"did not match address and id" );
Signature · 1 line
2.39.2
PATCH v6 3/24 mptcp: test set_id flag when appending addr
In reply to Geliang TangThis patch tests MPTCP_PM_ADDR_FLAG_SET_ID flag when appending a new address in mptcp_pm_nl_append_new_local_addr() in pm_netlink.c and in mptcp_userspace_pm_append_new_local_addr() in pm_userspace.c. If this flag is set, do not alloc new address ID from id_bitmap, just keep the userspace set address ID.
--- net/mptcp/pm_netlink.c | 7 +++++-- net/mptcp/pm_userspace.c | 9 +++++++-- 2 files changed, 12 insertions(+), 4 deletions(-)
net/mptcp/pm_netlink.c +5 -2
@@ -949,7 +949,7 @@ static int mptcp_pm_nl_append_new_local_addr(struct pm_nl_pernet *pernet, } } -if (!entry->addr.id) { +if (!entry->addr.id && !(entry->flags &MPTCP_PM_ADDR_FLAG_SET_ID )) { find_next: entry->addr.id = find_next_zero_bit(pernet->id_bitmap, MPTCP_PM_MAX_ADDR_ID + 1,
@@ -960,9 +960,12 @@ static int mptcp_pm_nl_append_new_local_addr(struct pm_nl_pernet *pernet, } } -if (!entry->addr.id) +if (!entry->addr.id && !(entry->flags &MPTCP_PM_ADDR_FLAG_SET_ID )) goto out; +if (entry->flags &MPTCP_PM_ADDR_FLAG_SET_ID ) + entry->flags &= ~MPTCP_PM_ADDR_FLAG_SET_ID ; +__set_bit (entry->addr.id, pernet->id_bitmap);if (entry->addr.id > pernet->next_id) pernet->next_id = entry->addr.id;
net/mptcp/pm_userspace.c +7 -2
@@ -41,8 +41,11 @@ static int mptcp_userspace_pm_append_new_local_addr(struct mptcp_sock *msk,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 ) +if (addr_match && entry->addr.id ==0 && + !(entry->flags &MPTCP_PM_ADDR_FLAG_SET_ID )) entry->addr.id = e->addr.id; +else if (entry->flags &MPTCP_PM_ADDR_FLAG_SET_ID ) + entry->flags &= ~MPTCP_PM_ADDR_FLAG_SET_ID ; id_match = (e->addr.id == entry->addr.id);if (addr_match && id_match) { match = e;
@@ -64,10 +67,12 @@ static int mptcp_userspace_pm_append_new_local_addr(struct mptcp_sock *msk, } *e = *entry; -if (!e->addr.id) +if (!e->addr.id && !(e->flags &MPTCP_PM_ADDR_FLAG_SET_ID )) e->addr.id =find_next_zero_bit (id_bitmap,MPTCP_PM_MAX_ADDR_ID +1 ,1 ); +else if (e->flags &MPTCP_PM_ADDR_FLAG_SET_ID ) + e->flags &= ~MPTCP_PM_ADDR_FLAG_SET_ID ;list_add_tail_rcu (&e->list, &msk->pm.userspace_pm_local_addr_list); msk->pm.local_addr_used++; ret = e->addr.id;
Signature · 1 line
2.39.2
PATCH v6 4/24 mptcp: check addrs list in userspace_pm_get_local_id
In reply to Geliang TangBefore adding a new entry in mptcp_userspace_pm_get_local_id(), it's better to check whether this address is already in userspace pm local address list. If it's in the list, no need to add a new entry, just return it's address ID and use this address.
--- net/mptcp/pm_userspace.c | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-)
net/mptcp/pm_userspace.c +12 -1
@@ -135,10 +135,21 @@ int mptcp_userspace_pm_get_flags_and_ifindex_by_id(struct mptcp_sock *msk,int mptcp_userspace_pm_get_local_id (struct mptcp_sock *msk,struct mptcp_addr_info *skc) { -struct mptcp_pm_addr_entry new_entry; +struct mptcp_pm_addr_entry *entry =NULL , *e, new_entry;__be16 msk_sport = ((struct inet_sock *)inet_sk ((struct sock *)msk))->inet_sport; +spin_lock_bh (&msk->pm.lock); +list_for_each_entry (e, &msk->pm.userspace_pm_local_addr_list, list) { +if (mptcp_addresses_equal (&e->addr, skc, false)) { + entry = e; +break ; + } + } +spin_unlock_bh (&msk->pm.lock); +if (entry) +return entry->addr.id; +memset (&new_entry,0 ,sizeof (struct mptcp_pm_addr_entry )); new_entry.addr = *skc; new_entry.addr.id =0 ;
Signature · 1 line
2.39.2
PATCH v6 5/24 mptcp: map v4 address to v6 when destroying subflow
In reply to Geliang TangIn mptcp_pm_nl_subflow_destroy_doit(), before checking local address family with remote address family, map an IPv4 address to an IPv6 address if the pair is a v4-mapped address.
--- net/mptcp/pm_userspace.c | 10 ++++++++++ 1 file changed, 10 insertions(+)
net/mptcp/pm_userspace.c +10 -0
@@ -499,6 +499,16 @@ int mptcp_pm_nl_subflow_destroy_doit(struct sk_buff *skb, struct genl_info *info goto destroy_err; } +#if IS_ENABLED (CONFIG_MPTCP_IPV6 ) +if (addr_l.family ==AF_INET &&ipv6_addr_v4mapped (&addr_r.addr6)) { +ipv6_addr_set_v4mapped (addr_l.addr.s_addr, &addr_l.addr6); + addr_l.family =AF_INET6 ; + } +if (addr_r.family ==AF_INET &&ipv6_addr_v4mapped (&addr_l.addr6)) { +ipv6_addr_set_v4mapped (addr_r.addr.s_addr, &addr_r.addr6); + addr_r.family =AF_INET6 ; + } +#endif if (addr_l.family != addr_r.family) {GENL_SET_ERR_MSG (info,"address families do not match" ); err = -EINVAL ;
Signature · 1 line
2.39.2
PATCH v6 6/24 selftests: mptcp: rm subflow with v4/v4mapped addr
In reply to Geliang TangNow both a v4 address and a v4-mapped address are supported when destroying a userspace pm subflow, this patch adds random tests for both addresses.
--- tools/testing/selftests/net/mptcp/mptcp_join.sh | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-)
tools/testing/selftests/net/mptcp/mptcp_join.sh +8 -3
@@ -3340,12 +3340,13 @@ userspace_pm_rm_sf() { local evts=$evts_ns1 local t=${3:-1} - local ip=4 + local ip local tk da dp sp local cnt [ "$1" == "$ns2" ] && evts=$evts_ns2 - if mptcp_lib_is_v6 $2; then ip=6; fi + [ -n "$(mptcp_lib_evts_get_info "saddr4" "$evts" $t)" ] && ip=4 + [ -n "$(mptcp_lib_evts_get_info "saddr6" "$evts" $t)" ] && ip=6 tk=$(mptcp_lib_evts_get_info token "$evts") da=$(mptcp_lib_evts_get_info "daddr$ip" "$evts" $t) dp=$(mptcp_lib_evts_get_info dport "$evts" $t)
@@ -3448,7 +3449,11 @@ userspace_tests() chk_subflows_total 2 2 chk_mptcp_info add_addr_signal 1 add_addr_accepted 1 userspace_pm_rm_addr $ns1 10 - userspace_pm_rm_sf $ns1 "::ffff:10.0.2.1" $SUB_ESTABLISHED + if [ $((RANDOM%2)) -eq 0 ]; then + userspace_pm_rm_sf $ns1 ::ffff:10.0.2.1 $SUB_ESTABLISHED + else + userspace_pm_rm_sf $ns1 10.0.2.1 $SUB_ESTABLISHED + fi chk_rm_nr 1 1 invert chk_mptcp_info subflows 0 subflows 0 chk_subflows_total 1 1
Signature · 1 line
2.39.2
PATCH v6 7/24 mptcp: export mptcp_genl_family & mptcp_nl_fill_addr
In reply to Geliang TangThis patch exports struct mptcp_genl_family and mptcp_nl_fill_addr() helper to allow them can be used in pm_userspace.c.
--- net/mptcp/pm_netlink.c | 9 +++------ net/mptcp/protocol.h | 4 ++++ 2 files changed, 7 insertions(+), 6 deletions(-)
net/mptcp/pm_netlink.c +3 -6
@@ -18,9 +18,6 @@#include "protocol.h" #include "mib.h" -/* forward declaration */ -static struct genl_family mptcp_genl_family; -static int pm_nl_pernet_id;struct mptcp_pm_add_entry {
@@ -1631,8 +1628,8 @@ int mptcp_pm_nl_flush_addrs_doit(struct sk_buff *skb, struct genl_info *info)return 0 ; } -static int mptcp_nl_fill_addr (struct sk_buff *skb, -struct mptcp_pm_addr_entry *entry) +int mptcp_nl_fill_addr (struct sk_buff *skb, +struct mptcp_pm_addr_entry *entry) {struct mptcp_addr_info *addr = &entry->addr;struct nlattr *attr;
@@ -2276,7 +2273,7 @@ void mptcp_event(enum mptcp_event_type type, const struct mptcp_sock *msk,nlmsg_free (skb); } -static struct genl_family mptcp_genl_family__ro_after_init = { +struct genl_family mptcp_genl_family__ro_after_init = { .name =MPTCP_PM_NAME , .version =MPTCP_PM_VER , .netnsok = true,
net/mptcp/protocol.h +4 -0
@@ -341,6 +341,8 @@ struct mptcp_sock {#define mptcp_for_each_subflow_safe (__msk, __subflow, __tmp) \ list_for_each_entry_safe(__subflow, __tmp, &((__msk)->conn_list), node) +extern struct genl_family mptcp_genl_family; +static inline void msk_owned_by_me (const struct mptcp_sock *msk) {sock_owned_by_me ((const struct sock *)msk);
@@ -961,6 +963,8 @@ void mptcp_fastopen_gen_msk_ackseq(struct mptcp_sock *msk, struct mptcp_subflow_ const struct mptcp_options_received *mp_opt);void mptcp_fastopen_subflow_synack_set_params (struct mptcp_subflow_context *subflow,struct request_sock *req); +int mptcp_nl_fill_addr (struct sk_buff *skb, +struct mptcp_pm_addr_entry *entry);static inline bool mptcp_pm_should_add_signal (struct mptcp_sock *msk) {
Signature · 1 line
2.39.2
PATCH v6 8/24 mptcp: implement mptcp_userspace_pm_dump_addr
In reply to Geliang TangThis patch implements mptcp_userspace_pm_dump_addr() to dump addresses from userspace pm address list. Use mptcp_token_get_sock() to get the msk from the given token, if userspace PM is enabled in it, traverse each address entry in address list, put every entry to userspace using mptcp_pm_nl_put_entry_msg().
--- net/mptcp/pm_userspace.c | 58 ++++++++++++++++++++++++++++++++++++++++ net/mptcp/protocol.h | 2 ++ 2 files changed, 60 insertions(+)
net/mptcp/pm_userspace.c +58 -0
@@ -576,3 +576,61 @@ int mptcp_userspace_pm_set_flags(struct net *net, struct nlattr *token,sock_put (sk);return ret; } + +int mptcp_userspace_pm_dump_addr (struct sk_buff *msg, +struct netlink_callback *cb) +{ +struct id_bitmap { + DECLARE_BITMAP(map, MPTCP_PM_MAX_ADDR_ID + 1); + } *bitmap; +const struct genl_info *info =genl_info_dump (cb); +struct net *net =sock_net (msg->sk); +struct mptcp_pm_addr_entry *entry; +struct mptcp_sock *msk; +struct nlattr *token; +int ret = -EINVAL ; +struct sock *sk; +void *hdr; + + bitmap = (struct id_bitmap *)cb->ctx; + token = info->attrs[MPTCP_PM_ATTR_TOKEN ]; + + msk =mptcp_token_get_sock (net,nla_get_u32 (token)); +if (!msk) { +NL_SET_ERR_MSG_ATTR (info->extack, token,"invalid token" ); +return ret; + } + +if (!mptcp_pm_is_userspace (msk)) { +GENL_SET_ERR_MSG (info,"invalid request; userspace PM not selected" ); +return ret; + } + + sk = (struct sock *)msk; + +lock_sock (sk); +spin_lock_bh (&msk->pm.lock); +list_for_each_entry (entry, &msk->pm.userspace_pm_local_addr_list, list) { +if (test_bit (entry->addr.id, bitmap->map)) +continue ; + + hdr =genlmsg_put (msg,NETLINK_CB (cb->skb).portid, + cb->nlh->nlmsg_seq, &mptcp_genl_family, +NLM_F_MULTI ,MPTCP_PM_CMD_GET_ADDR ); +if (!hdr) +break ; + +if (mptcp_nl_fill_addr (msg, entry) <0 ) { +genlmsg_cancel (msg, hdr); +break ; + } + +__set_bit (entry->addr.id, bitmap->map); +genlmsg_end (msg, hdr); + } +spin_unlock_bh (&msk->pm.lock); +release_sock (sk); + + *((struct id_bitmap *)cb->ctx) = *bitmap; +return msg->len; +}
net/mptcp/protocol.h +2 -0
@@ -1029,6 +1029,8 @@ bool mptcp_pm_rm_addr_signal(struct mptcp_sock *msk, unsigned int remaining,int mptcp_pm_get_local_id (struct mptcp_sock *msk,struct sock_common *skc);int mptcp_pm_nl_get_local_id (struct mptcp_sock *msk,struct mptcp_addr_info *skc);int mptcp_userspace_pm_get_local_id (struct mptcp_sock *msk,struct mptcp_addr_info *skc); +int mptcp_userspace_pm_dump_addr (struct sk_buff *msg, +struct netlink_callback *cb);void __init mptcp_pm_nl_init (void );void mptcp_pm_nl_work (struct mptcp_sock *msk);
Signature · 1 line
2.39.2
PATCH v6 9/24 mptcp: add token for get-addr in yaml
In reply to Geliang TangThis patch adds token paramenter together with addr in get-addr section in mptcp_pm.yaml, then use the following commands to update mptcp_pm_gen.c and mptcp_pm_gen.h:
./tools/net/ynl/ynl-gen-c.py --mode kernel \
--spec Documentation/netlink/specs/mptcp_pm.yaml --source \
-o net/mptcp/mptcp_pm_gen.c
./tools/net/ynl/ynl-gen-c.py --mode kernel \
--spec Documentation/netlink/specs/mptcp_pm.yaml --header \
-o net/mptcp/mptcp_pm_gen.h--- Documentation/netlink/specs/mptcp_pm.yaml | 3 ++- net/mptcp/mptcp_pm_gen.c | 7 ++++--- net/mptcp/mptcp_pm_gen.h | 2 +- 3 files changed, 7 insertions(+), 5 deletions(-)
Documentation/netlink/specs/mptcp_pm.yaml +2 -1
@@ -292,13 +292,14 @@ operations: - name: get-addr doc: Get endpoint information - attribute-set: endpoint + attribute-set: attr dont-validate: [ strict ] flags: [ uns-admin-perm ] do: &get-addr-attrs request: attributes: - addr + - token reply: attributes: - addr
net/mptcp/mptcp_pm_gen.c +4 -3
@@ -32,8 +32,9 @@ const struct nla_policy mptcp_pm_del_addr_nl_policy[MPTCP_PM_ENDPOINT_ADDR + 1] };/* MPTCP_PM_CMD_GET_ADDR - do */ -const struct nla_policy mptcp_pm_get_addr_nl_policy[MPTCP_PM_ENDPOINT_ADDR +1 ] = { - [MPTCP_PM_ENDPOINT_ADDR ] =NLA_POLICY_NESTED (mptcp_pm_address_nl_policy), +const struct nla_policy mptcp_pm_get_addr_nl_policy[MPTCP_PM_ATTR_TOKEN +1 ] = { + [MPTCP_PM_ATTR_ADDR ] =NLA_POLICY_NESTED (mptcp_pm_address_nl_policy), + [MPTCP_PM_ATTR_TOKEN ] = { .type =NLA_U32 , }, };/* MPTCP_PM_CMD_FLUSH_ADDRS - do */
@@ -110,7 +111,7 @@ const struct genl_ops mptcp_pm_nl_ops[11] = { .doit = mptcp_pm_nl_get_addr_doit, .dumpit = mptcp_pm_nl_get_addr_dumpit, .policy = mptcp_pm_get_addr_nl_policy, - .maxattr = MPTCP_PM_ENDPOINT_ADDR, + .maxattr = MPTCP_PM_ATTR_TOKEN, .flags = GENL_UNS_ADMIN_PERM, }, {
net/mptcp/mptcp_pm_gen.h +1 -1
@@ -18,7 +18,7 @@ extern const struct nla_policy mptcp_pm_add_addr_nl_policy[MPTCP_PM_ENDPOINT_ADDextern const struct nla_policy mptcp_pm_del_addr_nl_policy[MPTCP_PM_ENDPOINT_ADDR +1 ]; -extern const struct nla_policy mptcp_pm_get_addr_nl_policy[MPTCP_PM_ENDPOINT_ADDR +1 ]; +extern const struct nla_policy mptcp_pm_get_addr_nl_policy[MPTCP_PM_ATTR_TOKEN +1 ];extern const struct nla_policy mptcp_pm_flush_addrs_nl_policy[MPTCP_PM_ENDPOINT_ADDR +1 ];
Signature · 1 line
2.39.2
PATCH v6 10/24 mptcp: dump addrs in userspace pm list
In reply to Geliang TangThis patch renames mptcp_pm_nl_get_addr_dumpit() as a dedicated in-kernel netlink PM dump addrs function mptcp_pm_nl_dump_addr(), and invoke a newly added wrapper mptcp_pm_dump_addr() in mptcp_pm_nl_get_addr_dumpit().
Invoke in-kernel PM dump addrs function mptcp_pm_nl_dump_addr() or userspace PM dump addrs function mptcp_userspace_pm_dump_addr() based on whether the token parameter is passed in or not in the wrapper.
--- net/mptcp/pm.c | 10 ++++++++++ net/mptcp/pm_netlink.c | 10 ++++++++-- net/mptcp/protocol.h | 3 +++ 3 files changed, 21 insertions(+), 2 deletions(-)
net/mptcp/pm.c +10 -0
@@ -441,6 +441,16 @@ int mptcp_pm_get_flags_and_ifindex_by_id(struct mptcp_sock *msk, unsigned int idreturn mptcp_pm_nl_get_flags_and_ifindex_by_id (msk, id, flags, ifindex); } +int mptcp_pm_dump_addr (struct sk_buff *msg,struct netlink_callback *cb) +{ +const struct genl_info *info =genl_info_dump (cb); + +if (info->attrs[MPTCP_PM_ATTR_TOKEN ]) +return mptcp_userspace_pm_dump_addr (msg, cb); + +return mptcp_pm_nl_dump_addr (msg, cb); +} +int mptcp_pm_set_flags (struct net *net,struct nlattr *token,struct mptcp_pm_addr_entry *loc,struct mptcp_pm_addr_entry *rem,u8 bkup)
net/mptcp/pm_netlink.c +8 -2
@@ -1717,8 +1717,8 @@ int mptcp_pm_nl_get_addr_doit(struct sk_buff *skb, struct genl_info *info)return ret; } -int mptcp_pm_nl_get_addr_dumpit (struct sk_buff *msg, -struct netlink_callback *cb) +int mptcp_pm_nl_dump_addr (struct sk_buff *msg, +struct netlink_callback *cb) {struct net *net =sock_net (msg->sk);struct mptcp_pm_addr_entry *entry;
@@ -1760,6 +1760,12 @@ int mptcp_pm_nl_get_addr_dumpit(struct sk_buff *msg,return msg->len; } +int mptcp_pm_nl_get_addr_dumpit (struct sk_buff *msg, +struct netlink_callback *cb) +{ +return mptcp_pm_dump_addr (msg, cb); +} +static int parse_limit (struct genl_info *info,int id,unsigned int *limit) {struct nlattr *attr = info->attrs[id];
net/mptcp/protocol.h +3 -0
@@ -1029,6 +1029,9 @@ bool mptcp_pm_rm_addr_signal(struct mptcp_sock *msk, unsigned int remaining,int mptcp_pm_get_local_id (struct mptcp_sock *msk,struct sock_common *skc);int mptcp_pm_nl_get_local_id (struct mptcp_sock *msk,struct mptcp_addr_info *skc);int mptcp_userspace_pm_get_local_id (struct mptcp_sock *msk,struct mptcp_addr_info *skc); +int mptcp_pm_dump_addr (struct sk_buff *msg,struct netlink_callback *cb); +int mptcp_pm_nl_dump_addr (struct sk_buff *msg, +struct netlink_callback *cb);int mptcp_userspace_pm_dump_addr (struct sk_buff *msg,struct netlink_callback *cb);
Signature · 1 line
2.39.2
PATCH v6 11/24 mptcp: check userspace pm subflow flag
In reply to Geliang TangThis patch checks MPTCP_PM_ADDR_FLAG_SUBFLOW flag when creating a subflow by userspace PM in mptcp_pm_nl_subflow_create_doit(). If it's not set, don't create the subflow.
--- net/mptcp/pm_userspace.c | 6 ++++++ 1 file changed, 6 insertions(+)
net/mptcp/pm_userspace.c +6 -0
@@ -371,6 +371,12 @@ int mptcp_pm_nl_subflow_create_doit(struct sk_buff *skb, struct genl_info *info) } addr_l = local.addr; +if (!(local.flags &MPTCP_PM_ADDR_FLAG_SUBFLOW )) { +GENL_SET_ERR_MSG (info,"invalid addr flags" ); + err = -EINVAL ; + goto create_err; + } + err =mptcp_pm_parse_addr (raddr, info, &addr_r);if (err <0 ) {NL_SET_ERR_MSG_ATTR (info->extack, raddr,"error parsing remote addr" );
Signature · 1 line
2.39.2
PATCH v6 12/24 selftests: mptcp: add userspace pm subflow flag
In reply to Geliang TangThis patch adds the address flag MPTCP_PM_ADDR_FLAG_SUBFLOW in csf() in pm_nl_ctl.c when subflow is created by a userspace PM.
--- tools/testing/selftests/net/mptcp/pm_nl_ctl.c | 8 ++++++++ 1 file changed, 8 insertions(+)
tools/testing/selftests/net/mptcp/pm_nl_ctl.c +8 -0
@@ -453,6 +453,7 @@ int csf(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_SUBFLOW ;const char *params[5 ];struct nlmsghdr *nh;struct rtattr *addr;
@@ -558,6 +559,13 @@ int csf(int fd, int pm_family, int argc, char *argv[]) off +=NLMSG_ALIGN (rta->rta_len); } +/* 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; }
Signature · 1 line
2.39.2
PATCH v6 13/24 selftests: mptcp: add token for dump_addr
In reply to Geliang TangThe command dump_addr() of pm_nl_ctl can be used like this in in-kernel PM:
pm_nl_ctl dump
This patch adds token argument for it to support userspace PM:
pm_nl_ctl dump token $token
If 'token $token' is passed to dump_addr(), copy it into the kernel netlink.
--- tools/testing/selftests/net/mptcp/pm_nl_ctl.c | 17 +++++++++++++++++ 1 file changed, 17 insertions(+)
tools/testing/selftests/net/mptcp/pm_nl_ctl.c +17 -0
@@ -1127,8 +1127,16 @@ int dump_addrs(int fd, int pm_family, int argc, char *argv[]) 1024];pid_t pid =getpid ();struct nlmsghdr *nh; +u_int32_t token =0 ; +struct rtattr *rta;int off =0 ; +if (argc !=2 && argc !=4 ) +syntax (argv); + +if (argc ==4 && !strcmp (argv[2 ],"token" )) + token =strtoul (argv[3 ],NULL ,10 ); +memset (data,0 ,sizeof (data)); nh = (void *)data; off = init_genl_req(data, pm_family, MPTCP_PM_CMD_GET_ADDR,
@@ -1138,6 +1146,15 @@ int dump_addrs(int fd, int pm_family, int argc, char *argv[]) nh->nlmsg_pid = pid; nh->nlmsg_len = off; +/* token */ +if (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); + } +print_addrs (nh, pm_family,do_nl_req (fd, nh, off,sizeof (data)));return 0 ; }
Signature · 1 line
2.39.2
PATCH v6 14/24 selftests: mptcp: add check_output helper
In reply to Geliang TangSimilar to check() in pm_netlink.sh, add a new helper check_output() in mptcp_join.sh to check the output of the given commands.
--- .../testing/selftests/net/mptcp/mptcp_join.sh | 27 +++++++++++++++++++ 1 file changed, 27 insertions(+)
tools/testing/selftests/net/mptcp/mptcp_join.sh +27 -0
@@ -21,6 +21,7 @@ cinfail="" cinsent="" tmpfile="" cout="" +check_output_err="" capout="" ns1="" ns2=""
@@ -186,6 +187,7 @@ init() { cout=$(mktemp) evts_ns1=$(mktemp) evts_ns2=$(mktemp) + check_output_err=$(mktemp) trap cleanup EXIT
@@ -199,6 +201,7 @@ cleanup() rm -f "$sin" "$sout" "$cinsent" "$cinfail" rm -f "$tmpfile" rm -rf $evts_ns1 $evts_ns2 + rm -f $check_output_err cleanup_partial }
@@ -3358,6 +3361,30 @@ userspace_pm_rm_sf() wait_rm_sf $1 "${cnt}" } +check_output() +{ + local cmd="$1" + local expected="$2" + local msg="$3" + local out=`$cmd 2>$check_output_err` + local cmd_ret=$? + + printf "%-42s" "$msg" + if [ $cmd_ret -ne 0 ]; then + mptcp_lib_print_err "[ FAIL ] command execution '$cmd' stderr " + cat $check_output_err + ret=${KSFT_FAIL} + return $cmd_ret + elif [ "$out" = "$expected" ]; then + mptcp_lib_print_ok "[ OK ]" + return 0 + else + mptcp_lib_print_err "[ FAIL ] expected '$expected' got '$out'" + ret=${KSFT_FAIL} + return 1 + fi +} + userspace_tests() { # userspace pm type prevents add_addr
Signature · 1 line
2.39.2
PATCH v6 15/24 selftests: mptcp: dump after creating id 0 subflow
In reply to Geliang TangThis patch adds a new helper userspace_pm_dump() to dump addresses for the userspace PM. Use this helper to check whether an ID 0 subflow is listed in the output of dump command after creating an ID 0 subflow in "userspace pm create id 0 subflow" test.
--- tools/testing/selftests/net/mptcp/mptcp_join.sh | 15 +++++++++++++++ 1 file changed, 15 insertions(+)
tools/testing/selftests/net/mptcp/mptcp_join.sh +15 -0
@@ -3361,6 +3361,18 @@ userspace_pm_rm_sf() wait_rm_sf $1 "${cnt}" } +# $1: ns +userspace_pm_dump() +{ + local evts=$evts_ns1 + local tk + + [ "$1" == "$ns2" ] && evts=$evts_ns2 + tk=$(mptcp_lib_evts_get_info token "$evts") + + ip netns exec $1 ./pm_nl_ctl dump token $tk +} + check_output() { local cmd="$1"
@@ -3522,6 +3534,9 @@ userspace_tests() chk_mptcp_info subflows 0 subflows 0 chk_subflows_total 1 1 userspace_pm_add_sf $ns2 10.0.3.2 0 + check_output "userspace_pm_dump $ns2" \ + "id 0 flags subflow 10.0.3.2" \ + " dump addrs id 0 subflow" chk_join_nr 1 1 1 chk_mptcp_info subflows 1 subflows 1 chk_subflows_total 2 2
Signature · 1 line
2.39.2
PATCH v6 16/24 selftests: mptcp: dump userspace addrs list
In reply to Geliang TangThis patch adds two new tests for userspace pm dump address and subflow. Use userspace_pm_add_addr() and userspace_pm_add_sf() to add an address and a suflow.
--- .../testing/selftests/net/mptcp/mptcp_join.sh | 44 +++++++++++++++++++ 1 file changed, 44 insertions(+)
tools/testing/selftests/net/mptcp/mptcp_join.sh +44 -0
@@ -3593,6 +3593,50 @@ userspace_tests() kill_events_pids wait $tests_pid fi + + # userspace pm dump address + if reset_with_events "userspace pm dump address" && + continue_if mptcp_lib_has_file '/proc/sys/net/mptcp/pm_type'; then + set_userspace_pm $ns1 + pm_nl_set_limits $ns2 1 1 + speed=5 \ + run_tests $ns1 $ns2 10.0.1.1 & + local tests_pid=$! + wait_mpj $ns1 + userspace_pm_add_addr $ns1 10.0.2.1 10 + chk_join_nr 1 1 1 + chk_add_nr 1 1 + chk_mptcp_info subflows 1 subflows 1 + chk_subflows_total 2 2 + chk_mptcp_info add_addr_signal 1 add_addr_accepted 1 + local dump="id 10 flags signal 10.0.2.1" + check_output "userspace_pm_dump $ns1" \ + "$dump" " dump addrs signal" + kill_events_pids + wait $tests_pid + fi + + # userspace pm dump subflow + if reset_with_events "userspace pm dump subflow" && + continue_if mptcp_lib_has_file '/proc/sys/net/mptcp/pm_type'; then + set_userspace_pm $ns2 + pm_nl_set_limits $ns1 0 1 + speed=5 \ + run_tests $ns1 $ns2 10.0.1.1 & + local tests_pid=$! + wait_mpj $ns2 + chk_mptcp_info subflows 0 subflows 0 + chk_subflows_total 1 1 + userspace_pm_add_sf $ns2 10.0.3.2 20 + chk_join_nr 1 1 1 + chk_mptcp_info subflows 1 subflows 1 + chk_subflows_total 2 2 + local dump="id 20 flags subflow 10.0.3.2" + check_output "userspace_pm_dump $ns2" \ + "$dump" " dump addrs subflow" + kill_events_pids + wait $tests_pid + fi } endpoint_tests()
Signature · 1 line
2.39.2
PATCH v6 17/24 mptcp: add userspace_pm_lookup_addr_by_id helper
In reply to Geliang TangCorresponding __lookup_addr_by_id() helper in the in-kernel netlink PM, this patch adds a new helper mptcp_userspace_pm_lookup_addr_by_id() to lookup the address entry with the given id on the userspace pm local address list.
--- net/mptcp/pm_userspace.c | 31 ++++++++++++++++--------------- 1 file changed, 16 insertions(+), 15 deletions(-)
net/mptcp/pm_userspace.c +16 -15
@@ -110,19 +110,26 @@ static int mptcp_userspace_pm_delete_local_addr(struct mptcp_sock *msk,return -EINVAL ; } +static struct mptcp_pm_addr_entry * +mptcp_userspace_pm_lookup_addr_by_id (struct mptcp_sock *msk,unsigned int id) +{ +struct mptcp_pm_addr_entry *entry; + +list_for_each_entry (entry, &msk->pm.userspace_pm_local_addr_list, list) { +if (entry->addr.id == id) +return entry; + } +return NULL ; +} +int mptcp_userspace_pm_get_flags_and_ifindex_by_id (struct mptcp_sock *msk,unsigned int id,u8 *flags,int *ifindex) { -struct mptcp_pm_addr_entry *entry, *match =NULL ; +struct mptcp_pm_addr_entry *match;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 ; - } - } + match =mptcp_userspace_pm_lookup_addr_by_id (msk, id);spin_unlock_bh (&msk->pm.lock);if (match) { *flags = match->flags;
@@ -265,7 +272,7 @@ int mptcp_pm_nl_remove_doit(struct sk_buff *skb, struct genl_info *info) {struct nlattr *token = info->attrs[MPTCP_PM_ATTR_TOKEN ];struct nlattr *id = info->attrs[MPTCP_PM_ATTR_LOC_ID ]; -struct mptcp_pm_addr_entry *match =NULL ; +struct mptcp_pm_addr_entry *match;struct mptcp_pm_addr_entry *entry;struct mptcp_sock *msk;LIST_HEAD (free_list);
@@ -302,13 +309,7 @@ int mptcp_pm_nl_remove_doit(struct sk_buff *skb, struct genl_info *info)lock_sock (sk); -list_for_each_entry (entry, &msk->pm.userspace_pm_local_addr_list, list) { -if (entry->addr.id == id_val) { - match = entry; -break ; - } - } - + match =mptcp_userspace_pm_lookup_addr_by_id (msk, id_val);if (!match) {GENL_SET_ERR_MSG (info,"address with specified id not found" );release_sock (sk);
Signature · 1 line
2.39.2
PATCH v6 18/24 mptcp: implement mptcp_userspace_pm_get_addr
In reply to Geliang TangThis patch implements mptcp_userspace_pm_get_addr() to get an address from userspace pm address list according the given 'token' and 'id'. Use nla_get_u32() to get the u32 value of 'token', then pass it to mptcp_token_get_sock() to get the msk. Pass 'msk' and 'id' to the helper mptcp_userspace_pm_lookup_addr_by_id() to get the address entry. Put this entry to userspace using mptcp_pm_nl_put_entry_info().
--- net/mptcp/pm_userspace.c | 70 ++++++++++++++++++++++++++++++++++++++++ net/mptcp/protocol.h | 2 ++ 2 files changed, 72 insertions(+)
net/mptcp/pm_userspace.c +70 -0
@@ -641,3 +641,73 @@ int mptcp_userspace_pm_dump_addr(struct sk_buff *msg, *((struct id_bitmap *)cb->ctx) = *bitmap;return msg->len; } + +int mptcp_userspace_pm_get_addr (struct sk_buff *skb, +struct genl_info *info) +{ +struct nlattr *attr = info->attrs[MPTCP_PM_ENDPOINT_ADDR ]; +struct nlattr *token = info->attrs[MPTCP_PM_ATTR_TOKEN ]; +struct mptcp_pm_addr_entry addr, *entry; +struct net *net =sock_net (skb->sk); +struct mptcp_sock *msk; +struct sk_buff *msg; +int ret = -EINVAL ; +struct sock *sk; +void *reply; + + msk =mptcp_token_get_sock (net,nla_get_u32 (token)); +if (!msk) { +NL_SET_ERR_MSG_ATTR (info->extack, token,"invalid token" ); +return ret; + } + +if (!mptcp_pm_is_userspace (msk)) { +GENL_SET_ERR_MSG (info,"invalid request; userspace PM not selected" ); +return ret; + } + + ret =mptcp_pm_parse_entry (attr, info, false, &addr,NULL ); +if (ret <0 ) +return ret; + + msg =nlmsg_new (NLMSG_DEFAULT_SIZE ,GFP_KERNEL ); +if (!msg) +return -ENOMEM ; + + reply =genlmsg_put_reply (msg, info, &mptcp_genl_family,0 , + info->genlhdr->cmd); +if (!reply) { +GENL_SET_ERR_MSG (info,"not enough space in Netlink message" ); + ret = -EMSGSIZE ; + goto fail; + } + + sk = (struct sock *)msk; + +lock_sock (sk); +spin_lock_bh (&msk->pm.lock); + entry =mptcp_userspace_pm_lookup_addr_by_id (msk, addr.addr.id); +if (!entry) { +GENL_SET_ERR_MSG (info,"address not found" ); + ret = -EINVAL ; + goto unlock_fail; + } + + ret =mptcp_nl_fill_addr (msg, entry); +if (ret) + goto unlock_fail; + +genlmsg_end (msg, reply); + ret =genlmsg_reply (msg, info); +spin_unlock_bh (&msk->pm.lock); +release_sock (sk); +return ret; + +unlock_fail: +spin_unlock_bh (&msk->pm.lock); +release_sock (sk); + +fail: +nlmsg_free (msg); +return ret; +}
net/mptcp/protocol.h +2 -0
@@ -1034,6 +1034,8 @@ int mptcp_pm_nl_dump_addr(struct sk_buff *msg, struct netlink_callback *cb);int mptcp_userspace_pm_dump_addr (struct sk_buff *msg,struct netlink_callback *cb); +int mptcp_userspace_pm_get_addr (struct sk_buff *skb, +struct genl_info *info);void __init mptcp_pm_nl_init (void );void mptcp_pm_nl_work (struct mptcp_sock *msk);
Signature · 1 line
2.39.2
PATCH v6 19/24 mptcp: get addr in userspace pm list
In reply to Geliang TangThis patch renames mptcp_pm_nl_get_addr_doit() as a dedicated in-kernel netlink PM get addr function mptcp_pm_nl_get_addr(). and invoke a new wrapper mptcp_pm_get_addr() in mptcp_pm_nl_get_addr_doit.
If a token is gotten in the wrapper, that means a userspace PM is used. So invoke mptcp_userspace_pm_get_addr() to get addr in userspace PM list. Otherwise, invoke mptcp_pm_nl_get_addr().
--- net/mptcp/pm.c | 8 ++++++++ net/mptcp/pm_netlink.c | 7 ++++++- net/mptcp/protocol.h | 2 ++ 3 files changed, 16 insertions(+), 1 deletion(-)
net/mptcp/pm.c +8 -0
@@ -441,6 +441,14 @@ int mptcp_pm_get_flags_and_ifindex_by_id(struct mptcp_sock *msk, unsigned int idreturn mptcp_pm_nl_get_flags_and_ifindex_by_id (msk, id, flags, ifindex); } +int mptcp_pm_get_addr (struct sk_buff *skb,struct genl_info *info) +{ +if (info->attrs[MPTCP_PM_ATTR_TOKEN ]) +return mptcp_userspace_pm_get_addr (skb, info); + +return mptcp_pm_nl_get_addr (skb, info); +} +int mptcp_pm_dump_addr (struct sk_buff *msg,struct netlink_callback *cb) {const struct genl_info *info =genl_info_dump (cb);
net/mptcp/pm_netlink.c +6 -1
@@ -1667,7 +1667,7 @@ int mptcp_nl_fill_addr(struct sk_buff *skb,return -EMSGSIZE ; } -int mptcp_pm_nl_get_addr_doit (struct sk_buff *skb,struct genl_info *info) +int mptcp_pm_nl_get_addr (struct sk_buff *skb,struct genl_info *info) {struct nlattr *attr = info->attrs[MPTCP_PM_ENDPOINT_ADDR ];struct pm_nl_pernet *pernet =genl_info_pm_nl (info);
@@ -1717,6 +1717,11 @@ int mptcp_pm_nl_get_addr_doit(struct sk_buff *skb, struct genl_info *info)return ret; } +int mptcp_pm_nl_get_addr_doit (struct sk_buff *skb,struct genl_info *info) +{ +return mptcp_pm_get_addr (skb, info); +} +int mptcp_pm_nl_dump_addr (struct sk_buff *msg,struct netlink_callback *cb) {
net/mptcp/protocol.h +2 -0
@@ -1034,6 +1034,8 @@ int mptcp_pm_nl_dump_addr(struct sk_buff *msg, struct netlink_callback *cb);int mptcp_userspace_pm_dump_addr (struct sk_buff *msg,struct netlink_callback *cb); +int mptcp_pm_get_addr (struct sk_buff *skb,struct genl_info *info); +int mptcp_pm_nl_get_addr (struct sk_buff *skb,struct genl_info *info);int mptcp_userspace_pm_get_addr (struct sk_buff *skb,struct genl_info *info);
Signature · 1 line
2.39.2
PATCH v6 20/24 selftests: mptcp: add token for get_addr
In reply to Geliang TangThe command get_addr() of pm_nl_ctl can be used like this in in-kernel PM:
pm_nl_ctl get $id
This patch adds token argument for it to support userspace PM:
pm_nl_ctl get $id token $token
If 'token $token' is passed to get_addr(), copy it into the kernel netlink.
--- tools/testing/selftests/net/mptcp/pm_nl_ctl.c | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-)
tools/testing/selftests/net/mptcp/pm_nl_ctl.c +13 -1
@@ -1087,6 +1087,7 @@ int get_addr(int fd, int pm_family, int argc, char *argv[]) 1024];struct rtattr *rta, *nest;struct nlmsghdr *nh; +u_int32_t token =0 ;int nest_start;u_int8_t id;int off =0 ;
@@ -1097,10 +1098,12 @@ int get_addr(int fd, int pm_family, int argc, char *argv[]) MPTCP_PM_VER);/* the only argument is the address id */ -if (argc !=3 ) +if (argc !=3 && argc !=5 )syntax (argv); id =atoi (argv[2 ]); +if (argc ==5 && !strcmp (argv[3 ],"token" )) + token =strtoul (argv[4 ],NULL ,10 ); nest_start = off; nest = (void *)(data + off);
@@ -1116,6 +1119,15 @@ int get_addr(int fd, int pm_family, int argc, char *argv[]) off +=NLMSG_ALIGN (rta->rta_len); nest->rta_len = off - nest_start; +/* token */ +if (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); + } +print_addrs (nh, pm_family,do_nl_req (fd, nh, off,sizeof (data)));return 0 ; }
Signature · 1 line
2.39.2
PATCH v6 21/24 selftests: mptcp: userspace pm get addr tests
In reply to Geliang TangThis patch adds a new helper userspace_pm_get_addr() in mptcp_join.sh. In it, parse the token value from the output of 'pm_nl_ctl events', then pass it to pm_nl_ctl get_addr command. Use this helper in userspace pm dump tests.
--- tools/testing/selftests/net/mptcp/mptcp_join.sh | 16 ++++++++++++++++ 1 file changed, 16 insertions(+)
tools/testing/selftests/net/mptcp/mptcp_join.sh +16 -0
@@ -3373,6 +3373,18 @@ userspace_pm_dump() ip netns exec $1 ./pm_nl_ctl dump token $tk } +# $1: ns ; $2: id +userspace_pm_get_addr() +{ + local evts=$evts_ns1 + local tk + + [ "$1" == "$ns2" ] && evts=$evts_ns2 + tk=$(mptcp_lib_evts_get_info token "$evts") + + ip netns exec $1 ./pm_nl_ctl get $2 token $tk +} + check_output() { local cmd="$1"
@@ -3610,6 +3622,8 @@ userspace_tests() chk_subflows_total 2 2 chk_mptcp_info add_addr_signal 1 add_addr_accepted 1 local dump="id 10 flags signal 10.0.2.1" + check_output "userspace_pm_get_addr $ns1 10" \ + "$dump" " get id 10 addr" check_output "userspace_pm_dump $ns1" \ "$dump" " dump addrs signal" kill_events_pids
@@ -3632,6 +3646,8 @@ userspace_tests() chk_mptcp_info subflows 1 subflows 1 chk_subflows_total 2 2 local dump="id 20 flags subflow 10.0.3.2" + check_output "userspace_pm_get_addr $ns2 20" \ + "$dump" " get id 20 addr" check_output "userspace_pm_dump $ns2" \ "$dump" " dump addrs subflow" kill_events_pids
Signature · 1 line
2.39.2
PATCH v6 22/24 mptcp: update set_flags interfaces
In reply to Geliang TangThis patch updates set_flags interfaces, make it more similar to the interfaces of dump_addr and get_addr:
mptcp_pm_set_flags(struct sk_buff *skb, struct genl_info *info) mptcp_pm_nl_set_flags(struct sk_buff *skb, struct genl_info *info) mptcp_userspace_pm_set_flags(struct sk_buff *skb, struct genl_info *info)
--- net/mptcp/pm.c | 11 ++++---- net/mptcp/pm_netlink.c | 58 +++++++++++++++++----------------------- net/mptcp/pm_userspace.c | 34 ++++++++++++++++++----- net/mptcp/protocol.h | 10 +++---- 4 files changed, 60 insertions(+), 53 deletions(-)
net/mptcp/pm.c +5 -6
@@ -459,13 +459,12 @@ int mptcp_pm_dump_addr(struct sk_buff *msg, struct netlink_callback *cb)return mptcp_pm_nl_dump_addr (msg, cb); } -int mptcp_pm_set_flags (struct net *net,struct nlattr *token, -struct mptcp_pm_addr_entry *loc, -struct mptcp_pm_addr_entry *rem,u8 bkup) +int mptcp_pm_set_flags (struct sk_buff *skb,struct genl_info *info) { -if (token) -return mptcp_userspace_pm_set_flags (net, token, loc, rem, bkup); -return mptcp_pm_nl_set_flags (net, loc, bkup); +if (info->attrs[MPTCP_PM_ATTR_TOKEN ]) +return mptcp_userspace_pm_set_flags (skb, info); + +return mptcp_pm_nl_set_flags (skb, info); }void mptcp_pm_subflow_chk_stale (const struct mptcp_sock *msk,struct sock *ssk)
net/mptcp/pm_netlink.c +25 -33
91 lines not on this page · raw message
net/mptcp/pm_userspace.c +27 -7
@@ -551,14 +551,19 @@ int mptcp_pm_nl_subflow_destroy_doit(struct sk_buff *skb, struct genl_info *inforeturn err; } -int mptcp_userspace_pm_set_flags (struct net *net,struct nlattr *token, -struct mptcp_pm_addr_entry *loc, -struct mptcp_pm_addr_entry *rem,u8 bkup) +int mptcp_userspace_pm_set_flags (struct sk_buff *skb,struct genl_info *info) { +struct mptcp_pm_addr_entry loc = { .addr = { .family =AF_UNSPEC }, }; +struct mptcp_pm_addr_entry rem = { .addr = { .family =AF_UNSPEC }, }; +struct nlattr *attr_rem = info->attrs[MPTCP_PM_ATTR_ADDR_REMOTE ]; +struct nlattr *token = info->attrs[MPTCP_PM_ATTR_TOKEN ]; +struct nlattr *attr = info->attrs[MPTCP_PM_ATTR_ADDR ]; +struct net *net =sock_net (skb->sk);struct mptcp_sock *msk;int ret = -EINVAL ;struct sock *sk;u32 token_val; +u8 bkup =0 ; token_val =nla_get_u32 (token);
@@ -571,12 +576,27 @@ int mptcp_userspace_pm_set_flags(struct net *net, struct nlattr *token,if (!mptcp_pm_is_userspace (msk)) goto set_flags_err; -if (loc->addr.family ==AF_UNSPEC || - rem->addr.family ==AF_UNSPEC ) + ret =mptcp_pm_parse_entry (attr, info, false, &loc); +if (ret <0 ) +return ret; + +if (attr_rem) { + ret =mptcp_pm_parse_entry (attr_rem, info, false, &rem); +if (ret <0 ) +return ret; + } + +if (loc.addr.family ==AF_UNSPEC || + rem.addr.family ==AF_UNSPEC ) { + ret = -EINVAL ; goto set_flags_err; + } + +if (loc.flags &MPTCP_PM_ADDR_FLAG_BACKUP ) + bkup =1 ;lock_sock (sk); - ret =mptcp_pm_nl_mp_prio_send_ack (msk, &loc->addr, &rem->addr, bkup); + ret =mptcp_pm_nl_mp_prio_send_ack (msk, &loc.addr, &rem.addr, bkup);release_sock (sk); set_flags_err:
@@ -666,7 +686,7 @@ int mptcp_userspace_pm_get_addr(struct sk_buff *skb,return ret; } - ret =mptcp_pm_parse_entry (attr, info, false, &addr,NULL ); + ret =mptcp_pm_parse_entry (attr, info, false, &addr);if (ret <0 )return ret;
net/mptcp/protocol.h +3 -7
@@ -933,13 +933,9 @@ int mptcp_pm_nl_get_flags_and_ifindex_by_id(struct mptcp_sock *msk, unsigned intint mptcp_userspace_pm_get_flags_and_ifindex_by_id (struct mptcp_sock *msk,unsigned int id,u8 *flags,int *ifindex); -int mptcp_pm_set_flags (struct net *net,struct nlattr *token, -struct mptcp_pm_addr_entry *loc, -struct mptcp_pm_addr_entry *rem,u8 bkup); -int mptcp_pm_nl_set_flags (struct net *net,struct mptcp_pm_addr_entry *addr,u8 bkup); -int mptcp_userspace_pm_set_flags (struct net *net,struct nlattr *token, -struct mptcp_pm_addr_entry *loc, -struct mptcp_pm_addr_entry *rem,u8 bkup); +int mptcp_pm_set_flags (struct sk_buff *skb,struct genl_info *info); +int mptcp_pm_nl_set_flags (struct sk_buff *skb,struct genl_info *info); +int mptcp_userspace_pm_set_flags (struct sk_buff *skb,struct genl_info *info);int mptcp_pm_announce_addr (struct mptcp_sock *msk,const struct mptcp_addr_info *addr,bool echo);
Signature · 1 line
2.39.2
PATCH v6 23/24 mptcp: set error messages for set_flags
In reply to Geliang TangIn addition to returning the error value, this patch also sets an error messages with GENL_SET_ERR_MSG or NL_SET_ERR_MSG_ATTR both for pm_netlink.c and pm_userspace.c.
--- net/mptcp/pm_netlink.c | 6 +++++- net/mptcp/pm_userspace.c | 9 +++++++-- 2 files changed, 12 insertions(+), 3 deletions(-)
net/mptcp/pm_netlink.c +5 -1
@@ -1906,8 +1906,10 @@ int mptcp_pm_nl_set_flags(struct sk_buff *skb, struct genl_info *info)if (addr.addr.family ==AF_UNSPEC ) { lookup_by_id =1 ; -if (!addr.addr.id) +if (!addr.addr.id) { +GENL_SET_ERR_MSG (info,"missing required inputs" );return -EOPNOTSUPP ; + } }if (addr.flags &MPTCP_PM_ADDR_FLAG_BACKUP )
@@ -1917,11 +1919,13 @@ int mptcp_pm_nl_set_flags(struct sk_buff *skb, struct genl_info *info) entry =__lookup_addr (pernet, &addr.addr, lookup_by_id);if (!entry) {spin_unlock_bh (&pernet->lock); +GENL_SET_ERR_MSG (info,"address not found" );return -EINVAL ; }if ((addr.flags &MPTCP_PM_ADDR_FLAG_FULLMESH ) && (entry->flags &MPTCP_PM_ADDR_FLAG_SIGNAL )) {spin_unlock_bh (&pernet->lock); +GENL_SET_ERR_MSG (info,"invalid addr flags" );return -EINVAL ; }
net/mptcp/pm_userspace.c +7 -2
@@ -568,13 +568,17 @@ int mptcp_userspace_pm_set_flags(struct sk_buff *skb, struct genl_info *info) token_val =nla_get_u32 (token); msk =mptcp_token_get_sock (net, token_val); -if (!msk) +if (!msk) { +NL_SET_ERR_MSG_ATTR (info->extack, token,"invalid token" );return ret; + } sk = (struct sock *)msk; -if (!mptcp_pm_is_userspace (msk)) +if (!mptcp_pm_is_userspace (msk)) { +GENL_SET_ERR_MSG (info,"invalid request; userspace PM not selected" ); goto set_flags_err; + } ret =mptcp_pm_parse_entry (attr, info, false, &loc);if (ret <0 )
@@ -588,6 +592,7 @@ int mptcp_userspace_pm_set_flags(struct sk_buff *skb, struct genl_info *info)if (loc.addr.family ==AF_UNSPEC || rem.addr.family ==AF_UNSPEC ) { +GENL_SET_ERR_MSG (info,"address families do not match" ); ret = -EINVAL ; goto set_flags_err; }
Signature · 1 line
2.39.2
PATCH v6 24/24 selftests: mptcp: flush userspace addrs list
In reply to Geliang TangThis patch adds a new helper userspace_pm_flush() to flush all addresses for the userspace PM. Invoke it in userspace pm dump address and subflow tests. And use dump commands to check if the userspace pm local address list is empty after addresses flushing.
--- .../testing/selftests/net/mptcp/mptcp_join.sh | 45 +++++++++++++++++-- 1 file changed, 41 insertions(+), 4 deletions(-)
tools/testing/selftests/net/mptcp/mptcp_join.sh +41 -4
@@ -3409,6 +3409,31 @@ check_output() fi } +# $1: ns ; $2: addr +userspace_pm_flush() +{ + local ns=$1 + local line + + userspace_pm_dump $ns | while read -r line; do + local arr=($line) + local nr=0 + local id + local addr + local i + for i in "${arr[@]}"; do + if [ $i = "id" ]; then + id=${arr[$nr+1]} + fi + nr=$((nr + 1)) + done + addr=${arr[$nr-1]} + [ $ip_mptcp -eq 1 ] && addr=${arr[0]} + userspace_pm_rm_addr $ns $id + userspace_pm_rm_sf $ns "$addr" $MPTCP_LIB_SUB_ESTABLISHED + done +} + userspace_tests() { # userspace pm type prevents add_addr
@@ -3606,8 +3631,8 @@ userspace_tests() wait $tests_pid fi - # userspace pm dump address - if reset_with_events "userspace pm dump address" && + # userspace pm dump & flush address + if reset_with_events "userspace pm dump & flush address" && continue_if mptcp_lib_has_file '/proc/sys/net/mptcp/pm_type'; then set_userspace_pm $ns1 pm_nl_set_limits $ns2 1 1
@@ -3626,12 +3651,18 @@ userspace_tests() "$dump" " get id 10 addr" check_output "userspace_pm_dump $ns1" \ "$dump" " dump addrs signal" + userspace_pm_flush $ns1 + check_output "userspace_pm_dump $ns1" \ + "" " dump addrs after flush" + chk_rm_nr 1 1 invert + chk_mptcp_info subflows 0 subflows 0 + chk_subflows_total 1 1 kill_events_pids wait $tests_pid fi - # userspace pm dump subflow - if reset_with_events "userspace pm dump subflow" && + # userspace pm dump & flush subflow + if reset_with_events "userspace pm dump & flush subflow" && continue_if mptcp_lib_has_file '/proc/sys/net/mptcp/pm_type'; then set_userspace_pm $ns2 pm_nl_set_limits $ns1 0 1
@@ -3650,6 +3681,12 @@ userspace_tests() "$dump" " get id 20 addr" check_output "userspace_pm_dump $ns2" \ "$dump" " dump addrs subflow" + userspace_pm_flush $ns2 + check_output "userspace_pm_dump $ns2" \ + "" " dump addrs after flush" + chk_rm_nr 1 1 + chk_mptcp_info subflows 0 subflows 0 + chk_subflows_total 1 1 kill_events_pids wait $tests_pid fi
Signature · 1 line
2.39.2
Re: selftests: mptcp: flush userspace addrs list: Build Failure
Hi Geliang,
Thank you for your modifications, that's great!
But sadly, our CI spotted some issues with it when trying to build it.
You can find more details there:
https://patchwork.kernel.org/project/mptcp/patch/33341ee1f12b97eb0369c4ea6c84c4b99f03eb8e.1703853513.git.geliang.tang@linux.dev/
https://github.com/multipath-tcp/mptcp_net-next/actions/runs/7356843701
Status: failure
Initiator: MPTCPimporter
Commits: https://github.com/multipath-tcp/mptcp_net-next/commits/5fbf3fd9eabf
Feel free to reply to this email if you cannot access logs, if you need some support to fix the error, if this doesn't seem to be caused by your modifications or if the error is a false positive one.
Cheers,
MPTCP GH Action bot
Bot operated by Matthieu Baerts (NGI0 Core)