selftests/bpf: Drop must_fail from network_helper_opts

The struct member "must_fail" of network_helper_opts() is only used in
cgroup_v1v2 tests, it makes sense to drop it from network_helper_opts.

Return value (fd) of connect_to_fd_opts() and the expect errno (EPERM)
can be checked in cgroup_v1v2.c directly, no need to check them in
connect_fd_to_addr() in network_helpers.c.

This also makes connect_fd_to_addr() function useless. It can be replaced
by connect().

Suggested-by: Martin KaFai Lau <martin.lau@kernel.org>
Signed-off-by: Geliang Tang <tanggeliang@kylinos.cn>
Link: https://lore.kernel.org/r/3faf336019a9a48e2e8951f4cdebf19e3ac6e441.1721282219.git.tanggeliang@kylinos.cn
Signed-off-by: Martin KaFai Lau <martin.lau@kernel.org>
Signed-off-by: Andrii Nakryiko <andrii@kernel.org>

diff --git a/tools/testing/selftests/bpf/network_helpers.c b/tools/testing/selftests/bpf/network_helpers.c
index 15e0e0bb75536c627f06372763e3b599de2c01ec..bc4947afa0b4a6d191fd560c83365de3fe8466e3 100644 (file)
--- a/tools/testing/selftests/bpf/network_helpers.c
+++ b/tools/testing/selftests/bpf/network_helpers.c
@@ -277,33 +277,6 @@ error_close:
        return -1;
 }
 
-static int connect_fd_to_addr(int fd,
-                             const struct sockaddr_storage *addr,
-                             socklen_t addrlen, const bool must_fail)
-{
-       int ret;
-
-       errno = 0;
-       ret = connect(fd, (const struct sockaddr *)addr, addrlen);
-       if (must_fail) {
-               if (!ret) {
-                       log_err("Unexpected success to connect to server");
-                       return -1;
-               }
-               if (errno != EPERM) {
-                       log_err("Unexpected error from connect to server");
-                       return -1;
-               }
-       } else {
-               if (ret) {
-                       log_err("Failed to connect to server");
-                       return -1;
-               }
-       }
-
-       return 0;
-}
-
 int connect_to_addr(int type, const struct sockaddr_storage *addr, socklen_t addrlen,
                    const struct network_helper_opts *opts)
 {
@@ -318,14 +291,13 @@ int connect_to_addr(int type, const struct sockaddr_storage *addr, socklen_t add
                return -1;
        }
 
-       if (connect_fd_to_addr(fd, addr, addrlen, opts->must_fail))
-               goto error_close;
+       if (connect(fd, (const struct sockaddr *)addr, addrlen)) {
+               log_err("Failed to connect to server");
+               save_errno_close(fd);
+               return -1;
+       }
 
        return fd;
-
-error_close:
-       save_errno_close(fd);
-       return -1;
 }
 
 int connect_to_fd_opts(int server_fd, const struct network_helper_opts *opts)
@@ -383,8 +355,10 @@ int connect_fd_to_fd(int client_fd, int server_fd, int timeout_ms)
                return -1;
        }
 
-       if (connect_fd_to_addr(client_fd, &addr, len, false))
+       if (connect(client_fd, (const struct sockaddr *)&addr, len)) {
+               log_err("Failed to connect to server");
                return -1;
+       }
 
        return 0;
 }

diff --git a/tools/testing/selftests/bpf/network_helpers.h b/tools/testing/selftests/bpf/network_helpers.h
index 5b548c0c60dea31449d0c2ea35df1bd1b676aaba..f39eeb5a4594889976a7a90d5916a601397050c5 100644 (file)
--- a/tools/testing/selftests/bpf/network_helpers.h
+++ b/tools/testing/selftests/bpf/network_helpers.h
@@ -23,7 +23,6 @@ typedef __u16 __sum16;
 
 struct network_helper_opts {
        int timeout_ms;
-       bool must_fail;
        int proto;
        /* +ve: Passed to listen() as-is.
         *   0: Default when the test does not set

diff --git a/tools/testing/selftests/bpf/prog_tests/cgroup_v1v2.c b/tools/testing/selftests/bpf/prog_tests/cgroup_v1v2.c
index addf720428f7d5ca5ca91345552f72e02caac45a..64abba72ac10714bd97b911fe8a19ba662733936 100644 (file)
--- a/tools/testing/selftests/bpf/prog_tests/cgroup_v1v2.c
+++ b/tools/testing/selftests/bpf/prog_tests/cgroup_v1v2.c
@@ -9,9 +9,6 @@
 
 static int run_test(int cgroup_fd, int server_fd, bool classid)
 {
-       struct network_helper_opts opts = {
-               .must_fail = true,
-       };
        struct connect4_dropper *skel;
        int fd, err = 0;
 
@@ -32,11 +29,16 @@ static int run_test(int cgroup_fd, int server_fd, bool classid)
                goto out;
        }
 
-       fd = connect_to_fd_opts(server_fd, &opts);
-       if (fd < 0)
+       errno = 0;
+       fd = connect_to_fd_opts(server_fd, NULL);
+       if (fd >= 0) {
+               log_err("Unexpected success to connect to server");
                err = -1;
-       else
                close(fd);
+       } else if (errno != EPERM) {
+               log_err("Unexpected errno from connect to server");
+               err = -1;
+       }
 out:
        connect4_dropper__destroy(skel);
        return err;