mirror of https://lore.kernel.org/lkml/
 help / color / mirror / Atom feed
From: Wang Nan <wangnan0@huawei.com>
To: <acme@kernel.org>, <ast@plumgrid.com>
Cc: <linux-kernel@vger.kernel.org>, <lizefan@huawei.com>,
	<hekuang@huawei.com>, <xiakaixu@huawei.com>, <pi3orama@163.com>,
	<brendan.d.gregg@gmail.com>, <daniel@iogearbox.net>,
	<dsahern@gmail.com>, <jolsa@kernel.org>,
	<masami.hiramatsu.pt@hitachi.com>, <namhyung@kernel.org>,
	<paulus@samba.org>, <a.p.zijlstra@chello.nl>
Subject: [PATCH 14/27] perf test: Enable 'perf test' run as test targets
Date: Mon, 10 Aug 2015 06:15:56 +0000	[thread overview]
Message-ID: <1439187369-66492-15-git-send-email-wangnan0@huawei.com> (raw)
In-Reply-To: <1439187369-66492-1-git-send-email-wangnan0@huawei.com>

This patch introduce test target support which allows 'perf test'
work as program be traced by test cases. One test target
'testtarget__epoll_pwait_loop' is added, which calls epoll_pwait()
111 times with different invalid fd. Further test cases can use it
to test result of reacing and filtering. BPF test will be the first
user so it resides in bpf.c.

Signed-off-by: Wang Nan <wangnan0@huawei.com>
Cc: Arnaldo Carvalho de Melo <acme@redhat.com>
Cc: Alexei Starovoitov <ast@plumgrid.com>
Cc: Brendan Gregg <brendan.d.gregg@gmail.com>
Cc: Daniel Borkmann <daniel@iogearbox.net>
Cc: David Ahern <dsahern@gmail.com>
Cc: He Kuang <hekuang@huawei.com>
Cc: Jiri Olsa <jolsa@kernel.org>
Cc: Kaixu Xia <xiakaixu@huawei.com>
Cc: Masami Hiramatsu <masami.hiramatsu.pt@hitachi.com>
Cc: Namhyung Kim <namhyung@kernel.org>
Cc: Peter Zijlstra <a.p.zijlstra@chello.nl>
Cc: Zefan Li <lizefan@huawei.com>
Cc: pi3orama@163.com
---
 tools/perf/tests/Build          |  1 +
 tools/perf/tests/bpf.c          | 15 +++++++++++++
 tools/perf/tests/builtin-test.c | 49 +++++++++++++++++++++++++++++++++++++++++
 tools/perf/tests/tests.h        |  2 ++
 4 files changed, 67 insertions(+)
 create mode 100644 tools/perf/tests/bpf.c

diff --git a/tools/perf/tests/Build b/tools/perf/tests/Build
index 8c98409..7ceb448 100644
--- a/tools/perf/tests/Build
+++ b/tools/perf/tests/Build
@@ -33,6 +33,7 @@ perf-y += parse-no-sample-id-all.o
 perf-y += kmod-path.o
 perf-y += thread-map.o
 perf-y += llvm.o llvm-src.o
+perf-y += bpf.o
 
 $(OUTPUT)tests/llvm-src.c: tests/bpf-script-example.c
 	$(Q)echo '#include <tests/llvm.h>' > $@
