selftests: bpf: break up test_progs - spinlock

Move spinlock prog tests into separate files.

Signed-off-by: Stanislav Fomichev <sdf@google.com>
Signed-off-by: Alexei Starovoitov <ast@kernel.org>

diff --git a/tools/testing/selftests/bpf/prog_tests/map_lock.c b/tools/testing/selftests/bpf/prog_tests/map_lock.c
new file mode 100644 (file)
index 0000000..90f8a20
--- /dev/null
+++ b/tools/testing/selftests/bpf/prog_tests/map_lock.c
@@ -0,0 +1,75 @@
+// SPDX-License-Identifier: GPL-2.0
+#include <test_progs.h>
+
+static void *parallel_map_access(void *arg)
+{
+       int err, map_fd = *(u32 *) arg;
+       int vars[17], i, j, rnd, key = 0;
+
+       for (i = 0; i < 10000; i++) {
+               err = bpf_map_lookup_elem_flags(map_fd, &key, vars, BPF_F_LOCK);
+               if (err) {
+                       printf("lookup failed\n");
+                       error_cnt++;
+                       goto out;
+               }
+               if (vars[0] != 0) {
+                       printf("lookup #%d var[0]=%d\n", i, vars[0]);
+                       error_cnt++;
+                       goto out;
+               }
+               rnd = vars[1];
+               for (j = 2; j < 17; j++) {
+                       if (vars[j] == rnd)
+                               continue;
+                       printf("lookup #%d var[1]=%d var[%d]=%d\n",
+                              i, rnd, j, vars[j]);
+                       error_cnt++;
+                       goto out;
+               }
+       }
+out:
+       pthread_exit(arg);
+}
+
+void test_map_lock(void)
+{
+       const char *file = "./test_map_lock.o";
+       int prog_fd, map_fd[2], vars[17] = {};
+       pthread_t thread_id[6];
+       struct bpf_object *obj;
+       int err = 0, key = 0, i;
+       void *ret;
+
+       err = bpf_prog_load(file, BPF_PROG_TYPE_CGROUP_SKB, &obj, &prog_fd);
+       if (err) {
+               printf("test_map_lock:bpf_prog_load errno %d\n", errno);
+               goto close_prog;
+       }
+       map_fd[0] = bpf_find_map(__func__, obj, "hash_map");
+       if (map_fd[0] < 0)
+               goto close_prog;
+       map_fd[1] = bpf_find_map(__func__, obj, "array_map");
+       if (map_fd[1] < 0)
+               goto close_prog;
+
+       bpf_map_update_elem(map_fd[0], &key, vars, BPF_F_LOCK);
+
+       for (i = 0; i < 4; i++)
+               assert(pthread_create(&thread_id[i], NULL,
+                                     &spin_lock_thread, &prog_fd) == 0);
+       for (i = 4; i < 6; i++)
+               assert(pthread_create(&thread_id[i], NULL,
+                                     &parallel_map_access, &map_fd[i - 4]) == 0);
+       for (i = 0; i < 4; i++)
+               assert(pthread_join(thread_id[i], &ret) == 0 &&
+                      ret == (void *)&prog_fd);
+       for (i = 4; i < 6; i++)
+               assert(pthread_join(thread_id[i], &ret) == 0 &&
+                      ret == (void *)&map_fd[i - 4]);
+       goto close_prog_noerr;
+close_prog:
+       error_cnt++;
+close_prog_noerr:
+       bpf_object__close(obj);
+}

diff --git a/tools/testing/selftests/bpf/prog_tests/spinlock.c b/tools/testing/selftests/bpf/prog_tests/spinlock.c
new file mode 100644 (file)
index 0000000..9a573a9
--- /dev/null
+++ b/tools/testing/selftests/bpf/prog_tests/spinlock.c
@@ -0,0 +1,29 @@
+// SPDX-License-Identifier: GPL-2.0
+#include <test_progs.h>
+
+void test_spinlock(void)
+{
+       const char *file = "./test_spin_lock.o";
+       pthread_t thread_id[4];
+       struct bpf_object *obj;
+       int prog_fd;
+       int err = 0, i;
+       void *ret;
+
+       err = bpf_prog_load(file, BPF_PROG_TYPE_CGROUP_SKB, &obj, &prog_fd);
+       if (err) {
+               printf("test_spin_lock:bpf_prog_load errno %d\n", errno);
+               goto close_prog;
+       }
+       for (i = 0; i < 4; i++)
+               assert(pthread_create(&thread_id[i], NULL,
+                                     &spin_lock_thread, &prog_fd) == 0);
+       for (i = 0; i < 4; i++)
+               assert(pthread_join(thread_id[i], &ret) == 0 &&
+                      ret == (void *)&prog_fd);
+       goto close_prog_noerr;
+close_prog:
+       error_cnt++;
+close_prog_noerr:
+       bpf_object__close(obj);
+}

diff --git a/tools/testing/selftests/bpf/test_progs.c b/tools/testing/selftests/bpf/test_progs.c
index 6e41dfab1e756d511d2675ade84477dff6f11a6c..e97b5b0eaf27dc066223df409122ec0fdc87814a 100644 (file)
--- a/tools/testing/selftests/bpf/test_progs.c
+++ b/tools/testing/selftests/bpf/test_progs.c
@@ -829,7 +829,7 @@ static void test_flow_dissector(void)
        bpf_object__close(obj);
 }
 
