add mptcp_subflow bpf_iter
Subsystems (5)
Geliang Tang
reviewerv6 cover add mptcp_subflow bpf_iter
From: Geliang Tang <[email protected]>
v6:
- add KF_TRUSTED_ARGS flag in patch 2 (Andrii, Martin), then acquire
and release helpers (patch 3) are needed to be implemented.
- test mptcp_subflow bpf_iter in "cgroup/getsockopt" (patch 5),
instead of testing then in "tracing" (Martin).
v5:
- update patch 1 as Andrii suggested: if msk is NULL, initializekit->msk to NULL in _new() and check it in _next().
v4:
- squash patch 1/5 and 3/5 in v3 together as Matt suggested.
- a new squash-to patch to drop mptcp_subflow_active declaration in bpf_burst.
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 (10):
bpf: Register mptcp common kfunc set
bpf: Add mptcp_subflow bpf_iter
bpf: Add mptcp_sock acquire and release helpers selftests/bpf: Add mptcp_subflow bpf_iter test prog selftests/bpf: More endpoints for endpoint_init selftests/bpf: Add mptcp_subflow bpf_iter subtest Squash to "selftests/bpf: Add bpf scheduler test" Squash to "mptcp: add sched_data helpers"
Squash to "bpf: Export more bpf_burst related functions" Squash to "selftests/bpf: Add bpf_burst scheduler & test"
net/mptcp/bpf.c | 85 +++++++++++- net/mptcp/protocol.h | 3 - .../testing/selftests/bpf/bpf_experimental.h | 7 + .../testing/selftests/bpf/prog_tests/mptcp.c | 122 +++++++++++++++++- tools/testing/selftests/bpf/progs/mptcp_bpf.h | 6 + .../selftests/bpf/progs/mptcp_bpf_burst.c | 1 - .../selftests/bpf/progs/mptcp_bpf_iter.c | 46 +++++++ 7 files changed, 255 insertions(+), 15 deletions(-) create mode 100644 tools/testing/selftests/bpf/progs/mptcp_bpf_iter.c
Signature · 1 line
2.43.0
Geliang Tang
reviewerPATCH v6 1/10 bpf: Register mptcp common kfunc set
From: Geliang Tang <[email protected]>
The mptcp kfuncs mptcp_subflow_active(), mptcp_subflow_set_scheduled() and mptcp_sk() are going to be used in BPF selftests, so put them into mptcp common kfunc set and register it with BPF_PROG_TYPE_UNSPEC.
--- net/mptcp/bpf.c | 18 +++++++++++++++++- 1 file changed, 17 insertions(+), 1 deletion(-)
net/mptcp/bpf.c +17 -1
@@ -205,6 +205,11 @@ __diag_push();__diag_ignore_all ("-Wmissing-prototypes" ,"kfuncs which will be used in BPF programs" ); +__bpf_kfunc struct mptcp_sock *bpf_mptcp_sk(struct sock *sk) +{ +return mptcp_sk (sk); +} + __bpf_kfunc struct mptcp_subflow_context *bpf_mptcp_subflow_ctx_by_pos (const struct mptcp_sched_data *data,unsigned int pos) {
@@ -220,10 +225,19 @@ __bpf_kfunc bool bpf_mptcp_subflow_queues_empty(struct sock *sk)__diag_pop (); +BTF_KFUNCS_START (bpf_mptcp_common_kfunc_ids) +BTF_ID_FLAGS (func ,mptcp_subflow_active ) +BTF_ID_FLAGS (func, bpf_mptcp_sk) +BTF_KFUNCS_END (bpf_mptcp_common_kfunc_ids) + +static const struct btf_kfunc_id_set bpf_mptcp_common_kfunc_set = { + .owner =THIS_MODULE , + .set = &bpf_mptcp_common_kfunc_ids, +}; + BTF_KFUNCS_START(bpf_mptcp_sched_kfunc_ids) 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)
@@ -241,6 +255,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_UNSPEC , + &bpf_mptcp_common_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 v6 2/10 bpf: Add mptcp_subflow bpf_iter
In reply to Geliang TangFrom: 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(). And register these bpf_iter mptcp_subflow into mptcp common kfunc set. Then bpf_for_each() for mptcp_subflow can be used in BPF program like this:
bpf_for_each(mptcp_subflow, subflow, msk) kfunc(subflow);
v2: remove msk->pm.lock in _new() and _destroy() (Martin)
drop DEFINE_BPF_ITER_FUNC, change opaque[3] to opaque[2] (Andrii)
v3: drop bpf_iter__mptcp_subflow
v4: if msk is NULL, initialize kit->msk to NULL in _new() and check it in
_next() (Andrii)
v5: use list_is_last() instead of list_entry_is_head()
add KF_ITER_NEW/NEXT/DESTROY flags
add msk_owned_by_me in _new()
v6: add KF_TRUSTED_ARGS flag (Andrii, Martin)
"Suggested-by: Martin KaFai Lau <[email protected]>"
--- net/mptcp/bpf.c | 49 +++++++++++++++++++++++++++++++++++++++++++++---- 1 file changed, 45 insertions(+), 4 deletions(-)
net/mptcp/bpf.c +45 -4
@@ -201,15 +201,53 @@ 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 struct mptcp_sock *bpf_mptcp_sk(struct sock *sk) {return mptcp_sk (sk); } +__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; + + kit->msk = msk; +if (!msk) +return -EINVAL ; + +msk_owned_by_me (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; + +if (!kit->msk ||list_is_last (kit->pos, &kit->msk->conn_list)) +return NULL ; + + kit->pos = kit->pos->next; + return list_entry(kit->pos, struct mptcp_subflow_context, node); +} + +__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) {
@@ -223,11 +261,14 @@ __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_common_kfunc_ids)BTF_ID_FLAGS (func ,mptcp_subflow_active )BTF_ID_FLAGS (func, bpf_mptcp_sk) +BTF_ID_FLAGS (func, bpf_iter_mptcp_subflow_new,KF_ITER_NEW |KF_TRUSTED_ARGS ) +BTF_ID_FLAGS (func, bpf_iter_mptcp_subflow_next,KF_ITER_NEXT |KF_RET_NULL ) +BTF_ID_FLAGS (func, bpf_iter_mptcp_subflow_destroy,KF_ITER_DESTROY )BTF_KFUNCS_END (bpf_mptcp_common_kfunc_ids) static const struct btf_kfunc_id_set bpf_mptcp_common_kfunc_set = {
Signature · 1 line
2.43.0
Geliang Tang
reviewerPATCH v6 3/10 bpf: Add mptcp_sock acquire and release helpers
In reply to Geliang TangFrom: Geliang Tang <[email protected]>
This patch adds bpf_mptcp_sock_acquire() and bpf_mptcp_sock_release() helpers. A refcounted object is added in struct mptcp_sock, increase it in _acquire() and decrease it in _release(). Register them with KF_ACQUIRE flag and KF_RELEASE flag.
--- net/mptcp/bpf.c | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+)
net/mptcp/bpf.c +18 -0
@@ -248,6 +248,22 @@ __bpf_kfunc void bpf_iter_mptcp_subflow_destroy(struct bpf_iter_mptcp_subflow *i { } +__bpf_kfunc struct mptcp_sock *bpf_mptcp_sock_acquire(struct mptcp_sock *msk) +{ +struct sock *sk = (struct sock *)msk; + +if (sk &&refcount_inc_not_zero (&sk->sk_refcnt)) +return msk; +return NULL ; +} + +__bpf_kfunc void bpf_mptcp_sock_release(struct mptcp_sock *msk) +{ +struct sock *sk = (struct sock *)msk; + +WARN_ON_ONCE (!sk || !refcount_dec_not_one (&sk->sk_refcnt)); +} + __bpf_kfunc struct mptcp_subflow_context *bpf_mptcp_subflow_ctx_by_pos (const struct mptcp_sched_data *data,unsigned int pos) {
@@ -269,6 +285,8 @@ BTF_ID_FLAGS(func, bpf_mptcp_sk) BTF_ID_FLAGS(func, bpf_iter_mptcp_subflow_new, KF_ITER_NEW | KF_TRUSTED_ARGS) BTF_ID_FLAGS(func, bpf_iter_mptcp_subflow_next, KF_ITER_NEXT | KF_RET_NULL) BTF_ID_FLAGS(func, bpf_iter_mptcp_subflow_destroy, KF_ITER_DESTROY) +BTF_ID_FLAGS(func, bpf_mptcp_sock_acquire, KF_ACQUIRE | KF_RET_NULL) +BTF_ID_FLAGS(func, bpf_mptcp_sock_release, KF_RELEASE)BTF_KFUNCS_END (bpf_mptcp_common_kfunc_ids) static const struct btf_kfunc_id_set bpf_mptcp_common_kfunc_set = {
Signature · 1 line
2.43.0
Geliang Tang
reviewerPATCH v6 4/10 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 in "cgroup/getsockopt" for the newly added mptcp_subflow bpf_iter.
Export bpf_mptcp_sk, bpf_iter_mptcp_subflow_new/_next/_destroy and bpf_mptcp_sock_acquire/_release into bpf_experimental.h, then use bpf_for_each(mptcp_subflow, subflow, msk) to walk the mptcp subflow list. Invoke kfuncs mptcp_subflow_active() and mptcp_subflow_set_scheduled() in bpf_for_each loop.
--- .../testing/selftests/bpf/bpf_experimental.h | 7 +++ tools/testing/selftests/bpf/progs/mptcp_bpf.h | 6 +++ .../selftests/bpf/progs/mptcp_bpf_iter.c | 46 +++++++++++++++++++ 3 files changed, 59 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 +6 -0
@@ -43,6 +43,12 @@ mptcp_subflow_tcp_sock(const struct mptcp_subflow_context *subflow) }/* ksym */ +extern bool mptcp_subflow_active(struct mptcp_subflow_context *subflow) __ksym; +extern struct mptcp_sock *bpf_mptcp_sk (struct sock *sk) __ksym; + +extern struct mptcp_sock *bpf_mptcp_sock_acquire (struct mptcp_sock *msk) __ksym; +extern void bpf_mptcp_sock_release(struct mptcp_sock *msk) __ksym; + extern void mptcp_subflow_set_scheduled(struct mptcp_subflow_context *subflow, bool scheduled) __ksym;
tools/testing/selftests/bpf/progs/mptcp_bpf_iter.c new file +46 -0
46 lines not on this page · raw message
Signature · 1 line
2.43.0
Geliang Tang
reviewerPATCH v6 5/10 selftests/bpf: More endpoints for endpoint_init
In reply to Geliang TangFrom: Geliang Tang <[email protected]>
This patch adds two more test addresses ADDR_3 and ADDR_4, and adds a new helper address_init() to initialize all these addresses.
Add a new parameter "endpoints" for endpoint_init() to control how many endpoints are used for the tests. This makes it more flexible.
Update the parameters of endpoint_init() in test_subflow().
--- .../testing/selftests/bpf/prog_tests/mptcp.c | 46 +++++++++++++++++-- 1 file changed, 41 insertions(+), 5 deletions(-)
tools/testing/selftests/bpf/prog_tests/mptcp.c +41 -5
@@ -20,6 +20,8 @@#define NS_TEST "mptcp_ns"#define ADDR_1 "10.0.1.1"#define ADDR_2 "10.0.1.2" +#define ADDR_3 "10.0.1.3" +#define ADDR_4 "10.0.1.4"#define PORT_1 10001#define WITH_DATA true#define WITHOUT_DATA false
@@ -351,22 +353,56 @@ static void test_mptcpify(void)close (cgroup_fd); } -static int endpoint_init (char *flags) +static int address_init (void ) {SYS (fail,"ip -net %s link add veth1 type veth peer name veth2" ,NS_TEST );SYS (fail,"ip -net %s addr add %s/24 dev veth1" ,NS_TEST ,ADDR_1 );SYS (fail,"ip -net %s link set dev veth1 up" ,NS_TEST );SYS (fail,"ip -net %s addr add %s/24 dev veth2" ,NS_TEST ,ADDR_2 );SYS (fail,"ip -net %s link set dev veth2 up" ,NS_TEST ); -if (SYS_NOFAIL ("ip -net %s mptcp endpoint add %s %s" ,NS_TEST ,ADDR_2 , flags)) { + +SYS (fail,"ip -net %s link add veth3 type veth peer name veth4" ,NS_TEST ); +SYS (fail,"ip -net %s addr add %s/24 dev veth3" ,NS_TEST ,ADDR_3 ); +SYS (fail,"ip -net %s link set dev veth3 up" ,NS_TEST ); +SYS (fail,"ip -net %s addr add %s/24 dev veth4" ,NS_TEST ,ADDR_4 ); +SYS (fail,"ip -net %s link set dev veth4 up" ,NS_TEST ); + +return 0 ; +fail: +return -1 ; +} + +static int endpoint_add (char *addr,char *flags) +{ +return SYS_NOFAIL ("ip -net %s mptcp endpoint add %s %s" ,NS_TEST , addr, flags); +} + +static int endpoint_init (char *flags,u8 endpoints) +{ +int ret =-1 ; + +if (!endpoints || endpoints >4 ) + goto fail; + +if (address_init ()) + goto fail; + +if (SYS_NOFAIL ("ip -net %s mptcp limits set add_addr_accepted 4 subflows 4" , +NS_TEST )) {printf ("'ip mptcp' not supported, skip this test.\n" );test__skip (); goto fail; } -return 0 ; +if (endpoints >1 ) + ret =endpoint_add (ADDR_2 , flags); +if (endpoints >2 ) + ret = ret ?:endpoint_add (ADDR_3 , flags); +if (endpoints >3 ) + ret = ret ?:endpoint_add (ADDR_4 , flags); + fail: -return -1 ; +return ret; }static void wait_for_new_subflows (int fd)
@@ -452,7 +488,7 @@ static void test_subflow(void)if (!ASSERT_OK_PTR (nstoken,"create_netns: mptcp_subflow" )) goto skel_destroy; -if (endpoint_init ("subflow" ) <0 ) +if (endpoint_init ("subflow" ,2 ) <0 ) goto close_netns;run_subflow ();
Signature · 1 line
2.43.0
Geliang Tang
reviewerPATCH v6 6/10 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 the helper endpoint_init() to add 3 new subflow endpoints. getsockopt(TCP_CONGESTION) is invoked to trigger the "cgroup/getsockopt" program after wait_for_new_subflows(). Check if skel->bss->subflows equals 4 to verify whether the "cgroup/getsockopt" program loops fourth as expected.
--- .../testing/selftests/bpf/prog_tests/mptcp.c | 74 +++++++++++++++++++ 1 file changed, 74 insertions(+)
tools/testing/selftests/bpf/prog_tests/mptcp.c +74 -0
@@ -11,6 +11,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"
@@ -501,6 +502,77 @@ static void test_subflow(void)close (cgroup_fd); } +static void run_bpf_iter (void ) +{ +int server_fd, client_fd, err; +char new[TCP_CA_NAME_MAX ]; +char cc[TCP_CA_NAME_MAX ]; +socklen_t len; + + 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); + + len =sizeof (new); + err =getsockopt (client_fd,SOL_TCP ,TCP_CONGESTION , new, &len); +if (ASSERT_OK (err,"getsockopt(client_fd, TCP_CONGESTION)" )) { +get_msk_ca_name (cc); +ASSERT_STREQ (new, cc,"cc" ); + } + +close (client_fd); +close_server: +close (server_fd); +} + +static void test_bpf_iter (void ) +{ +struct mptcp_bpf_iter *skel; +struct nstoken *nstoken; +int subflows =4 ; +int cgroup_fd; + + cgroup_fd =test__join_cgroup ("/mptcp_iter" ); +if (!ASSERT_OK_FD (cgroup_fd,"join_cgroup: mptcp_iter" )) +return ; + + skel =mptcp_bpf_iter__open_and_load (); +if (!ASSERT_OK_PTR (skel,"skel_open_load: mptcp_iter" )) + goto close_cgroup; + + skel->bss->pid =getpid (); + + skel->links.mptcp_getsockopt =bpf_program__attach_cgroup (skel->progs.mptcp_getsockopt, + cgroup_fd); +if (!ASSERT_OK_PTR (skel->links.mptcp_getsockopt,"attach getsockopt" )) + goto skel_destroy; + + nstoken =create_netns (); +if (!ASSERT_OK_PTR (nstoken,"create_netns: mptcp_iter" )) + goto skel_destroy; + +if (endpoint_init ("subflow" , subflows) <0 ) + goto close_netns; + +run_bpf_iter (); + +ASSERT_EQ (skel->bss->subflows, subflows,"subflows" ); + +close_netns: +cleanup_netns (nstoken); +skel_destroy: +mptcp_bpf_iter__destroy (skel); +close_cgroup: +close (cgroup_fd); +} +static struct nstoken *sched_init (char *flags,char *sched) {struct nstoken *nstoken;
@@ -682,6 +754,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
Geliang Tang
reviewerPATCH v6 7/10 Squash to "selftests/bpf: Add bpf scheduler test"
In reply to Geliang TangFrom: Geliang Tang <[email protected]>
Update endpoint_init() in sched_init().
--- tools/testing/selftests/bpf/prog_tests/mptcp.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
tools/testing/selftests/bpf/prog_tests/mptcp.c +1 -1
@@ -581,7 +581,7 @@ static struct nstoken *sched_init(char *flags, char *sched)if (!ASSERT_OK_PTR (nstoken,"create_netns" ))return NULL ; -if (endpoint_init ("subflow" ) <0 ) +if (endpoint_init ("subflow" ,2 ) <0 ) goto fail;SYS (fail,"ip netns exec %s sysctl -qw net.mptcp.scheduler=%s" ,NS_TEST , sched);
Signature · 1 line
2.43.0
Geliang Tang
reviewerPATCH v6 8/10 Squash to "mptcp: add sched_data helpers"
In reply to Geliang TangFrom: Geliang Tang <[email protected]>
Use __bpf_kfunc_start_defs and __bpf_kfunc_end_defs.
Drop bpf_mptcp_subflow_ctx_by_pos declaration.
--- 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 v6 9/10 Squash to "bpf: Export more bpf_burst related functions"
In reply to Geliang TangFrom: Geliang Tang <[email protected]>
Drop bpf_mptcp_subflow_queues_empty declaration.
--- net/mptcp/protocol.h | 1 - 1 file changed, 1 deletion(-)
net/mptcp/protocol.h +0 -1
@@ -721,7 +721,6 @@ void mptcp_subflow_queue_clean(struct sock *sk, struct sock *ssk);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 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 v6 10/10 Squash to "selftests/bpf: Add bpf_burst scheduler & test"
In reply to Geliang TangFrom: Geliang Tang <[email protected]>
Drop mptcp_subflow_active declaration.
--- tools/testing/selftests/bpf/progs/mptcp_bpf_burst.c | 1 - 1 file changed, 1 deletion(-)
tools/testing/selftests/bpf/progs/mptcp_bpf_burst.c +0 -1
@@ -16,7 +16,6 @@ struct bpf_subflow_send_info {__u64 linger_time; }; -extern bool mptcp_subflow_active(struct mptcp_subflow_context *subflow) __ksym; extern void mptcp_set_timeout(struct sock *sk) __ksym; extern __u64 mptcp_wnd_end(const struct mptcp_sock *msk) __ksym; extern bool tcp_stream_memory_free(const struct sock *sk, int wake) __ksym;
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/11011018563
Status: failure
Initiator: Patchew Applier
Commits: https://github.com/multipath-tcp/mptcp_net-next/commits/fe0ed2ed48f9
Patchwork: https://patchwork.kernel.org/project/mptcp/list/?series=892355
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)
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/11011018561
Initiator: Patchew Applier
Commits: https://github.com/multipath-tcp/mptcp_net-next/commits/fe0ed2ed48f9
Patchwork: https://patchwork.kernel.org/project/mptcp/list/?series=892355
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)