use network helpers, part 5
Subsystems (3)
v4 cover use network helpers, part 5
From: Geliang Tang <[email protected]>
This patchset uses post_socket_cb and post_connect_cb callbacks of struct network_helper_opts to refactor do_test() in bpf_tcp_ca.c to move dctcp test dedicated code out of do_test() into test_dctcp().
v4:
- address Martin's comments in v3 (thanks).
- drop 2 patches, keep "type" as the individual arg to start_server_addr, connect_to_addr and start_server_str.
v3:
- Add 4 new patches, 1-3 are cleanups. 4 adds a new helper.
- address Martin's comments in v2.
v2:
- rebased on commit "selftests/bpf: Add test for the use of new args in cong_control"
Geliang Tang (6):
selftests/bpf: Drop struct post_socket_opts selftests/bpf: Add start_server_str helper selftests/bpf: Use post_socket_cb in connect_to_fd_opts selftests/bpf: Use start_server_str in bpf_tcp_ca selftests/bpf: Use connect_to_fd_opts in do_test in bpf_tcp_ca selftests/bpf: Add post_connect_cb callback
tools/testing/selftests/bpf/network_helpers.c | 39 +++-- tools/testing/selftests/bpf/network_helpers.h | 9 +- .../selftests/bpf/prog_tests/bpf_tcp_ca.c | 138 +++++++++++++----- .../bpf/prog_tests/sockopt_inherit.c | 2 +- .../bpf/test_tcp_check_syncookie_user.c | 4 +- 5 files changed, 133 insertions(+), 59 deletions(-)
Signature · 1 line
2.43.0
PATCH v4 1/6 selftests/bpf: Drop struct post_socket_opts
From: Geliang Tang <[email protected]>
It's not possible to have one generic/common "struct post_socket_opts" for all tests. It's better to have the individual test define its own callback opts struct.
So this patch drops struct post_socket_opts, and changes the second parameter of post_socket_cb as "void *" type.
--- tools/testing/selftests/bpf/network_helpers.c | 2 +- tools/testing/selftests/bpf/network_helpers.h | 4 +--- tools/testing/selftests/bpf/prog_tests/sockopt_inherit.c | 2 +- tools/testing/selftests/bpf/test_tcp_check_syncookie_user.c | 4 ++-- 4 files changed, 5 insertions(+), 7 deletions(-)
tools/testing/selftests/bpf/network_helpers.c +1 -1
@@ -133,7 +133,7 @@ int start_server(int family, int type, const char *addr_str, __u16 port,return __start_server (type, (struct sockaddr *)&addr, addrlen, &opts); } -static int reuseport_cb (int fd,const struct post_socket_opts *opts) +static int reuseport_cb (int fd,void *opts) {int on =1 ;
tools/testing/selftests/bpf/network_helpers.h +1 -3
@@ -21,8 +21,6 @@ typedef __u16 __sum16;#define VIP_NUM 5#define MAGIC_BYTES 123 -struct post_socket_opts {}; -struct network_helper_opts {const char *cc;int timeout_ms;
@@ -30,7 +28,7 @@ struct network_helper_opts {bool noconnect;int type;int proto; -int (*post_socket_cb)(int fd,const struct post_socket_opts *opts); +int (*post_socket_cb)(int fd,void *opts); };/* ipv4 test vector */
tools/testing/selftests/bpf/prog_tests/sockopt_inherit.c +1 -1
@@ -70,7 +70,7 @@ static void *server_thread(void *arg)return (void *)(long )err; } -static int custom_cb (int fd,const struct post_socket_opts *opts) +static int custom_cb (int fd,void *opts) {char buf;int err;
tools/testing/selftests/bpf/test_tcp_check_syncookie_user.c +2 -2
@@ -139,14 +139,14 @@ static int run_test(int server_fd, int results_fd, bool xdp)return ret; } -static int v6only_true (int fd,const struct post_socket_opts *opts) +static int v6only_true (int fd,void *opts) {int mode = true;return setsockopt (fd,IPPROTO_IPV6 ,IPV6_V6ONLY , &mode,sizeof (mode)); } -static int v6only_false (int fd,const struct post_socket_opts *opts) +static int v6only_false (int fd,void *opts) {int mode = false;
Signature · 1 line
2.43.0
PATCH v4 2/6 selftests/bpf: Add start_server_str helper
In reply to Geliang TangFrom: Geliang Tang <[email protected]>
It's a tech debt that start_server() does not take the "opts" argument. It's pretty handy to have start_server() as a helper that takes string address.
So this patch creates a new helper start_server_str(). Then start_server() can be a wrapper of it.
--- tools/testing/selftests/bpf/network_helpers.c | 22 ++++++++++++++----- tools/testing/selftests/bpf/network_helpers.h | 2 ++ 2 files changed, 18 insertions(+), 6 deletions(-)
tools/testing/selftests/bpf/network_helpers.c +16 -6
@@ -118,19 +118,29 @@ static int __start_server(int type, const struct sockaddr *addr, socklen_t addrlreturn -1 ; } -int start_server (int family,int type,const char *addr_str,__u16 port, -int timeout_ms) +int start_server_str (int family,int type,const char *addr_str,__u16 port, +const struct network_helper_opts *opts) { -struct network_helper_opts opts = { - .timeout_ms = timeout_ms, - };struct sockaddr_storage addr;socklen_t addrlen; +if (!opts) + opts = &default_opts; +if (make_sockaddr (family, addr_str, port, &addr, &addrlen))return -1 ; -return __start_server (type, (struct sockaddr *)&addr, addrlen, &opts); +return __start_server (type, (struct sockaddr *)&addr, addrlen, opts); +} + +int start_server (int family,int type,const char *addr_str,__u16 port, +int timeout_ms) +{ +struct network_helper_opts opts = { + .timeout_ms = timeout_ms, + }; + +return start_server_str (family, type, addr_str, port, &opts); }static int reuseport_cb (int fd,void *opts)
tools/testing/selftests/bpf/network_helpers.h +2 -0
@@ -48,6 +48,8 @@ struct ipv6_packet {extern struct ipv6_packet pkt_v6;int settimeo (int fd,int timeout_ms); +int start_server_str (int family,int type,const char *addr_str,__u16 port, +const struct network_helper_opts *opts);int start_server (int family,int type,const char *addr,__u16 port,int timeout_ms); int *start_reuseport_server(int family, int type, const char *addr_str,
Signature · 1 line
2.43.0
PATCH v4 3/6 selftests/bpf: Use post_socket_cb in connect_to_fd_opts
In reply to Geliang TangFrom: Geliang Tang <[email protected]>
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.
--- 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(-)
tools/testing/selftests/bpf/network_helpers.c +2 -3
@@ -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)
tools/testing/selftests/bpf/network_helpers.h +1 -1
@@ -22,13 +22,13 @@ typedef __u16 __sum16;#define MAGIC_BYTES 123struct 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 */
tools/testing/selftests/bpf/prog_tests/bpf_tcp_ca.c +17 -1
@@ -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 ];
Signature · 1 line
2.43.0
Martin KaFai Lau
reviewerRe: [PATCH bpf-next v4 3/6] selftests/bpf: Use post_socket_cb in connect_to_fd_opts
tools/testing/selftests/bpf/prog_tests/bpf_tcp_ca.c static void do_test(const char *tcp_ca, const struct bpf_map *sk_stg_map) · line 93
Quoted 6 lines · Geliang Tang
tools/testing/selftests/bpf/prog_tests/bpf_tcp_ca.c +6
-0+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 );
Since this cc_cb is in the test itself, it should use ASSERT_* such that the error output will be more useful. The same (use ASSERT_* whenever makes sense) goes for all cb functions in this set. In particular for the cb that does more than setsockopt in patch 5.
PATCH v4 4/6 selftests/bpf: Use start_server_str in bpf_tcp_ca
In reply to Geliang TangFrom: Geliang Tang <[email protected]>
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().
opts->cb_opts needs to be passed to post_socket_cb() in __start_server().
--- tools/testing/selftests/bpf/network_helpers.c | 3 +- .../selftests/bpf/prog_tests/bpf_tcp_ca.c | 66 +++++++++++++++---- 2 files changed, 57 insertions(+), 12 deletions(-)
tools/testing/selftests/bpf/network_helpers.c +2 -1
@@ -94,7 +94,8 @@ static int __start_server(int type, const struct sockaddr *addr, socklen_t addrlif (settimeo (fd, opts->timeout_ms)) goto error_close; -if (opts->post_socket_cb && opts->post_socket_cb (fd,NULL )) { +if (opts->post_socket_cb && + opts->post_socket_cb (fd, opts->cb_opts)) {log_err ("Failed to call post_socket_cb" ); goto error_close; }
tools/testing/selftests/bpf/prog_tests/bpf_tcp_ca.c +55 -11
166 lines not on this page · raw message
Signature · 1 line
2.43.0
Martin KaFai Lau
reviewerRe: [PATCH bpf-next v4 4/6] selftests/bpf: Use start_server_str in bpf_tcp_ca
Quoted 5 lines · Geliang Tang
From: Geliang Tang <[email protected]>
This patch uses new helper
start_server_str()indo_test()inbpf_tcp_ca.cto accept a structnetwork_helper_optsargument instead of usingstart_server()andsettcpca(). Then change the type of the first paramenter
I think it missed to replace the start_server()+settcpca() usage in test_dctcp_fallback().
PATCH v4 5/6 selftests/bpf: Use connect_to_fd_opts in do_test in bpf_tcp_ca
In reply to Geliang TangFrom: Geliang Tang <[email protected]>
This patch uses connect_to_fd_opts() instead of using connect_fd_to_fd() and settcpca() in do_test() in prog_tests/bpf_tcp_ca.c to accept a struct network_helper_opts argument.
Then define a dctcp dedicated post_socket_cb callback stg_post_socket_cb(), invoking both cc_cb() and bpf_map_update_elem() in it, and set it in test_dctcp(). For passing map_fd into stg_post_socket_cb() callback, a new member map_fd is added in struct cb_opts.
--- .../selftests/bpf/prog_tests/bpf_tcp_ca.c | 36 +++++++++---------- 1 file changed, 16 insertions(+), 20 deletions(-)
tools/testing/selftests/bpf/prog_tests/bpf_tcp_ca.c +16 -20
@@ -25,6 +25,7 @@ static int expected_stg = 0xeB9F;struct cb_opts {const char *cc; +int map_fd; };static int settcpca (int fd,const char *tcp_ca)
@@ -41,7 +42,6 @@ static int settcpca(int fd, const char *tcp_ca)static void do_test (const struct network_helper_opts *opts,const struct bpf_map *sk_stg_map) { -struct cb_opts *co = (struct cb_opts *)opts->cb_opts;int lfd =-1 , fd =-1 ;int err;
@@ -49,25 +49,9 @@ static void do_test(const struct network_helper_opts *opts,if (!ASSERT_NEQ (lfd,-1 ,"socket" ))return ; - fd =socket (AF_INET6 ,SOCK_STREAM ,0 ); -if (!ASSERT_NEQ (fd,-1 ,"socket" )) { -close (lfd); -return ; - } - -if (settcpca (fd, co->cc)) - goto done; - -if (sk_stg_map) { - err =bpf_map_update_elem (bpf_map__fd (sk_stg_map), &fd, - &expected_stg,BPF_NOEXIST ); -if (!ASSERT_OK (err,"bpf_map_update_elem(sk_stg_map)" )) - goto done; - } -/* connect to server */ - err =connect_fd_to_fd (fd, lfd,0 ); -if (!ASSERT_NEQ (err,-1 ,"connect" )) + fd =connect_to_fd_opts (lfd, opts); +if (!ASSERT_NEQ (fd,-1 ,"connect_to_fd_opts" )) goto done;if (sk_stg_map) {
@@ -125,13 +109,24 @@ static void test_cubic(void)bpf_cubic__destroy (cubic_skel); } +static int stg_post_socket_cb (int fd,void *opts) +{ +struct cb_opts *cb_opts = (struct cb_opts *)opts; +int err; + + err =cc_cb (fd, opts); +if (err) +return err; +return bpf_map_update_elem (cb_opts->map_fd, &fd, &expected_stg,BPF_NOEXIST ); +} +static void test_dctcp (void ) {struct cb_opts cb_opts = { .cc ="bpf_dctcp" , };struct network_helper_opts opts = { - .post_socket_cb = cc_cb, + .post_socket_cb = stg_post_socket_cb, .cb_opts = &cb_opts, };struct bpf_dctcp *dctcp_skel;
@@ -147,6 +142,7 @@ static void test_dctcp(void)return ; } + cb_opts.map_fd =bpf_map__fd (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" );
Signature · 1 line
2.43.0
PATCH v4 6/6 selftests/bpf: Add post_connect_cb callback
In reply to Geliang TangFrom: Geliang Tang <[email protected]>
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().
--- 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(-)
tools/testing/selftests/bpf/network_helpers.c +6 -1
@@ -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:
tools/testing/selftests/bpf/network_helpers.h +1 -0
@@ -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; };
tools/testing/selftests/bpf/prog_tests/bpf_tcp_ca.c +23 -21
118 lines not on this page · raw message
Signature · 1 line
2.43.0
Martin KaFai Lau
reviewerQuoted 5 lines · Geliang Tang
From: Geliang Tang <[email protected]>
This patchset uses
post_socket_cbandpost_connect_cbcallbacks of structnetwork_helper_optsto refactordo_test()inbpf_tcp_ca.cto move dctcp test dedicated code out ofdo_test()intotest_dctcp().
Overall looks good. It needs another respin.
pw-bot: cr