From: Song Liu <songliubraving@fb.com>
To: <linux-kernel@vger.kernel.org>, <bpf@vger.kernel.org>,
<netdev@vger.kernel.org>
Cc: <ast@kernel.org>, <daniel@iogearbox.net>, <kernel-team@fb.com>,
<john.fastabend@gmail.com>, <kpsingh@chromium.org>,
<brouer@redhat.com>, <dlxu@fb.com>,
Song Liu <songliubraving@fb.com>
Subject: [PATCH bpf-next 4/5] selftests/bpf: move two functions to test_progs.c
Date: Sat, 1 Aug 2020 01:47:20 -0700 [thread overview]
Message-ID: <20200801084721.1812607-5-songliubraving@fb.com> (raw)
In-Reply-To: <20200801084721.1812607-1-songliubraving@fb.com>
Move time_get_ns() and get_base_addr() to test_progs.c, so they can be
used in other tests.
Signed-off-by: Song Liu <songliubraving@fb.com>
---
.../selftests/bpf/prog_tests/attach_probe.c | 21 -------------
.../selftests/bpf/prog_tests/test_overhead.c | 8 -----
tools/testing/selftests/bpf/test_progs.c | 30 +++++++++++++++++++
tools/testing/selftests/bpf/test_progs.h | 2 ++
4 files changed, 32 insertions(+), 29 deletions(-)
diff --git a/tools/testing/selftests/bpf/prog_tests/attach_probe.c b/tools/testing/selftests/bpf/prog_tests/attach_probe.c
index a0ee87c8e1ea7..3bda8acbbafb5 100644
--- a/tools/testing/selftests/bpf/prog_tests/attach_probe.c
+++ b/tools/testing/selftests/bpf/prog_tests/attach_probe.c
@@ -2,27 +2,6 @@
#include <test_progs.h>
#include "test_attach_probe.skel.h"
-ssize_t get_base_addr() {
- size_t start, offset;
- char buf[256];
- FILE *f;
-
- f = fopen("/proc/self/maps", "r");
- if (!f)
- return -errno;
-
- while (fscanf(f, "%zx-%*x %s %zx %*[^\n]\n",
- &start, buf, &offset) == 3) {
- if (strcmp(buf, "r-xp") == 0) {
- fclose(f);
- return start - offset;
- }
- }
-
- fclose(f);
- return -EINVAL;
-}
-
void test_attach_probe(void)
{
int duration = 0;
diff --git a/tools/testing/selftests/bpf/prog_tests/test_overhead.c b/tools/testing/selftests/bpf/prog_tests/test_overhead.c
index 2702df2b23433..3fe32e9357c4b 100644
--- a/tools/testing/selftests/bpf/prog_tests/test_overhead.c
+++ b/tools/testing/selftests/bpf/prog_tests/test_overhead.c
@@ -7,14 +7,6 @@
#define MAX_CNT 100000
-static __u64 time_get_ns(void)
-{
- struct timespec ts;
-
- clock_gettime(CLOCK_MONOTONIC, &ts);
- return ts.tv_sec * 1000000000ull + ts.tv_nsec;
-}
-
static int test_task_rename(const char *prog)
{
int i, fd, duration = 0, err;
diff --git a/tools/testing/selftests/bpf/test_progs.c b/tools/testing/selftests/bpf/test_progs.c
index b1e4dadacd9b4..c9e6a5ad5b9a4 100644
--- a/tools/testing/selftests/bpf/test_progs.c
+++ b/tools/testing/selftests/bpf/test_progs.c
@@ -622,6 +622,36 @@ int cd_flavor_subdir(const char *exec_name)
return chdir(flavor);
}
+__u64 time_get_ns(void)
+{
+ struct timespec ts;
+
+ clock_gettime(CLOCK_MONOTONIC, &ts);
+ return ts.tv_sec * 1000000000ull + ts.tv_nsec;
+}
+
+ssize_t get_base_addr(void)
+{
+ size_t start, offset;
+ char buf[256];
+ FILE *f;
+
+ f = fopen("/proc/self/maps", "r");
+ if (!f)
+ return -errno;
+
+ while (fscanf(f, "%zx-%*x %s %zx %*[^\n]\n",
+ &start, buf, &offset) == 3) {
+ if (strcmp(buf, "r-xp") == 0) {
+ fclose(f);
+ return start - offset;
+ }
+ }
+
+ fclose(f);
+ return -EINVAL;
+}
+
#define MAX_BACKTRACE_SZ 128
void crash_handler(int signum)
{
diff --git a/tools/testing/selftests/bpf/test_progs.h b/tools/testing/selftests/bpf/test_progs.h
index 6e09bf738473e..2d617201024bf 100644
--- a/tools/testing/selftests/bpf/test_progs.h
+++ b/tools/testing/selftests/bpf/test_progs.h
@@ -91,6 +91,8 @@ extern bool test__start_subtest(const char *name);
extern void test__skip(void);
extern void test__fail(void);
extern int test__join_cgroup(const char *path);
+extern __u64 time_get_ns(void);
+extern ssize_t get_base_addr();
#define PRINT_FAIL(format...) \
({ \
--
2.24.1
next prev parent reply other threads:[~2020-08-01 8:50 UTC|newest]
Thread overview: 43+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-08-01 8:47 [PATCH bpf-next 0/5] introduce BPF_PROG_TYPE_USER Song Liu
2020-08-01 8:47 ` [PATCH bpf-next 1/5] bpf: " Song Liu
2020-08-01 13:58 ` kernel test robot
2020-08-01 15:21 ` kernel test robot
2020-08-06 18:18 ` kernel test robot
2020-08-06 18:18 ` [RFC PATCH] bpf: user_verifier_ops can be static kernel test robot
2020-08-01 8:47 ` [PATCH bpf-next 2/5] libbpf: support BPF_PROG_TYPE_USER programs Song Liu
2020-08-03 1:40 ` Andrii Nakryiko
2020-08-03 4:21 ` Song Liu
2020-08-03 5:05 ` Andrii Nakryiko
2020-08-04 1:18 ` Song Liu
2020-08-05 1:38 ` Andrii Nakryiko
2020-08-05 3:59 ` Song Liu
2020-08-05 5:32 ` Andrii Nakryiko
2020-08-05 6:26 ` Song Liu
2020-08-05 6:54 ` Andrii Nakryiko
2020-08-05 7:23 ` Song Liu
2020-08-05 17:44 ` Andrii Nakryiko
2020-08-01 8:47 ` [PATCH bpf-next 3/5] selftests/bpf: add selftest for BPF_PROG_TYPE_USER Song Liu
2020-08-03 1:43 ` Andrii Nakryiko
2020-08-03 4:33 ` Song Liu
2020-08-03 5:07 ` Andrii Nakryiko
2020-08-01 8:47 ` Song Liu [this message]
2020-08-03 1:46 ` [PATCH bpf-next 4/5] selftests/bpf: move two functions to test_progs.c Andrii Nakryiko
2020-08-03 4:34 ` Song Liu
2020-08-01 8:47 ` [PATCH bpf-next 5/5] selftests/bpf: add benchmark for uprobe vs. user_prog Song Liu
2020-08-03 1:51 ` Andrii Nakryiko
2020-08-03 4:47 ` Song Liu
2020-08-03 5:10 ` Andrii Nakryiko
2020-08-04 20:54 ` Song Liu
2020-08-05 1:52 ` Andrii Nakryiko
2020-08-05 4:47 ` Song Liu
2020-08-05 5:47 ` Andrii Nakryiko
2020-08-05 7:01 ` Song Liu
2020-08-05 17:39 ` Andrii Nakryiko
2020-08-05 18:41 ` Song Liu
2020-08-05 17:16 ` Alexei Starovoitov
2020-08-05 17:27 ` Andrii Nakryiko
2020-08-05 17:45 ` Alexei Starovoitov
2020-08-05 17:56 ` Andrii Nakryiko
2020-08-05 18:56 ` Song Liu
2020-08-05 22:50 ` Alexei Starovoitov
2020-08-05 23:50 ` Song Liu
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=20200801084721.1812607-5-songliubraving@fb.com \
--to=songliubraving@fb.com \
--cc=ast@kernel.org \
--cc=bpf@vger.kernel.org \
--cc=brouer@redhat.com \
--cc=daniel@iogearbox.net \
--cc=dlxu@fb.com \
--cc=john.fastabend@gmail.com \
--cc=kernel-team@fb.com \
--cc=kpsingh@chromium.org \
--cc=linux-kernel@vger.kernel.org \
--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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).