bpf, selftests: Use single cgroup helpers for both test_sockmap/progs

Nearly every user of cgroup helpers does the same sequence of API calls. So
push these into a single helper cgroup_setup_and_join. The cases that do
a bit of extra logic are test_progs which currently uses an env variable
to decide if it needs to setup the cgroup environment or can use an
existingi environment. And then tests that are doing cgroup tests
themselves. We skip these cases for now.

Signed-off-by: John Fastabend <john.fastabend@gmail.com>
Signed-off-by: Alexei Starovoitov <ast@kernel.org>
Acked-by: Andrii Nakryiko <andriin@fb.com>
Link: https://lore.kernel.org/bpf/159623335418.30208.15807461815525100199.stgit@john-XPS-13-9370

diff --git a/tools/testing/selftests/bpf/cgroup_helpers.c b/tools/testing/selftests/bpf/cgroup_helpers.c
index 0fb910df53879ae7f4bb6de8ab6bd5d5ba0092af..033051717ba58da3c2a27a182884fb59c4282a60 100644 (file)
--- a/tools/testing/selftests/bpf/cgroup_helpers.c
+++ b/tools/testing/selftests/bpf/cgroup_helpers.c
@@ -290,3 +290,26 @@ free_mem:
        free(fhp);
        return ret;
 }
+
+int cgroup_setup_and_join(const char *path) {
+       int cg_fd;
+
+       if (setup_cgroup_environment()) {
+               fprintf(stderr, "Failed to setup cgroup environment\n");
+               return -EINVAL;
+       }
+
+       cg_fd = create_and_get_cgroup(path);
+       if (cg_fd < 0) {
+               fprintf(stderr, "Failed to create test cgroup\n");
+               cleanup_cgroup_environment();
+               return cg_fd;
+       }
+
+       if (join_cgroup(path)) {
+               fprintf(stderr, "Failed to join cgroup\n");
+               cleanup_cgroup_environment();
+               return -EINVAL;
+       }
+       return cg_fd;
+}

diff --git a/tools/testing/selftests/bpf/cgroup_helpers.h b/tools/testing/selftests/bpf/cgroup_helpers.h
index d64bb895709078435295e7e8b1d981ff90a16e0b..5fe3d88e4f0d271d77ad1dcec724147620d59c21 100644 (file)
--- a/tools/testing/selftests/bpf/cgroup_helpers.h
+++ b/tools/testing/selftests/bpf/cgroup_helpers.h
@@ -9,6 +9,7 @@
        __FILE__, __LINE__, clean_errno(), ##__VA_ARGS__)
 
 
+int cgroup_setup_and_join(const char *path);
 int create_and_get_cgroup(const char *path);
 int join_cgroup(const char *path);
 int setup_cgroup_environment(void);

diff --git a/tools/testing/selftests/bpf/get_cgroup_id_user.c b/tools/testing/selftests/bpf/get_cgroup_id_user.c
index e8da7b39158d415a125b28891cb345f8db34a212..b8d6aef99db4e138d3c586fd0d8a37e1ab7dac35 100644 (file)
--- a/tools/testing/selftests/bpf/get_cgroup_id_user.c
+++ b/tools/testing/selftests/bpf/get_cgroup_id_user.c
@@ -58,20 +58,10 @@ int main(int argc, char **argv)
        int exit_code = 1;
        char buf[256];
 
-       err = setup_cgroup_environment();
-       if (CHECK(err, "setup_cgroup_environment", "err %d errno %d\n", err,
-                 errno))
+       cgroup_fd = cgroup_setup_and_join(TEST_CGROUP);
+       if (CHECK(cgroup_fd < 0, "cgroup_setup_and_join", "err %d errno %d\n", cgroup_fd, errno))
                return 1;
 
-       cgroup_fd = create_and_get_cgroup(TEST_CGROUP);
-       if (CHECK(cgroup_fd < 0, "create_and_get_cgroup", "err %d errno %d\n",
-                 cgroup_fd, errno))
-               goto cleanup_cgroup_env;
-
-       err = join_cgroup(TEST_CGROUP);
-       if (CHECK(err, "join_cgroup", "err %d errno %d\n", err, errno))
-               goto cleanup_cgroup_env;
-
        err = bpf_prog_load(file, BPF_PROG_TYPE_TRACEPOINT, &obj, &prog_fd);
        if (CHECK(err, "bpf_prog_load", "err %d errno %d\n", err, errno))
                goto cleanup_cgroup_env;

