selftests/bpf: Use start_server_addr in test_sock_addr

Include network_helpers.h in test_sock_addr.c, use the newly added public
helper start_server_addr() instead of the local defined function
start_server(). This can avoid duplicate code.

In order to use functions defined in network_helpers.c in test_sock_addr.c,
Makefile needs to be updated and <Linux/err.h> needs to be included in
network_helpers.h to avoid compilation errors.

Signed-off-by: Geliang Tang <tanggeliang@kylinos.cn>
Link: https://lore.kernel.org/r/3101f57bde5502383eb41723c8956cc26be06893.1713868264.git.tanggeliang@kylinos.cn
Signed-off-by: Martin KaFai Lau <martin.lau@kernel.org>

diff --git a/tools/testing/selftests/bpf/Makefile b/tools/testing/selftests/bpf/Makefile
index edc73f8f5aefbcddd1b6bf0d698c23a41e54ba46..0ce5c3c26b5ce0147ae175647c3306024bcefd61 100644 (file)
--- a/tools/testing/selftests/bpf/Makefile
+++ b/tools/testing/selftests/bpf/Makefile
@@ -290,11 +290,12 @@ UNPRIV_HELPERS  := $(OUTPUT)/unpriv_helpers.o
 TRACE_HELPERS  := $(OUTPUT)/trace_helpers.o
 JSON_WRITER            := $(OUTPUT)/json_writer.o
 CAP_HELPERS    := $(OUTPUT)/cap_helpers.o
+NETWORK_HELPERS := $(OUTPUT)/network_helpers.o
 
 $(OUTPUT)/test_dev_cgroup: $(CGROUP_HELPERS) $(TESTING_HELPERS)
 $(OUTPUT)/test_skb_cgroup_id_user: $(CGROUP_HELPERS) $(TESTING_HELPERS)
 $(OUTPUT)/test_sock: $(CGROUP_HELPERS) $(TESTING_HELPERS)
-$(OUTPUT)/test_sock_addr: $(CGROUP_HELPERS) $(TESTING_HELPERS)
+$(OUTPUT)/test_sock_addr: $(CGROUP_HELPERS) $(TESTING_HELPERS) $(NETWORK_HELPERS)
 $(OUTPUT)/test_sockmap: $(CGROUP_HELPERS) $(TESTING_HELPERS)
 $(OUTPUT)/test_tcpnotify_user: $(CGROUP_HELPERS) $(TESTING_HELPERS) $(TRACE_HELPERS)
 $(OUTPUT)/get_cgroup_id_user: $(CGROUP_HELPERS) $(TESTING_HELPERS)

diff --git a/tools/testing/selftests/bpf/network_helpers.h b/tools/testing/selftests/bpf/network_helpers.h
index aef297dfa6cafacc28c10445c13f84365932403f..5a8c5cf4ec1aa725f1e7d41ae56b77fa1e2f79df 100644 (file)
--- a/tools/testing/selftests/bpf/network_helpers.h
+++ b/tools/testing/selftests/bpf/network_helpers.h
@@ -11,6 +11,7 @@ typedef __u16 __sum16;
 #include <linux/ipv6.h>
 #include <linux/ethtool.h>
 #include <linux/sockios.h>
+#include <linux/err.h>
 #include <netinet/tcp.h>
 #include <bpf/bpf_endian.h>
 #include <net/if.h>

diff --git a/tools/testing/selftests/bpf/test_sock_addr.c b/tools/testing/selftests/bpf/test_sock_addr.c
index 80c42583f5977e49a8ebe0145ef84347e7fe909f..ca4fb142b7b7fa2c225855c12644e23adf1c6757 100644 (file)
--- a/tools/testing/selftests/bpf/test_sock_addr.c
+++ b/tools/testing/selftests/bpf/test_sock_addr.c
@@ -19,6 +19,7 @@
 #include <bpf/libbpf.h>
 
 #include "cgroup_helpers.h"
+#include "network_helpers.h"
 #include "testing_helpers.h"
 #include "bpf_util.h"
 
@@ -939,37 +940,6 @@ static int cmp_peer_addr(int sock1, const struct sockaddr_storage *addr2)
        return cmp_sock_addr(getpeername, sock1, addr2, /*cmp_port*/ 1);
 }
 
-static int start_server(int type, const struct sockaddr_storage *addr,
-                       socklen_t addr_len)
-{
-       int fd;
-
-       fd = socket(addr->ss_family, type, 0);
-       if (fd == -1) {
-               log_err("Failed to create server socket");
-               goto out;
-       }
-
-       if (bind(fd, (const struct sockaddr *)addr, addr_len) == -1) {
-               log_err("Failed to bind server socket");
-               goto close_out;
-       }
-
-       if (type == SOCK_STREAM) {
-               if (listen(fd, 128) == -1) {
-                       log_err("Failed to listen on server socket");
-                       goto close_out;
-               }
-       }
-
-       goto out;
-close_out:
-       close(fd);
-       fd = -1;
-out:
-       return fd;
-}
-
 static int connect_to_server(int type, const struct sockaddr_storage *addr,
                             socklen_t addr_len)
 {
@@ -1178,7 +1148,7 @@ static int run_bind_test_case(const struct sock_addr_test *test)
        if (init_addrs(test, &requested_addr, &expected_addr, NULL))
                goto err;
 
-       servfd = start_server(test->type, &requested_addr, addr_len);
+       servfd = start_server_addr(test->type, &requested_addr, addr_len, NULL);
        if (servfd == -1)
                goto err;
 
@@ -1214,7 +1184,7 @@ static int run_connect_test_case(const struct sock_addr_test *test)
                goto err;
 
        /* Prepare server to connect to */
-       servfd = start_server(test->type, &expected_addr, addr_len);
+       servfd = start_server_addr(test->type, &expected_addr, addr_len, NULL);
        if (servfd == -1)
                goto err;
 
@@ -1271,7 +1241,7 @@ static int run_xmsg_test_case(const struct sock_addr_test *test, int max_cmsg)
                goto err;
 
        /* Prepare server to sendmsg to */
-       servfd = start_server(test->type, &server_addr, addr_len);
+       servfd = start_server_addr(test->type, &server_addr, addr_len, NULL);
        if (servfd == -1)
                goto err;