add mptcp_subflow bpf_iter
Subsystems (5)
Geliang Tang
reviewerv3 cover add mptcp_subflow bpf_iter
From: Geliang Tang <[email protected]>
v3:
- drop bpf_iter__mptcp_subflow, __diag_push, __diag_pop and __diag_ignore_all
- drop declarations for bpf kfuncs
v2:
- update patch 1 as Martin and Andrii suggested.
- fix warnings and errors reported by MPTCP CI.
This patch set adds a mptcp_subflow type bpf_iter, and self tests.
Geliang Tang (5):
bpf: Add mptcp_subflow bpf_iter
Squash to "mptcp: add sched_data helpers"
bpf: Register mptcp tracing kfunc set selftests/bpf: Add mptcp_subflow bpf_iter test prog selftests/bpf: Add mptcp_subflow bpf_iter subtest
net/mptcp/bpf.c | 54 ++++++++++-- net/mptcp/protocol.h | 2 - .../testing/selftests/bpf/bpf_experimental.h | 7 ++ .../testing/selftests/bpf/prog_tests/mptcp.c | 85 +++++++++++++++++++ tools/testing/selftests/bpf/progs/mptcp_bpf.h | 4 + .../selftests/bpf/progs/mptcp_bpf_iter.c | 38 +++++++++ 6 files changed, 183 insertions(+), 7 deletions(-) create mode 100644 tools/testing/selftests/bpf/progs/mptcp_bpf_iter.c
Signature · 1 line
2.43.0
Geliang Tang
reviewerPATCH v3 1/5 bpf: Add mptcp_subflow bpf_iter
From: Geliang Tang <[email protected]>
It's necessary to traverse all subflows on the conn_list of an MPTCP socket and then call kfunc to modify the fields of each subflow. In kernel space, mptcp_for_each_subflow() helper is used for this:
mptcp_for_each_subflow(msk, subflow) kfunc(subflow);
But in the MPTCP BPF program, this has not yet been implemented. As Martin suggested recently, this conn_list walking + modify-by-kfunc usage fits the bpf_iter use case. So this patch adds a new bpf_iter type named "mptcp_subflow" to do this and implements its helpers bpf_iter_mptcp_subflow_new()/_next()/_destroy().
Then bpf_for_each() for mptcp_subflow can be used in BPF program like this:
bpf_rcu_read_lock(); bpf_for_each(mptcp_subflow, subflow, msk) kfunc(subflow); bpf_rcu_read_unlock();
--- net/mptcp/bpf.c | 47 +++++++++++++++++++++++++++++++++++++++++++---- 1 file changed, 43 insertions(+), 4 deletions(-)
net/mptcp/bpf.c +43 -4
@@ -201,9 +201,48 @@ static const struct btf_kfunc_id_set bpf_mptcp_fmodret_set = { .set = &bpf_mptcp_fmodret_ids, }; -__diag_push (); -__diag_ignore_all ("-Wmissing-prototypes" , -"kfuncs which will be used in BPF programs" ); +struct bpf_iter_mptcp_subflow { +__u64 __opaque[2 ]; +} __attribute__((aligned (8 ))); + +struct bpf_iter_mptcp_subflow_kern { +struct mptcp_sock *msk; +struct list_head *pos; +} __attribute__((aligned (8 ))); + +__bpf_kfunc_start_defs (); + +__bpf_kfunc int bpf_iter_mptcp_subflow_new(struct bpf_iter_mptcp_subflow *it, +struct mptcp_sock *msk) +{ +struct bpf_iter_mptcp_subflow_kern *kit = (void *)it; + +if (!msk) +return -EINVAL ; + + kit->msk = msk; + kit->pos = &msk->conn_list; +return 0 ; +} + +__bpf_kfunc struct mptcp_subflow_context * +bpf_iter_mptcp_subflow_next (struct bpf_iter_mptcp_subflow *it) +{ +struct bpf_iter_mptcp_subflow_kern *kit = (void *)it; +struct mptcp_subflow_context *subflow; +struct mptcp_sock *msk = kit->msk; + + subflow = list_entry((kit->pos)->next, struct mptcp_subflow_context, node); +if (!msk ||list_entry_is_head (subflow, &msk->conn_list, node)) +return NULL ; + + kit->pos = &subflow->node; +return subflow; +} + +__bpf_kfunc void bpf_iter_mptcp_subflow_destroy(struct bpf_iter_mptcp_subflow *it) +{ +} __bpf_kfunc struct mptcp_subflow_context *bpf_mptcp_subflow_ctx_by_pos (const struct mptcp_sched_data *data,unsigned int pos)
@@ -218,7 +257,7 @@ __bpf_kfunc bool bpf_mptcp_subflow_queues_empty(struct sock *sk)return tcp_rtx_queue_empty (sk); } -__diag_pop (); +__bpf_kfunc_end_defs ();BTF_KFUNCS_START (bpf_mptcp_sched_kfunc_ids)BTF_ID_FLAGS (func, mptcp_subflow_set_scheduled)
Signature · 1 line
2.43.0
Re: [PATCH mptcp-next v3 1/5] bpf: Add mptcp_subflow bpf_iter
Quoted 24 lines · Geliang Tang
From: Geliang Tang <[email protected]>
It's necessary to traverse all subflows on the
conn_listof an MPTCP socket and then call kfunc to modify the fields of each subflow. In kernel space,mptcp_for_each_subflow()helper is used for this:mptcp_for_each_subflow(msk, subflow) kfunc(subflow);But in the MPTCP BPF program, this has not yet been implemented. As Martin suggested recently, this
conn_listwalking + modify-by-kfunc usage fits thebpf_iteruse case. So this patch adds a newbpf_itertype named "mptcp_subflow" to do this and implements its helpers bpf_iter_mptcp_subflow_new()/_next()/_destroy().Then
bpf_for_each()formptcp_subflowcan be used in BPF program like this:bpf_rcu_read_lock(); bpf_for_each(mptcp_subflow, subflow, msk) kfunc(subflow); bpf_rcu_read_unlock();
Quoted 6 lines
Suggested-by Martin KaFai Lau <[email protected]>Signed-off-by Geliang Tang <[email protected]>--- net/mptcp/bpf.c | 47 +++++++++++++++++++++++++++++++++++++++++++---- 1 file changed, 43 insertions(+), 4 deletions(-)
Not sure why, but only this patch made it to the BPF mailing list? Did you cc bpf@vger on all patches?
Quoted 19 lines
net/mptcp/bpf.c +8
-3@@ -201,9 +201,48 @@ static const struct btf_kfunc_id_set bpf_mptcp_fmodret_set = { .set = &bpf_mptcp_fmodret_ids, }; -__diag_push (); -__diag_ignore_all ("-Wmissing-prototypes" , -"kfuncs which will be used in BPF programs" ); +struct bpf_iter_mptcp_subflow { +__u64 __opaque[2 ]; +} __attribute__((aligned (8 ))); + +struct bpf_iter_mptcp_subflow_kern { +struct mptcp_sock *msk; +struct list_head *pos; +} __attribute__((aligned (8 )));
net/mptcp/bpf.c static const struct btf_kfunc_id_set bpf_mptcp_fmodret_set = { · line 221
Quoted 10 lines
net/mptcp/bpf.c +10
-0+ +__bpf_kfunc_start_defs (); + +__bpf_kfunc int bpf_iter_mptcp_subflow_new(struct bpf_iter_mptcp_subflow *it, +struct mptcp_sock *msk) +{ +struct bpf_iter_mptcp_subflow_kern *kit = (void *)it; + +if (!msk) +return -EINVAL ;
you still need to initialize at least kit->msk to NULL to prevent next implementation below doing the wrong thing
keep in mind, iterator constructor returning error doesn't prevent BPF program from still calling next() and destroy(), so implementation has to set iterator state such that next can return NULL if iterator was never successfully initialized
pw-bot: cr
net/mptcp/bpf.c static const struct btf_kfunc_id_set bpf_mptcp_fmodret_set = { · line 234
Quoted 13 lines
net/mptcp/bpf.c +13
-0+ + kit->msk = msk; + kit->pos = &msk->conn_list; +return 0 ; +} + +__bpf_kfunc struct mptcp_subflow_context * +bpf_iter_mptcp_subflow_next (struct bpf_iter_mptcp_subflow *it) +{ +struct bpf_iter_mptcp_subflow_kern *kit = (void *)it; +struct mptcp_subflow_context *subflow; +struct mptcp_sock *msk = kit->msk; +
you should check if (!msk) early here, before accessing kit->pos->next below
net/mptcp/bpf.c static const struct btf_kfunc_id_set bpf_mptcp_fmodret_set = { · line 235
Quoted 1 line
net/mptcp/bpf.c +1
-0+ subflow = list_entry((kit->pos)->next, struct mptcp_subflow_context, node);
nit: why () around kit->pos?
net/mptcp/bpf.c static const struct btf_kfunc_id_set bpf_mptcp_fmodret_set = { · line 236
Quoted 1 line
net/mptcp/bpf.c +1
-0+if (!msk ||list_entry_is_head (subflow, &msk->conn_list, node))
as I mentioned, !msk check seems too late. Maybe list_entry_is_head() is a bit too late as well?
Quoted 25 lines
net/mptcp/bpf.c +10
-2+return NULL ; + + kit->pos = &subflow->node; +return subflow; +} + +__bpf_kfunc void bpf_iter_mptcp_subflow_destroy(struct bpf_iter_mptcp_subflow *it) +{ +} __bpf_kfunc struct mptcp_subflow_context *bpf_mptcp_subflow_ctx_by_pos (const struct mptcp_sched_data *data,unsigned int pos)@@ -218,7 +257,7 @@ __bpf_kfunc bool bpf_mptcp_subflow_queues_empty(struct sock *sk)return tcp_rtx_queue_empty (sk); } -__diag_pop (); +__bpf_kfunc_end_defs ();BTF_KFUNCS_START (bpf_mptcp_sched_kfunc_ids)BTF_ID_FLAGS (func, mptcp_subflow_set_scheduled) --2.43.0
Geliang Tang
reviewerRe: [PATCH mptcp-next v3 1/5] bpf: Add mptcp_subflow bpf_iter
Hi Andrii,
Quoted 36 lines · Andrii Nakryiko
Quoted 26 lines · Geliang Tang
From: Geliang Tang <[email protected]>
It's necessary to traverse all subflows on the
conn_listof an MPTCP
socket and then call kfunc to modify the fields of each subflow. In kernel space,mptcp_for_each_subflow()helper is used for this:
mptcp_for_each_subflow(msk, subflow)
kfunc(subflow);But in the MPTCP BPF program, this has not yet been implemented. As Martin suggested recently, this
conn_listwalking + modify-by-kfunc usage fits thebpf_iteruse case. So this patch adds a newbpf_itertype named "mptcp_subflow" to do this and implements its helpers bpf_iter_mptcp_subflow_new()/_next()/_destroy().Then
bpf_for_each()formptcp_subflowcan be used in BPF program like
this:
bpf_rcu_read_lock();
bpf_for_each(mptcp_subflow, subflow, msk)
kfunc(subflow);
bpf_rcu_read_unlock();Quoted 7 lines
Suggested-by Martin KaFai Lau <[email protected]>Signed-off-by Geliang Tang <[email protected]>---
net/mptcp/bpf.c | 47 +++++++++++++++++++++++++++++++++++++++++++-- --1 file changed, 43 insertions(+), 4 deletions(-)
Quoted 3 lines
Not sure why, but only this patch made it to the BPF mailing list? Did
you cc bpf@vger on all patches?
This patch is for "mptcp-next" [1], it depends on the "new MPTCP subflow subtest" which is under review on the bpf list. We will send it to the bpf list very soon.
[1]
https://patchwork.kernel.org/project/mptcp/cover/[email protected]/
Quoted 37 lines
Quoted 22 lines
net/mptcp/bpf.c +9
-3@@ -201,9 +201,48 @@ static const struct btf_kfunc_id_set bpf_mptcp_fmodret_set = { .set = &bpf_mptcp_fmodret_ids, }; -__diag_push (); -__diag_ignore_all ("-Wmissing-prototypes" , - "kfuncs which will be used in BPF programs"); +struct bpf_iter_mptcp_subflow { + __u64 __opaque[2]; +} __attribute__((aligned (8 ))); + +struct bpf_iter_mptcp_subflow_kern { + struct mptcp_sock *msk; + struct list_head *pos; +} __attribute__((aligned (8 ))); +net/mptcp/bpf.c static const struct btf_kfunc_id_set · line 223
Quoted 10 lines
net/mptcp/bpf.c +9
-0+__bpf_kfunc_start_defs (); + +__bpf_kfunc int bpf_iter_mptcp_subflow_new(structbpf_iter_mptcp_subflow *it, + struct mptcp_sock *msk) +{ + struct bpf_iter_mptcp_subflow_kern *kit = (void *)it; + + if (!msk) + return -EINVAL;you still need to initialize at least
kit->mskto NULL to prevent next
implementation below doing the wrong thing
Quoted 7 lines
keep in mind, iterator constructor returning error doesn't prevent BPF
program from still callingnext()anddestroy(), so implementation has
to set iterator state such that next can return NULL if iterator was never successfully initialized
I'll move "kit->msk = msk;" earlier like this:
{
struct bpf_iter_mptcp_subflow_kern *kit = (void *)it;
kit->msk = msk;
if (!msk)
return -EINVAL;
kit->pos = &msk->conn_list;
return 0;
}Quoted 22 lines
pw-bot: cr
net/mptcp/bpf.c static const struct btf_kfunc_id_set bpf_mptcp_fmodret_set = { · line 234
Quoted 13 lines
net/mptcp/bpf.c +13
-0+ + kit->msk = msk; + kit->pos = &msk->conn_list; + return 0; +} + +__bpf_kfunc struct mptcp_subflow_context * +bpf_iter_mptcp_subflow_next (struct bpf_iter_mptcp_subflow *it) +{ + struct bpf_iter_mptcp_subflow_kern *kit = (void *)it; + struct mptcp_subflow_context *subflow; + struct mptcp_sock *msk = kit->msk; +you should check if (!msk) early here, before accessing kit->pos-
Quoted 4 lines
next below
+ subflow =
list_entry((kit->pos)->next, struct mptcp_subflow_context, node);
Quoted 7 lines
nit: why () around
kit->pos?Quoted 2 lines
+ if (!msk ||
list_entry_is_head(subflow, &msk->conn_list, node))as I mentioned, !msk check seems too late. Maybe
list_entry_is_head()is a bit too late as well?
We can use list_is_last() to check kit->pos earlier. But here we use list_entry_is_head(), it should be after list_entry().
I'll move "if (!msk)" check earlier like this:
{
struct bpf_iter_mptcp_subflow_kern *kit = (void *)it;
struct mptcp_subflow_context *subflow;
struct mptcp_sock *msk = kit->msk;
if (!msk)
return NULL;
subflow = list_entry(kit->pos->next, struct
mptcp_subflow_context, node);
if (!subflow || list_entry_is_head(subflow, &msk->conn_list,
node))
return NULL;
kit->pos = &subflow->node;
return subflow;
}Thanks,
-Geliang
Quoted 29 lines
Quoted 29 lines
+ return NULL;
net/mptcp/bpf.c +6
-0+ + kit->pos = &subflow->node; + return subflow; +} + +__bpf_kfunc void bpf_iter_mptcp_subflow_destroy(struct
bpf_iter_mptcp_subflow*it)net/mptcp/bpf.c +2
-0+{ +}__bpf_kfunc struct
mptcp_subflow_context*bpf_mptcp_subflow_ctx_by_pos(const struct mptcp_sched_data *data, unsigned int pos)net/mptcp/bpf.c +1
-1@@ -218,7 +257,7 @@ __bpf_kfunc bool bpf_mptcp_subflow_queues_empty(struct sock *sk) return tcp_rtx_queue_empty(sk); } -__diag_pop (); +__bpf_kfunc_end_defs (); BTF_KFUNCS_START(bpf_mptcp_sched_kfunc_ids)BTF_ID_FLAGS(func,
mptcp_subflow_set_scheduled)
--
2.43.0
Geliang Tang
reviewerPATCH v3 2/5 Squash to "mptcp: add sched_data helpers"
In reply to Geliang TangFrom: Geliang Tang <[email protected]>
Drop bpf_mptcp_subflow_ctx_by_pos declaration, since "-Wmissing-declarations" is ignored in __bpf_kfunc_start_defs.
--- net/mptcp/protocol.h | 2 -- 1 file changed, 2 deletions(-)
net/mptcp/protocol.h +0 -2
@@ -722,8 +722,6 @@ void mptcp_sock_graft(struct sock *sk, struct socket *parent);u64 mptcp_wnd_end (const struct mptcp_sock *msk);void mptcp_set_timeout (struct sock *sk);bool bpf_mptcp_subflow_queues_empty (struct sock *sk); -struct mptcp_subflow_context * -bpf_mptcp_subflow_ctx_by_pos (const struct mptcp_sched_data *data,unsigned int pos);struct sock *__mptcp_nmpc_sk (struct mptcp_sock *msk);bool __mptcp_close (struct sock *sk,long timeout);void mptcp_cancel_work (struct sock *sk);
Signature · 1 line
2.43.0
Geliang Tang
reviewerPATCH v3 3/5 bpf: Register mptcp tracing kfunc set
In reply to Geliang TangFrom: Geliang Tang <[email protected]>
Since the kfuncs mptcp_subflow_active() and mptcp_subflow_set_scheduled() are invoked in the mptcp_subflow bpf_iter test in a ftrace hook for mptcp_sched_get_send(), it's necessary to register them into a BPF_PROG_TYPE_TRACING type kfunc set together with the bpf_iter mptcp_subflow helpers bpf_iter_mptcp_subflow_new()/_next()/_destroy().
--- net/mptcp/bpf.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-)
net/mptcp/bpf.c +6 -1
@@ -260,9 +260,12 @@ __bpf_kfunc bool bpf_mptcp_subflow_queues_empty(struct sock *sk)__bpf_kfunc_end_defs (); BTF_KFUNCS_START(bpf_mptcp_sched_kfunc_ids) +BTF_ID_FLAGS(func, bpf_iter_mptcp_subflow_new) +BTF_ID_FLAGS(func, bpf_iter_mptcp_subflow_next) +BTF_ID_FLAGS(func, bpf_iter_mptcp_subflow_destroy) +BTF_ID_FLAGS(func, mptcp_subflow_active) BTF_ID_FLAGS(func, mptcp_subflow_set_scheduled) BTF_ID_FLAGS(func, bpf_mptcp_subflow_ctx_by_pos) -BTF_ID_FLAGS(func, mptcp_subflow_active) BTF_ID_FLAGS(func, mptcp_set_timeout) BTF_ID_FLAGS(func, mptcp_wnd_end) BTF_ID_FLAGS(func, tcp_stream_memory_free)
@@ -280,6 +283,8 @@ static int __init bpf_mptcp_kfunc_init(void)int ret; ret =register_btf_fmodret_id_set (&bpf_mptcp_fmodret_set); + ret = ret ?:register_btf_kfunc_id_set (BPF_PROG_TYPE_TRACING , + &bpf_mptcp_sched_kfunc_set); ret = ret ?:register_btf_kfunc_id_set (BPF_PROG_TYPE_STRUCT_OPS , &bpf_mptcp_sched_kfunc_set);#ifdef CONFIG_BPF_JIT
Signature · 1 line
2.43.0
Geliang Tang
reviewerPATCH v3 4/5 selftests/bpf: Add mptcp_subflow bpf_iter test prog
In reply to Geliang TangFrom: Geliang Tang <[email protected]>
This patch adds a new mptcp bpf selftest program for the newly added mptcp_subflow bpf_iter.
Export bpf_iter_mptcp_subflow_new/_next/_destroy into bpf_experimental.h then use bpf_for_each(mptcp_subflow, subflow, msk) to walk the mptcp subflow list.
Add a ftrace hook for mptcp_sched_get_send() to do this test and invoke kfuncs mptcp_subflow_active() and mptcp_subflow_set_scheduled() in the loops.
--- .../testing/selftests/bpf/bpf_experimental.h | 7 ++++ tools/testing/selftests/bpf/progs/mptcp_bpf.h | 4 ++ .../selftests/bpf/progs/mptcp_bpf_iter.c | 38 +++++++++++++++++++ 3 files changed, 49 insertions(+) create mode 100644 tools/testing/selftests/bpf/progs/mptcp_bpf_iter.c
tools/testing/selftests/bpf/bpf_experimental.h +7 -0
@@ -549,6 +549,13 @@ extern int bpf_iter_css_new(struct bpf_iter_css *it,extern struct cgroup_subsys_state *bpf_iter_css_next (struct bpf_iter_css *it)__weak __ksym; extern void bpf_iter_css_destroy(struct bpf_iter_css *it) __weak __ksym; +struct bpf_iter_mptcp_subflow ; +extern int bpf_iter_mptcp_subflow_new(struct bpf_iter_mptcp_subflow *it, + struct mptcp_sock *msk) __weak __ksym; +extern struct mptcp_subflow_context * +bpf_iter_mptcp_subflow_next (struct bpf_iter_mptcp_subflow *it)__weak __ksym; +extern void bpf_iter_mptcp_subflow_destroy(struct bpf_iter_mptcp_subflow *it) __weak __ksym; + extern int bpf_wq_init(struct bpf_wq *wq, void *p__map, unsigned int flags) __weak __ksym; extern int bpf_wq_start(struct bpf_wq *wq, unsigned int flags) __weak __ksym; extern int bpf_wq_set_callback_impl(struct bpf_wq *wq,
tools/testing/selftests/bpf/progs/mptcp_bpf.h +4 -0
@@ -43,9 +43,13 @@ mptcp_subflow_tcp_sock(const struct mptcp_subflow_context *subflow) }/* ksym */ +extern bool mptcp_subflow_active(struct mptcp_subflow_context *subflow) __ksym; extern void mptcp_subflow_set_scheduled(struct mptcp_subflow_context *subflow, bool scheduled) __ksym; +extern void bpf_rcu_read_lock(void) __ksym; +extern void bpf_rcu_read_unlock(void) __ksym; +extern struct mptcp_subflow_context *bpf_mptcp_subflow_ctx_by_pos (const struct mptcp_sched_data *data,unsigned int pos) __ksym;
tools/testing/selftests/bpf/progs/mptcp_bpf_iter.c new file +38 -0
@@ -0,0 +1,38 @@ +// SPDX-License-Identifier: GPL-2.0 +/* Copyright (c) 2024, Kylin Software */ + +/* vmlinux.h, bpf_helpers.h and other 'define' */ +#include "bpf_tracing_net.h" +#include "mptcp_bpf.h" + +char _license[] SEC("license") = "GPL"; +int iter =0 ; +int pid; + +SEC("fentry/mptcp_sched_get_send") +int BPF_PROG (trace_mptcp_sched_get_send ,struct mptcp_sock *msk) +{ +struct mptcp_subflow_context *subflow; +int i =0 ; + +if (bpf_get_current_pid_tgid () >>32 != pid) +return 0 ; + +bpf_rcu_read_lock (); +bpf_for_each (mptcp_subflow, subflow, msk) { +if (i++ >=MPTCP_SUBFLOWS_MAX ) +break ; + +if (subflow->token != msk->token) +break ; + +if (!mptcp_subflow_active (subflow)) +continue ; + +mptcp_subflow_set_scheduled (subflow, false); + } +bpf_rcu_read_unlock (); + + iter = i; +return 0 ; +}
Signature · 1 line
2.43.0
Geliang Tang
reviewerPATCH v3 5/5 selftests/bpf: Add mptcp_subflow bpf_iter subtest
In reply to Geliang TangFrom: Geliang Tang <[email protected]>
This patch adds a subtest named test_bpf_iter to load and verify the newly added mptcp_subflow type bpf_iter example in test_mptcp. Use endpoint_init() to add a new subflow endpoint. A new helper recv_send() is invoked to trigger the ftrace hook for mptcp_sched_get_send() after wait_for_new_subflows(). Check if skel->bss->iter equals 2 to verify whether the ftrace program loops twice as expected.
--- .../testing/selftests/bpf/prog_tests/mptcp.c | 85 +++++++++++++++++++ 1 file changed, 85 insertions(+)
tools/testing/selftests/bpf/prog_tests/mptcp.c +85 -0
@@ -10,6 +10,7 @@#include "mptcp_sock.skel.h" #include "mptcpify.skel.h" #include "mptcp_subflow.skel.h" +#include "mptcp_bpf_iter.skel.h" #include "mptcp_bpf_first.skel.h" #include "mptcp_bpf_bkup.skel.h" #include "mptcp_bpf_rr.skel.h"
@@ -258,6 +259,34 @@ static void send_byte(int fd)ASSERT_EQ (write (fd, &b,sizeof (b)),1 ,"send single byte" ); } +static int recv_send (int server_fd) +{ +char buf[1 ]; +int ret, fd; +ssize_t n; + + fd =accept (server_fd,NULL ,NULL ); +if (!ASSERT_OK_FD (fd,"accept" )) +return -1 ; + + n =recv (fd, buf,sizeof (buf),0 ); +if (!ASSERT_GT (n,0 ,"recv" )) { + ret =-1 ; + goto close; + } + + n =send (fd, buf, n,0 ); +if (!ASSERT_GT (n,0 ,"send" )) { + ret =-1 ; + goto close; + } + + ret =0 ; +close: +close (fd); +return ret; +} +static int verify_mptcpify (int server_fd,int client_fd) {struct __mptcp_info info;
@@ -470,6 +499,60 @@ static void test_subflow(void)close (cgroup_fd); } +static void run_bpf_iter (void ) +{ +int server_fd, client_fd; + + server_fd =start_mptcp_server (AF_INET ,ADDR_1 ,PORT_1 ,0 ); +if (!ASSERT_OK_FD (server_fd,"start_mptcp_server" )) +return ; + + client_fd =connect_to_fd (server_fd,0 ); +if (!ASSERT_OK_FD (client_fd,"connect_to_fd" )) + goto close_server; + +send_byte (client_fd); +wait_for_new_subflows (client_fd); +recv_send (server_fd); + +close (client_fd); +close_server: +close (server_fd); +} + +static void test_bpf_iter (void ) +{ +struct mptcp_bpf_iter *skel; +struct nstoken *nstoken; +int err; + + skel =mptcp_bpf_iter__open_and_load (); +if (!ASSERT_OK_PTR (skel,"skel_open_load: mptcp_iter" )) +return ; + + skel->bss->pid =getpid (); + + err =mptcp_bpf_iter__attach (skel); +if (!ASSERT_OK (err,"skel_attach: mptcp_iter" )) + goto skel_destroy; + + nstoken =create_netns (); +if (!ASSERT_OK_PTR (nstoken,"create_netns: mptcp_iter" )) + goto skel_destroy; + +if (endpoint_init ("subflow" ) <0 ) + goto close_netns; + +run_bpf_iter (); + +ASSERT_EQ (skel->bss->iter,2 ,"iter" ); + +close_netns: +cleanup_netns (nstoken); +skel_destroy: +mptcp_bpf_iter__destroy (skel); +} +static struct nstoken *sched_init (char *flags,char *sched) {struct nstoken *nstoken;
@@ -651,6 +734,8 @@ void test_mptcp(void)test_mptcpify ();if (test__start_subtest ("subflow" ))test_subflow (); +if (test__start_subtest ("bpf_iter" )) +test_bpf_iter ();if (test__start_subtest ("default" ))test_default ();if (test__start_subtest ("first" ))
Signature · 1 line
2.43.0
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://github.com/multipath-tcp/mptcp_net-next/actions/runs/10786552828
Status: failure
Initiator: Patchew Applier
Commits: https://github.com/multipath-tcp/mptcp_net-next/commits/ed6d012aaff4
Patchwork: https://patchwork.kernel.org/project/mptcp/list/?series=888713
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)
Geliang Tang
reviewerQuoted 7 lines · MPTCP CI
Hi Geliang,
Thank you for your modifications, that's great!
But sadly, our CI spotted some issues with it when trying to build it.
Quoted 6 lines
You can find more details there:
https://github.com/multipath-tcp/mptcp_net-next/actions/runs/10786552828Status: failure
These errors reported by CI should be ignored:
Unable to compile mptcp source code with make C=1 net/mptcp/bpf.o:net/mptcp/bpf.c:215:17: warning: symbol 'bpf_iter_mptcp_subflow_new' was not declared. Should it be static?
Unable to compile mptcp source code with make C=1 net/mptcp/bpf.o:net/mptcp/bpf.c:228:42: warning: symbol 'bpf_iter_mptcp_subflow_next' was not declared. Should it be static?
Unable to compile mptcp source code with make C=1 net/mptcp/bpf.o:net/mptcp/bpf.c:243:18: warning: symbol 'bpf_iter_mptcp_subflow_destroy' was not declared. Should it be static? Unable to compile mptcp source code with make C=1 net/mptcp/bpf.o:net/mptcp/bpf.c:247:42: warning: symbol 'bpf_mptcp_subflow_ctx_by_pos' was not declared. Should it be static?
Thanks,
-Geliang
Quoted 16 lines
Initiator: Patchew Applier
Commits:
https://github.com/multipath-tcp/mptcp_net-next/commits/ed6d012aaff4
Patchwork:
https://patchwork.kernel.org/project/mptcp/list/?series=888713Feel 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)
Matthieu Baerts
maintainerHi Geliang,
Quoted 17 lines · Geliang Tang
Quoted 7 lines · MPTCP CI
Hi Geliang,
Thank you for your modifications, that's great!
But sadly, our CI spotted some issues with it when trying to build it.
Quoted 6 lines
You can find more details there:
https://github.com/multipath-tcp/mptcp_net-next/actions/runs/10786552828Status: failure
These errors reported by CI should be ignored:
Quoted 12 lines
Unable to compile mptcp source code with make C=1
net/mptcp/bpf.o:net/mptcp/bpf.c:215:17: warning: symbol 'bpf_iter_mptcp_subflow_new' was not declared. Should it be static?
Unable to compile mptcp source code with make C=1net/mptcp/bpf.o:net/mptcp/bpf.c:228:42: warning: symbol 'bpf_iter_mptcp_subflow_next' was not declared. Should it be static?
Unable to compile mptcp source code with make C=1net/mptcp/bpf.o:net/mptcp/bpf.c:243:18: warning: symbol 'bpf_iter_mptcp_subflow_destroy' was not declared. Should it be static? Unable to compile mptcp source code with make C=1net/mptcp/bpf.o:net/mptcp/bpf.c:247:42: warning: symbol 'bpf_mptcp_subflow_ctx_by_pos' was not declared. Should it be static?
Can we not squash patch 1/5 and 3/5 together?
It is strange to add the helpers but not using them, then register them in another patch.
Or did you split them to ease the review on BPF side?
Cheers,
Matt
Signature · 1 line
Sponsored by the NGI0 Core fund.
Geliang Tang
reviewerHi Matt,
Quoted 38 lines · Matthieu Baerts
Hi Geliang,
Quoted 18 lines · Geliang Tang
Quoted 8 lines · MPTCP CI
Hi Geliang,
Thank you for your modifications, that's great!
But sadly, our CI spotted some issues with it when trying to build
it.Quoted 6 lines
You can find more details there:
https://github.com/multipath-tcp/mptcp_net-next/actions/runs/10786552828Status: failure
These errors reported by CI should be ignored:
Quoted 16 lines
Unable to compile mptcp source code with make C=1
net/mptcp/bpf.o:net/mptcp/bpf.c:215:17: warning: symbol 'bpf_iter_mptcp_subflow_new'
was not declared. Should it be static?
Unable to compile mptcp source code with make C=1net/mptcp/bpf.o:net/mptcp/bpf.c:228:42: warning: symbol 'bpf_iter_mptcp_subflow_next'
was not declared. Should it be static?
Unable to compile mptcp source code with make C=1net/mptcp/bpf.o:net/mptcp/bpf.c:243:18: warning: symbol 'bpf_iter_mptcp_subflow_destroy' was not declared. Should it be static?
Unable to compile mptcp source code with make C=1net/mptcp/bpf.o:net/mptcp/bpf.c:247:42: warning: symbol 'bpf_mptcp_subflow_ctx_by_pos'
was not declared. Should it be static?
Quoted 5 lines
Can we not squash patch 1/5 and 3/5 together?
It is strange to add the helpers but not using them, then register them
in another patch.
It's a bit strange indeed. It's better to register them in common_btf_ids in kernel/bpf/helpers.c, not in bpf_mptcp_sched_kfunc_ids in net/mptcp/bpf.c.
I'll send two squash-to patches to fix this.
Thanks,
-Geliang
Quoted 5 lines
Or did you split them to ease the review on BPF side?
Cheers,
Matt
Hi Geliang,
Thank you for your modifications, that's great!
Our CI did some validations and here is its report:
- KVM Validation: normal: Success! ✅
- KVM Validation: debug: Success! ✅
- KVM Validation: btf (only bpftest_all): Success! ✅
- Task: https://github.com/multipath-tcp/mptcp_net-next/actions/runs/10786552827
Initiator: Patchew Applier
Commits: https://github.com/multipath-tcp/mptcp_net-next/commits/ed6d012aaff4
Patchwork: https://patchwork.kernel.org/project/mptcp/list/?series=888713
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-normalFor 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)