diff --git a/tools/testing/selftests/bpf/test_cgroup_storage.c b/tools/testing/selftests/bpf/test_cgroup_storage.c
index 65572900439118dc17522ae971f5daf91a84db6b..d946252a25bbc3978378b890d37e3535edb5a2c0 100644 (file)
--- a/tools/testing/selftests/bpf/test_cgroup_storage.c
+++ b/tools/testing/selftests/bpf/test_cgroup_storage.c
@@ -74,22 +74,7 @@ int main(int argc, char **argv)
                goto out;
        }
 
-       if (setup_cgroup_environment()) {
-               printf("Failed to setup cgroup environment\n");
-               goto err;
-       }
-
-       /* Create a cgroup, get fd, and join it */
-       cgroup_fd = create_and_get_cgroup(TEST_CGROUP);
-       if (cgroup_fd < 0) {
-               printf("Failed to create test cgroup\n");
-               goto err;
-       }
-
-       if (join_cgroup(TEST_CGROUP)) {
-               printf("Failed to join cgroup\n");
-               goto err;
-       }
+       cgroup_fd = cgroup_setup_and_join(TEST_CGROUP);
 
        /* Attach the bpf program */
        if (bpf_prog_attach(prog_fd, cgroup_fd, BPF_CGROUP_INET_EGRESS, 0)) {

diff --git a/tools/testing/selftests/bpf/test_dev_cgroup.c b/tools/testing/selftests/bpf/test_dev_cgroup.c
index d850fb9076b5d6fd82a481eb39baab30759bc676..804dddd97d4c5b7a51d85e24a2e6bec11e527149 100644 (file)
--- a/tools/testing/selftests/bpf/test_dev_cgroup.c
+++ b/tools/testing/selftests/bpf/test_dev_cgroup.c
@@ -33,21 +33,10 @@ int main(int argc, char **argv)
                goto out;
        }
 
-       if (setup_cgroup_environment()) {
-               printf("Failed to load DEV_CGROUP program\n");
-               goto err;
-       }
-
-       /* Create a cgroup, get fd, and join it */
-       cgroup_fd = create_and_get_cgroup(TEST_CGROUP);
+       cgroup_fd = cgroup_setup_and_join(TEST_CGROUP);
        if (cgroup_fd < 0) {
                printf("Failed to create test cgroup\n");
-               goto err;
-       }
-
-       if (join_cgroup(TEST_CGROUP)) {
-               printf("Failed to join cgroup\n");
-               goto err;
+               goto out;
        }
 
        /* Attach bpf program */

diff --git a/tools/testing/selftests/bpf/test_netcnt.c b/tools/testing/selftests/bpf/test_netcnt.c
index 7a68c90696397ca8a847c3eafc81ea9d455de481..a7b9a69f4fd5fa5457b6218bdff65b3ea25fb522 100644 (file)
--- a/tools/testing/selftests/bpf/test_netcnt.c
+++ b/tools/testing/selftests/bpf/test_netcnt.c
@@ -58,22 +58,9 @@ int main(int argc, char **argv)
                goto out;
        }
 
-       if (setup_cgroup_environment()) {
-               printf("Failed to load bpf program\n");
-               goto err;
-       }
-
-       /* Create a cgroup, get fd, and join it */
-       cgroup_fd = create_and_get_cgroup(TEST_CGROUP);
-       if (cgroup_fd < 0) {
-               printf("Failed to create test cgroup\n");
+       cgroup_fd = cgroup_setup_and_join(TEST_CGROUP);
+       if (cgroup_fd < 0)
                goto err;
-       }
-
-       if (join_cgroup(TEST_CGROUP)) {
-               printf("Failed to join cgroup\n");
-               goto err;
-       }
 
        /* Attach bpf program */
        if (bpf_prog_attach(prog_fd, cgroup_fd, BPF_CGROUP_INET_EGRESS, 0)) {

diff --git a/tools/testing/selftests/bpf/test_skb_cgroup_id_user.c b/tools/testing/selftests/bpf/test_skb_cgroup_id_user.c
index 356351c0ac28e81194ce6cecaa83769e79f0cb99..4a64306728abba9ee7fb47e01b88e4b1ec047ca8 100644 (file)
--- a/tools/testing/selftests/bpf/test_skb_cgroup_id_user.c
+++ b/tools/testing/selftests/bpf/test_skb_cgroup_id_user.c
@@ -160,16 +160,10 @@ int main(int argc, char **argv)
                exit(EXIT_FAILURE);
        }
 
-       if (setup_cgroup_environment())
-               goto err;
-
-       cgfd = create_and_get_cgroup(CGROUP_PATH);
+       cgfd = cgroup_setup_and_join(CGROUP_PATH);
        if (cgfd < 0)
                goto err;
 
