From: Jiri Olsa <jolsa@kernel.org>
To: Arnaldo Carvalho de Melo <acme@kernel.org>
Cc: lkml <linux-kernel@vger.kernel.org>,
Ingo Molnar <mingo@kernel.org>,
Namhyung Kim <namhyung@kernel.org>,
David Ahern <dsahern@gmail.com>,
Alexander Shishkin <alexander.shishkin@linux.intel.com>,
Peter Zijlstra <a.p.zijlstra@chello.nl>
Subject: [PATCH 12/13] perf bpf: Run begin/end programs
Date: Mon, 12 Mar 2018 10:43:12 +0100 [thread overview]
Message-ID: <20180312094313.18738-13-jolsa@kernel.org> (raw)
In-Reply-To: <20180312094313.18738-1-jolsa@kernel.org>
Running begin and end programs for ebpf object.
Link: http://lkml.kernel.org/n/tip-ego7m00cr7sru8l5bjpjwwcm@git.kernel.org
Signed-off-by: Jiri Olsa <jolsa@kernel.org>
---
tools/perf/builtin-bpf.c | 6 ++++
tools/perf/util/bpf-loader.c | 78 ++++++++++++++++++++++++++++++++++++++++++++
tools/perf/util/bpf-loader.h | 2 ++
3 files changed, 86 insertions(+)
diff --git a/tools/perf/builtin-bpf.c b/tools/perf/builtin-bpf.c
index 7065153a9577..1111e240e259 100644
--- a/tools/perf/builtin-bpf.c
+++ b/tools/perf/builtin-bpf.c
@@ -94,6 +94,10 @@ static int __cmd_bpf(int argc , const char **argv)
goto out_child;
}
+ err = bpf__run_begin(stdout);
+ if (err)
+ goto out_child;
+
if (forks) {
perf_evlist__start_workload(bpf.evlist);
@@ -115,6 +119,8 @@ static int __cmd_bpf(int argc , const char **argv)
child_pid = -1;
+ bpf__run_end(stdout);
+
out_child:
if (forks) {
if (workload_exec_errno) {
diff --git a/tools/perf/util/bpf-loader.c b/tools/perf/util/bpf-loader.c
index e59168153375..d5f9c3cd5280 100644
--- a/tools/perf/util/bpf-loader.c
+++ b/tools/perf/util/bpf-loader.c
@@ -9,6 +9,7 @@
#include <linux/bpf.h>
#include <bpf/libbpf.h>
#include <bpf/bpf.h>
+#include <bpf/interp.h>
#include <linux/err.h>
#include <linux/kernel.h>
#include <linux/string.h>
@@ -23,6 +24,7 @@
#include "strfilter.h"
#include "llvm-utils.h"
#include "c++/clang-c.h"
+#include "bpf-userapi.h"
#define DEFINE_PRINT_FN(name, level) \
static int libbpf_##name(const char *fmt, ...) \
@@ -1547,6 +1549,82 @@ int bpf__apply_obj_config(void)
return 0;
}
+struct interp {
+ struct bpf_interp in;
+ FILE *out;
+};
+
+static int bpf_interp_call_cb(struct bpf_interp *in,
+ u64 imm, u64 *regs)
+{
+ struct interp *interp = container_of(in, struct interp, in);
+ u64 dr;
+
+ switch (imm) {
+ case BPF_FUNC_USER_bpf_map_lookup_elem:
+ dr = bpf_map_lookup_elem((int) regs[1],
+ (void *) regs[2],
+ (void *) regs[3]);
+ break;
+ case BPF_FUNC_USER_bpf_map_get_next_key:
+ dr = bpf_map_get_next_key((int) regs[1],
+ (void *) regs[2],
+ (void *) regs[3]);
+ break;
+ case BPF_FUNC_USER_print:
+ dr = fprintf(interp->out, (const char *) regs[1],
+ regs[2], regs[3], regs[4], regs[5]);
+ fflush(interp->out);
+ break;
+ default:
+ return -1;
+ break;
+ };
+
+ regs[0] = dr;
+ regs[1] = 0xdeadbeef;
+ regs[2] = 0xdeadbeef;
+ regs[3] = 0xdeadbeef;
+ regs[4] = 0xdeadbeef;
+ return 0;
+}
+
+int bpf__run_begin(FILE *out)
+{
+ struct interp interp = {
+ .in.call_cb = bpf_interp_call_cb,
+ .out = out,
+ };
+ struct bpf_object *obj, *tmp;
+ int err;
+
+ bpf_object__for_each_safe(obj, tmp) {
+ err = bpf_object__run_begin(obj, &interp.in);
+ if (err)
+ return err;
+ }
+
+ return 0;
+}
+
+int bpf__run_end(FILE *out)
+{
+ struct interp interp = {
+ .in.call_cb = bpf_interp_call_cb,
+ .out = out,
+ };
+ struct bpf_object *obj, *tmp;
+ int err;
+
+ bpf_object__for_each_safe(obj, tmp) {
+ err = bpf_object__run_end(obj, &interp.in);
+ if (err)
+ return err;
+ }
+
+ return 0;
+}
+
#define bpf__for_each_map(pos, obj, objtmp) \
bpf_object__for_each_safe(obj, objtmp) \
bpf_map__for_each(pos, obj)
diff --git a/tools/perf/util/bpf-loader.h b/tools/perf/util/bpf-loader.h
index 8c2a494cab53..1ee4c3ca4927 100644
--- a/tools/perf/util/bpf-loader.h
+++ b/tools/perf/util/bpf-loader.h
@@ -87,6 +87,8 @@ int bpf__setup_stdout(struct perf_evlist *evlist);
int bpf__strerror_setup_stdout(struct perf_evlist *evlist, int err,
char *buf, size_t size);
+int bpf__run_begin(FILE *out);
+int bpf__run_end(FILE *out);
#else
#include <errno.h>
--
2.13.6
next prev parent reply other threads:[~2018-03-12 9:44 UTC|newest]
Thread overview: 27+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-03-12 9:43 [RFC 00/13] perf bpf: Add support to run BEGIN/END code Jiri Olsa
2018-03-12 9:43 ` [PATCH 01/13] lib bpf: Add bpf_program__insns function Jiri Olsa
2018-03-12 9:43 ` [PATCH 02/13] perf tools: Display ebpf compiling command in debug output Jiri Olsa
2018-03-12 14:24 ` Arnaldo Carvalho de Melo
2018-03-20 6:29 ` [tip:perf/core] perf llvm: Display eBPF " tip-bot for Jiri Olsa
2018-03-12 9:43 ` [PATCH 03/13] perf tools: Add bpf command Jiri Olsa
2018-03-12 9:43 ` [PATCH 04/13] perf tools: Add bpf__compile function Jiri Olsa
2018-03-12 9:43 ` [PATCH 05/13] perf bpf: Add compile option Jiri Olsa
2018-03-12 9:43 ` [PATCH 06/13] perf bpf: Add disasm option Jiri Olsa
2018-03-12 9:43 ` [PATCH 07/13] libbpf: Make bpf_program__next skip .text section Jiri Olsa
2018-03-12 9:43 ` [PATCH 08/13] libbpf: Collect begin/end .text functions Jiri Olsa
2018-03-12 9:43 ` [PATCH 09/13] libbpf: Add bpf_insn__interpret function Jiri Olsa
2018-03-12 15:44 ` Arnaldo Carvalho de Melo
2018-03-12 15:53 ` Jiri Olsa
2018-03-12 9:43 ` [PATCH 10/13] libbpf: Add bpf_object__run_(begin|end) functions Jiri Olsa
2018-03-12 9:43 ` [PATCH 11/13] perf bpf: Add helper header files Jiri Olsa
2018-03-12 18:44 ` Alexei Starovoitov
2018-03-12 19:06 ` Arnaldo Carvalho de Melo
2018-03-12 19:20 ` Jiri Olsa
2018-03-12 19:25 ` Arnaldo Carvalho de Melo
2018-03-12 22:32 ` Jiri Olsa
2018-03-13 1:35 ` Arnaldo Carvalho de Melo
2018-03-13 14:18 ` Jiri Olsa
2018-03-12 9:43 ` Jiri Olsa [this message]
2018-03-12 9:43 ` [PATCH 13/13] perf samples: Add syscall-count.c object Jiri Olsa
2018-03-12 11:17 ` [RFC 00/13] perf bpf: Add support to run BEGIN/END code Jiri Olsa
2018-03-12 13:56 ` Arnaldo Carvalho de Melo
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=20180312094313.18738-13-jolsa@kernel.org \
--to=jolsa@kernel.org \
--cc=a.p.zijlstra@chello.nl \
--cc=acme@kernel.org \
--cc=alexander.shishkin@linux.intel.com \
--cc=dsahern@gmail.com \
--cc=linux-kernel@vger.kernel.org \
--cc=mingo@kernel.org \
--cc=namhyung@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.