iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

selftests/bpf: Drop struct post_socket_opts

Browse Source 
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>
Link: https://lore.kernel.org/r/f8bda41c7cb9cb6979b2779f89fb3a684234304f.1716638248.git.tanggeliang@kylinos.cn
Signed-off-by: Martin KaFai Lau <martin.lau@kernel.org>
This commit is contained in:
Geliang Tang 2024-05-25 20:08:15 +08:00 committed by Martin KaFai Lau
parent eb4e772627
commit ed31adf687
4 changed files with 5 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
tools/testing/selftests/bpf/network_helpers.c
View File

@ -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;

4
tools/testing/selftests/bpf/network_helpers.h
View File

@ -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 */

2
tools/testing/selftests/bpf/prog_tests/sockopt_inherit.c
View File

@ -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;

4
tools/testing/selftests/bpf/test_tcp_check_syncookie_user.c
View File

@ -139,14 +139,14 @@ out:
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;