-       if (join_cgroup(CGROUP_PATH))
-               goto err;
-
        if (send_packet(argv[1]))
                goto err;
 

diff --git a/tools/testing/selftests/bpf/test_sock.c b/tools/testing/selftests/bpf/test_sock.c
index 52bf14955797d18d8f220a92a475b19c4191d4e2..9613f75388405601e635e706a221e9c37924fbff 100644 (file)
--- a/tools/testing/selftests/bpf/test_sock.c
+++ b/tools/testing/selftests/bpf/test_sock.c
@@ -464,16 +464,10 @@ int main(int argc, char **argv)
        int cgfd = -1;
        int err = 0;
 
-       if (setup_cgroup_environment())
-               goto err;
-
-       cgfd = create_and_get_cgroup(CG_PATH);
+       cgfd = cgroup_setup_and_join(CG_PATH);
        if (cgfd < 0)
                goto err;
 
-       if (join_cgroup(CG_PATH))
-               goto err;
-
        if (run_tests(cgfd))
                goto err;
 

diff --git a/tools/testing/selftests/bpf/test_sock_addr.c b/tools/testing/selftests/bpf/test_sock_addr.c
index 0358814c67dc3c6873bacab5a74bef9f52259fab..b8c72c1d9cf7a46fcbf708dfb9abb3f1eed524c2 100644 (file)
--- a/tools/testing/selftests/bpf/test_sock_addr.c
+++ b/tools/testing/selftests/bpf/test_sock_addr.c
@@ -1638,16 +1638,10 @@ int main(int argc, char **argv)
                exit(err);
        }
 
-       if (setup_cgroup_environment())
-               goto err;
-
-       cgfd = create_and_get_cgroup(CG_PATH);
+       cgfd = cgroup_setup_and_join(CG_PATH);
        if (cgfd < 0)
                goto err;
 
-       if (join_cgroup(CG_PATH))
-               goto err;
-
        if (run_tests(cgfd))
                goto err;
 

diff --git a/tools/testing/selftests/bpf/test_sock_fields.c b/tools/testing/selftests/bpf/test_sock_fields.c
index f0fc103261a40f52004d8df5bfa7dbbeca44191e..6c9f269c396d2f528644e4124130941c8a522bab 100644 (file)
--- a/tools/testing/selftests/bpf/test_sock_fields.c
+++ b/tools/testing/selftests/bpf/test_sock_fields.c
@@ -421,19 +421,11 @@ int main(int argc, char **argv)
        struct bpf_object *obj;
        struct bpf_map *map;
 
-       err = setup_cgroup_environment();
-       CHECK(err, "setup_cgroup_environment()", "err:%d errno:%d",
-             err, errno);
-
-       atexit(cleanup_cgroup_environment);
-
        /* Create a cgroup, get fd, and join it */
-       cgroup_fd = create_and_get_cgroup(TEST_CGROUP);
-       CHECK(cgroup_fd == -1, "create_and_get_cgroup()",
+       cgroup_fd = cgroup_setup_and_join(TEST_CGROUP);
+       CHECK(cgroup_fd < 0, "cgroup_setup_and_join()",
              "cgroup_fd:%d errno:%d", cgroup_fd, errno);
-
-       err = join_cgroup(TEST_CGROUP);
-       CHECK(err, "join_cgroup", "err:%d errno:%d", err, errno);
+       atexit(cleanup_cgroup_environment);
 
        err = bpf_prog_load_xattr(&attr, &obj, &egress_fd);
        CHECK(err, "bpf_prog_load_xattr()", "err:%d", err);

diff --git a/tools/testing/selftests/bpf/test_socket_cookie.c b/tools/testing/selftests/bpf/test_socket_cookie.c
index 15653b0e26eb200621d481d85417b5f82b751e74..154a8fd2a48d97afbd01702763e9e2ff4b513e0d 100644 (file)
--- a/tools/testing/selftests/bpf/test_socket_cookie.c
+++ b/tools/testing/selftests/bpf/test_socket_cookie.c
@@ -191,16 +191,10 @@ int main(int argc, char **argv)
        int cgfd = -1;
        int err = 0;
 
-       if (setup_cgroup_environment())
-               goto err;
-
-       cgfd = create_and_get_cgroup(CG_PATH);
+       cgfd = cgroup_setup_and_join(CG_PATH);
        if (cgfd < 0)
                goto err;
 
-       if (join_cgroup(CG_PATH))
-               goto err;
-
        if (run_test(cgfd))
                goto err;
 

diff --git a/tools/testing/selftests/bpf/test_sockmap.c b/tools/testing/selftests/bpf/test_sockmap.c
index 78789b27e5730267d7b54ad8e1679aac3b35b6b1..9b6fb00dc7a06a51ced6a544117c97b94d2158ad 100644 (file)
--- a/tools/testing/selftests/bpf/test_sockmap.c
+++ b/tools/testing/selftests/bpf/test_sockmap.c
@@ -1963,23 +1963,9 @@ int main(int argc, char **argv)
        }
 
        if (!cg_fd) {
-               if (setup_cgroup_environment()) {
-                       fprintf(stderr, "ERROR: cgroup env failed\n");
-                       return -EINVAL;
-               }
-
-               cg_fd = create_and_get_cgroup(CG_PATH);
-               if (cg_fd < 0) {
-                       fprintf(stderr,
-                               "ERROR: (%i) open cg path failed: %s\n",
-                               cg_fd, strerror(errno));
+               cg_fd = cgroup_setup_and_join(CG_PATH);
+               if (cg_fd < 0)
                        return cg_fd;
-               }
-
-               if (join_cgroup(CG_PATH)) {
-                       fprintf(stderr, "ERROR: failed to join cgroup\n");
-                       return -EINVAL;
-               }
                cg_created = 1;
        }
 

