[PATCH bpf-next v2 4/6] selftests/bpf: test_progs: convert test_sockopt_multi

[Stanislav Fomichev]

Move the files, adjust includes, remove entry from Makefile & .gitignore

Signed-off-by: Stanislav Fomichev <s...@google.com>
---
 tools/testing/selftests/bpf/.gitignore        |  1 -
 tools/testing/selftests/bpf/Makefile          |  3 +-
 .../sockopt_multi.c}                          | 62 +++----------------
 3 files changed, 11 insertions(+), 55 deletions(-)
 rename tools/testing/selftests/bpf/{test_sockopt_multi.c => 
prog_tests/sockopt_multi.c} (83%)

diff --git a/tools/testing/selftests/bpf/.gitignore 
b/tools/testing/selftests/bpf/.gitignore
index bc83c1a7ea1b..4143add5a11e 100644
--- a/tools/testing/selftests/bpf/.gitignore
+++ b/tools/testing/selftests/bpf/.gitignore
@@ -39,6 +39,5 @@ libbpf.so.*
 test_hashmap
 test_btf_dump
 xdping
-test_sockopt_multi
 test_sockopt_inherit
 test_tcp_rtt
diff --git a/tools/testing/selftests/bpf/Makefile 
b/tools/testing/selftests/bpf/Makefile
index ea790901297c..271f8ce89c97 100644
--- a/tools/testing/selftests/bpf/Makefile
+++ b/tools/testing/selftests/bpf/Makefile
@@ -29,7 +29,7 @@ TEST_GEN_PROGS = test_verifier test_tag test_maps 
test_lru_map test_lpm_map test
        test_cgroup_storage test_select_reuseport test_section_names \
        test_netcnt test_tcpnotify_user test_sock_fields test_sysctl 
test_hashmap \
        test_btf_dump test_cgroup_attach xdping \
-       test_sockopt_multi test_sockopt_inherit test_tcp_rtt
+       test_sockopt_inherit test_tcp_rtt
 
 BPF_OBJ_FILES = $(patsubst %.c,%.o, $(notdir $(wildcard progs/*.c)))
 TEST_GEN_FILES = $(BPF_OBJ_FILES)
@@ -109,7 +109,6 @@ $(OUTPUT)/test_netcnt: cgroup_helpers.c
 $(OUTPUT)/test_sock_fields: cgroup_helpers.c
 $(OUTPUT)/test_sysctl: cgroup_helpers.c
 $(OUTPUT)/test_cgroup_attach: cgroup_helpers.c
-$(OUTPUT)/test_sockopt_multi: cgroup_helpers.c
 $(OUTPUT)/test_sockopt_inherit: cgroup_helpers.c
 $(OUTPUT)/test_tcp_rtt: cgroup_helpers.c
 
diff --git a/tools/testing/selftests/bpf/test_sockopt_multi.c 
b/tools/testing/selftests/bpf/prog_tests/sockopt_multi.c
similarity index 83%
rename from tools/testing/selftests/bpf/test_sockopt_multi.c
rename to tools/testing/selftests/bpf/prog_tests/sockopt_multi.c
index 4be3441db867..29188d6f5c8d 100644
--- a/tools/testing/selftests/bpf/test_sockopt_multi.c
+++ b/tools/testing/selftests/bpf/prog_tests/sockopt_multi.c
@@ -1,19 +1,5 @@
 // SPDX-License-Identifier: GPL-2.0
-
-#include <error.h>
-#include <errno.h>
-#include <stdio.h>
-#include <unistd.h>
-#include <sys/types.h>
-#include <sys/socket.h>
-#include <netinet/in.h>
-
-#include <linux/filter.h>
-#include <bpf/bpf.h>
-#include <bpf/libbpf.h>
-
-#include "bpf_rlimit.h"
-#include "bpf_util.h"
+#include <test_progs.h>
 #include "cgroup_helpers.h"
 
 static int prog_attach(struct bpf_object *obj, int cgroup_fd, const char 
*title)
@@ -308,7 +294,7 @@ static int run_setsockopt_test(struct bpf_object *obj, int 
cg_parent,
        return err;
 }
 
-int main(int argc, char **argv)
+void test_sockopt_multi(void)
 {
        struct bpf_prog_load_attr attr = {
                .file = "./sockopt_multi.o",
@@ -319,56 +305,28 @@ int main(int argc, char **argv)
        int err = -1;
        int ignored;
 
-       if (setup_cgroup_environment()) {
-               log_err("Failed to setup cgroup environment\n");
-               goto out;
-       }
-
-       cg_parent = create_and_get_cgroup("/parent");
-       if (cg_parent < 0) {
-               log_err("Failed to create cgroup /parent\n");
-               goto out;
-       }
-
-       cg_child = create_and_get_cgroup("/parent/child");
-       if (cg_child < 0) {
-               log_err("Failed to create cgroup /parent/child\n");
+       cg_parent = test__join_cgroup("/parent");
+       if (CHECK_FAIL(cg_parent < 0))
                goto out;
-       }
 
-       if (join_cgroup("/parent/child")) {
-               log_err("Failed to join cgroup /parent/child\n");
+       cg_child = test__join_cgroup("/parent/child");
+       if (CHECK_FAIL(cg_child < 0))
                goto out;
-       }
 
        err = bpf_prog_load_xattr(&attr, &obj, &ignored);
-       if (err) {
-               log_err("Failed to load BPF object");
+       if (CHECK_FAIL(err))
                goto out;
-       }
 
        sock_fd = socket(AF_INET, SOCK_STREAM, 0);
-       if (sock_fd < 0) {
-               log_err("Failed to create socket");
+       if (CHECK_FAIL(sock_fd < 0))
                goto out;
-       }
 
-       if (run_getsockopt_test(obj, cg_parent, cg_child, sock_fd))
-               err = -1;
-       printf("test_sockopt_multi: getsockopt %s\n",
-              err ? "FAILED" : "PASSED");
-
-       if (run_setsockopt_test(obj, cg_parent, cg_child, sock_fd))
-               err = -1;
-       printf("test_sockopt_multi: setsockopt %s\n",
-              err ? "FAILED" : "PASSED");
+       CHECK_FAIL(run_getsockopt_test(obj, cg_parent, cg_child, sock_fd));
+       CHECK_FAIL(run_setsockopt_test(obj, cg_parent, cg_child, sock_fd));
 
 out:
        close(sock_fd);
        bpf_object__close(obj);
        close(cg_child);
        close(cg_parent);
-
-       printf("test_sockopt_multi: %s\n", err ? "FAILED" : "PASSED");
-       return err ? EXIT_FAILURE : EXIT_SUCCESS;
 }
-- 
2.23.0.187.g17f5b7556c-goog