From: Geliang Tang <tanggeliang@xxxxxxxxxx>
For getting rid of the second parameter of do_test(), this patch adds a
new callback post_connect_cb in struct network_helper_opts, it will be
invoked after connect_fd_to_addr() in connect_to_fd_opts().
Then define a dctcp dedicated post_connect_cb callback, invoking
bpf_map_lookup_elem() in it, named stg_post_connect_cb() and set it in
test_dctcp().
Signed-off-by: Geliang Tang <tanggeliang@xxxxxxxxxx>
---
tools/testing/selftests/bpf/network_helpers.c | 7 ++-
tools/testing/selftests/bpf/network_helpers.h | 1 +
.../selftests/bpf/prog_tests/bpf_tcp_ca.c | 44 ++++++++++---------
3 files changed, 30 insertions(+), 22 deletions(-)
diff --git a/tools/testing/selftests/bpf/network_helpers.c b/tools/testing/selftests/bpf/network_helpers.c
index e20caef06aae..75589597c17e 100644
--- a/tools/testing/selftests/bpf/network_helpers.c
+++ b/tools/testing/selftests/bpf/network_helpers.c
@@ -353,10 +353,15 @@ int connect_to_fd_opts(int server_fd, const struct network_helper_opts *opts)
opts->post_socket_cb(fd, opts->cb_opts))
goto error_close;
- if (!opts->noconnect)
+ if (!opts->noconnect) {
if (connect_fd_to_addr(fd, &addr, addrlen, opts->must_fail))
goto error_close;
+ if (opts->post_connect_cb &&
+ opts->post_connect_cb(fd, opts->cb_opts))
+ goto error_close;
+ }
+
return fd;
error_close:
diff --git a/tools/testing/selftests/bpf/network_helpers.h b/tools/testing/selftests/bpf/network_helpers.h
index 11eea8e2e4f1..b387e8142f3c 100644
--- a/tools/testing/selftests/bpf/network_helpers.h
+++ b/tools/testing/selftests/bpf/network_helpers.h
@@ -28,6 +28,7 @@ struct network_helper_opts {
int type;
int proto;
int (*post_socket_cb)(int fd, void *opts);
+ int (*post_connect_cb)(int fd, void *opts);
void *cb_opts;
};
diff --git a/tools/testing/selftests/bpf/prog_tests/bpf_tcp_ca.c b/tools/testing/selftests/bpf/prog_tests/bpf_tcp_ca.c
index cde796f82206..a2501e5aaa7d 100644
--- a/tools/testing/selftests/bpf/prog_tests/bpf_tcp_ca.c
+++ b/tools/testing/selftests/bpf/prog_tests/bpf_tcp_ca.c
@@ -39,11 +39,9 @@ static int settcpca(int fd, const char *tcp_ca)
return 0;
}
-static void do_test(const struct network_helper_opts *opts,
- const struct bpf_map *sk_stg_map)
+static void do_test(const struct network_helper_opts *opts)
{
int lfd = -1, fd = -1;
- int err;
lfd = start_server_str(AF_INET6, SOCK_STREAM, NULL, 0, opts);
if (!ASSERT_NEQ(lfd, -1, "socket"))
@@ -54,16 +52,6 @@ static void do_test(const struct network_helper_opts *opts,
if (!ASSERT_NEQ(fd, -1, "connect_to_fd_opts"))
goto done;
- if (sk_stg_map) {
- int tmp_stg;
-
- err = bpf_map_lookup_elem(bpf_map__fd(sk_stg_map), &fd,
- &tmp_stg);
- if (!ASSERT_ERR(err, "bpf_map_lookup_elem(sk_stg_map)") ||
- !ASSERT_EQ(errno, ENOENT, "bpf_map_lookup_elem(sk_stg_map)"))
- goto done;
- }
-
ASSERT_OK(send_recv_data(lfd, fd, total_bytes), "send_recv_data");
done:
@@ -101,7 +89,7 @@ static void test_cubic(void)
return;
}
- do_test(&opts, NULL);
+ do_test(&opts);
ASSERT_EQ(cubic_skel->bss->bpf_cubic_acked_called, 1, "pkts_acked called");
@@ -120,6 +108,19 @@ static int stg_post_socket_cb(int fd, void *opts)
return bpf_map_update_elem(cb_opts->map_fd, &fd, &expected_stg, BPF_NOEXIST);
}
+static int stg_post_connect_cb(int fd, void *opts)
+{
+ struct cb_opts *cb_opts = (struct cb_opts *)opts;
+ int tmp_stg;
+ int err;
+
+ err = bpf_map_lookup_elem(cb_opts->map_fd, &fd, &tmp_stg);
+ if (!ASSERT_ERR(err, "bpf_map_lookup_elem(sk_stg_map)") ||
+ !ASSERT_EQ(errno, ENOENT, "bpf_map_lookup_elem(sk_stg_map)"))
+ return err;
+ return 0;
+}
+
static void test_dctcp(void)
{
struct cb_opts cb_opts = {
@@ -127,6 +128,7 @@ static void test_dctcp(void)
};
struct network_helper_opts opts = {
.post_socket_cb = stg_post_socket_cb,
+ .post_connect_cb = stg_post_connect_cb,
.cb_opts = &cb_opts,
};
struct bpf_dctcp *dctcp_skel;
@@ -143,7 +145,7 @@ static void test_dctcp(void)
}
cb_opts.map_fd = bpf_map__fd(dctcp_skel->maps.sk_stg_map);
- do_test(&opts, dctcp_skel->maps.sk_stg_map);
+ do_test(&opts);
ASSERT_EQ(dctcp_skel->bss->stg_result, expected_stg, "stg_result");
bpf_link__destroy(link);
@@ -344,14 +346,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(&opts, NULL);
+ do_test(&opts);
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(&opts, NULL);
+ do_test(&opts);
ASSERT_EQ(skel->bss->ca1_cnt, saved_ca1_cnt, "ca2_ca1_cnt");
ASSERT_GT(skel->bss->ca2_cnt, 0, "ca2_ca2_cnt");
@@ -380,14 +382,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(&opts, NULL);
+ do_test(&opts);
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(&opts, NULL);
+ do_test(&opts);
ASSERT_GT(skel->bss->ca1_cnt, saved_ca1_cnt, "ca2_ca1_cnt");
bpf_link__destroy(link);
@@ -417,7 +419,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(&opts, NULL);
+ do_test(&opts);
ASSERT_GT(skel->bss->ca1_cnt, 0, "ca1_ca1_cnt");
err = bpf_link__update_map(link, skel->maps.ca_no_link);
@@ -524,7 +526,7 @@ static void test_cc_cubic(void)
return;
}
- do_test(&opts, NULL);
+ do_test(&opts);
bpf_link__destroy(link);
bpf_cc_cubic__destroy(cc_cubic_skel);
--
2.43.0