-static void *test_spin_lock(void *arg)
+void *spin_lock_thread(void *arg)
 {
        __u32 duration, retval;
        int err, prog_fd = *(u32 *) arg;
@@ -842,106 +842,6 @@ static void *test_spin_lock(void *arg)
        pthread_exit(arg);
 }
 
-static void test_spinlock(void)
-{
-       const char *file = "./test_spin_lock.o";
-       pthread_t thread_id[4];
-       struct bpf_object *obj;
-       int prog_fd;
-       int err = 0, i;
-       void *ret;
-
-       err = bpf_prog_load(file, BPF_PROG_TYPE_CGROUP_SKB, &obj, &prog_fd);
-       if (err) {
-               printf("test_spin_lock:bpf_prog_load errno %d\n", errno);
-               goto close_prog;
-       }
-       for (i = 0; i < 4; i++)
-               assert(pthread_create(&thread_id[i], NULL,
-                                     &test_spin_lock, &prog_fd) == 0);
-       for (i = 0; i < 4; i++)
-               assert(pthread_join(thread_id[i], &ret) == 0 &&
-                      ret == (void *)&prog_fd);
-       goto close_prog_noerr;
-close_prog:
-       error_cnt++;
-close_prog_noerr:
-       bpf_object__close(obj);
-}
-
-static void *parallel_map_access(void *arg)
-{
-       int err, map_fd = *(u32 *) arg;
-       int vars[17], i, j, rnd, key = 0;
-
-       for (i = 0; i < 10000; i++) {
-               err = bpf_map_lookup_elem_flags(map_fd, &key, vars, BPF_F_LOCK);
-               if (err) {
-                       printf("lookup failed\n");
-                       error_cnt++;
-                       goto out;
-               }
-               if (vars[0] != 0) {
-                       printf("lookup #%d var[0]=%d\n", i, vars[0]);
-                       error_cnt++;
-                       goto out;
-               }
-               rnd = vars[1];
-               for (j = 2; j < 17; j++) {
-                       if (vars[j] == rnd)
-                               continue;
-                       printf("lookup #%d var[1]=%d var[%d]=%d\n",
-                              i, rnd, j, vars[j]);
-                       error_cnt++;
-                       goto out;
-               }
-       }
-out:
-       pthread_exit(arg);
-}
-
-static void test_map_lock(void)
-{
-       const char *file = "./test_map_lock.o";
-       int prog_fd, map_fd[2], vars[17] = {};
-       pthread_t thread_id[6];
-       struct bpf_object *obj;
-       int err = 0, key = 0, i;
-       void *ret;
-
-       err = bpf_prog_load(file, BPF_PROG_TYPE_CGROUP_SKB, &obj, &prog_fd);
-       if (err) {
-               printf("test_map_lock:bpf_prog_load errno %d\n", errno);
-               goto close_prog;
-       }
-       map_fd[0] = bpf_find_map(__func__, obj, "hash_map");
-       if (map_fd[0] < 0)
-               goto close_prog;
-       map_fd[1] = bpf_find_map(__func__, obj, "array_map");
-       if (map_fd[1] < 0)
-               goto close_prog;
-
-       bpf_map_update_elem(map_fd[0], &key, vars, BPF_F_LOCK);
-
-       for (i = 0; i < 4; i++)
-               assert(pthread_create(&thread_id[i], NULL,
-                                     &test_spin_lock, &prog_fd) == 0);
-       for (i = 4; i < 6; i++)
-               assert(pthread_create(&thread_id[i], NULL,
-                                     &parallel_map_access, &map_fd[i - 4]) == 0);
-       for (i = 0; i < 4; i++)
-               assert(pthread_join(thread_id[i], &ret) == 0 &&
-                      ret == (void *)&prog_fd);
-       for (i = 4; i < 6; i++)
-               assert(pthread_join(thread_id[i], &ret) == 0 &&
-                      ret == (void *)&map_fd[i - 4]);
-       goto close_prog_noerr;
-close_prog:
-       error_cnt++;
-close_prog_noerr:
-       bpf_object__close(obj);
-}
-
 static void sigalrm_handler(int s) {}
 static struct sigaction sigalrm_action = {
        .sa_handler = sigalrm_handler,
@@ -1004,8 +904,6 @@ int main(void)
        test_queue_stack_map(QUEUE);
        test_queue_stack_map(STACK);
        test_flow_dissector();
-       test_spinlock();
-       test_map_lock();
        test_signal_pending(BPF_PROG_TYPE_SOCKET_FILTER);
        test_signal_pending(BPF_PROG_TYPE_FLOW_DISSECTOR);
 

diff --git a/tools/testing/selftests/bpf/test_progs.h b/tools/testing/selftests/bpf/test_progs.h
index 148b5494ed08f42db0ae7654d986ac5d5b1e2f4d..66309327b4f87b77f3657201767e34fbaf7bf49e 100644 (file)
--- a/tools/testing/selftests/bpf/test_progs.h
+++ b/tools/testing/selftests/bpf/test_progs.h
@@ -85,3 +85,4 @@ int bpf_find_map(const char *test, struct bpf_object *obj, const char *name);
 int compare_map_keys(int map1_fd, int map2_fd);
 int compare_stack_ips(int smap_fd, int amap_fd, int stack_trace_len);
 int extract_build_id(char *build_id, size_t size);
+void *spin_lock_thread(void *arg);