diff --git a/tools/testing/selftests/bpf/test_sysctl.c b/tools/testing/selftests/bpf/test_sysctl.c
index d196e2a4a6e04d3be7b090bf4723218f57ad2f01..a20a919244c0b3c97525b9b7a0d78ec6601cdb38 100644 (file)
--- a/tools/testing/selftests/bpf/test_sysctl.c
+++ b/tools/testing/selftests/bpf/test_sysctl.c
@@ -1619,16 +1619,10 @@ int main(int argc, char **argv)
        int cgfd = -1;
        int err = 0;
 
-       if (setup_cgroup_environment())
-               goto err;
-
-       cgfd = create_and_get_cgroup(CG_PATH);
+       cgfd = cgroup_setup_and_join(CG_PATH);
        if (cgfd < 0)
                goto err;
 
-       if (join_cgroup(CG_PATH))
-               goto err;
-
        if (run_tests(cgfd))
                goto err;
 

diff --git a/tools/testing/selftests/bpf/test_tcpbpf_user.c b/tools/testing/selftests/bpf/test_tcpbpf_user.c
index 3ae127620463da9cfbdd96b236e96f1a91a1c1ae..74a9e49988b63b1c129a22f8ad8a950a861140b4 100644 (file)
--- a/tools/testing/selftests/bpf/test_tcpbpf_user.c
+++ b/tools/testing/selftests/bpf/test_tcpbpf_user.c
@@ -102,16 +102,10 @@ int main(int argc, char **argv)
        __u32 key = 0;
        int rv;
 
-       if (setup_cgroup_environment())
-               goto err;
-
-       cg_fd = create_and_get_cgroup(cg_path);
+       cg_fd = cgroup_setup_and_join(cg_path);
        if (cg_fd < 0)
                goto err;
 
-       if (join_cgroup(cg_path))
-               goto err;
-
        if (bpf_prog_load(file, BPF_PROG_TYPE_SOCK_OPS, &obj, &prog_fd)) {
                printf("FAILED: load_bpf_file failed for: %s\n", file);
                goto err;

diff --git a/tools/testing/selftests/bpf/test_tcpnotify_user.c b/tools/testing/selftests/bpf/test_tcpnotify_user.c
index f9765ddf07613ee26c108c93da57ebc44f9eb2ba..8549b31716ab7390b52ce3fef787a784b6372b1a 100644 (file)
--- a/tools/testing/selftests/bpf/test_tcpnotify_user.c
+++ b/tools/testing/selftests/bpf/test_tcpnotify_user.c
@@ -86,16 +86,10 @@ int main(int argc, char **argv)
        CPU_SET(0, &cpuset);
        pthread_setaffinity_np(pthread_self(), sizeof(cpu_set_t), &cpuset);
 
-       if (setup_cgroup_environment())
-               goto err;
-
-       cg_fd = create_and_get_cgroup(cg_path);
+       cg_fd = cgroup_setup_and_join(cg_path);
        if (cg_fd < 0)
                goto err;
 
-       if (join_cgroup(cg_path))
-               goto err;
-
        if (bpf_prog_load(file, BPF_PROG_TYPE_SOCK_OPS, &obj, &prog_fd)) {
                printf("FAILED: load_bpf_file failed for: %s\n", file);
                goto err;