* [PATCH mptcp-next v12 01/15] mptcp: export mptcp_genl_family & mptcp_nl_fill_addr
2024-02-14 11:39 [PATCH mptcp-next v12 00/15] dump for userspace pm Geliang Tang
@ 2024-02-14 11:39 ` Geliang Tang
2024-02-14 11:39 ` [PATCH mptcp-next v12 02/15] mptcp: implement mptcp_userspace_pm_dump_addr Geliang Tang
` (13 subsequent siblings)
14 siblings, 0 replies; 36+ messages in thread
From: Geliang Tang @ 2024-02-14 11:39 UTC (permalink / raw)
To: mptcp; +Cc: Geliang Tang
From: Geliang Tang <tanggeliang@kylinos.cn>
This patch exports struct mptcp_genl_family and mptcp_nl_fill_addr() helper
to allow them can be used in pm_userspace.c.
Signed-off-by: Geliang Tang <tanggeliang@kylinos.cn>
---
net/mptcp/pm_netlink.c | 9 +++------
net/mptcp/protocol.h | 4 ++++
2 files changed, 7 insertions(+), 6 deletions(-)
diff --git a/net/mptcp/pm_netlink.c b/net/mptcp/pm_netlink.c
index d5a942b9ab29..5cca84c6b87b 100644
--- a/net/mptcp/pm_netlink.c
+++ b/net/mptcp/pm_netlink.c
@@ -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 {
@@ -1636,8 +1633,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;
@@ -2281,7 +2278,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,
diff --git a/net/mptcp/protocol.h b/net/mptcp/protocol.h
index 486fff865803..60de3f997de2 100644
--- a/net/mptcp/protocol.h
+++ b/net/mptcp/protocol.h
@@ -343,6 +343,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);
@@ -964,6 +966,8 @@ void __mptcp_fastopen_gen_msk_ackseq(struct mptcp_sock *msk, struct mptcp_subflo
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)
{
--
2.40.1
^ permalink raw reply related [flat|nested] 36+ messages in thread* [PATCH mptcp-next v12 02/15] mptcp: implement mptcp_userspace_pm_dump_addr
2024-02-14 11:39 [PATCH mptcp-next v12 00/15] dump for userspace pm Geliang Tang
2024-02-14 11:39 ` [PATCH mptcp-next v12 01/15] mptcp: export mptcp_genl_family & mptcp_nl_fill_addr Geliang Tang
@ 2024-02-14 11:39 ` Geliang Tang
2024-02-14 11:39 ` [PATCH mptcp-next v12 03/15] mptcp: add token for get-addr in yaml Geliang Tang
` (12 subsequent siblings)
14 siblings, 0 replies; 36+ messages in thread
From: Geliang Tang @ 2024-02-14 11:39 UTC (permalink / raw)
To: mptcp; +Cc: Geliang Tang
From: Geliang Tang <tanggeliang@kylinos.cn>
This 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().
Signed-off-by: Geliang Tang <tanggeliang@kylinos.cn>
---
net/mptcp/pm_userspace.c | 60 ++++++++++++++++++++++++++++++++++++++++
net/mptcp/protocol.h | 2 ++
2 files changed, 62 insertions(+)
diff --git a/net/mptcp/pm_userspace.c b/net/mptcp/pm_userspace.c
index bc97cc30f013..d6b7be3afbe5 100644
--- a/net/mptcp/pm_userspace.c
+++ b/net/mptcp/pm_userspace.c
@@ -572,3 +572,63 @@ 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;
+ }
+
+ sk = (struct sock *)msk;
+
+ if (!mptcp_pm_is_userspace(msk)) {
+ GENL_SET_ERR_MSG(info, "invalid request; userspace PM not selected");
+ goto out;
+ }
+
+ 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);
+ ret = msg->len;
+
+out:
+ sock_put(sk);
+ return ret;
+}
diff --git a/net/mptcp/protocol.h b/net/mptcp/protocol.h
index 60de3f997de2..af20833f3157 100644
--- a/net/mptcp/protocol.h
+++ b/net/mptcp/protocol.h
@@ -1032,6 +1032,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);
static inline u8 subflow_get_local_id(const struct mptcp_subflow_context *subflow)
{
--
2.40.1
^ permalink raw reply related [flat|nested] 36+ messages in thread* [PATCH mptcp-next v12 03/15] mptcp: add token for get-addr in yaml
2024-02-14 11:39 [PATCH mptcp-next v12 00/15] dump for userspace pm Geliang Tang
2024-02-14 11:39 ` [PATCH mptcp-next v12 01/15] mptcp: export mptcp_genl_family & mptcp_nl_fill_addr Geliang Tang
2024-02-14 11:39 ` [PATCH mptcp-next v12 02/15] mptcp: implement mptcp_userspace_pm_dump_addr Geliang Tang
@ 2024-02-14 11:39 ` Geliang Tang
2024-02-15 23:00 ` Mat Martineau
2024-02-14 11:39 ` [PATCH mptcp-next v12 04/15] mptcp: dump addrs in userspace pm list Geliang Tang
` (11 subsequent siblings)
14 siblings, 1 reply; 36+ messages in thread
From: Geliang Tang @ 2024-02-14 11:39 UTC (permalink / raw)
To: mptcp; +Cc: Geliang Tang
From: Geliang Tang <tanggeliang@kylinos.cn>
This 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
Signed-off-by: Geliang Tang <tanggeliang@kylinos.cn>
---
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(-)
diff --git a/Documentation/netlink/specs/mptcp_pm.yaml b/Documentation/netlink/specs/mptcp_pm.yaml
index 49f90cfb4698..af525ed29792 100644
--- a/Documentation/netlink/specs/mptcp_pm.yaml
+++ b/Documentation/netlink/specs/mptcp_pm.yaml
@@ -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
diff --git a/net/mptcp/mptcp_pm_gen.c b/net/mptcp/mptcp_pm_gen.c
index 670da7822e6c..c30a2a90a192 100644
--- a/net/mptcp/mptcp_pm_gen.c
+++ b/net/mptcp/mptcp_pm_gen.c
@@ -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,
},
{
diff --git a/net/mptcp/mptcp_pm_gen.h b/net/mptcp/mptcp_pm_gen.h
index ac9fc7225b6a..e24258f6f819 100644
--- a/net/mptcp/mptcp_pm_gen.h
+++ b/net/mptcp/mptcp_pm_gen.h
@@ -18,7 +18,7 @@ extern const struct nla_policy mptcp_pm_add_addr_nl_policy[MPTCP_PM_ENDPOINT_ADD
extern 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];
--
2.40.1
^ permalink raw reply related [flat|nested] 36+ messages in thread* Re: [PATCH mptcp-next v12 03/15] mptcp: add token for get-addr in yaml
2024-02-14 11:39 ` [PATCH mptcp-next v12 03/15] mptcp: add token for get-addr in yaml Geliang Tang
@ 2024-02-15 23:00 ` Mat Martineau
0 siblings, 0 replies; 36+ messages in thread
From: Mat Martineau @ 2024-02-15 23:00 UTC (permalink / raw)
To: Geliang Tang; +Cc: mptcp, Geliang Tang
On Wed, 14 Feb 2024, Geliang Tang wrote:
> From: Geliang Tang <tanggeliang@kylinos.cn>
>
> This patch adds token paramenter together with addr in get-addr section in
Hi Geliang -
The CI shows a checkpatch warning for the misspelled "parameter" above.
Thanks,
Mat
> 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
>
> Signed-off-by: Geliang Tang <tanggeliang@kylinos.cn>
> ---
> 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(-)
>
> diff --git a/Documentation/netlink/specs/mptcp_pm.yaml b/Documentation/netlink/specs/mptcp_pm.yaml
> index 49f90cfb4698..af525ed29792 100644
> --- a/Documentation/netlink/specs/mptcp_pm.yaml
> +++ b/Documentation/netlink/specs/mptcp_pm.yaml
> @@ -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
> diff --git a/net/mptcp/mptcp_pm_gen.c b/net/mptcp/mptcp_pm_gen.c
> index 670da7822e6c..c30a2a90a192 100644
> --- a/net/mptcp/mptcp_pm_gen.c
> +++ b/net/mptcp/mptcp_pm_gen.c
> @@ -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,
> },
> {
> diff --git a/net/mptcp/mptcp_pm_gen.h b/net/mptcp/mptcp_pm_gen.h
> index ac9fc7225b6a..e24258f6f819 100644
> --- a/net/mptcp/mptcp_pm_gen.h
> +++ b/net/mptcp/mptcp_pm_gen.h
> @@ -18,7 +18,7 @@ extern const struct nla_policy mptcp_pm_add_addr_nl_policy[MPTCP_PM_ENDPOINT_ADD
>
> extern 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];
>
> --
> 2.40.1
>
>
>
^ permalink raw reply [flat|nested] 36+ messages in thread
* [PATCH mptcp-next v12 04/15] mptcp: dump addrs in userspace pm list
2024-02-14 11:39 [PATCH mptcp-next v12 00/15] dump for userspace pm Geliang Tang
` (2 preceding siblings ...)
2024-02-14 11:39 ` [PATCH mptcp-next v12 03/15] mptcp: add token for get-addr in yaml Geliang Tang
@ 2024-02-14 11:39 ` Geliang Tang
2024-02-14 11:39 ` [PATCH mptcp-next v12 05/15] mptcp: check userspace pm flags Geliang Tang
` (10 subsequent siblings)
14 siblings, 0 replies; 36+ messages in thread
From: Geliang Tang @ 2024-02-14 11:39 UTC (permalink / raw)
To: mptcp; +Cc: Geliang Tang
From: Geliang Tang <tanggeliang@kylinos.cn>
This 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.
Signed-off-by: Geliang Tang <tanggeliang@kylinos.cn>
---
net/mptcp/pm.c | 9 +++++++++
net/mptcp/pm_netlink.c | 10 ++++++++--
net/mptcp/protocol.h | 3 +++
3 files changed, 20 insertions(+), 2 deletions(-)
diff --git a/net/mptcp/pm.c b/net/mptcp/pm.c
index 53e0b08b1123..193198cec74a 100644
--- a/net/mptcp/pm.c
+++ b/net/mptcp/pm.c
@@ -441,6 +441,15 @@ int mptcp_pm_get_flags_and_ifindex_by_id(struct mptcp_sock *msk, unsigned int id
return 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)
diff --git a/net/mptcp/pm_netlink.c b/net/mptcp/pm_netlink.c
index 5cca84c6b87b..7b15bb4f12c1 100644
--- a/net/mptcp/pm_netlink.c
+++ b/net/mptcp/pm_netlink.c
@@ -1722,8 +1722,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;
@@ -1765,6 +1765,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];
diff --git a/net/mptcp/protocol.h b/net/mptcp/protocol.h
index af20833f3157..657d23a9678c 100644
--- a/net/mptcp/protocol.h
+++ b/net/mptcp/protocol.h
@@ -1032,6 +1032,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);
--
2.40.1
^ permalink raw reply related [flat|nested] 36+ messages in thread* [PATCH mptcp-next v12 05/15] mptcp: check userspace pm flags
2024-02-14 11:39 [PATCH mptcp-next v12 00/15] dump for userspace pm Geliang Tang
` (3 preceding siblings ...)
2024-02-14 11:39 ` [PATCH mptcp-next v12 04/15] mptcp: dump addrs in userspace pm list Geliang Tang
@ 2024-02-14 11:39 ` Geliang Tang
2024-02-14 11:39 ` [PATCH mptcp-next v12 06/15] selftests: mptcp: add userspace pm subflow flag Geliang Tang
` (9 subsequent siblings)
14 siblings, 0 replies; 36+ messages in thread
From: Geliang Tang @ 2024-02-14 11:39 UTC (permalink / raw)
To: mptcp; +Cc: Geliang Tang
From: Geliang Tang <tanggeliang@kylinos.cn>
Just like MPTCP_PM_ADDR_FLAG_SIGNAL flag is checked in userspace PM
announce mptcp_pm_nl_announce_doit(), PM flags should be checked in
mptcp_pm_nl_subflow_create_doit() too.
If MPTCP_PM_ADDR_FLAG_SUBFLOW flag is not set, there's no flags field
in the output of dump_addr. This looks a bit strange:
id 10 flags 10.0.3.2
This patch uses mptcp_pm_parse_entry() instead of mptcp_pm_parse_addr()
to get the PM flags of the entry and check it. MPTCP_PM_ADDR_FLAG_SIGNAL
flag shouldn't be set here, and if MPTCP_PM_ADDR_FLAG_SUBFLOW flag is
missing from the netlink attribute, always set this flag.
Signed-off-by: Geliang Tang <tanggeliang@kylinos.cn>
---
net/mptcp/pm_userspace.c | 12 ++++++++++--
1 file changed, 10 insertions(+), 2 deletions(-)
diff --git a/net/mptcp/pm_userspace.c b/net/mptcp/pm_userspace.c
index d6b7be3afbe5..73ad286247f1 100644
--- a/net/mptcp/pm_userspace.c
+++ b/net/mptcp/pm_userspace.c
@@ -360,11 +360,20 @@ 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;
+
+ if (local.flags & MPTCP_PM_ADDR_FLAG_SIGNAL) {
+ GENL_SET_ERR_MSG(info, "invalid addr flags");
+ err = -EINVAL;
+ goto create_err;
+ }
+ if (!(local.flags & MPTCP_PM_ADDR_FLAG_SUBFLOW))
+ local.flags |= MPTCP_PM_ADDR_FLAG_SUBFLOW;
err = mptcp_pm_parse_addr(raddr, info, &addr_r);
if (err < 0) {
@@ -378,7 +387,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, false);
if (err < 0) {
GENL_SET_ERR_MSG(info, "did not match address and id");
--
2.40.1
^ permalink raw reply related [flat|nested] 36+ messages in thread* [PATCH mptcp-next v12 06/15] selftests: mptcp: add userspace pm subflow flag
2024-02-14 11:39 [PATCH mptcp-next v12 00/15] dump for userspace pm Geliang Tang
` (4 preceding siblings ...)
2024-02-14 11:39 ` [PATCH mptcp-next v12 05/15] mptcp: check userspace pm flags Geliang Tang
@ 2024-02-14 11:39 ` Geliang Tang
2024-02-14 11:39 ` [PATCH mptcp-next v12 07/15] selftests: mptcp: add token for dump_addr Geliang Tang
` (8 subsequent siblings)
14 siblings, 0 replies; 36+ messages in thread
From: Geliang Tang @ 2024-02-14 11:39 UTC (permalink / raw)
To: mptcp; +Cc: Geliang Tang
From: Geliang Tang <tanggeliang@kylinos.cn>
This 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.
Signed-off-by: Geliang Tang <tanggeliang@kylinos.cn>
---
tools/testing/selftests/net/mptcp/pm_nl_ctl.c | 8 ++++++++
1 file changed, 8 insertions(+)
diff --git a/tools/testing/selftests/net/mptcp/pm_nl_ctl.c b/tools/testing/selftests/net/mptcp/pm_nl_ctl.c
index 49369c4a5f26..e97856323ec3 100644
--- a/tools/testing/selftests/net/mptcp/pm_nl_ctl.c
+++ b/tools/testing/selftests/net/mptcp/pm_nl_ctl.c
@@ -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;
}
--
2.40.1
^ permalink raw reply related [flat|nested] 36+ messages in thread* [PATCH mptcp-next v12 07/15] selftests: mptcp: add token for dump_addr
2024-02-14 11:39 [PATCH mptcp-next v12 00/15] dump for userspace pm Geliang Tang
` (5 preceding siblings ...)
2024-02-14 11:39 ` [PATCH mptcp-next v12 06/15] selftests: mptcp: add userspace pm subflow flag Geliang Tang
@ 2024-02-14 11:39 ` Geliang Tang
2024-02-14 11:39 ` [PATCH mptcp-next v12 08/15] selftests: mptcp: add check_output helper Geliang Tang
` (7 subsequent siblings)
14 siblings, 0 replies; 36+ messages in thread
From: Geliang Tang @ 2024-02-14 11:39 UTC (permalink / raw)
To: mptcp; +Cc: Geliang Tang
From: Geliang Tang <tanggeliang@kylinos.cn>
The 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.
Signed-off-by: Geliang Tang <tanggeliang@kylinos.cn>
---
tools/testing/selftests/net/mptcp/pm_nl_ctl.c | 17 +++++++++++++++++
1 file changed, 17 insertions(+)
diff --git a/tools/testing/selftests/net/mptcp/pm_nl_ctl.c b/tools/testing/selftests/net/mptcp/pm_nl_ctl.c
index e97856323ec3..8d7d1b4ed28e 100644
--- a/tools/testing/selftests/net/mptcp/pm_nl_ctl.c
+++ b/tools/testing/selftests/net/mptcp/pm_nl_ctl.c
@@ -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;
}
--
2.40.1
^ permalink raw reply related [flat|nested] 36+ messages in thread* [PATCH mptcp-next v12 08/15] selftests: mptcp: add check_output helper
2024-02-14 11:39 [PATCH mptcp-next v12 00/15] dump for userspace pm Geliang Tang
` (6 preceding siblings ...)
2024-02-14 11:39 ` [PATCH mptcp-next v12 07/15] selftests: mptcp: add token for dump_addr Geliang Tang
@ 2024-02-14 11:39 ` Geliang Tang
2024-02-14 11:40 ` [PATCH mptcp-next v12 09/15] selftests: mptcp: dump after creating id 0 subflow Geliang Tang
` (6 subsequent siblings)
14 siblings, 0 replies; 36+ messages in thread
From: Geliang Tang @ 2024-02-14 11:39 UTC (permalink / raw)
To: mptcp; +Cc: Geliang Tang
From: Geliang Tang <tanggeliang@kylinos.cn>
Similar to check() in pm_netlink.sh, add a new helper check_output()
in mptcp_join.sh to check the output of the given commands.
Signed-off-by: Geliang Tang <tanggeliang@kylinos.cn>
---
.../testing/selftests/net/mptcp/mptcp_join.sh | 27 +++++++++++++++++++
1 file changed, 27 insertions(+)
diff --git a/tools/testing/selftests/net/mptcp/mptcp_join.sh b/tools/testing/selftests/net/mptcp/mptcp_join.sh
index e68b1bc2c2e4..d92d233ddccf 100755
--- a/tools/testing/selftests/net/mptcp/mptcp_join.sh
+++ b/tools/testing/selftests/net/mptcp/mptcp_join.sh
@@ -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
}
@@ -3351,6 +3354,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
--
2.40.1
^ permalink raw reply related [flat|nested] 36+ messages in thread* [PATCH mptcp-next v12 09/15] selftests: mptcp: dump after creating id 0 subflow
2024-02-14 11:39 [PATCH mptcp-next v12 00/15] dump for userspace pm Geliang Tang
` (7 preceding siblings ...)
2024-02-14 11:39 ` [PATCH mptcp-next v12 08/15] selftests: mptcp: add check_output helper Geliang Tang
@ 2024-02-14 11:40 ` Geliang Tang
2024-02-14 11:40 ` [PATCH mptcp-next v12 10/15] selftests: mptcp: dump userspace addrs list Geliang Tang
` (5 subsequent siblings)
14 siblings, 0 replies; 36+ messages in thread
From: Geliang Tang @ 2024-02-14 11:40 UTC (permalink / raw)
To: mptcp; +Cc: Geliang Tang
From: Geliang Tang <tanggeliang@kylinos.cn>
This 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.
Signed-off-by: Geliang Tang <tanggeliang@kylinos.cn>
---
tools/testing/selftests/net/mptcp/mptcp_join.sh | 15 +++++++++++++++
1 file changed, 15 insertions(+)
diff --git a/tools/testing/selftests/net/mptcp/mptcp_join.sh b/tools/testing/selftests/net/mptcp/mptcp_join.sh
index d92d233ddccf..dcb146c426dd 100755
--- a/tools/testing/selftests/net/mptcp/mptcp_join.sh
+++ b/tools/testing/selftests/net/mptcp/mptcp_join.sh
@@ -3354,6 +3354,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"
@@ -3514,6 +3526,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
--
2.40.1
^ permalink raw reply related [flat|nested] 36+ messages in thread* [PATCH mptcp-next v12 10/15] selftests: mptcp: dump userspace addrs list
2024-02-14 11:39 [PATCH mptcp-next v12 00/15] dump for userspace pm Geliang Tang
` (8 preceding siblings ...)
2024-02-14 11:40 ` [PATCH mptcp-next v12 09/15] selftests: mptcp: dump after creating id 0 subflow Geliang Tang
@ 2024-02-14 11:40 ` Geliang Tang
2024-02-15 22:57 ` Mat Martineau
2024-02-14 11:40 ` [PATCH mptcp-next v12 11/15] mptcp: add userspace_pm_lookup_addr_by_id helper Geliang Tang
` (4 subsequent siblings)
14 siblings, 1 reply; 36+ messages in thread
From: Geliang Tang @ 2024-02-14 11:40 UTC (permalink / raw)
To: mptcp; +Cc: Geliang Tang
From: Geliang Tang <tanggeliang@kylinos.cn>
This 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.
Signed-off-by: Geliang Tang <tanggeliang@kylinos.cn>
---
.../testing/selftests/net/mptcp/mptcp_join.sh | 44 +++++++++++++++++++
1 file changed, 44 insertions(+)
diff --git a/tools/testing/selftests/net/mptcp/mptcp_join.sh b/tools/testing/selftests/net/mptcp/mptcp_join.sh
index dcb146c426dd..5f12bd1de383 100755
--- a/tools/testing/selftests/net/mptcp/mptcp_join.sh
+++ b/tools/testing/selftests/net/mptcp/mptcp_join.sh
@@ -3585,6 +3585,50 @@ userspace_tests()
kill_events_pids
mptcp_lib_kill_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()
--
2.40.1
^ permalink raw reply related [flat|nested] 36+ messages in thread* Re: [PATCH mptcp-next v12 10/15] selftests: mptcp: dump userspace addrs list
2024-02-14 11:40 ` [PATCH mptcp-next v12 10/15] selftests: mptcp: dump userspace addrs list Geliang Tang
@ 2024-02-15 22:57 ` Mat Martineau
2024-02-16 10:30 ` Matthieu Baerts
0 siblings, 1 reply; 36+ messages in thread
From: Mat Martineau @ 2024-02-15 22:57 UTC (permalink / raw)
To: Geliang Tang, Matthieu Baerts; +Cc: mptcp, Geliang Tang
On Wed, 14 Feb 2024, Geliang Tang wrote:
> From: Geliang Tang <tanggeliang@kylinos.cn>
>
> This 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.
>
Hi Geliang -
The kernel code looks good to me, but I realized the selftests need some
changes.
In order to run the new tests with old kernels (without userspace dump
address support), mptcp_lib_kallsyms_has checks are needed so the new
functionality is skipped on old kernels (right Matthieu?).
Also, since our tests already take a long time to run, could the userspace
dump addrs checks be integrated with an existing test like "userspace pm
add & remove address"?
Thanks,
Mat
> Signed-off-by: Geliang Tang <tanggeliang@kylinos.cn>
> ---
> .../testing/selftests/net/mptcp/mptcp_join.sh | 44 +++++++++++++++++++
> 1 file changed, 44 insertions(+)
>
> diff --git a/tools/testing/selftests/net/mptcp/mptcp_join.sh b/tools/testing/selftests/net/mptcp/mptcp_join.sh
> index dcb146c426dd..5f12bd1de383 100755
> --- a/tools/testing/selftests/net/mptcp/mptcp_join.sh
> +++ b/tools/testing/selftests/net/mptcp/mptcp_join.sh
> @@ -3585,6 +3585,50 @@ userspace_tests()
> kill_events_pids
> mptcp_lib_kill_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()
> --
> 2.40.1
>
>
>
^ permalink raw reply [flat|nested] 36+ messages in thread
* Re: [PATCH mptcp-next v12 10/15] selftests: mptcp: dump userspace addrs list
2024-02-15 22:57 ` Mat Martineau
@ 2024-02-16 10:30 ` Matthieu Baerts
0 siblings, 0 replies; 36+ messages in thread
From: Matthieu Baerts @ 2024-02-16 10:30 UTC (permalink / raw)
To: Mat Martineau, Geliang Tang; +Cc: mptcp, Geliang Tang
Hi Mat, Geliang,
On 15/02/2024 23:57, Mat Martineau wrote:
> On Wed, 14 Feb 2024, Geliang Tang wrote:
>
>> From: Geliang Tang <tanggeliang@kylinos.cn>
>>
>> This 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.
>>
>
> Hi Geliang -
>
> The kernel code looks good to me, but I realized the selftests need some
> changes.
>
> In order to run the new tests with old kernels (without userspace dump
> address support), mptcp_lib_kallsyms_has checks are needed so the new
> functionality is skipped on old kernels (right Matthieu?).
Good point!
I didn't check what can be done, but yes, something needs to be done:
looking for a counter, a symbol, the output of a command, etc.
> Also, since our tests already take a long time to run, could the
> userspace dump addrs checks be integrated with an existing test like
> "userspace pm add & remove address"?
Good idea! (maybe even more tests doing the same actions, but checking
different things, could be merged with a new title)
Cheers,
Matt
--
Sponsored by the NGI0 Core fund.
^ permalink raw reply [flat|nested] 36+ messages in thread
* [PATCH mptcp-next v12 11/15] mptcp: add userspace_pm_lookup_addr_by_id helper
2024-02-14 11:39 [PATCH mptcp-next v12 00/15] dump for userspace pm Geliang Tang
` (9 preceding siblings ...)
2024-02-14 11:40 ` [PATCH mptcp-next v12 10/15] selftests: mptcp: dump userspace addrs list Geliang Tang
@ 2024-02-14 11:40 ` Geliang Tang
2024-02-14 11:40 ` [PATCH mptcp-next v12 12/15] mptcp: implement mptcp_userspace_pm_get_addr Geliang Tang
` (3 subsequent siblings)
14 siblings, 0 replies; 36+ messages in thread
From: Geliang Tang @ 2024-02-14 11:40 UTC (permalink / raw)
To: mptcp; +Cc: Geliang Tang
From: Geliang Tang <tanggeliang@kylinos.cn>
Corresponding __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.
Signed-off-by: Geliang Tang <tanggeliang@kylinos.cn>
---
net/mptcp/pm_userspace.c | 31 ++++++++++++++++---------------
1 file changed, 16 insertions(+), 15 deletions(-)
diff --git a/net/mptcp/pm_userspace.c b/net/mptcp/pm_userspace.c
index 73ad286247f1..a9328f41f74c 100644
--- a/net/mptcp/pm_userspace.c
+++ b/net/mptcp/pm_userspace.c
@@ -106,19 +106,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;
@@ -261,7 +268,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);
@@ -298,13 +305,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);
--
2.40.1
^ permalink raw reply related [flat|nested] 36+ messages in thread* [PATCH mptcp-next v12 12/15] mptcp: implement mptcp_userspace_pm_get_addr
2024-02-14 11:39 [PATCH mptcp-next v12 00/15] dump for userspace pm Geliang Tang
` (10 preceding siblings ...)
2024-02-14 11:40 ` [PATCH mptcp-next v12 11/15] mptcp: add userspace_pm_lookup_addr_by_id helper Geliang Tang
@ 2024-02-14 11:40 ` Geliang Tang
2024-02-14 11:40 ` [PATCH mptcp-next v12 13/15] mptcp: get addr in userspace pm list Geliang Tang
` (2 subsequent siblings)
14 siblings, 0 replies; 36+ messages in thread
From: Geliang Tang @ 2024-02-14 11:40 UTC (permalink / raw)
To: mptcp; +Cc: Geliang Tang
From: Geliang Tang <tanggeliang@kylinos.cn>
This 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().
Signed-off-by: Geliang Tang <tanggeliang@kylinos.cn>
---
net/mptcp/pm_userspace.c | 74 ++++++++++++++++++++++++++++++++++++++++
net/mptcp/protocol.h | 2 ++
2 files changed, 76 insertions(+)
diff --git a/net/mptcp/pm_userspace.c b/net/mptcp/pm_userspace.c
index a9328f41f74c..a8571da70212 100644
--- a/net/mptcp/pm_userspace.c
+++ b/net/mptcp/pm_userspace.c
@@ -641,3 +641,77 @@ int mptcp_userspace_pm_dump_addr(struct sk_buff *msg,
sock_put(sk);
return ret;
}
+
+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;
+ }
+
+ sk = (struct sock *)msk;
+
+ if (!mptcp_pm_is_userspace(msk)) {
+ GENL_SET_ERR_MSG(info, "invalid request; userspace PM not selected");
+ goto out;
+ }
+
+ ret = mptcp_pm_parse_entry(attr, info, false, &addr);
+ if (ret < 0)
+ goto out;
+
+ msg = nlmsg_new(NLMSG_DEFAULT_SIZE, GFP_KERNEL);
+ if (!msg) {
+ ret = -ENOMEM;
+ goto out;
+ }
+
+ 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;
+ }
+
+ 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);
+ sock_put(sk);
+ return ret;
+
+unlock_fail:
+ spin_unlock_bh(&msk->pm.lock);
+ release_sock(sk);
+fail:
+ nlmsg_free(msg);
+out:
+ sock_put(sk);
+ return ret;
+}
diff --git a/net/mptcp/protocol.h b/net/mptcp/protocol.h
index 657d23a9678c..a86708996954 100644
--- a/net/mptcp/protocol.h
+++ b/net/mptcp/protocol.h
@@ -1037,6 +1037,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);
static inline u8 subflow_get_local_id(const struct mptcp_subflow_context *subflow)
{
--
2.40.1
^ permalink raw reply related [flat|nested] 36+ messages in thread* [PATCH mptcp-next v12 13/15] mptcp: get addr in userspace pm list
2024-02-14 11:39 [PATCH mptcp-next v12 00/15] dump for userspace pm Geliang Tang
` (11 preceding siblings ...)
2024-02-14 11:40 ` [PATCH mptcp-next v12 12/15] mptcp: implement mptcp_userspace_pm_get_addr Geliang Tang
@ 2024-02-14 11:40 ` Geliang Tang
2024-02-14 11:40 ` [PATCH mptcp-next v12 14/15] selftests: mptcp: add token for get_addr Geliang Tang
2024-02-14 11:40 ` [PATCH mptcp-next v12 15/15] selftests: mptcp: userspace pm get addr tests Geliang Tang
14 siblings, 0 replies; 36+ messages in thread
From: Geliang Tang @ 2024-02-14 11:40 UTC (permalink / raw)
To: mptcp; +Cc: Geliang Tang
From: Geliang Tang <tanggeliang@kylinos.cn>
This 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().
Signed-off-by: Geliang Tang <tanggeliang@kylinos.cn>
---
net/mptcp/pm.c | 7 +++++++
net/mptcp/pm_netlink.c | 7 ++++++-
net/mptcp/protocol.h | 2 ++
3 files changed, 15 insertions(+), 1 deletion(-)
diff --git a/net/mptcp/pm.c b/net/mptcp/pm.c
index 193198cec74a..b4bdd92a5648 100644
--- a/net/mptcp/pm.c
+++ b/net/mptcp/pm.c
@@ -441,6 +441,13 @@ int mptcp_pm_get_flags_and_ifindex_by_id(struct mptcp_sock *msk, unsigned int id
return 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);
diff --git a/net/mptcp/pm_netlink.c b/net/mptcp/pm_netlink.c
index 7b15bb4f12c1..f04e354b0c64 100644
--- a/net/mptcp/pm_netlink.c
+++ b/net/mptcp/pm_netlink.c
@@ -1672,7 +1672,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);
@@ -1722,6 +1722,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)
{
diff --git a/net/mptcp/protocol.h b/net/mptcp/protocol.h
index a86708996954..75d9184db7ff 100644
--- a/net/mptcp/protocol.h
+++ b/net/mptcp/protocol.h
@@ -1037,6 +1037,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);
--
2.40.1
^ permalink raw reply related [flat|nested] 36+ messages in thread* [PATCH mptcp-next v12 14/15] selftests: mptcp: add token for get_addr
2024-02-14 11:39 [PATCH mptcp-next v12 00/15] dump for userspace pm Geliang Tang
` (12 preceding siblings ...)
2024-02-14 11:40 ` [PATCH mptcp-next v12 13/15] mptcp: get addr in userspace pm list Geliang Tang
@ 2024-02-14 11:40 ` Geliang Tang
2024-02-14 11:40 ` [PATCH mptcp-next v12 15/15] selftests: mptcp: userspace pm get addr tests Geliang Tang
14 siblings, 0 replies; 36+ messages in thread
From: Geliang Tang @ 2024-02-14 11:40 UTC (permalink / raw)
To: mptcp; +Cc: Geliang Tang
From: Geliang Tang <tanggeliang@kylinos.cn>
The 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.
Signed-off-by: Geliang Tang <tanggeliang@kylinos.cn>
---
tools/testing/selftests/net/mptcp/pm_nl_ctl.c | 14 +++++++++++++-
1 file changed, 13 insertions(+), 1 deletion(-)
diff --git a/tools/testing/selftests/net/mptcp/pm_nl_ctl.c b/tools/testing/selftests/net/mptcp/pm_nl_ctl.c
index 8d7d1b4ed28e..7426a2cbd4a0 100644
--- a/tools/testing/selftests/net/mptcp/pm_nl_ctl.c
+++ b/tools/testing/selftests/net/mptcp/pm_nl_ctl.c
@@ -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;
}
--
2.40.1
^ permalink raw reply related [flat|nested] 36+ messages in thread* [PATCH mptcp-next v12 15/15] selftests: mptcp: userspace pm get addr tests
2024-02-14 11:39 [PATCH mptcp-next v12 00/15] dump for userspace pm Geliang Tang
` (13 preceding siblings ...)
2024-02-14 11:40 ` [PATCH mptcp-next v12 14/15] selftests: mptcp: add token for get_addr Geliang Tang
@ 2024-02-14 11:40 ` Geliang Tang
2024-02-14 12:37 ` selftests: mptcp: userspace pm get addr tests: Tests Results MPTCP CI
2024-02-14 12:48 ` MPTCP CI
14 siblings, 2 replies; 36+ messages in thread
From: Geliang Tang @ 2024-02-14 11:40 UTC (permalink / raw)
To: mptcp; +Cc: Geliang Tang
From: Geliang Tang <tanggeliang@kylinos.cn>
This 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.
Signed-off-by: Geliang Tang <tanggeliang@kylinos.cn>
---
tools/testing/selftests/net/mptcp/mptcp_join.sh | 16 ++++++++++++++++
1 file changed, 16 insertions(+)
diff --git a/tools/testing/selftests/net/mptcp/mptcp_join.sh b/tools/testing/selftests/net/mptcp/mptcp_join.sh
index 5f12bd1de383..7cf55609b7d2 100755
--- a/tools/testing/selftests/net/mptcp/mptcp_join.sh
+++ b/tools/testing/selftests/net/mptcp/mptcp_join.sh
@@ -3366,6 +3366,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"
@@ -3602,6 +3614,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
@@ -3624,6 +3638,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
--
2.40.1
^ permalink raw reply related [flat|nested] 36+ messages in thread* Re: selftests: mptcp: userspace pm get addr tests: Tests Results
2024-02-14 11:40 ` [PATCH mptcp-next v12 15/15] selftests: mptcp: userspace pm get addr tests Geliang Tang
@ 2024-02-14 12:37 ` MPTCP CI
2024-02-14 12:48 ` MPTCP CI
1 sibling, 0 replies; 36+ messages in thread
From: MPTCP CI @ 2024-02-14 12:37 UTC (permalink / raw)
To: Geliang Tang; +Cc: mptcp
Hi Geliang,
Thank you for your modifications, that's great!
Our CI (GitHub Action) did some validations and here is its report:
- KVM Validation: normal:
- Success! ✅:
- Task: https://github.com/multipath-tcp/mptcp_net-next/actions/runs/7900781714
Initiator: Patchew Applier
Commits: https://github.com/multipath-tcp/mptcp_net-next/commits/ef0e97c755ed
If there are some issues, you can reproduce them using the same environment as
the one used by the CI thanks to a docker image, e.g.:
$ cd [kernel source code]
$ docker run -v "${PWD}:${PWD}:rw" -w "${PWD}" --privileged --rm -it \
--pull always mptcp/mptcp-upstream-virtme-docker:latest \
auto-normal
For more details:
https://github.com/multipath-tcp/mptcp-upstream-virtme-docker
Please note that despite all the efforts that have been already done to have a
stable tests suite when executed on a public CI like here, it is possible some
reported issues are not due to your modifications. Still, do not hesitate to
help us improve that ;-)
Cheers,
MPTCP GH Action bot
Bot operated by Matthieu Baerts (NGI0 Core)
^ permalink raw reply [flat|nested] 36+ messages in thread* Re: selftests: mptcp: userspace pm get addr tests: Tests Results
2024-02-14 11:40 ` [PATCH mptcp-next v12 15/15] selftests: mptcp: userspace pm get addr tests Geliang Tang
2024-02-14 12:37 ` selftests: mptcp: userspace pm get addr tests: Tests Results MPTCP CI
@ 2024-02-14 12:48 ` MPTCP CI
1 sibling, 0 replies; 36+ messages in thread
From: MPTCP CI @ 2024-02-14 12:48 UTC (permalink / raw)
To: Geliang Tang; +Cc: mptcp
Hi Geliang,
Thank you for your modifications, that's great!
Our CI (Cirrus) did some validations with a debug kernel and here is its report:
- KVM Validation: debug (except selftest_mptcp_join):
- Success! ✅:
- Task: https://cirrus-ci.com/task/5161940717142016
- Summary: https://api.cirrus-ci.com/v1/artifact/task/5161940717142016/summary/summary.txt
- KVM Validation: debug (only selftest_mptcp_join):
- Success! ✅:
- Task: https://cirrus-ci.com/task/6287840623984640
- Summary: https://api.cirrus-ci.com/v1/artifact/task/6287840623984640/summary/summary.txt
Initiator: Patchew Applier
Commits: https://github.com/multipath-tcp/mptcp_net-next/commits/ef0e97c755ed
If there are some issues, you can reproduce them using the same environment as
the one used by the CI thanks to a docker image, e.g.:
$ cd [kernel source code]
$ docker run -v "${PWD}:${PWD}:rw" -w "${PWD}" --privileged --rm -it \
--pull always mptcp/mptcp-upstream-virtme-docker:latest \
auto-debug
For more details:
https://github.com/multipath-tcp/mptcp-upstream-virtme-docker
Please note that despite all the efforts that have been already done to have a
stable tests suite when executed on a public CI like here, it is possible some
reported issues are not due to your modifications. Still, do not hesitate to
help us improve that ;-)
Cheers,
MPTCP GH Action bot
Bot operated by Matthieu Baerts (NGI0 Core)
^ permalink raw reply [flat|nested] 36+ messages in thread