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 2/7] selftests: bpf: break up test_progs - pkt access
Date: Fri, 1 Mar 2019 19:42:14 -0800 [thread overview]
Message-ID: <20190302034219.99480-3-sdf@google.com> (raw)
In-Reply-To: <20190302034219.99480-1-sdf@google.com>
Move pkt access prog tests into separate files.
Signed-off-by: Stanislav Fomichev <sdf@google•com>
---
.../selftests/bpf/prog_tests/pkt_access.c | 29 +++++++++++
.../selftests/bpf/prog_tests/pkt_md_access.c | 24 +++++++++
tools/testing/selftests/bpf/test_progs.c | 51 -------------------
3 files changed, 53 insertions(+), 51 deletions(-)
create mode 100644 tools/testing/selftests/bpf/prog_tests/pkt_access.c
create mode 100644 tools/testing/selftests/bpf/prog_tests/pkt_md_access.c
diff --git a/tools/testing/selftests/bpf/prog_tests/pkt_access.c b/tools/testing/selftests/bpf/prog_tests/pkt_access.c
new file mode 100644
index 000000000000..4ecfd721a044
--- /dev/null
+++ b/tools/testing/selftests/bpf/prog_tests/pkt_access.c
@@ -0,0 +1,29 @@
+// SPDX-License-Identifier: GPL-2.0
+#include <test_progs.h>
+
+void test_pkt_access(void)
+{
+ const char *file = "./test_pkt_access.o";
+ struct bpf_object *obj;
+ __u32 duration, retval;
+ int err, prog_fd;
+
+ err = bpf_prog_load(file, BPF_PROG_TYPE_SCHED_CLS, &obj, &prog_fd);
+ if (err) {
+ error_cnt++;
+ return;
+ }
+
+ err = bpf_prog_test_run(prog_fd, 100000, &pkt_v4, sizeof(pkt_v4),
+ NULL, NULL, &retval, &duration);
+ CHECK(err || retval, "ipv4",
+ "err %d errno %d retval %d duration %d\n",
+ err, errno, retval, duration);
+
+ err = bpf_prog_test_run(prog_fd, 100000, &pkt_v6, sizeof(pkt_v6),
+ NULL, NULL, &retval, &duration);
+ CHECK(err || retval, "ipv6",
+ "err %d errno %d retval %d duration %d\n",
+ err, errno, retval, duration);
+ bpf_object__close(obj);
+}
diff --git a/tools/testing/selftests/bpf/prog_tests/pkt_md_access.c b/tools/testing/selftests/bpf/prog_tests/pkt_md_access.c
new file mode 100644
index 000000000000..ac0d43435806
--- /dev/null
+++ b/tools/testing/selftests/bpf/prog_tests/pkt_md_access.c
@@ -0,0 +1,24 @@
+// SPDX-License-Identifier: GPL-2.0
+#include <test_progs.h>
+
+void test_pkt_md_access(void)
+{
+ const char *file = "./test_pkt_md_access.o";
+ struct bpf_object *obj;
+ __u32 duration, retval;
+ int err, prog_fd;
+
+ err = bpf_prog_load(file, BPF_PROG_TYPE_SCHED_CLS, &obj, &prog_fd);
+ if (err) {
+ error_cnt++;
+ return;
+ }
+
+ err = bpf_prog_test_run(prog_fd, 10, &pkt_v4, sizeof(pkt_v4),
+ NULL, NULL, &retval, &duration);
+ CHECK(err || retval, "",
+ "err %d errno %d retval %d duration %d\n",
+ err, errno, retval, duration);
+
+ bpf_object__close(obj);
+}
diff --git a/tools/testing/selftests/bpf/test_progs.c b/tools/testing/selftests/bpf/test_progs.c
index e3f74fb617c1..4f5709615749 100644
--- a/tools/testing/selftests/bpf/test_progs.c
+++ b/tools/testing/selftests/bpf/test_progs.c
@@ -40,33 +40,6 @@ int bpf_find_map(const char *test, struct bpf_object *obj, const char *name)
return bpf_map__fd(map);
}
-static void test_pkt_access(void)
-{
- const char *file = "./test_pkt_access.o";
- struct bpf_object *obj;
- __u32 duration, retval;
- int err, prog_fd;
-
- err = bpf_prog_load(file, BPF_PROG_TYPE_SCHED_CLS, &obj, &prog_fd);
- if (err) {
- error_cnt++;
- return;
- }
-
- err = bpf_prog_test_run(prog_fd, 100000, &pkt_v4, sizeof(pkt_v4),
- NULL, NULL, &retval, &duration);
- CHECK(err || retval, "ipv4",
- "err %d errno %d retval %d duration %d\n",
- err, errno, retval, duration);
-
- err = bpf_prog_test_run(prog_fd, 100000, &pkt_v6, sizeof(pkt_v6),
- NULL, NULL, &retval, &duration);
- CHECK(err || retval, "ipv6",
- "err %d errno %d retval %d duration %d\n",
- err, errno, retval, duration);
- bpf_object__close(obj);
-}
-
static void test_prog_run_xattr(void)
{
const char *file = "./test_pkt_access.o";
@@ -648,28 +621,6 @@ static void test_bpf_obj_id(void)
bpf_object__close(objs[i]);
}
-static void test_pkt_md_access(void)
-{
- const char *file = "./test_pkt_md_access.o";
- struct bpf_object *obj;
- __u32 duration, retval;
- int err, prog_fd;
-
- err = bpf_prog_load(file, BPF_PROG_TYPE_SCHED_CLS, &obj, &prog_fd);
- if (err) {
- error_cnt++;
- return;
- }
-
- err = bpf_prog_test_run(prog_fd, 10, &pkt_v4, sizeof(pkt_v4),
- NULL, NULL, &retval, &duration);
- CHECK(err || retval, "",
- "err %d errno %d retval %d duration %d\n",
- err, errno, retval, duration);
-
- bpf_object__close(obj);
-}
-
static void test_obj_name(void)
{
struct {
@@ -2095,7 +2046,6 @@ int main(void)
#define CALL
#include <prog_tests/tests.h>
#undef CALL
- test_pkt_access();
test_prog_run_xattr();
test_xdp();
test_xdp_adjust_tail();
@@ -2103,7 +2053,6 @@ int main(void)
test_xdp_noinline();
test_tcp_estats();
test_bpf_obj_id();
- test_pkt_md_access();
test_obj_name();
test_tp_attach_query();
test_stacktrace_map();
--
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 ` Stanislav Fomichev [this message]
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 ` [PATCH bpf-next v3 6/7] selftests: bpf: break up test_progs - spinlock Stanislav Fomichev
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-3-sdf@google.com \
--to=sdf@google$(echo .)com \
--cc=ast@kernel$(echo .)org \
--cc=bpf@vger$(echo .)kernel.org \
--cc=daniel@iogearbox$(echo .)net \
--cc=davem@davemloft$(echo .)net \
--cc=netdev@vger$(echo .)kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox