Squash to "selftests/bpf: Add bpf_red scheduler & test"

Geliang Tang · intel-lab-lkp · commit 1dc120b0257a · 2025-03-06T10:20:20.000+08:00
Update test_bpf_sched().

Signed-off-by: Geliang Tang &lt;tanggeliang@kylinos.cn&gt;
diff --git 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
@@ -27,7 +27,7 @@ int BPF_PROG(bpf_red_get_send, struct mptcp_sock *msk)
 	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,

Original file line number	Diff line number	Diff line change
`@@ -720,7 +720,7 @@ static void test_red(void)`
`720`	`720`	`if (!ASSERT_OK_PTR(skel, "open_and_load: red"))`
`721`	`721`	`return;`
`722`	`722`
`723`		`- test_bpf_sched(skel->obj, "red", WITH_DATA, WITH_DATA);`
	`723`	`+ test_bpf_sched(skel->maps.red, "red", WITH_DATA, WITH_DATA);`
`724`	`724`	`mptcp_bpf_red__destroy(skel);`
`725`	`725`	`}`
`726`	`726`
Original file line number	Diff line number	Diff line change
`@@ -27,7 +27,7 @@ int BPF_PROG(bpf_red_get_send, struct mptcp_sock *msk)`
`27`	`27`	`return 0;`
`28`	`28`	`}`
`29`	`29`
`30`		`-SEC(".struct_ops")`
	`30`	`+SEC(".struct_ops.link")`
`31`	`31`	`struct mptcp_sched_ops red = {`
`32`	`32`	`.init = (void *)mptcp_sched_red_init,`
`33`	`33`	`.release = (void *)mptcp_sched_red_release,`