TWxSoftware/twx-linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

selftests/bpf: Add post_socket_cb for network_helper_opts

Browse Source 
__start_server() sets SO_REUSPORT through setsockopt() when the parameter
'reuseport' is set. This patch makes it more flexible by adding a function
pointer post_socket_cb into struct network_helper_opts. The
'const struct post_socket_opts *cb_opts' args in the post_socket_cb is
for the future extension.

The 'reuseport' parameter can be dropped.
Now the original start_reuseport_server() can be implemented by setting a
newly defined reuseport_cb() function pointer to post_socket_cb filed of
struct network_helper_opts.

Signed-off-by: Geliang Tang <tanggeliang@kylinos.cn>
Link: https://lore.kernel.org/r/470cb82f209f055fc7fb39c66c6b090b5b7ed2b2.1714907662.git.tanggeliang@kylinos.cn
Signed-off-by: Martin KaFai Lau <martin.lau@kernel.org>
This commit is contained in:
Geliang Tang
2024-05-05 19:35:08 +08:00
committed by Martin KaFai Lau
parent cbe35adf69
commit 20434d2d89
2 changed files with 18 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
tools/testing/selftests/bpf/network_helpers.c
+15 -9
View File
@@ -81,9 +81,8 @@ int settimeo(int fd, int timeout_ms)
#define save_errno_close(fd) ({ int __save = errno; close(fd); errno = __save; }) #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(int type, const struct sockaddr *addr, socklen_t addrlen,
bool reuseport, const struct network_helper_opts *opts) const struct network_helper_opts *opts)
{ {
int on = 1;
int fd; int fd;
fd = socket(addr->sa_family, type, opts->proto); fd = socket(addr->sa_family, type, opts->proto);
@@ -95,9 +94,8 @@ static int __start_server(int type, const struct sockaddr *addr, socklen_t addrl
if (settimeo(fd, opts->timeout_ms)) if (settimeo(fd, opts->timeout_ms))
goto error_close; goto error_close;
if (reuseport && if (opts->post_socket_cb && opts->post_socket_cb(fd, NULL)) {
setsockopt(fd, SOL_SOCKET, SO_REUSEPORT, &on, sizeof(on))) { log_err("Failed to call post_socket_cb");
log_err("Failed to set SO_REUSEPORT");
goto error_close; goto error_close;
} }
@@ -132,7 +130,14 @@ int start_server(int family, int type, const char *addr_str, __u16 port,
if (make_sockaddr(family, addr_str, port, &addr, &addrlen)) if (make_sockaddr(family, addr_str, port, &addr, &addrlen))
return -1; return -1;
return __start_server(type, (struct sockaddr *)&addr, addrlen, false, &opts); return __start_server(type, (struct sockaddr *)&addr, addrlen, &opts);
}
static int reuseport_cb(int fd, const struct post_socket_opts *opts)
{
int on = 1;
return setsockopt(fd, SOL_SOCKET, SO_REUSEPORT, &on, sizeof(on));
} }
int *start_reuseport_server(int family, int type, const char *addr_str, int *start_reuseport_server(int family, int type, const char *addr_str,
@@ -140,6 +145,7 @@ int *start_reuseport_server(int family, int type, const char *addr_str,
{ {
struct network_helper_opts opts = { struct network_helper_opts opts = {
.timeout_ms = timeout_ms, .timeout_ms = timeout_ms,
.post_socket_cb = reuseport_cb,
}; };
struct sockaddr_storage addr; struct sockaddr_storage addr;
unsigned int nr_fds = 0; unsigned int nr_fds = 0;
@@ -156,7 +162,7 @@ int *start_reuseport_server(int family, int type, const char *addr_str,
if (!fds) if (!fds)
return NULL; return NULL;
fds[0] = __start_server(type, (struct sockaddr *)&addr, addrlen, true, &opts); fds[0] = __start_server(type, (struct sockaddr *)&addr, addrlen, &opts);
if (fds[0] == -1) if (fds[0] == -1)
goto close_fds; goto close_fds;
nr_fds = 1; nr_fds = 1;
@@ -165,7 +171,7 @@ int *start_reuseport_server(int family, int type, const char *addr_str,
goto close_fds; goto close_fds;
for (; nr_fds < nr_listens; nr_fds++) { for (; nr_fds < nr_listens; nr_fds++) {
fds[nr_fds] = __start_server(type, (struct sockaddr *)&addr, addrlen, true, &opts); fds[nr_fds] = __start_server(type, (struct sockaddr *)&addr, addrlen, &opts);
if (fds[nr_fds] == -1) if (fds[nr_fds] == -1)
goto close_fds; goto close_fds;
} }
@@ -183,7 +189,7 @@ int start_server_addr(int type, const struct sockaddr_storage *addr, socklen_t l
if (!opts) if (!opts)
opts = &default_opts; opts = &default_opts;
return __start_server(type, (struct sockaddr *)addr, len, 0, opts); return __start_server(type, (struct sockaddr *)addr, len, opts);
} }
void free_fds(int *fds, unsigned int nr_close_fds) void free_fds(int *fds, unsigned int nr_close_fds)
tools/testing/selftests/bpf/network_helpers.h
+3
View File
@@ -21,6 +21,8 @@ typedef __u16 __sum16;
#define VIP_NUM 5 #define VIP_NUM 5
#define MAGIC_BYTES 123 #define MAGIC_BYTES 123
struct post_socket_opts {};
struct network_helper_opts { struct network_helper_opts {
const char *cc; const char *cc;
int timeout_ms; int timeout_ms;
@@ -28,6 +30,7 @@ struct network_helper_opts {
bool noconnect; bool noconnect;
int type; int type;
int proto; int proto;
int (*post_socket_cb)(int fd, const struct post_socket_opts *opts);
}; };
/* ipv4 test vector */ /* ipv4 test vector */