selftests/bpf: Replace CHECK with ASSERT in test_local_storage

This patch migrates the CHECK macro to ASSERT macro.

Signed-off-by: Martin KaFai Lau <martin.lau@kernel.org>
Link: https://lore.kernel.org/r/20230308065936.1550103-16-martin.lau@linux.dev
Signed-off-by: Alexei Starovoitov <ast@kernel.org>

diff --git a/tools/testing/selftests/bpf/prog_tests/test_local_storage.c b/tools/testing/selftests/bpf/prog_tests/test_local_storage.c
index 9c77cd6..563a9c7 100644 (file)
--- a/tools/testing/selftests/bpf/prog_tests/test_local_storage.c
+++ b/tools/testing/selftests/bpf/prog_tests/test_local_storage.c
@@ -13,8 +13,6 @@
 #include "network_helpers.h"
 #include "task_local_storage_helpers.h"
 
-static unsigned int duration;
-
 #define TEST_STORAGE_VALUE 0xbeefdead
 
 struct storage {
@@ -60,36 +58,30 @@ static bool check_syscall_operations(int map_fd, int obj_fd)
 
        /* Looking up an existing element should fail initially */
        err = bpf_map_lookup_elem_flags(map_fd, &obj_fd, &lookup_val, 0);
-       if (CHECK(!err || errno != ENOENT, "bpf_map_lookup_elem",
-                 "err:%d errno:%d\n", err, errno))
+       if (!ASSERT_EQ(err, -ENOENT, "bpf_map_lookup_elem"))
                return false;
 
        /* Create a new element */
        err = bpf_map_update_elem(map_fd, &obj_fd, &val, BPF_NOEXIST);
-       if (CHECK(err < 0, "bpf_map_update_elem", "err:%d errno:%d\n", err,
-                 errno))
+       if (!ASSERT_OK(err, "bpf_map_update_elem"))
                return false;
 
        /* Lookup the newly created element */
        err = bpf_map_lookup_elem_flags(map_fd, &obj_fd, &lookup_val, 0);
-       if (CHECK(err < 0, "bpf_map_lookup_elem", "err:%d errno:%d", err,
-                 errno))
+       if (!ASSERT_OK(err, "bpf_map_lookup_elem"))
                return false;
 
        /* Check the value of the newly created element */
-       if (CHECK(lookup_val.value != val.value, "bpf_map_lookup_elem",
-                 "value got = %x errno:%d", lookup_val.value, val.value))
+       if (!ASSERT_EQ(lookup_val.value, val.value, "bpf_map_lookup_elem"))
                return false;
 
        err = bpf_map_delete_elem(map_fd, &obj_fd);
-       if (CHECK(err, "bpf_map_delete_elem()", "err:%d errno:%d\n", err,
-                 errno))
+       if (!ASSERT_OK(err, "bpf_map_delete_elem()"))
                return false;
 
        /* The lookup should fail, now that the element has been deleted */
        err = bpf_map_lookup_elem_flags(map_fd, &obj_fd, &lookup_val, 0);
-       if (CHECK(!err || errno != ENOENT, "bpf_map_lookup_elem",
-                 "err:%d errno:%d\n", err, errno))
+       if (!ASSERT_EQ(err, -ENOENT, "bpf_map_lookup_elem"))
                return false;
 
        return true;
@@ -104,35 +96,32 @@ void test_test_local_storage(void)
        char cmd[256];
 
        skel = local_storage__open_and_load();
-       if (CHECK(!skel, "skel_load", "lsm skeleton failed\n"))
+       if (!ASSERT_OK_PTR(skel, "skel_load"))
                goto close_prog;
 
        err = local_storage__attach(skel);
-       if (CHECK(err, "attach", "lsm attach failed: %d\n", err))
+       if (!ASSERT_OK(err, "attach"))
                goto close_prog;
 
        task_fd = sys_pidfd_open(getpid(), 0);
-       if (CHECK(task_fd < 0, "pidfd_open",
-                 "failed to get pidfd err:%d, errno:%d", task_fd, errno))
+       if (!ASSERT_GE(task_fd, 0, "pidfd_open"))
                goto close_prog;
 
        if (!check_syscall_operations(bpf_map__fd(skel->maps.task_storage_map),
                                      task_fd))
                goto close_prog;
 
-       if (CHECK(!mkdtemp(tmp_dir_path), "mkdtemp",
-                 "unable to create tmpdir: %d\n", errno))
+       if (!ASSERT_OK_PTR(mkdtemp(tmp_dir_path), "mkdtemp"))
                goto close_prog;
 
        snprintf(tmp_exec_path, sizeof(tmp_exec_path), "%s/copy_of_rm",
                 tmp_dir_path);
        snprintf(cmd, sizeof(cmd), "cp /bin/rm %s", tmp_exec_path);
-       if (CHECK_FAIL(system(cmd)))
+       if (!ASSERT_OK(system(cmd), "system(cp)"))
                goto close_prog_rmdir;
 
        rm_fd = open(tmp_exec_path, O_RDONLY);
-       if (CHECK(rm_fd < 0, "open", "failed to open %s err:%d, errno:%d",
-                 tmp_exec_path, rm_fd, errno))
+       if (!ASSERT_GE(rm_fd, 0, "open(tmp_exec_path)"))
                goto close_prog_rmdir;
 
        if (!check_syscall_operations(bpf_map__fd(skel->maps.inode_storage_map),
@@ -145,7 +134,7 @@ void test_test_local_storage(void)
         * LSM program.
         */
        err = run_self_unlink(&skel->bss->monitored_pid, tmp_exec_path);
-       if (CHECK(err != EPERM, "run_self_unlink", "err %d want EPERM\n", err))
+       if (!ASSERT_EQ(err, EPERM, "run_self_unlink"))
                goto close_prog_rmdir;
 
        /* Set the process being monitored to be the current process */
@@ -156,18 +145,16 @@ void test_test_local_storage(void)
         */
        snprintf(cmd, sizeof(cmd), "mv %s/copy_of_rm %s/check_null_ptr",
                 tmp_dir_path, tmp_dir_path);
-       if (CHECK_FAIL(system(cmd)))
+       if (!ASSERT_OK(system(cmd), "system(mv)"))
                goto close_prog_rmdir;
 
-       CHECK(skel->data->inode_storage_result != 0, "inode_storage_result",
-             "inode_local_storage not set\n");
+       ASSERT_EQ(skel->data->inode_storage_result, 0, "inode_storage_result");
 
        serv_sk = start_server(AF_INET6, SOCK_STREAM, NULL, 0, 0);
-       if (CHECK(serv_sk < 0, "start_server", "failed to start server\n"))
+       if (!ASSERT_GE(serv_sk, 0, "start_server"))
                goto close_prog_rmdir;
 
-       CHECK(skel->data->sk_storage_result != 0, "sk_storage_result",
-             "sk_local_storage not set\n");
+       ASSERT_EQ(skel->data->sk_storage_result, 0, "sk_storage_result");
 
        if (!check_syscall_operations(bpf_map__fd(skel->maps.sk_storage_map),
                                      serv_sk))