use network helpers, part 5
Subsystems (3)
v2 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().
Patch 3 adds a new member in post_socket_opts and patch 4 adds a new callback in network_helper_opts. I'm not sure if this is going too far.
v2:
- rebased on commit "selftests/bpf: Add test for the use of new args in cong_control"
Geliang Tang (4):
selftests/bpf: Use post_socket_cb in connect_to_fd_opts selftests/bpf: Use start_server_addr 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 | 13 +- tools/testing/selftests/bpf/network_helpers.h | 8 +- .../selftests/bpf/prog_tests/bpf_tcp_ca.c | 111 ++++++++++++------ 3 files changed, 86 insertions(+), 46 deletions(-)
Signature · 1 line
2.43.0
PATCH v2 1/4 selftests/bpf: Use post_socket_cb in connect_to_fd_opts
From: 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 post_socket_opts type member cb_opts into struct network_helper_opts, then cc can be moved into struct post_socket_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 | 6 ++++-- tools/testing/selftests/bpf/prog_tests/bpf_tcp_ca.c | 9 ++++++++- 3 files changed, 14 insertions(+), 6 deletions(-)
tools/testing/selftests/bpf/network_helpers.c +2 -3
@@ -338,9 +338,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 +4 -2
@@ -21,16 +21,18 @@ typedef __u16 __sum16;#define VIP_NUM 5#define MAGIC_BYTES 123 -struct post_socket_opts {}; +struct post_socket_opts { +const char *cc; +};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,const struct post_socket_opts *opts); +struct post_socket_opts cb_opts; };/* ipv4 test vector */
tools/testing/selftests/bpf/prog_tests/bpf_tcp_ca.c +8 -1
@@ -81,6 +81,12 @@ static void do_test(const char *tcp_ca, const struct bpf_map *sk_stg_map)close (fd); } +static int cc_cb (int fd,const struct post_socket_opts *opts) +{ +return setsockopt (fd,SOL_TCP ,TCP_CONGESTION , opts->cc, +strlen (opts->cc) +1 ); +} +static void test_cubic (void ) {struct bpf_cubic *cubic_skel;
@@ -172,7 +178,8 @@ static void test_dctcp_fallback(void) {int err, lfd =-1 , cli_fd =-1 , srv_fd =-1 ;struct network_helper_opts opts = { - .cc ="cubic" , + .cb_opts.cc ="cubic" , + .post_socket_cb = cc_cb, };struct bpf_dctcp *dctcp_skel;struct bpf_link *link =NULL ;
Signature · 1 line
2.43.0
Martin KaFai Lau
reviewerRe: [PATCH bpf-next v2 1/4] selftests/bpf: Use post_socket_cb in connect_to_fd_opts
Quoted 39 lines · Geliang Tang
From: Geliang Tang <[email protected]>
Since the
post_socket_cb()callback is added in structnetwork_helper_opts, it's make sense to use it not only in__start_server(), but also inconnect_to_fd_opts(). Then it can be used to setTCP_CONGESTIONsockopt.Add a
post_socket_optstype membercb_optsinto structnetwork_helper_opts, then cc can be moved into structpost_socket_optsfromnetwork_helper_opts. Define a new callbackcc_cb()to setTCP_CONGESTIONsockopt, and set it topost_socket_cbpointer.Signed-off-by Geliang Tang <[email protected]>--- tools/testing/selftests/bpf/network_helpers.c | 5 ++--- tools/testing/selftests/bpf/network_helpers.h | 6 ++++-- tools/testing/selftests/bpf/prog_tests/bpf_tcp_ca.c | 9 ++++++++- 3 files changed, 14 insertions(+), 6 deletions(-)tools/testing/selftests/bpf/network_helpers.c +2
-3@@ -338,9 +338,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 +0
-0
tools/testing/selftests/bpf/network_helpers.h typedef __u16 __sum16; · line 26
Quoted 7 lines
tools/testing/selftests/bpf/network_helpers.h +3
-1@@ -21,16 +21,18 @@ typedef __u16 __sum16;#define VIP_NUM 5#define MAGIC_BYTES 123 -struct post_socket_opts {}; +struct post_socket_opts { +const char *cc; +};
From looking its usage in this set, it has cc name and map fd in it. It becomes clear that it is not possible to have one generic/common "struct post_socket_opts" for all tests.
tools/testing/selftests/bpf/network_helpers.h typedef __u16 __sum16; · line 35
Quoted 10 lines
tools/testing/selftests/bpf/network_helpers.h +1
-1struct network_helper_opts { -const char *cc;int timeout_ms;bool must_fail;bool noconnect;int type;int proto;int (*post_socket_cb)(int fd,const struct post_socket_opts *opts); +struct post_socket_opts cb_opts;
It is better to have the individual test define its own callback opts struct. Something like this:
/* network_helpers.h */
struct network_helper_opts {
/* ... */
int (*post_socket_cb)(int fd, void *opts);
void *post_socket_opts;
};/* bpf_tcp_ca.c */
struct cb_opts {
const char *cc;
int map_fd;
};struct cb_opts cb_opts = {
.cc = "bpf_dctcp",
.map_fd = fd,
};struct network_helper_opts opts = {
.post_socket_cb = stg_post_socket_cb,
.post_sock_opts = &cb_opts,
};pw-bot: cr
Quoted 30 lines
tools/testing/selftests/bpf/network_helpers.h +0
-0};/* ipv4 test vector */ tools/testing/selftests/bpf/prog_tests/bpf_tcp_ca.c +8
-1@@ -81,6 +81,12 @@ static void do_test(const char *tcp_ca, const struct bpf_map *sk_stg_map)close (fd); } +static int cc_cb (int fd,const struct post_socket_opts *opts) +{ +return setsockopt (fd,SOL_TCP ,TCP_CONGESTION , opts->cc, +strlen (opts->cc) +1 ); +} +static void test_cubic (void ) {struct bpf_cubic *cubic_skel;@@ -172,7 +178,8 @@ static void test_dctcp_fallback(void) {int err, lfd =-1 , cli_fd =-1 , srv_fd =-1 ;struct network_helper_opts opts = { - .cc ="cubic" , + .cb_opts.cc ="cubic" , + .post_socket_cb = cc_cb, };struct bpf_dctcp *dctcp_skel;struct bpf_link *link =NULL ;
PATCH v2 2/4 selftests/bpf: Use start_server_addr in bpf_tcp_ca
In reply to Geliang TangFrom: Geliang Tang <[email protected]>
This patch uses start_server_addr() in do_test() in prog_tests/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 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 | 2 +- .../selftests/bpf/prog_tests/bpf_tcp_ca.c | 52 +++++++++++++++---- 2 files changed, 42 insertions(+), 12 deletions(-)
tools/testing/selftests/bpf/network_helpers.c +1 -1
@@ -94,7 +94,7 @@ 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 +41 -11
152 lines not on this page · raw message
Signature · 1 line
2.43.0
Martin KaFai Lau
reviewerRe: [PATCH bpf-next v2 2/4] selftests/bpf: Use start_server_addr in bpf_tcp_ca
Quoted 43 lines · Geliang Tang
From: Geliang Tang <[email protected]>
This patch uses
start_server_addr()indo_test()inprog_tests/bpf_tcp_ca.cto accept a structnetwork_helper_optsargument instead of usingstart_server()andsettcpca(). Then change the type of the first paramenter ofdo_test()into a structnetwork_helper_optsone.Define its own opts for each test, set its own cc name into cb_opts.cc, and
cc_cb()intopost_socket_cbcallback, then pass it todo_test().
opts->cb_optsneeds to be passed topost_socket_cb()in__start_server().Signed-off-by Geliang Tang <[email protected]>--- tools/testing/selftests/bpf/network_helpers.c | 2 +- .../selftests/bpf/prog_tests/bpf_tcp_ca.c | 52 +++++++++++++++---- 2 files changed, 42 insertions(+), 12 deletions(-)tools/testing/selftests/bpf/network_helpers.c +1
-1@@ -94,7 +94,7 @@ 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 +2
-1@@ -34,12 +34,18 @@ 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) {
tools/testing/selftests/bpf/prog_tests/bpf_tcp_ca.c static int settcpca(int fd, const char *tcp_ca) · line 48
Quoted 10 lines
tools/testing/selftests/bpf/prog_tests/bpf_tcp_ca.c +6
-1+struct sockaddr_storage addr;int lfd =-1 , fd =-1 ; +socklen_t addrlen;int err; - lfd =start_server (AF_INET6 ,SOCK_STREAM ,NULL ,0 ,0 ); +if (make_sockaddr (AF_INET6 ,NULL ,0 , &addr, &addrlen)) +return ; + + lfd =start_server_addr (SOCK_STREAM , &addr, addrlen, opts);
It is a tech debt that start_server does not take the "opts" argument. It is pretty handy to have start_server as a helper that takes string address.
How about create a start_server_str() and start using it in this set. The other existing start_server() usages can be retired later.
int start_server_str(int family, int type, const char *addr, __u16 port,
const struct network_helper_opts *opts);
PATCH v2 3/4 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 post_socket_opts.
--- tools/testing/selftests/bpf/network_helpers.h | 1 + .../selftests/bpf/prog_tests/bpf_tcp_ca.c | 33 ++++++++----------- 2 files changed, 15 insertions(+), 19 deletions(-)
tools/testing/selftests/bpf/network_helpers.h +1 -0
@@ -23,6 +23,7 @@ typedef __u16 __sum16;struct post_socket_opts {const char *cc; +int map_fd; };struct network_helper_opts {
tools/testing/selftests/bpf/prog_tests/bpf_tcp_ca.c +14 -19
@@ -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, opts->cb_opts.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) {
@@ -120,11 +104,21 @@ static void test_cubic(void)bpf_cubic__destroy (cubic_skel); } +static int stg_post_socket_cb (int fd,const struct post_socket_opts *opts) +{ +int err; + + err =cc_cb (fd, opts); +if (err) +return err; +return bpf_map_update_elem (opts->map_fd, &fd, &expected_stg,BPF_NOEXIST ); +} +static void test_dctcp (void ) {struct network_helper_opts opts = { .cb_opts.cc ="bpf_dctcp" , - .post_socket_cb = cc_cb, + .post_socket_cb = stg_post_socket_cb, };struct bpf_dctcp *dctcp_skel;struct bpf_link *link;
@@ -139,6 +133,7 @@ static void test_dctcp(void)return ; } + opts.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 v2 4/4 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 | 6 ++- tools/testing/selftests/bpf/network_helpers.h | 1 + .../selftests/bpf/prog_tests/bpf_tcp_ca.c | 43 ++++++++++--------- 3 files changed, 28 insertions(+), 22 deletions(-)
tools/testing/selftests/bpf/network_helpers.c +5 -1
@@ -342,10 +342,14 @@ 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
@@ -33,6 +33,7 @@ struct network_helper_opts {int type;int proto;int (*post_socket_cb)(int fd,const struct post_socket_opts *opts); +int (*post_connect_cb)(int fd,const struct post_socket_opts *opts);struct post_socket_opts cb_opts; };
tools/testing/selftests/bpf/prog_tests/bpf_tcp_ca.c +22 -21
118 lines not on this page · raw message
Signature · 1 line
2.43.0