github-mirror/linux
1
0
Fork 0
mirror of https://github.com/torvalds/linux.git synced 2026-05-25 07:33:19 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity Graph

selftests/bpf: Use start_server_str in do_test in bpf_tcp_ca

Browse Source 
This patch uses new helper start_server_str() in do_test() in bpf_tcp_ca.c
to accept a struct network_helper_opts argument instead of using
start_server() and settcpca(). Then change the type of the first paramenter
of do_test() into a struct network_helper_opts one.

Define its own cb_opts and opts for each test, set its own cc name into
cb_opts.cc, and cc_cb() into post_socket_cb callback, then pass it to
do_test().

Signed-off-by: Geliang Tang <tanggeliang@kylinos.cn>
Link: https://lore.kernel.org/r/6e1b6555e3284e77c8aa60668c61a66c5f99aa37.1716638248.git.tanggeliang@kylinos.cn
Signed-off-by: Martin KaFai Lau <martin.lau@kernel.org>
This commit is contained in:
Geliang Tang 2024-05-25 20:08:19 +08:00 committed by Martin KaFai Lau
parent 79b330c57d
commit ed61271af5
1 changed files with 55 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

66
tools/testing/selftests/bpf/prog_tests/bpf_tcp_ca.c
View File

@ -38,12 +38,14 @@ static int settcpca(int fd, const char *tcp_ca)
return 0;
}
static void do_test(const char *tcp_ca, const struct bpf_map *sk_stg_map)
static void do_test(const struct network_helper_opts *opts,
const struct bpf_map *sk_stg_map)
{
struct cb_opts *cb_opts = (struct cb_opts *)opts->cb_opts;
int lfd = -1, fd = -1;
int err;
lfd = start_server(AF_INET6, SOCK_STREAM, NULL, 0, 0);
lfd = start_server_str(AF_INET6, SOCK_STREAM, NULL, 0, opts);
if (!ASSERT_NEQ(lfd, -1, "socket"))
return;
@ -53,7 +55,7 @@ static void do_test(const char *tcp_ca, const struct bpf_map *sk_stg_map)
return;
}
if (settcpca(lfd, tcp_ca) || settcpca(fd, tcp_ca))
if (settcpca(fd, cb_opts->cc))
goto done;
if (sk_stg_map) {
@ -94,6 +96,13 @@ static int cc_cb(int fd, void *opts)
static void test_cubic(void)
{
struct cb_opts cb_opts = {
.cc = "bpf_cubic",
};
struct network_helper_opts opts = {
.post_socket_cb = cc_cb,
.cb_opts = &cb_opts,
};
struct bpf_cubic *cubic_skel;
struct bpf_link *link;
@ -107,7 +116,7 @@ static void test_cubic(void)
return;
}
do_test("bpf_cubic", NULL);
do_test(&opts, NULL);
ASSERT_EQ(cubic_skel->bss->bpf_cubic_acked_called, 1, "pkts_acked called");
@ -117,6 +126,13 @@ static void test_cubic(void)
static void test_dctcp(void)
{
struct cb_opts cb_opts = {
.cc = "bpf_dctcp",
};
struct network_helper_opts opts = {
.post_socket_cb = cc_cb,
.cb_opts = &cb_opts,
};
struct bpf_dctcp *dctcp_skel;
struct bpf_link *link;
@ -130,7 +146,7 @@ static void test_dctcp(void)
return;
}
do_test("bpf_dctcp", dctcp_skel->maps.sk_stg_map);
do_test(&opts, dctcp_skel->maps.sk_stg_map);
ASSERT_EQ(dctcp_skel->bss->stg_result, expected_stg, "stg_result");
bpf_link__destroy(link);
@ -315,6 +331,13 @@ static void test_unsupp_cong_op(void)
static void test_update_ca(void)
{
struct cb_opts cb_opts = {
.cc = "tcp_ca_update",
};
struct network_helper_opts opts = {
.post_socket_cb = cc_cb,
.cb_opts = &cb_opts,
};
struct tcp_ca_update *skel;
struct bpf_link *link;
int saved_ca1_cnt;
@ -327,14 +350,14 @@ static void test_update_ca(void)
link = bpf_map__attach_struct_ops(skel->maps.ca_update_1);
ASSERT_OK_PTR(link, "attach_struct_ops");
do_test("tcp_ca_update", NULL);
do_test(&opts, NULL);
saved_ca1_cnt = skel->bss->ca1_cnt;
ASSERT_GT(saved_ca1_cnt, 0, "ca1_ca1_cnt");
err = bpf_link__update_map(link, skel->maps.ca_update_2);
ASSERT_OK(err, "update_map");
do_test("tcp_ca_update", NULL);
do_test(&opts, NULL);
ASSERT_EQ(skel->bss->ca1_cnt, saved_ca1_cnt, "ca2_ca1_cnt");
ASSERT_GT(skel->bss->ca2_cnt, 0, "ca2_ca2_cnt");
@ -344,6 +367,13 @@ static void test_update_ca(void)
static void test_update_wrong(void)
{
struct cb_opts cb_opts = {
.cc = "tcp_ca_update",
};
struct network_helper_opts opts = {
.post_socket_cb = cc_cb,
.cb_opts = &cb_opts,
};
struct tcp_ca_update *skel;
struct bpf_link *link;
int saved_ca1_cnt;
@ -356,14 +386,14 @@ static void test_update_wrong(void)
link = bpf_map__attach_struct_ops(skel->maps.ca_update_1);
ASSERT_OK_PTR(link, "attach_struct_ops");
do_test("tcp_ca_update", NULL);
do_test(&opts, NULL);
saved_ca1_cnt = skel->bss->ca1_cnt;
ASSERT_GT(saved_ca1_cnt, 0, "ca1_ca1_cnt");
err = bpf_link__update_map(link, skel->maps.ca_wrong);
ASSERT_ERR(err, "update_map");
do_test("tcp_ca_update", NULL);
do_test(&opts, NULL);
ASSERT_GT(skel->bss->ca1_cnt, saved_ca1_cnt, "ca2_ca1_cnt");
bpf_link__destroy(link);
@ -372,6 +402,13 @@ static void test_update_wrong(void)
static void test_mixed_links(void)
{
struct cb_opts cb_opts = {
.cc = "tcp_ca_update",
};
struct network_helper_opts opts = {
.post_socket_cb = cc_cb,
.cb_opts = &cb_opts,
};
struct tcp_ca_update *skel;
struct bpf_link *link, *link_nl;
int err;
@ -386,7 +423,7 @@ static void test_mixed_links(void)
link = bpf_map__attach_struct_ops(skel->maps.ca_update_1);
ASSERT_OK_PTR(link, "attach_struct_ops");
do_test("tcp_ca_update", NULL);
do_test(&opts, NULL);
ASSERT_GT(skel->bss->ca1_cnt, 0, "ca1_ca1_cnt");
err = bpf_link__update_map(link, skel->maps.ca_no_link);
@ -473,6 +510,13 @@ static void test_tcp_ca_kfunc(void)
static void test_cc_cubic(void)
{
struct cb_opts cb_opts = {
.cc = "bpf_cc_cubic",
};
struct network_helper_opts opts = {
.post_socket_cb = cc_cb,
.cb_opts = &cb_opts,
};
struct bpf_cc_cubic *cc_cubic_skel;
struct bpf_link *link;
@ -486,7 +530,7 @@ static void test_cc_cubic(void)
return;
}
do_test("bpf_cc_cubic", NULL);
do_test(&opts, NULL);
bpf_link__destroy(link);
bpf_cc_cubic__destroy(cc_cubic_skel);