[bpf-next,v2,01/14] selftests/bpf: Add start_server_addr helper

Commit Message

Geliang Tang April 11, 2024, 1:03 a.m. UTC

From: Geliang Tang <[e-mail]>

In order to pair up with connect_to addr(), this patch adds a new helper
start_server_addr(), which is a wrapper of __start_server(), and accepts an
argument 'addr' of 'struct sockaddr' type instead of a string type argument
like start_server().

Signed-off-by: Geliang Tang <[e-mail]>
---
 tools/testing/selftests/bpf/network_helpers.c | 5 +++++
 tools/testing/selftests/bpf/network_helpers.h | 1 +
 2 files changed, 6 insertions(+)

Comments

Martin KaFai Lau April 11, 2024, 10:06 p.m. UTC | #1

On 4/10/24 6:03 PM, Geliang Tang wrote:
> From: Geliang Tang <[e-mail]>
> 
> In order to pair up with connect_to addr(), this patch adds a new helper
> start_server_addr(), which is a wrapper of __start_server(), and accepts an
> argument 'addr' of 'struct sockaddr' type instead of a string type argument
> like start_server().

Thanks for the cleanup work in the set.

> 
> Signed-off-by: Geliang Tang <[e-mail]>
> ---
>   tools/testing/selftests/bpf/network_helpers.c | 5 +++++
>   tools/testing/selftests/bpf/network_helpers.h | 1 +
>   2 files changed, 6 insertions(+)
> 
> diff --git a/tools/testing/selftests/bpf/network_helpers.c b/tools/testing/selftests/bpf/network_helpers.c
> index ca16ef2b648e..7ddeb6698ec7 100644
> --- a/tools/testing/selftests/bpf/network_helpers.c
> +++ b/tools/testing/selftests/bpf/network_helpers.c
> @@ -185,6 +185,11 @@ int *start_reuseport_server(int family, int type, const char *addr_str,
>   	return NULL;
>   }
>   
> +int start_server_addr(const struct sockaddr *addr, socklen_t addrlen, int type)

nit. Move "int type" to the first argument which is closer to how the socket 
syscall is doing it. It is unfortunate that the existing connect_to_addr() has 
it at the last arg but its usage seems to be limited to sock_addr.c, so should 
be an easy change.

Although there is an "addrlen", connect_to_addr() and some other helpers are 
using "sockaddr_storage" instead of "sockaddr", so may as well use that to have 
a consistent usage.

Also add a network_helper_opts arg at the end for the future needs (e.g. 
timeout), so something like this:

int start_server_addr_opts(int type, const struct sockaddr_storage *addr,
			   socklen_t addrlen,
			   const struct network_helper_opts *opts);

pw-bot: cr

> +{
> +	return __start_server(type, 0, addr, addrlen, 0, 0);
> +}
> +
>   void free_fds(int *fds, unsigned int nr_close_fds)
>   {
>   	if (fds) {
> diff --git a/tools/testing/selftests/bpf/network_helpers.h b/tools/testing/selftests/bpf/network_helpers.h
> index 70f4e4c92733..89f59b65ce76 100644
> --- a/tools/testing/selftests/bpf/network_helpers.h
> +++ b/tools/testing/selftests/bpf/network_helpers.h
> @@ -53,6 +53,7 @@ int start_mptcp_server(int family, 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(const struct sockaddr *addr, socklen_t addrlen, int type);
>   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);

Patch

diff --git a/tools/testing/selftests/bpf/network_helpers.c b/tools/testing/selftests/bpf/network_helpers.c
index ca16ef2b648e..7ddeb6698ec7 100644
--- a/tools/testing/selftests/bpf/network_helpers.c
+++ b/tools/testing/selftests/bpf/network_helpers.c
@@ -185,6 +185,11 @@  int *start_reuseport_server(int family, int type, const char *addr_str,
 	return NULL;
 }
 
+int start_server_addr(const struct sockaddr *addr, socklen_t addrlen, int type)
+{
+	return __start_server(type, 0, addr, addrlen, 0, 0);
+}
+
 void free_fds(int *fds, unsigned int nr_close_fds)
 {
 	if (fds) {
diff --git a/tools/testing/selftests/bpf/network_helpers.h b/tools/testing/selftests/bpf/network_helpers.h
index 70f4e4c92733..89f59b65ce76 100644
--- a/tools/testing/selftests/bpf/network_helpers.h
+++ b/tools/testing/selftests/bpf/network_helpers.h
@@ -53,6 +53,7 @@  int start_mptcp_server(int family, 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(const struct sockaddr *addr, socklen_t addrlen, int type);
 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);