diff --git a/tools/perf/tests/bpf.c b/tools/perf/tests/bpf.c
new file mode 100644
index 0000000..1a9eec3
--- /dev/null
+++ b/tools/perf/tests/bpf.c
@@ -0,0 +1,15 @@
+#include <stdio.h>
+#include <sys/epoll.h>
+#include "tests.h"
+#include "debug.h"
+#define NR_ITERS	111
+
+int testtarget__epoll_pwait_loop(void)
+{
+	int i;
+
+	/* Should fail NR_ITERS times */
+	for (i = 0; i < NR_ITERS; i++)
+		epoll_pwait(-(i + 1), NULL, 0, 0, NULL);
+	return 0;
+}
diff --git a/tools/perf/tests/builtin-test.c b/tools/perf/tests/builtin-test.c
index 1a349e8..0d0c963 100644
--- a/tools/perf/tests/builtin-test.c
+++ b/tools/perf/tests/builtin-test.c
@@ -15,6 +15,7 @@
 #include "symbol.h"
 
 static struct test {
+	bool is_test_target;
 	const char *desc;
 	int (*func)(void);
 	void (*prepare)(void);
@@ -182,6 +183,15 @@ static struct test {
 		.prepare = test__llvm_prepare,
 		.cleanup = test__llvm_cleanup,
 	},
+	/*
+	 * Put test targets after all test cases so sequence number will be
+	 * less confusing.
+	 */
+	{
+		.is_test_target = true,
+		.desc = TESTTARGET_EPOLL_PWAIT_LOOP,
+		.func = testtarget__epoll_pwait_loop,
+	},
 	{
 		.func = NULL,
 	},
@@ -245,12 +255,39 @@ static int __cmd_test(int argc, const char *argv[], struct intlist *skiplist)
 {
 	int i = 0;
 	int width = 0;
+	bool run_test_targets = true;
 
 	while (tests[i].func) {
 		int len = strlen(tests[i].desc);
 
 		if (width < len)
 			width = len;
+
+		/*
+		 * Check whether we are going to run test targets or test
+		 * cases:
+		 *
+		 * Test targets must be specified explicitly.
+		 */
+		switch (argc) {
+		case 0:
+			run_test_targets = false;
+			break;
+		default:
+			if (!perf_test__matches(i, argc, argv))
+				break;
+			/*
+			 * If there is at lease one matched tests is
+			 * not test target, run test cases.
+			 *
+			 * This can avoid something like 'perf test T'
+			 * matches different targets and cases.
+			 */
+			if (!tests[i].is_test_target)
+				run_test_targets = false;
+			break;
+		}
+
 		++i;
 	}
 
@@ -261,6 +298,15 @@ static int __cmd_test(int argc, const char *argv[], struct intlist *skiplist)
 		if (!perf_test__matches(curr, argc, argv))
 			continue;
 
+		if (run_test_targets) {
+			if (tests[curr].is_test_target)
+				tests[curr].func();
+			continue;
+		}
+
+		if (tests[curr].is_test_target)
+			continue;
+
 		pr_info("%2d: %-*s:", i, width, tests[curr].desc);
 
 		if (intlist__find(skiplist, i)) {
@@ -290,6 +336,9 @@ static int __cmd_test(int argc, const char *argv[], struct intlist *skiplist)
 		}
 	}
 
+	if (run_test_targets)
+		exit(0);
+
 	return 0;
 }
 
diff --git a/tools/perf/tests/tests.h b/tools/perf/tests/tests.h
index 0d79f04..0138a3d 100644
--- a/tools/perf/tests/tests.h
+++ b/tools/perf/tests/tests.h
@@ -65,6 +65,8 @@ int test__thread_map(void);
 int test__llvm(void);
 void test__llvm_prepare(void);
 void test__llvm_cleanup(void);
+#define TESTTARGET_EPOLL_PWAIT_LOOP "TESTTARGET: epoll_pwait loop"
+int testtarget__epoll_pwait_loop(void);
 
 #if defined(__x86_64__) || defined(__i386__) || defined(__arm__) || defined(__aarch64__)
 #ifdef HAVE_DWARF_UNWIND_SUPPORT
-- 
1.8.3.4


  parent reply	other threads:[~2015-08-10  6:19 UTC|newest]

