[PATCH bpf-next v4 3/6] selftests/bpf: Use post_socket_cb in connect_to_fd_opts

[Geliang Tang]

From: Geliang Tang <tanggeli...@kylinos.cn>

Since the post_socket_cb() callback is added in struct network_helper_opts,
it's make sense to use it not only in __start_server(), but also in
connect_to_fd_opts(). Then it can be used to set TCP_CONGESTION sockopt.

Add a "void *" type member cb_opts into struct network_helper_opts, and add
a new struct named cb_opts in prog_tests/bpf_tcp_ca.c, then cc can be moved
into struct cb_opts from network_helper_opts. Define a new callback cc_cb()
to set TCP_CONGESTION sockopt, and set it to post_socket_cb pointer.

Signed-off-by: Geliang Tang <tanggeli...@kylinos.cn>
---
 tools/testing/selftests/bpf/network_helpers.c  |  5 ++---
 tools/testing/selftests/bpf/network_helpers.h  |  2 +-
 .../selftests/bpf/prog_tests/bpf_tcp_ca.c      | 18 +++++++++++++++++-
 3 files changed, 20 insertions(+), 5 deletions(-)

diff --git a/tools/testing/selftests/bpf/network_helpers.c 
b/tools/testing/selftests/bpf/network_helpers.c
index 0e8266f439e4..8502917b6c7b 100644
--- a/tools/testing/selftests/bpf/network_helpers.c
+++ b/tools/testing/selftests/bpf/network_helpers.c
@@ -348,9 +348,8 @@ int connect_to_fd_opts(int server_fd, const struct 
network_helper_opts *opts)
        if (settimeo(fd, opts->timeout_ms))
                goto error_close;
 
-       if (opts->cc && opts->cc[0] &&
-           setsockopt(fd, SOL_TCP, TCP_CONGESTION, opts->cc,
-                      strlen(opts->cc) + 1))
+       if (opts->post_socket_cb &&
+           opts->post_socket_cb(fd, opts->cb_opts))
                goto error_close;
 
        if (!opts->noconnect)
diff --git a/tools/testing/selftests/bpf/network_helpers.h 
b/tools/testing/selftests/bpf/network_helpers.h
index 4e3e6afe7d3a..11eea8e2e4f1 100644
--- a/tools/testing/selftests/bpf/network_helpers.h
+++ b/tools/testing/selftests/bpf/network_helpers.h
@@ -22,13 +22,13 @@ typedef __u16 __sum16;
 #define MAGIC_BYTES 123
 
 struct network_helper_opts {
-       const char *cc;
        int timeout_ms;
        bool must_fail;
        bool noconnect;
        int type;
        int proto;
        int (*post_socket_cb)(int fd, void *opts);
+       void *cb_opts;
 };
 
 /* ipv4 test vector */
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 0aca02532794..c9dd2a3d3218 100644
--- a/tools/testing/selftests/bpf/prog_tests/bpf_tcp_ca.c
+++ b/tools/testing/selftests/bpf/prog_tests/bpf_tcp_ca.c
@@ -23,6 +23,10 @@
 static const unsigned int total_bytes = 10 * 1024 * 1024;
 static int expected_stg = 0xeB9F;
 
+struct cb_opts {
+       const char *cc;
+};
+
 static int settcpca(int fd, const char *tcp_ca)
 {
        int err;
@@ -81,6 +85,14 @@ static void do_test(const char *tcp_ca, const struct bpf_map 
*sk_stg_map)
        close(fd);
 }
 
+static int cc_cb(int fd, void *opts)
+{
+       struct cb_opts *cb_opts = (struct cb_opts *)opts;
+
+       return setsockopt(fd, SOL_TCP, TCP_CONGESTION, cb_opts->cc,
+                         strlen(cb_opts->cc) + 1);
+}
+
 static void test_cubic(void)
 {
        struct bpf_cubic *cubic_skel;
@@ -171,9 +183,13 @@ static void test_invalid_license(void)
 static void test_dctcp_fallback(void)
 {
        int err, lfd = -1, cli_fd = -1, srv_fd = -1;
-       struct network_helper_opts opts = {
+       struct cb_opts cb_opts = {
                .cc = "cubic",
        };
+       struct network_helper_opts opts = {
+               .post_socket_cb = cc_cb,
+               .cb_opts        = &cb_opts,
+       };
        struct bpf_dctcp *dctcp_skel;
        struct bpf_link *link = NULL;
        char srv_cc[16];
-- 
2.43.0