* [PATCH bpf-next v3 1/8] selftests/bpf: Drop struct post_socket_opts
2024-05-22 9:23 [PATCH bpf-next v3 0/8] use network helpers, part 5 Geliang Tang
@ 2024-05-22 9:23 ` Geliang Tang
2024-05-22 9:23 ` [PATCH bpf-next v3 2/8] selftests/bpf: Drop type parameter of start_server_addr Geliang Tang
` (6 subsequent siblings)
7 siblings, 0 replies; 10+ messages in thread
From: Geliang Tang @ 2024-05-22 9:23 UTC (permalink / raw)
To: Andrii Nakryiko, Eduard Zingerman, Mykola Lysenko,
Alexei Starovoitov, Daniel Borkmann, Martin KaFai Lau, Song Liu,
Yonghong Song, John Fastabend, KP Singh, Stanislav Fomichev,
Hao Luo, Jiri Olsa, Shuah Khan
Cc: Geliang Tang, bpf, linux-kselftest
From: Geliang Tang <tanggeliang@kylinos.cn>
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.
Signed-off-by: Geliang Tang <tanggeliang@kylinos.cn>
---
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(-)
diff --git a/tools/testing/selftests/bpf/network_helpers.c b/tools/testing/selftests/bpf/network_helpers.c
index 35250e6cde7f..4d776b78929c 100644
--- a/tools/testing/selftests/bpf/network_helpers.c
+++ b/tools/testing/selftests/bpf/network_helpers.c
@@ -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;
diff --git a/tools/testing/selftests/bpf/network_helpers.h b/tools/testing/selftests/bpf/network_helpers.h
index 883c7ea9d8d5..40011e0f584b 100644
--- a/tools/testing/selftests/bpf/network_helpers.h
+++ b/tools/testing/selftests/bpf/network_helpers.h
@@ -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 */
diff --git a/tools/testing/selftests/bpf/prog_tests/sockopt_inherit.c b/tools/testing/selftests/bpf/prog_tests/sockopt_inherit.c
index 1d3a20f01b60..7cd8be2780ca 100644
--- a/tools/testing/selftests/bpf/prog_tests/sockopt_inherit.c
+++ b/tools/testing/selftests/bpf/prog_tests/sockopt_inherit.c
@@ -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;
diff --git a/tools/testing/selftests/bpf/test_tcp_check_syncookie_user.c b/tools/testing/selftests/bpf/test_tcp_check_syncookie_user.c
index 7b5fc98838cd..aebc58c24dc5 100644
--- a/tools/testing/selftests/bpf/test_tcp_check_syncookie_user.c
+++ b/tools/testing/selftests/bpf/test_tcp_check_syncookie_user.c
@@ -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;
--
2.43.0
^ permalink raw reply related [flat|nested] 10+ messages in thread* [PATCH bpf-next v3 2/8] selftests/bpf: Drop type parameter of start_server_addr
2024-05-22 9:23 [PATCH bpf-next v3 0/8] use network helpers, part 5 Geliang Tang
2024-05-22 9:23 ` [PATCH bpf-next v3 1/8] selftests/bpf: Drop struct post_socket_opts Geliang Tang
@ 2024-05-22 9:23 ` Geliang Tang
2024-05-23 19:06 ` Martin KaFai Lau
2024-05-22 9:23 ` [PATCH bpf-next v3 3/8] selftests/bpf: Drop type parameter of connect_to_addr Geliang Tang
` (5 subsequent siblings)
7 siblings, 1 reply; 10+ messages in thread
From: Geliang Tang @ 2024-05-22 9:23 UTC (permalink / raw)
To: Andrii Nakryiko, Eduard Zingerman, Mykola Lysenko,
Alexei Starovoitov, Daniel Borkmann, Martin KaFai Lau, Song Liu,
Yonghong Song, John Fastabend, KP Singh, Stanislav Fomichev,
Hao Luo, Jiri Olsa, Shuah Khan
Cc: Geliang Tang, bpf, linux-kselftest
From: Geliang Tang <tanggeliang@kylinos.cn>
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.
Signed-off-by: Geliang Tang <tanggeliang@kylinos.cn>
---
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(-)
diff --git a/tools/testing/selftests/bpf/network_helpers.c b/tools/testing/selftests/bpf/network_helpers.c
index 4d776b78929c..129ac90e4528 100644
--- a/tools/testing/selftests/bpf/network_helpers.c
+++ b/tools/testing/selftests/bpf/network_helpers.c
@@ -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)
diff --git a/tools/testing/selftests/bpf/network_helpers.h b/tools/testing/selftests/bpf/network_helpers.h
index 40011e0f584b..9de84a8d00fd 100644
--- a/tools/testing/selftests/bpf/network_helpers.h
+++ b/tools/testing/selftests/bpf/network_helpers.h
@@ -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,
diff --git a/tools/testing/selftests/bpf/prog_tests/cls_redirect.c b/tools/testing/selftests/bpf/prog_tests/cls_redirect.c
index 34b59f6baca1..53b81651a6fa 100644
--- a/tools/testing/selftests/bpf/prog_tests/cls_redirect.c
+++ b/tools/testing/selftests/bpf/prog_tests/cls_redirect.c
@@ -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;
diff --git a/tools/testing/selftests/bpf/prog_tests/mptcp.c b/tools/testing/selftests/bpf/prog_tests/mptcp.c
index 4472aa404da0..eff1adf8cbc9 100644
--- a/tools/testing/selftests/bpf/prog_tests/mptcp.c
+++ b/tools/testing/selftests/bpf/prog_tests/mptcp.c
@@ -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)
diff --git a/tools/testing/selftests/bpf/prog_tests/sk_assign.c b/tools/testing/selftests/bpf/prog_tests/sk_assign.c
index 0b9bd1d6f7cc..517d1186e386 100644
--- a/tools/testing/selftests/bpf/prog_tests/sk_assign.c
+++ b/tools/testing/selftests/bpf/prog_tests/sk_assign.c
@@ -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;
diff --git a/tools/testing/selftests/bpf/prog_tests/sockopt_inherit.c b/tools/testing/selftests/bpf/prog_tests/sockopt_inherit.c
index 7cd8be2780ca..d2b2e0924bc4 100644
--- a/tools/testing/selftests/bpf/prog_tests/sockopt_inherit.c
+++ b/tools/testing/selftests/bpf/prog_tests/sockopt_inherit.c
@@ -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;
diff --git a/tools/testing/selftests/bpf/test_tcp_check_syncookie_user.c b/tools/testing/selftests/bpf/test_tcp_check_syncookie_user.c
index aebc58c24dc5..6265f44ae3a4 100644
--- a/tools/testing/selftests/bpf/test_tcp_check_syncookie_user.c
+++ b/tools/testing/selftests/bpf/test_tcp_check_syncookie_user.c
@@ -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;
--
2.43.0
^ permalink raw reply related [flat|nested] 10+ messages in thread* Re: [PATCH bpf-next v3 2/8] selftests/bpf: Drop type parameter of start_server_addr
2024-05-22 9:23 ` [PATCH bpf-next v3 2/8] selftests/bpf: Drop type parameter of start_server_addr Geliang Tang
@ 2024-05-23 19:06 ` Martin KaFai Lau
0 siblings, 0 replies; 10+ messages in thread
From: Martin KaFai Lau @ 2024-05-23 19:06 UTC (permalink / raw)
To: Geliang Tang
Cc: Andrii Nakryiko, Eduard Zingerman, Mykola Lysenko,
Alexei Starovoitov, Daniel Borkmann, Song Liu, Yonghong Song,
John Fastabend, KP Singh, Stanislav Fomichev, Hao Luo, Jiri Olsa,
Shuah Khan, Geliang Tang, bpf, linux-kselftest
On 5/22/24 2:23 AM, Geliang Tang wrote:
> diff --git a/tools/testing/selftests/bpf/prog_tests/sk_assign.c b/tools/testing/selftests/bpf/prog_tests/sk_assign.c
> index 0b9bd1d6f7cc..517d1186e386 100644
> --- a/tools/testing/selftests/bpf/prog_tests/sk_assign.c
> +++ b/tools/testing/selftests/bpf/prog_tests/sk_assign.c
> @@ -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
> + };
> 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);
^ permalink raw reply [flat|nested] 10+ messages in thread
* [PATCH bpf-next v3 3/8] selftests/bpf: Drop type parameter of connect_to_addr
2024-05-22 9:23 [PATCH bpf-next v3 0/8] use network helpers, part 5 Geliang Tang
2024-05-22 9:23 ` [PATCH bpf-next v3 1/8] selftests/bpf: Drop struct post_socket_opts Geliang Tang
2024-05-22 9:23 ` [PATCH bpf-next v3 2/8] selftests/bpf: Drop type parameter of start_server_addr Geliang Tang
@ 2024-05-22 9:23 ` Geliang Tang
2024-05-22 9:23 ` [PATCH bpf-next v3 4/8] selftests/bpf: Add start_server_str helper Geliang Tang
` (4 subsequent siblings)
7 siblings, 0 replies; 10+ messages in thread
From: Geliang Tang @ 2024-05-22 9:23 UTC (permalink / raw)
To: Andrii Nakryiko, Eduard Zingerman, Mykola Lysenko,
Alexei Starovoitov, Daniel Borkmann, Martin KaFai Lau, Song Liu,
Yonghong Song, John Fastabend, KP Singh, Stanislav Fomichev,
Hao Luo, Jiri Olsa, Shuah Khan
Cc: Geliang Tang, bpf, linux-kselftest
From: Geliang Tang <tanggeliang@kylinos.cn>
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.
Signed-off-by: Geliang Tang <tanggeliang@kylinos.cn>
---
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(-)
diff --git a/tools/testing/selftests/bpf/network_helpers.c b/tools/testing/selftests/bpf/network_helpers.c
index 129ac90e4528..49e807ffcccb 100644
--- a/tools/testing/selftests/bpf/network_helpers.c
+++ b/tools/testing/selftests/bpf/network_helpers.c
@@ -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 add
if (!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;
diff --git a/tools/testing/selftests/bpf/network_helpers.h b/tools/testing/selftests/bpf/network_helpers.h
index 9de84a8d00fd..c925c771bd98 100644
--- a/tools/testing/selftests/bpf/network_helpers.h
+++ b/tools/testing/selftests/bpf/network_helpers.h
@@ -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);
diff --git a/tools/testing/selftests/bpf/prog_tests/cls_redirect.c b/tools/testing/selftests/bpf/prog_tests/cls_redirect.c
index 53b81651a6fa..1f1b9f0c2ffc 100644
--- a/tools/testing/selftests/bpf/prog_tests/cls_redirect.c
+++ b/tools/testing/selftests/bpf/prog_tests/cls_redirect.c
@@ -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;
diff --git a/tools/testing/selftests/bpf/prog_tests/sk_assign.c b/tools/testing/selftests/bpf/prog_tests/sk_assign.c
index 517d1186e386..91f65b407f3a 100644
--- a/tools/testing/selftests/bpf/prog_tests/sk_assign.c
+++ b/tools/testing/selftests/bpf/prog_tests/sk_assign.c
@@ -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;
diff --git a/tools/testing/selftests/bpf/prog_tests/sock_addr.c b/tools/testing/selftests/bpf/prog_tests/sock_addr.c
index b880c564a204..244686d582cb 100644
--- a/tools/testing/selftests/bpf/prog_tests/sock_addr.c
+++ b/tools/testing/selftests/bpf/prog_tests/sock_addr.c
@@ -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;
--
2.43.0
^ permalink raw reply related [flat|nested] 10+ messages in thread* [PATCH bpf-next v3 4/8] selftests/bpf: Add start_server_str helper
2024-05-22 9:23 [PATCH bpf-next v3 0/8] use network helpers, part 5 Geliang Tang
` (2 preceding siblings ...)
2024-05-22 9:23 ` [PATCH bpf-next v3 3/8] selftests/bpf: Drop type parameter of connect_to_addr Geliang Tang
@ 2024-05-22 9:23 ` Geliang Tang
2024-05-22 9:23 ` [PATCH bpf-next v3 5/8] selftests/bpf: Use post_socket_cb in connect_to_fd_opts Geliang Tang
` (3 subsequent siblings)
7 siblings, 0 replies; 10+ messages in thread
From: Geliang Tang @ 2024-05-22 9:23 UTC (permalink / raw)
To: Andrii Nakryiko, Eduard Zingerman, Mykola Lysenko,
Alexei Starovoitov, Daniel Borkmann, Martin KaFai Lau, Song Liu,
Yonghong Song, John Fastabend, KP Singh, Stanislav Fomichev,
Hao Luo, Jiri Olsa, Shuah Khan
Cc: Geliang Tang, bpf, linux-kselftest
From: Geliang Tang <tanggeliang@kylinos.cn>
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.
Signed-off-by: Geliang Tang <tanggeliang@kylinos.cn>
---
tools/testing/selftests/bpf/network_helpers.c | 22 ++++++++++++++-----
tools/testing/selftests/bpf/network_helpers.h | 2 ++
2 files changed, 18 insertions(+), 6 deletions(-)
diff --git a/tools/testing/selftests/bpf/network_helpers.c b/tools/testing/selftests/bpf/network_helpers.c
index 49e807ffcccb..ba80005d2d7a 100644
--- a/tools/testing/selftests/bpf/network_helpers.c
+++ b/tools/testing/selftests/bpf/network_helpers.c
@@ -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)
diff --git a/tools/testing/selftests/bpf/network_helpers.h b/tools/testing/selftests/bpf/network_helpers.h
index c925c771bd98..d1d28d4f92bd 100644
--- a/tools/testing/selftests/bpf/network_helpers.h
+++ b/tools/testing/selftests/bpf/network_helpers.h
@@ -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,
--
2.43.0
^ permalink raw reply related [flat|nested] 10+ messages in thread* [PATCH bpf-next v3 5/8] selftests/bpf: Use post_socket_cb in connect_to_fd_opts
2024-05-22 9:23 [PATCH bpf-next v3 0/8] use network helpers, part 5 Geliang Tang
` (3 preceding siblings ...)
2024-05-22 9:23 ` [PATCH bpf-next v3 4/8] selftests/bpf: Add start_server_str helper Geliang Tang
@ 2024-05-22 9:23 ` Geliang Tang
2024-05-22 9:23 ` [PATCH bpf-next v3 6/8] selftests/bpf: Use start_server_str in bpf_tcp_ca Geliang Tang
` (2 subsequent siblings)
7 siblings, 0 replies; 10+ messages in thread
From: Geliang Tang @ 2024-05-22 9:23 UTC (permalink / raw)
To: Andrii Nakryiko, Eduard Zingerman, Mykola Lysenko,
Alexei Starovoitov, Daniel Borkmann, Martin KaFai Lau, Song Liu,
Yonghong Song, John Fastabend, KP Singh, Stanislav Fomichev,
Hao Luo, Jiri Olsa, Shuah Khan
Cc: Geliang Tang, bpf, linux-kselftest
From: Geliang Tang <tanggeliang@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 <tanggeliang@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 ba80005d2d7a..6f80c0285464 100644
--- a/tools/testing/selftests/bpf/network_helpers.c
+++ b/tools/testing/selftests/bpf/network_helpers.c
@@ -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)
diff --git a/tools/testing/selftests/bpf/network_helpers.h b/tools/testing/selftests/bpf/network_helpers.h
index d1d28d4f92bd..24c873963742 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
^ permalink raw reply related [flat|nested] 10+ messages in thread* [PATCH bpf-next v3 6/8] selftests/bpf: Use start_server_str in bpf_tcp_ca
2024-05-22 9:23 [PATCH bpf-next v3 0/8] use network helpers, part 5 Geliang Tang
` (4 preceding siblings ...)
2024-05-22 9:23 ` [PATCH bpf-next v3 5/8] selftests/bpf: Use post_socket_cb in connect_to_fd_opts Geliang Tang
@ 2024-05-22 9:23 ` Geliang Tang
2024-05-22 9:23 ` [PATCH bpf-next v3 7/8] selftests/bpf: Use connect_to_fd_opts in do_test " Geliang Tang
2024-05-22 9:23 ` [PATCH bpf-next v3 8/8] selftests/bpf: Add post_connect_cb callback Geliang Tang
7 siblings, 0 replies; 10+ messages in thread
From: Geliang Tang @ 2024-05-22 9:23 UTC (permalink / raw)
To: Andrii Nakryiko, Eduard Zingerman, Mykola Lysenko,
Alexei Starovoitov, Daniel Borkmann, Martin KaFai Lau, Song Liu,
Yonghong Song, John Fastabend, KP Singh, Stanislav Fomichev,
Hao Luo, Jiri Olsa, Shuah Khan
Cc: Geliang Tang, bpf, linux-kselftest
From: Geliang Tang <tanggeliang@kylinos.cn>
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().
Signed-off-by: Geliang Tang <tanggeliang@kylinos.cn>
---
tools/testing/selftests/bpf/network_helpers.c | 3 +-
.../selftests/bpf/prog_tests/bpf_tcp_ca.c | 66 +++++++++++++++----
2 files changed, 57 insertions(+), 12 deletions(-)
diff --git a/tools/testing/selftests/bpf/network_helpers.c b/tools/testing/selftests/bpf/network_helpers.c
index 6f80c0285464..fae4add78f4d 100644
--- a/tools/testing/selftests/bpf/network_helpers.c
+++ b/tools/testing/selftests/bpf/network_helpers.c
@@ -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;
}
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 c9dd2a3d3218..d37364c5beac 100644
--- a/tools/testing/selftests/bpf/prog_tests/bpf_tcp_ca.c
+++ b/tools/testing/selftests/bpf/prog_tests/bpf_tcp_ca.c
@@ -38,12 +38,14 @@ 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)
{
+ struct cb_opts *co = (struct cb_opts *)opts->cb_opts;
int lfd = -1, fd = -1;
int err;
- lfd = start_server(AF_INET6, SOCK_STREAM, NULL, 0, 0);
+ lfd = start_server_str(AF_INET6, NULL, 0, opts);
if (!ASSERT_NEQ(lfd, -1, "socket"))
return;
@@ -53,7 +55,7 @@ static void do_test(const char *tcp_ca, const struct bpf_map *sk_stg_map)
return;
}
- if (settcpca(lfd, tcp_ca) || settcpca(fd, tcp_ca))
+ if (settcpca(fd, co->cc))
goto done;
if (sk_stg_map) {
@@ -95,6 +97,13 @@ static int cc_cb(int fd, void *opts)
static void test_cubic(void)
{
+ struct cb_opts cb_opts = {
+ .cc = "bpf_cubic",
+ };
+ struct network_helper_opts opts = {
+ .post_socket_cb = cc_cb,
+ .cb_opts = &cb_opts,
+ };
struct bpf_cubic *cubic_skel;
struct bpf_link *link;
@@ -108,7 +117,7 @@ static void test_cubic(void)
return;
}
- do_test("bpf_cubic", NULL);
+ do_test(&opts, NULL);
ASSERT_EQ(cubic_skel->bss->bpf_cubic_acked_called, 1, "pkts_acked called");
@@ -118,6 +127,13 @@ static void test_cubic(void)
static void test_dctcp(void)
{
+ struct cb_opts cb_opts = {
+ .cc = "bpf_dctcp",
+ };
+ struct network_helper_opts opts = {
+ .post_socket_cb = cc_cb,
+ .cb_opts = &cb_opts,
+ };
struct bpf_dctcp *dctcp_skel;
struct bpf_link *link;
@@ -131,7 +147,7 @@ static void test_dctcp(void)
return;
}
- do_test("bpf_dctcp", 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");
bpf_link__destroy(link);
@@ -313,6 +329,13 @@ static void test_unsupp_cong_op(void)
static void test_update_ca(void)
{
+ struct cb_opts cb_opts = {
+ .cc = "tcp_ca_update",
+ };
+ struct network_helper_opts opts = {
+ .post_socket_cb = cc_cb,
+ .cb_opts = &cb_opts,
+ };
struct tcp_ca_update *skel;
struct bpf_link *link;
int saved_ca1_cnt;
@@ -325,14 +348,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("tcp_ca_update", NULL);
+ do_test(&opts, NULL);
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("tcp_ca_update", NULL);
+ do_test(&opts, NULL);
ASSERT_EQ(skel->bss->ca1_cnt, saved_ca1_cnt, "ca2_ca1_cnt");
ASSERT_GT(skel->bss->ca2_cnt, 0, "ca2_ca2_cnt");
@@ -342,6 +365,13 @@ static void test_update_ca(void)
static void test_update_wrong(void)
{
+ struct cb_opts cb_opts = {
+ .cc = "tcp_ca_update",
+ };
+ struct network_helper_opts opts = {
+ .post_socket_cb = cc_cb,
+ .cb_opts = &cb_opts,
+ };
struct tcp_ca_update *skel;
struct bpf_link *link;
int saved_ca1_cnt;
@@ -354,14 +384,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("tcp_ca_update", NULL);
+ do_test(&opts, NULL);
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("tcp_ca_update", NULL);
+ do_test(&opts, NULL);
ASSERT_GT(skel->bss->ca1_cnt, saved_ca1_cnt, "ca2_ca1_cnt");
bpf_link__destroy(link);
@@ -370,6 +400,13 @@ static void test_update_wrong(void)
static void test_mixed_links(void)
{
+ struct cb_opts cb_opts = {
+ .cc = "tcp_ca_update",
+ };
+ struct network_helper_opts opts = {
+ .post_socket_cb = cc_cb,
+ .cb_opts = &cb_opts,
+ };
struct tcp_ca_update *skel;
struct bpf_link *link, *link_nl;
int err;
@@ -384,7 +421,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("tcp_ca_update", NULL);
+ do_test(&opts, NULL);
ASSERT_GT(skel->bss->ca1_cnt, 0, "ca1_ca1_cnt");
err = bpf_link__update_map(link, skel->maps.ca_no_link);
@@ -471,6 +508,13 @@ static void test_tcp_ca_kfunc(void)
static void test_cc_cubic(void)
{
+ struct cb_opts cb_opts = {
+ .cc = "bpf_cc_cubic",
+ };
+ struct network_helper_opts opts = {
+ .post_socket_cb = cc_cb,
+ .cb_opts = &cb_opts,
+ };
struct bpf_cc_cubic *cc_cubic_skel;
struct bpf_link *link;
@@ -484,7 +528,7 @@ static void test_cc_cubic(void)
return;
}
- do_test("bpf_cc_cubic", NULL);
+ do_test(&opts, NULL);
bpf_link__destroy(link);
bpf_cc_cubic__destroy(cc_cubic_skel);
--
2.43.0
^ permalink raw reply related [flat|nested] 10+ messages in thread* [PATCH bpf-next v3 7/8] selftests/bpf: Use connect_to_fd_opts in do_test in bpf_tcp_ca
2024-05-22 9:23 [PATCH bpf-next v3 0/8] use network helpers, part 5 Geliang Tang
` (5 preceding siblings ...)
2024-05-22 9:23 ` [PATCH bpf-next v3 6/8] selftests/bpf: Use start_server_str in bpf_tcp_ca Geliang Tang
@ 2024-05-22 9:23 ` Geliang Tang
2024-05-22 9:23 ` [PATCH bpf-next v3 8/8] selftests/bpf: Add post_connect_cb callback Geliang Tang
7 siblings, 0 replies; 10+ messages in thread
From: Geliang Tang @ 2024-05-22 9:23 UTC (permalink / raw)
To: Andrii Nakryiko, Eduard Zingerman, Mykola Lysenko,
Alexei Starovoitov, Daniel Borkmann, Martin KaFai Lau, Song Liu,
Yonghong Song, John Fastabend, KP Singh, Stanislav Fomichev,
Hao Luo, Jiri Olsa, Shuah Khan
Cc: Geliang Tang, bpf, linux-kselftest
From: Geliang Tang <tanggeliang@kylinos.cn>
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.
Signed-off-by: Geliang Tang <tanggeliang@kylinos.cn>
---
.../selftests/bpf/prog_tests/bpf_tcp_ca.c | 36 +++++++++----------
1 file changed, 16 insertions(+), 20 deletions(-)
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 d37364c5beac..4c85b443a78c 100644
--- a/tools/testing/selftests/bpf/prog_tests/bpf_tcp_ca.c
+++ b/tools/testing/selftests/bpf/prog_tests/bpf_tcp_ca.c
@@ -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");
--
2.43.0
^ permalink raw reply related [flat|nested] 10+ messages in thread* [PATCH bpf-next v3 8/8] selftests/bpf: Add post_connect_cb callback
2024-05-22 9:23 [PATCH bpf-next v3 0/8] use network helpers, part 5 Geliang Tang
` (6 preceding siblings ...)
2024-05-22 9:23 ` [PATCH bpf-next v3 7/8] selftests/bpf: Use connect_to_fd_opts in do_test " Geliang Tang
@ 2024-05-22 9:23 ` Geliang Tang
7 siblings, 0 replies; 10+ messages in thread
From: Geliang Tang @ 2024-05-22 9:23 UTC (permalink / raw)
To: Andrii Nakryiko, Eduard Zingerman, Mykola Lysenko,
Alexei Starovoitov, Daniel Borkmann, Martin KaFai Lau, Song Liu,
Yonghong Song, John Fastabend, KP Singh, Stanislav Fomichev,
Hao Luo, Jiri Olsa, Shuah Khan
Cc: Geliang Tang, bpf, linux-kselftest
From: Geliang Tang <tanggeliang@kylinos.cn>
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@kylinos.cn>
---
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 fae4add78f4d..c61da0a3197d 100644
--- a/tools/testing/selftests/bpf/network_helpers.c
+++ b/tools/testing/selftests/bpf/network_helpers.c
@@ -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:
diff --git a/tools/testing/selftests/bpf/network_helpers.h b/tools/testing/selftests/bpf/network_helpers.h
index 24c873963742..15b6a01c54c1 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 4c85b443a78c..467774dd9dd9 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, 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
^ permalink raw reply related [flat|nested] 10+ messages in thread