use network helpers, part 5
Subsystems (4)
Geliang Tang
reviewerv3 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().
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 (8):
selftests/bpf: Drop struct post_socket_opts selftests/bpf: Drop type parameter of start_server_addr selftests/bpf: Drop type parameter of connect_to_addr 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 | 56 ++++--- tools/testing/selftests/bpf/network_helpers.h | 13 +- .../selftests/bpf/prog_tests/bpf_tcp_ca.c | 138 +++++++++++++----- .../selftests/bpf/prog_tests/cls_redirect.c | 7 +- .../testing/selftests/bpf/prog_tests/mptcp.c | 2 +- .../selftests/bpf/prog_tests/sk_assign.c | 13 +- .../selftests/bpf/prog_tests/sock_addr.c | 23 ++- .../bpf/prog_tests/sockopt_inherit.c | 4 +- .../bpf/test_tcp_check_syncookie_user.c | 10 +- 9 files changed, 179 insertions(+), 87 deletions(-)
Signature · 1 line
2.43.0
Geliang Tang
reviewerPATCH v3 1/8 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
Geliang Tang
reviewerPATCH v3 2/8 selftests/bpf: Drop type parameter of start_server_addr
In reply to Geliang TangFrom: Geliang Tang <[email protected]>
Since "type" is a struct member of network_helper_opts, it makes sense to drop the "type" parameter of start_server_addr() and __start_server() helpers, using opts->type instead in the helpers.
If no network_helper_opts is set, use SOCK_STREAM as default socket type.
--- tools/testing/selftests/bpf/network_helpers.c | 15 +++++++++------ tools/testing/selftests/bpf/network_helpers.h | 2 +- .../selftests/bpf/prog_tests/cls_redirect.c | 5 ++++- tools/testing/selftests/bpf/prog_tests/mptcp.c | 2 +- .../testing/selftests/bpf/prog_tests/sk_assign.c | 8 +++++--- .../selftests/bpf/prog_tests/sockopt_inherit.c | 2 +- .../selftests/bpf/test_tcp_check_syncookie_user.c | 6 +++--- 7 files changed, 24 insertions(+), 16 deletions(-)
tools/testing/selftests/bpf/network_helpers.c +9 -6
@@ -80,9 +80,10 @@ int settimeo(int fd, int timeout_ms)#define save_errno_close (fd) ({ int __save = errno; close(fd); errno = __save; }) -static int __start_server (int type,const struct sockaddr *addr,socklen_t addrlen, +static int __start_server (const struct sockaddr *addr,socklen_t addrlen,const struct network_helper_opts *opts) { +int type = opts->type ? :SOCK_STREAM ;int fd; fd =socket (addr->sa_family, type, opts->proto);
@@ -122,6 +123,7 @@ int start_server(int family, int type, const char *addr_str, __u16 port, int timeout_ms) {struct network_helper_opts opts = { + .type = type, .timeout_ms = timeout_ms, };struct sockaddr_storage addr;
@@ -130,7 +132,7 @@ int start_server(int family, int type, const char *addr_str, __u16 port,if (make_sockaddr (family, addr_str, port, &addr, &addrlen))return -1 ; -return __start_server (type, (struct sockaddr *)&addr, addrlen, &opts); +return __start_server ((struct sockaddr *)&addr, addrlen, &opts); }static int reuseport_cb (int fd,void *opts)
@@ -144,6 +146,7 @@ int *start_reuseport_server(int family, int type, const char *addr_str, __u16 port, int timeout_ms, unsigned int nr_listens) { struct network_helper_opts opts = { + .type = type, .timeout_ms = timeout_ms, .post_socket_cb = reuseport_cb, };
@@ -162,7 +165,7 @@ int *start_reuseport_server(int family, int type, const char *addr_str,if (!fds)return NULL ; - fds[0 ] =__start_server (type, (struct sockaddr *)&addr, addrlen, &opts); + fds[0 ] =__start_server ((struct sockaddr *)&addr, addrlen, &opts);if (fds[0 ] ==-1 ) goto close_fds; nr_fds =1 ;
@@ -171,7 +174,7 @@ int *start_reuseport_server(int family, int type, const char *addr_str, goto close_fds;for (; nr_fds < nr_listens; nr_fds++) { - fds[nr_fds] =__start_server (type, (struct sockaddr *)&addr, addrlen, &opts); + fds[nr_fds] =__start_server ((struct sockaddr *)&addr, addrlen, &opts);if (fds[nr_fds] ==-1 ) goto close_fds; }
@@ -183,13 +186,13 @@ int *start_reuseport_server(int family, int type, const char *addr_str,return NULL ; } -int start_server_addr (int type,const struct sockaddr_storage *addr,socklen_t len, +int start_server_addr (const struct sockaddr_storage *addr,socklen_t len,const struct network_helper_opts *opts) {if (!opts) opts = &default_opts; -return __start_server (type, (struct sockaddr *)addr, len, opts); +return __start_server ((struct sockaddr *)addr, len, opts); }void free_fds (int *fds,unsigned int nr_close_fds)
tools/testing/selftests/bpf/network_helpers.h +1 -1
@@ -53,7 +53,7 @@ int start_server(int family, int type, const char *addr, __u16 port,int *start_reuseport_server (int family,int type,const char *addr_str,__u16 port,int timeout_ms,unsigned int nr_listens); -int start_server_addr (int type,const struct sockaddr_storage *addr,socklen_t len, +int start_server_addr (const struct sockaddr_storage *addr,socklen_t len,const struct network_helper_opts *opts);void free_fds (int *fds,unsigned int nr_close_fds); int connect_to_addr(int type, const struct sockaddr_storage *addr, socklen_t len,
tools/testing/selftests/bpf/prog_tests/cls_redirect.c +4 -1
@@ -62,11 +62,14 @@ static bool fill_addr_port(const struct sockaddr *sa, struct addr_port *ap)static bool set_up_conn (const struct sockaddr *addr,socklen_t len,int type,int *server,int *conn,struct tuple *tuple) { +struct network_helper_opts opts = { + .type = type, + };struct sockaddr_storage ss;socklen_t slen =sizeof (ss);struct sockaddr *sa = (struct sockaddr *)&ss; - *server =start_server_addr (type, (struct sockaddr_storage *)addr, len,NULL ); + *server =start_server_addr ((struct sockaddr_storage *)addr, len, &opts);if (*server <0 )return false;
tools/testing/selftests/bpf/prog_tests/mptcp.c +1 -1
@@ -110,7 +110,7 @@ static int start_mptcp_server(int family, const char *addr_str, __u16 port,if (make_sockaddr (family, addr_str, port, &addr, &addrlen))return -1 ; -return start_server_addr (SOCK_STREAM , &addr, addrlen, &opts); +return start_server_addr (&addr, addrlen, &opts); }static int verify_tsk (int map_fd,int client_fd)
tools/testing/selftests/bpf/prog_tests/sk_assign.c +5 -3
@@ -255,6 +255,9 @@ void test_sk_assign(void)for (i =0 ; i <ARRAY_SIZE (tests) && !READ_ONCE (stop); i++) {struct test_sk_cfg *test = &tests[i]; +struct network_helper_opts opts = { + .type = test->type, + };const struct sockaddr *addr;const int zero =0 ;int err;
@@ -263,9 +266,8 @@ void test_sk_assign(void)continue ;prepare_addr (test->addr, test->family,BIND_PORT , false); addr = (const struct sockaddr *)test->addr; - server =start_server_addr (test->type, - (const struct sockaddr_storage *)addr, - test->len,NULL ); + server =start_server_addr ((const struct sockaddr_storage *)addr, + test->len, &opts);if (server ==-1 ) goto close;
tools/testing/selftests/bpf/prog_tests/sockopt_inherit.c +1 -1
@@ -121,7 +121,7 @@ static void run_test(int cgroup_fd)if (!ASSERT_OK_PTR (link_setsockopt,"cg-attach-setsockopt" )) goto close_bpf_object; - server_fd =start_server_addr (SOCK_STREAM , (struct sockaddr_storage *)&addr, + server_fd =start_server_addr ((struct sockaddr_storage *)&addr,sizeof (addr), &opts);if (!ASSERT_GE (server_fd,0 ,"start_server" )) goto close_bpf_object;
tools/testing/selftests/bpf/test_tcp_check_syncookie_user.c +3 -3
@@ -197,19 +197,19 @@ int main(int argc, char **argv) addr6dual.sin6_addr = in6addr_any; addr6dual.sin6_port =0 ; - server =start_server_addr (SOCK_STREAM , (struct sockaddr_storage *)&addr4, + server =start_server_addr ((struct sockaddr_storage *)&addr4,sizeof (addr4),NULL );if (server ==-1 ) goto err; opts.post_socket_cb = v6only_true; - server_v6 =start_server_addr (SOCK_STREAM , (struct sockaddr_storage *)&addr6, + server_v6 =start_server_addr ((struct sockaddr_storage *)&addr6,sizeof (addr6), &opts);if (server_v6 ==-1 ) goto err; opts.post_socket_cb = v6only_false; - server_dual =start_server_addr (SOCK_STREAM , (struct sockaddr_storage *)&addr6dual, + server_dual =start_server_addr ((struct sockaddr_storage *)&addr6dual,sizeof (addr6dual), &opts);if (server_dual ==-1 ) goto err;
Signature · 1 line
2.43.0
Martin KaFai Lau
reviewerRe: [PATCH bpf-next v3 2/8] selftests/bpf: Drop type parameter of start_server_addr
tools/testing/selftests/bpf/prog_tests/sk_assign.c void test_sk_assign(void) · line 259
Quoted 10 lines · Geliang Tang
tools/testing/selftests/bpf/prog_tests/sk_assign.c +2
-0@@ -255,6 +255,9 @@ void test_sk_assign(void)for (i =0 ; i <ARRAY_SIZE (tests) && !READ_ONCE (stop); i++) {struct test_sk_cfg *test = &tests[i]; +struct network_helper_opts opts = { + .type = test->type,
I think dropping the type arg from the start_server_addr (and other existing helpers) is wrong.
"type" is the common case that tests usually want to specify here (at least between SOCK_STREAM and SOCK_DGRAM). It becomes optional (opts) now and have a more complicated way to pass it to the the start_server_addr, connect_to_addr...etc.
imo, the opts.{type, proto, noconnect} is at least a bit non intuitive or unnecessary. The only use case now is in test_bpf_ip_check_defrag_ok which ends up bypassing most (or at least some) of the connect_to_fd_opts() logic. May be that test should have its own connect_to_fd_opts() instead. However, lets leave this potential cleanup out for later and not complicate this set further.
Please keep type as the individual arg to the helper functions.
pw-bot: cr
Quoted 13 lines
tools/testing/selftests/bpf/prog_tests/sk_assign.c +3
-3+ };const struct sockaddr *addr;const int zero =0 ;int err;@@ -263,9 +266,8 @@ void test_sk_assign(void)continue ;prepare_addr (test->addr, test->family,BIND_PORT , false); addr = (const struct sockaddr *)test->addr; - server =start_server_addr (test->type, - (const struct sockaddr_storage *)addr, - test->len,NULL ); + server =start_server_addr ((const struct sockaddr_storage *)addr, + test->len, &opts);
Geliang Tang
reviewerPATCH v3 3/8 selftests/bpf: Drop type parameter of connect_to_addr
In reply to Geliang TangFrom: Geliang Tang <[email protected]>
Since "type" is a struct member of network_helper_opts, it makes sense to drop the "type" parameter of connect_to_addr() helper, using opts->type instead in this helper.
If no network_helper_opts is set, use SOCK_STREAM as default socket type.
--- tools/testing/selftests/bpf/network_helpers.c | 4 ++-- tools/testing/selftests/bpf/network_helpers.h | 2 +- .../selftests/bpf/prog_tests/cls_redirect.c | 2 +- .../selftests/bpf/prog_tests/sk_assign.c | 5 +++- .../selftests/bpf/prog_tests/sock_addr.c | 23 ++++++++++++------- 5 files changed, 23 insertions(+), 13 deletions(-)
tools/testing/selftests/bpf/network_helpers.c +2 -2
@@ -268,7 +268,7 @@ static int connect_fd_to_addr(int fd,return 0 ; } -int connect_to_addr (int type,const struct sockaddr_storage *addr,socklen_t addrlen, +int connect_to_addr (const struct sockaddr_storage *addr,socklen_t addrlen,const struct network_helper_opts *opts) {int fd;
@@ -276,7 +276,7 @@ int connect_to_addr(int type, const struct sockaddr_storage *addr, socklen_t addif (!opts) opts = &default_opts; - fd =socket (addr->ss_family, type, opts->proto); + fd =socket (addr->ss_family, opts->type ? :SOCK_STREAM , opts->proto);if (fd <0 ) {log_err ("Failed to create client socket" );return -1 ;
tools/testing/selftests/bpf/network_helpers.h +1 -1
@@ -56,7 +56,7 @@ int *start_reuseport_server(int family, int type, const char *addr_str,int start_server_addr (const struct sockaddr_storage *addr,socklen_t len,const struct network_helper_opts *opts);void free_fds (int *fds,unsigned int nr_close_fds); -int connect_to_addr (int type,const struct sockaddr_storage *addr,socklen_t len, +int connect_to_addr (const struct sockaddr_storage *addr,socklen_t len,const struct network_helper_opts *opts);int connect_to_fd (int server_fd,int timeout_ms);int connect_to_fd_opts (int server_fd,const struct network_helper_opts *opts);
tools/testing/selftests/bpf/prog_tests/cls_redirect.c +1 -1
@@ -76,7 +76,7 @@ static bool set_up_conn(const struct sockaddr *addr, socklen_t len, int type,if (CHECK_FAIL (getsockname (*server, sa, &slen))) goto close_server; - *conn =connect_to_addr (type, (struct sockaddr_storage *)sa, slen,NULL ); + *conn =connect_to_addr ((struct sockaddr_storage *)sa, slen, &opts);if (*conn <0 ) goto close_server;
tools/testing/selftests/bpf/prog_tests/sk_assign.c +4 -1
@@ -109,12 +109,15 @@ rcv_msg(int srv_client, int type)static int run_test (int server_fd,const struct sockaddr *addr,socklen_t len,int type) { +struct network_helper_opts opts = { + .type = type, + };int client =-1 , srv_client =-1 ;char buf[] ="testing" ;in_port_t port;int ret =1 ; - client =connect_to_addr (type, (struct sockaddr_storage *)addr, len,NULL ); + client =connect_to_addr ((struct sockaddr_storage *)addr, len, &opts);if (client ==-1 ) {perror ("Cannot connect to server" ); goto out;
tools/testing/selftests/bpf/prog_tests/sock_addr.c +15 -8
@@ -224,12 +224,12 @@ static int kernel_getpeername(int fd, struct sockaddr *addr, socklen_t *addrlen)return sock_addr_op ("kernel_getpeername" , addr, addrlen, true); } -int kernel_connect_to_addr (int type,const struct sockaddr_storage *addr,socklen_t addrlen, +int kernel_connect_to_addr (const struct sockaddr_storage *addr,socklen_t addrlen,const struct network_helper_opts *opts) {int err; -if (!ASSERT_OK (kernel_init_sock (addr->ss_family, type,0 ), +if (!ASSERT_OK (kernel_init_sock (addr->ss_family, opts->type,0 ),"kernel_init_sock" )) goto err;
@@ -278,7 +278,7 @@ int kernel_start_server(int family, int type, const char *addr_str, __u16 port, }struct sock_ops { -int (*connect_to_addr)(int type,const struct sockaddr_storage *addr, +int (*connect_to_addr)(const struct sockaddr_storage *addr,socklen_t addrlen,const struct network_helper_opts *opts); int (*start_server)(int family, int type, const char *addr_str,
@@ -2284,6 +2284,9 @@ static int test_bind(struct sock_addr_test *test) {struct sockaddr_storage expected_addr;socklen_t expected_addr_len =sizeof (struct sockaddr_storage ); +struct network_helper_opts opts = { + .type = test->socket_type, + };int serv =-1 , client =-1 , err; serv = test->ops->start_server(test->socket_family, test->socket_type,
@@ -2306,7 +2309,7 @@ static int test_bind(struct sock_addr_test *test) goto cleanup;/* Try to connect to server just in case */ - client =connect_to_addr (test->socket_type, &expected_addr, expected_addr_len,NULL ); + client =connect_to_addr (&expected_addr, expected_addr_len, &opts);if (!ASSERT_GE (client,0 ,"connect_to_addr" )) goto cleanup;
@@ -2327,6 +2330,9 @@ static int test_connect(struct sock_addr_test *test)socklen_t addr_len =sizeof (struct sockaddr_storage ), expected_addr_len =sizeof (struct sockaddr_storage ), expected_src_addr_len =sizeof (struct sockaddr_storage ); +struct network_helper_opts opts = { + .type = test->socket_type, + };int serv =-1 , client =-1 , err; serv = start_server(test->socket_family, test->socket_type,
@@ -2339,8 +2345,7 @@ static int test_connect(struct sock_addr_test *test)if (!ASSERT_EQ (err,0 ,"make_sockaddr" )) goto cleanup; - client = test->ops->connect_to_addr (test->socket_type, &addr, addr_len, -NULL ); + client = test->ops->connect_to_addr (&addr, addr_len, &opts);if (client <0 ) { err = errno; goto err;
@@ -2519,6 +2524,9 @@ static int test_getpeername(struct sock_addr_test *test)struct sockaddr_storage addr, expected_addr;socklen_t addr_len =sizeof (struct sockaddr_storage ), expected_addr_len =sizeof (struct sockaddr_storage ); +struct network_helper_opts opts = { + .type = test->socket_type, + };int serv =-1 , client =-1 , err; serv = start_server(test->socket_family, test->socket_type,
@@ -2531,8 +2539,7 @@ static int test_getpeername(struct sock_addr_test *test)if (!ASSERT_EQ (err,0 ,"make_sockaddr" )) goto cleanup; - client = test->ops->connect_to_addr (test->socket_type, &addr, addr_len, -NULL ); + client = test->ops->connect_to_addr (&addr, addr_len, &opts);if (!ASSERT_GE (client,0 ,"connect_to_addr" )) goto cleanup;
Signature · 1 line
2.43.0
Geliang Tang
reviewerPATCH v3 4/8 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
@@ -119,6 +119,21 @@ static int __start_server(const struct sockaddr *addr, socklen_t addrlen,return -1 ; } +int start_server_str (int family,const char *addr_str,__u16 port, +const struct network_helper_opts *opts) +{ +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 ((struct sockaddr *)&addr, addrlen, opts); +} +int start_server (int family,int type,const char *addr_str,__u16 port,int timeout_ms) {
@@ -126,13 +141,8 @@ int start_server(int family, int type, const char *addr_str, __u16 port, .type = type, .timeout_ms = timeout_ms, }; -struct sockaddr_storage addr; -socklen_t addrlen; - -if (make_sockaddr (family, addr_str, port, &addr, &addrlen)) -return -1 ; -return __start_server ((struct sockaddr *)&addr, addrlen, &opts); +return start_server_str (family, 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,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
Geliang Tang
reviewerPATCH v3 5/8 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
@@ -351,9 +351,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
Geliang Tang
reviewerPATCH v3 6/8 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
@@ -95,7 +95,8 @@ static int __start_server(const struct sockaddr *addr, socklen_t addrlen,if (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
Geliang Tang
reviewerPATCH v3 7/8 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
Geliang Tang
reviewerPATCH v3 8/8 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
@@ -356,10 +356,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