From: Geliang Tang <tanggeliang@kylinos.cn>
Drop bpf_mptcp_sock_acquire/release.
Signed-off-by: Geliang Tang <tanggeliang@kylinos.cn>
---
tools/testing/selftests/bpf/bpf_experimental.h | 2 +-
tools/testing/selftests/bpf/progs/mptcp_bpf.h | 3 ---
tools/testing/selftests/bpf/progs/mptcp_bpf_iters.c | 6 +-----
3 files changed, 2 insertions(+), 9 deletions(-)
diff --git a/tools/testing/selftests/bpf/bpf_experimental.h b/tools/testing/selftests/bpf/bpf_experimental.h
index 2ab3f0063c0f..6a96c56f0725 100644
--- a/tools/testing/selftests/bpf/bpf_experimental.h
+++ b/tools/testing/selftests/bpf/bpf_experimental.h
@@ -577,7 +577,7 @@ 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;
+ struct sock *sk) __weak __ksym;
extern struct mptcp_subflow_context *
bpf_iter_mptcp_subflow_next(struct bpf_iter_mptcp_subflow *it) __weak __ksym;
extern void
diff --git a/tools/testing/selftests/bpf/progs/mptcp_bpf.h b/tools/testing/selftests/bpf/progs/mptcp_bpf.h
index b1f6e1fb467e..ede9111ee597 100644
--- a/tools/testing/selftests/bpf/progs/mptcp_bpf.h
+++ b/tools/testing/selftests/bpf/progs/mptcp_bpf.h
@@ -43,9 +43,6 @@ mptcp_subflow_tcp_sock(const struct mptcp_subflow_context *subflow)
}
/* 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 struct mptcp_subflow_context *
bpf_mptcp_subflow_ctx(const struct sock *sk) __ksym;
extern struct sock *
diff --git a/tools/testing/selftests/bpf/progs/mptcp_bpf_iters.c b/tools/testing/selftests/bpf/progs/mptcp_bpf_iters.c
index fd5691a4073b..6124c484efe3 100644
--- a/tools/testing/selftests/bpf/progs/mptcp_bpf_iters.c
+++ b/tools/testing/selftests/bpf/progs/mptcp_bpf_iters.c
@@ -28,10 +28,7 @@ int iters_subflow(struct bpf_sockopt *ctx)
if (!msk || msk->pm.server_side || !msk->pm.subflows)
return 1;
- msk = bpf_mptcp_sock_acquire(msk);
- if (!msk)
- return 1;
- bpf_for_each(mptcp_subflow, subflow, msk) {
+ bpf_for_each(mptcp_subflow, subflow, (struct sock *)sk) {
/* Here MPTCP-specific packet scheduler kfunc can be called:
* this test is not doing anything really useful, only to
* verify the iteration works.
@@ -58,6 +55,5 @@ int iters_subflow(struct bpf_sockopt *ctx)
ids = local_ids;
out:
- bpf_mptcp_sock_release(msk);
return 1;
}
--
2.43.0
On 24/01/2025 11:28, Geliang Tang wrote: > From: Geliang Tang <tanggeliang@kylinos.cn> > > Drop bpf_mptcp_sock_acquire/release. It might be good to share a link to the WIP commits/patches to Martin (and us) to better understand how it is going to be used. Maybe a link to a git repo containing commits from the series "use bpf_iter in bpf schedulers" where the squash-to commits have been squashed? Cheers, Matt -- Sponsored by the NGI0 Core fund.
On Fri, 2025-01-24 at 17:10 +0100, Matthieu Baerts wrote: > On 24/01/2025 11:28, Geliang Tang wrote: > > From: Geliang Tang <tanggeliang@kylinos.cn> > > > > Drop bpf_mptcp_sock_acquire/release. > > It might be good to share a link to the WIP commits/patches to Martin > (and us) to better understand how it is going to be used. > > Maybe a link to a git repo containing commits from the series "use > bpf_iter in bpf schedulers" where the squash-to commits have been > squashed? Sure, I'll do this. I think it would be better to directly send these patches to BPF maintainers as RFC ones for more suggestions. Since the last time I sent the link to Martin, he didn't have time to read these patches. Thanks, -Geliang > > Cheers, > Matt
Hi Geliang, (sorry, it looks like I missed this reply) On 02/02/2025 06:13, Geliang Tang wrote: > On Fri, 2025-01-24 at 17:10 +0100, Matthieu Baerts wrote: >> On 24/01/2025 11:28, Geliang Tang wrote: >>> From: Geliang Tang <tanggeliang@kylinos.cn> >>> >>> Drop bpf_mptcp_sock_acquire/release. >> >> It might be good to share a link to the WIP commits/patches to Martin >> (and us) to better understand how it is going to be used. >> >> Maybe a link to a git repo containing commits from the series "use >> bpf_iter in bpf schedulers" where the squash-to commits have been >> squashed? > > Sure, I'll do this. > > I think it would be better to directly send these patches to BPF > maintainers as RFC ones for more suggestions. Since the last time I > sent the link to Martin, he didn't have time to read these patches. I think this time, it is OK with just a link, because Martin asked for it. Probably best to wait before sending these patches not to add more pressure to rework the scheduler API. Cheers, Matt -- Sponsored by the NGI0 Core fund.
© 2016 - 2025 Red Hat, Inc.