From: Stanislav Fomichev <sdf@google.com>
To: netdev@vger.kernel.org, bpf@vger.kernel.org
Cc: davem@davemloft.net, ast@kernel.org, daniel@iogearbox.net,
Stanislav Fomichev <sdf@google.com>
Subject: [PATCH bpf-next v3 6/7] selftests: bpf: break up test_progs - spinlock
Date: Fri, 1 Mar 2019 19:42:18 -0800 [thread overview]
Message-ID: <20190302034219.99480-7-sdf@google.com> (raw)
In-Reply-To: <20190302034219.99480-1-sdf@google.com>
Move spinlock prog tests into separate files.
Signed-off-by: Stanislav Fomichev <sdf@google.com>
---
.../selftests/bpf/prog_tests/map_lock.c | 75 +++++++++++++
.../selftests/bpf/prog_tests/spinlock.c | 29 +++++
tools/testing/selftests/bpf/test_progs.c | 104 +-----------------
tools/testing/selftests/bpf/test_progs.h | 1 +
4 files changed, 106 insertions(+), 103 deletions(-)
create mode 100644 tools/testing/selftests/bpf/prog_tests/map_lock.c
create mode 100644 tools/testing/selftests/bpf/prog_tests/spinlock.c
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
index 000000000000..90f8a206340a
--- /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,
+ ¶llel_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
index 000000000000..9a573a9675d7
--- /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 6e41dfab1e75..e97b5b0eaf27 100644
--- 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,
- ¶llel_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 148b5494ed08..66309327b4f8 100644
--- 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);
--
2.21.0.352.gf09ad66450-goog
next prev parent reply other threads:[~2019-03-02 3:42 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-03-02 3:42 [PATCH bpf-next v3 0/7] selftests: bpf: break up test_progs Stanislav Fomichev
2019-03-02 3:42 ` [PATCH bpf-next v3 1/7] selftests: bpf: break up test_progs - preparations Stanislav Fomichev
2019-03-02 3:42 ` [PATCH bpf-next v3 2/7] selftests: bpf: break up test_progs - pkt access Stanislav Fomichev
2019-03-02 3:42 ` [PATCH bpf-next v3 3/7] selftests: bpf: break up test_progs - xdp Stanislav Fomichev
2019-03-02 3:42 ` [PATCH bpf-next v3 4/7] selftests: bpf: break up test_progs - stackmap Stanislav Fomichev
2019-03-02 3:42 ` [PATCH bpf-next v3 5/7] selftests: bpf: break up test_progs - tracepoint Stanislav Fomichev
2019-03-02 3:42 ` Stanislav Fomichev [this message]
2019-03-02 3:42 ` [PATCH bpf-next v3 7/7] selftests: bpf: break up test_progs - misc Stanislav Fomichev
2019-03-02 19:16 ` [PATCH bpf-next v3 0/7] selftests: bpf: break up test_progs Alexei Starovoitov
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20190302034219.99480-7-sdf@google.com \
--to=sdf@google.com \
--cc=ast@kernel.org \
--cc=bpf@vger.kernel.org \
--cc=daniel@iogearbox.net \
--cc=davem@davemloft.net \
--cc=netdev@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.