| Message ID | eedd84f856fe2c9101ab4b7086276e4830370839.1712796967.git.tanggeliang@kylinos.cn |
|---|---|
| State | New |
| Headers | show |
| Series | [bpf-next,v2,01/14] selftests/bpf: Add start_server_addr helper | expand |
On Thu, 2024-04-11 at 09:03 +0800, Geliang Tang wrote: [...] > static int __start_server(int type, int protocol, const struct sockaddr *addr, > - socklen_t addrlen, int timeout_ms, bool reuseport) > + socklen_t addrlen, int timeout_ms, > + int *(*setsockopt)(int fd, int val), int val) There is no need for setsockopt to return pointer to int, the code could be simplified e.g. as in the patch below (on top of this series): --- diff --git a/tools/testing/selftests/bpf/network_helpers.c b/tools/testing/selftests/bpf/network_helpers.c index f6810bb54edc..30ac03322c61 100644 --- a/tools/testing/selftests/bpf/network_helpers.c +++ b/tools/testing/selftests/bpf/network_helpers.c @@ -80,7 +80,7 @@ int settimeo(int fd, int timeout_ms) static int __start_server(int type, int protocol, const struct sockaddr *addr, socklen_t addrlen, int timeout_ms, - int *(*setsockopt)(int fd, int val), int val) + int (*setsockopt)(int fd, int val), int val) { int fd; @@ -167,7 +167,7 @@ int *start_reuseport_server(int family, int type, const char *addr_str, return NULL; fds[0] = __start_server(type, 0, (struct sockaddr *)&addr, addrlen, - timeout_ms, (void *)setsockopt_reuse, 1); + timeout_ms, setsockopt_reuse, 1); if (fds[0] == -1) goto close_fds; nr_fds = 1; @@ -177,7 +177,7 @@ int *start_reuseport_server(int family, int type, const char *addr_str, for (; nr_fds < nr_listens; nr_fds++) { fds[nr_fds] = __start_server(type, 0, (struct sockaddr *)&addr, - addrlen, timeout_ms, (void *)setsockopt_reuse, 1); + addrlen, timeout_ms, setsockopt_reuse, 1); if (fds[nr_fds] == -1) goto close_fds; } @@ -195,7 +195,7 @@ int start_server_addr(const struct sockaddr *addr, socklen_t addrlen, int type) } int start_server_setsockopt(const struct sockaddr *addr, socklen_t addrlen, int type, - int *(*setsockopt)(int fd, int val), int val) + int (*setsockopt)(int fd, int val), int val) { return __start_server(type, 0, addr, addrlen, 0, setsockopt, val); } diff --git a/tools/testing/selftests/bpf/network_helpers.h b/tools/testing/selftests/bpf/network_helpers.h index 543295230062..0f0f1803e0c8 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, unsigned int nr_listens); int start_server_addr(const struct sockaddr *addr, socklen_t addrlen, int type); int start_server_setsockopt(const struct sockaddr *addr, socklen_t addrlen, int type, - int *(*setsockopt)(int fd, int val), int val); + int (*setsockopt)(int fd, int val), int val); void free_fds(int *fds, unsigned int nr_close_fds); int connect_to_addr(const struct sockaddr_storage *addr, socklen_t len, int type); int connect_to_fd(int server_fd, int timeout_ms); diff --git a/tools/testing/selftests/bpf/prog_tests/sockopt_inherit.c b/tools/testing/selftests/bpf/prog_tests/sockopt_inherit.c index 4fee4b343255..0c39170d543a 100644 --- a/tools/testing/selftests/bpf/prog_tests/sockopt_inherit.c +++ b/tools/testing/selftests/bpf/prog_tests/sockopt_inherit.c @@ -97,7 +97,7 @@ static int start_server_lo(void) if (make_sockaddr(AF_INET, "127.0.0.1", 0, &addr, &addrlen)) return -1; return start_server_setsockopt((struct sockaddr *)&addr, addrlen, - SOCK_STREAM, (void *)setsockopt_loop, 0); + SOCK_STREAM, setsockopt_loop, 0); } static void run_test(int cgroup_fd)
diff --git a/tools/testing/selftests/bpf/network_helpers.c b/tools/testing/selftests/bpf/network_helpers.c index 91b014784dd9..2a389e8c2503 100644 --- a/tools/testing/selftests/bpf/network_helpers.c +++ b/tools/testing/selftests/bpf/network_helpers.c @@ -79,9 +79,9 @@ 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, int protocol, const struct sockaddr *addr, - socklen_t addrlen, int timeout_ms, bool reuseport) + socklen_t addrlen, int timeout_ms, + int *(*setsockopt)(int fd, int val), int val) { - int on = 1; int fd; fd = socket(addr->sa_family, type, protocol); @@ -93,9 +93,8 @@ static int __start_server(int type, int protocol, const struct sockaddr *addr, if (settimeo(fd, timeout_ms)) goto error_close; - if (reuseport && - setsockopt(fd, SOL_SOCKET, SO_REUSEPORT, &on, sizeof(on))) { - log_err("Failed to set SO_REUSEPORT"); + if (setsockopt && setsockopt(fd, val)) { + log_err("Failed to set sockopt"); goto error_close; } @@ -128,7 +127,7 @@ static int start_server_proto(int family, int type, int protocol, return -1; return __start_server(type, protocol, (struct sockaddr *)&addr, - addrlen, timeout_ms, false); + addrlen, timeout_ms, NULL, 0); } int start_server(int family, int type, const char *addr_str, __u16 port, @@ -144,6 +143,11 @@ int start_mptcp_server(int family, const char *addr_str, __u16 port, port, timeout_ms); } +static int setsockopt_reuse(int fd, int on) +{ + return setsockopt(fd, SOL_SOCKET, SO_REUSEPORT, &on, sizeof(on)); +} + int *start_reuseport_server(int family, int type, const char *addr_str, __u16 port, int timeout_ms, unsigned int nr_listens) { @@ -163,7 +167,7 @@ int *start_reuseport_server(int family, int type, const char *addr_str, return NULL; fds[0] = __start_server(type, 0, (struct sockaddr *)&addr, addrlen, - timeout_ms, true); + timeout_ms, (void *)setsockopt_reuse, 1); if (fds[0] == -1) goto close_fds; nr_fds = 1; @@ -173,7 +177,7 @@ int *start_reuseport_server(int family, int type, const char *addr_str, for (; nr_fds < nr_listens; nr_fds++) { fds[nr_fds] = __start_server(type, 0, (struct sockaddr *)&addr, - addrlen, timeout_ms, true); + addrlen, timeout_ms, (void *)setsockopt_reuse, 1); if (fds[nr_fds] == -1) goto close_fds; } @@ -187,7 +191,7 @@ int *start_reuseport_server(int family, int type, const char *addr_str, int start_server_addr(const struct sockaddr *addr, socklen_t addrlen, int type) { - return __start_server(type, 0, addr, addrlen, 0, 0); + return __start_server(type, 0, addr, addrlen, 0, NULL, 0); } void free_fds(int *fds, unsigned int nr_close_fds)