From: Geliang Tang <tanggeliang@kylinos.cn>
Update test_bpf_sched().
Use the newly added bpf_for_each() helper to walk the conn_list.
Signed-off-by: Geliang Tang <tanggeliang@kylinos.cn>
---
tools/testing/selftests/bpf/prog_tests/mptcp.c | 2 +-
tools/testing/selftests/bpf/progs/mptcp_bpf_red.c | 10 ++++------
2 files changed, 5 insertions(+), 7 deletions(-)
diff --git a/tools/testing/selftests/bpf/prog_tests/mptcp.c b/tools/testing/selftests/bpf/prog_tests/mptcp.c
index 524527306958..e845809cd2a8 100644
--- a/tools/testing/selftests/bpf/prog_tests/mptcp.c
+++ b/tools/testing/selftests/bpf/prog_tests/mptcp.c
@@ -720,7 +720,7 @@ static void test_red(void)
if (!ASSERT_OK_PTR(skel, "open_and_load: red"))
return;
- test_bpf_sched(skel->obj, "red", WITH_DATA, WITH_DATA);
+ test_bpf_sched(skel->maps.red, "red", WITH_DATA, WITH_DATA);
mptcp_bpf_red__destroy(skel);
}
diff --git a/tools/testing/selftests/bpf/progs/mptcp_bpf_red.c b/tools/testing/selftests/bpf/progs/mptcp_bpf_red.c
index cc0aab732fc4..35150771e174 100644
--- a/tools/testing/selftests/bpf/progs/mptcp_bpf_red.c
+++ b/tools/testing/selftests/bpf/progs/mptcp_bpf_red.c
@@ -20,17 +20,15 @@ SEC("struct_ops")
int BPF_PROG(bpf_red_get_subflow, struct mptcp_sock *msk,
struct mptcp_sched_data *data)
{
- for (int i = 0; i < data->subflows && i < MPTCP_SUBFLOWS_MAX; i++) {
- if (!bpf_mptcp_subflow_ctx_by_pos(data, i))
- break;
+ struct mptcp_subflow_context *subflow;
- mptcp_subflow_set_scheduled(bpf_mptcp_subflow_ctx_by_pos(data, i), true);
- }
+ bpf_for_each(mptcp_subflow, subflow, msk)
+ mptcp_subflow_set_scheduled(subflow, true);
return 0;
}
-SEC(".struct_ops")
+SEC(".struct_ops.link")
struct mptcp_sched_ops red = {
.init = (void *)mptcp_sched_red_init,
.release = (void *)mptcp_sched_red_release,
--
2.45.2