Thread overview: 28+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2015-08-10  6:15 [GIT PULL 00/27] perf tools: filtering events using eBPF programs Wang Nan
2015-08-10  6:15 ` [PATCH 01/27] perf tools: Make perf depend on libbpf Wang Nan
2015-08-10  6:15 ` [PATCH 02/27] perf ebpf: Add the libbpf glue Wang Nan
2015-08-10  6:15 ` [PATCH 03/27] perf tools: Enable passing bpf object file to --event Wang Nan
2015-08-10  6:15 ` [PATCH 04/27] perf probe: Attach trace_probe_event with perf_probe_event Wang Nan
2015-08-10  6:15 ` [PATCH 05/27] perf record, bpf: Parse and probe eBPF programs probe points Wang Nan
2015-08-10  6:15 ` [PATCH 06/27] perf bpf: Collect 'struct perf_probe_event' for bpf_program Wang Nan
2015-08-10  6:15 ` [PATCH 07/27] perf record: Load all eBPF object into kernel Wang Nan
2015-08-10  6:15 ` [PATCH 08/27] perf tools: Add bpf_fd field to evsel and config it Wang Nan
2015-08-10  6:15 ` [PATCH 09/27] perf tools: Attach eBPF program to perf event Wang Nan
2015-08-10  6:15 ` [PATCH 10/27] perf tools: Suppress probing messages when probing by BPF loading Wang Nan
2015-08-10  6:15 ` [PATCH 11/27] perf record: Add clang options for compiling BPF scripts Wang Nan
2015-08-10  6:15 ` [PATCH 12/27] perf tools: Infrastructure for compiling scriptlets when passing '.c' to --event Wang Nan
2015-08-10  6:15 ` [PATCH 13/27] perf tests: Enforce LLVM test for BPF test Wang Nan
2015-08-10  6:15 ` Wang Nan [this message]
2015-08-10  6:15 ` [PATCH 15/27] perf test: Add 'perf test BPF' Wang Nan
2015-08-10  6:15 ` [PATCH 16/27] bpf tools: Load a program with different instances using preprocessor Wang Nan
2015-08-10  6:15 ` [PATCH 17/27] perf tools: Fix probe-event.h include Wang Nan
2015-08-10  6:16 ` [PATCH 18/27] perf probe: Reset args and nargs for probe_trace_event when failure Wang Nan
2015-08-10  6:16 ` [PATCH 19/27] perf tools: Move linux/filter.h to tools/include Wang Nan
2015-08-10  6:16 ` [PATCH 20/27] perf tools: Add BPF_PROLOGUE config options for further patches Wang Nan
2015-08-10  6:16 ` [PATCH 21/27] perf tools: Introduce arch_get_reg_info() for x86 Wang Nan
2015-08-10  6:16 ` [PATCH 22/27] perf tools: Add prologue for BPF programs for fetching arguments Wang Nan
2015-08-10  6:16 ` [PATCH 23/27] perf tools: Generate prologue for BPF programs Wang Nan
2015-08-10  6:16 ` [PATCH 24/27] perf tools: Use same BPF program if arguments are identical Wang Nan
2015-08-10  6:16 ` [PATCH 25/27] perf record: Support custom vmlinux path Wang Nan
2015-08-10  6:16 ` [PATCH 26/27] perf probe: Init symbol as kprobe Wang Nan
2015-08-10  6:16 ` [PATCH 27/27] perf tools: Support attach BPF program on uprobe events Wang Nan

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=1439187369-66492-15-git-send-email-wangnan0@huawei.com \
    --to=wangnan0@huawei.com \
    --cc=a.p.zijlstra@chello.nl \
    --cc=acme@kernel.org \
    --cc=ast@plumgrid.com \
    --cc=brendan.d.gregg@gmail.com \
    --cc=daniel@iogearbox.net \
    --cc=dsahern@gmail.com \
    --cc=hekuang@huawei.com \
    --cc=jolsa@kernel.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=lizefan@huawei.com \
    --cc=masami.hiramatsu.pt@hitachi.com \
    --cc=namhyung@kernel.org \
    --cc=paulus@samba.org \
    --cc=pi3orama@163.com \
    --cc=xiakaixu@huawei.com \
    /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

all inboxes | Powered by JetHome®