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 02/27] perf ebpf: Add the libbpf glue
Date: Mon, 10 Aug 2015 06:15:44 +0000 [thread overview]
Message-ID: <1439187369-66492-3-git-send-email-wangnan0@huawei.com> (raw)
In-Reply-To: <1439187369-66492-1-git-send-email-wangnan0@huawei.com>
The 'bpf-loader.[ch]' files are introduced in this patch. Which will be
the interface between perf and libbpf. bpf__prepare_load() resides in
bpf-loader.c. Dummy functions should be used because bpf-loader.c is
available only when CONFIG_LIBBPF is on.
Signed-off-by: Wang Nan <wangnan0@huawei.com>
Acked-by: 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
Link: http://lkml.kernel.org/n/1436445342-1402-19-git-send-email-wangnan0@huawei.com
[ split from a larger patch ]
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
---
tools/perf/util/bpf-loader.c | 89 ++++++++++++++++++++++++++++++++++++++++++++
tools/perf/util/bpf-loader.h | 44 ++++++++++++++++++++++
2 files changed, 133 insertions(+)
create mode 100644 tools/perf/util/bpf-loader.c
create mode 100644 tools/perf/util/bpf-loader.h
diff --git a/tools/perf/util/bpf-loader.c b/tools/perf/util/bpf-loader.c
new file mode 100644
index 0000000..baabb95
--- /dev/null
+++ b/tools/perf/util/bpf-loader.c
@@ -0,0 +1,89 @@
+/*
+ * bpf-loader.c
+ *
+ * Copyright (C) 2015 Wang Nan <wangnan0@huawei.com>
+ * Copyright (C) 2015 Huawei Inc.
+ */
+
+#include <bpf/libbpf.h>
+#include "perf.h"
+#include "debug.h"
+#include "bpf-loader.h"
+
+#define DEFINE_PRINT_FN(name, level) \
+static int libbpf_##name(const char *fmt, ...) \
+{ \
+ va_list args; \
+ int ret; \
+ \
+ va_start(args, fmt); \
+ ret = veprintf(level, verbose, pr_fmt(fmt), args);\
+ va_end(args); \
+ return ret; \
+}
+
+DEFINE_PRINT_FN(warning, 0)
+DEFINE_PRINT_FN(info, 0)
+DEFINE_PRINT_FN(debug, 1)
+
+static bool libbpf_initialized;
+
+int bpf__prepare_load(const char *filename)
+{
+ struct bpf_object *obj;
+
+ if (!libbpf_initialized)
+ libbpf_set_print(libbpf_warning,
+ libbpf_info,
+ libbpf_debug);
+
+ obj = bpf_object__open(filename);
+ if (!obj) {
+ pr_debug("bpf: failed to load %s\n", filename);
+ return -EINVAL;
+ }
+
+ /*
+ * Throw object pointer away: it will be retrived using
+ * bpf_objects iterater.
+ */
+
+ return 0;
+}
+
+void bpf__clear(void)
+{
+ struct bpf_object *obj, *tmp;
+
+ bpf_object__for_each_safe(obj, tmp)
+ bpf_object__close(obj);
+}
+
+#define bpf__strerror_head(err, buf, size) \
+ char sbuf[STRERR_BUFSIZE], *emsg;\
+ if (err < 0)\
+ err = -err;\
+ emsg = strerror_r(err, sbuf, sizeof(sbuf));\
+ switch (err) {\
+ default:\
+ scnprintf(buf, size, "%s", emsg);\
+ break;
+
+#define bpf__strerror_entry(val, fmt...)\
+ case val: {\
+ scnprintf(buf, size, fmt);\
+ break;\
+ }
+
+#define bpf__strerror_end()\
+ }\
+
+int bpf__strerror_prepare_load(const char *filename, int err,
+ char *buf, size_t size)
+{
+ bpf__strerror_head(err, buf, size);
+ bpf__strerror_entry(EINVAL, "%s: BPF object file '%s' is invalid",
+ emsg, filename)
+ bpf__strerror_end();
+ return 0;
+}
diff --git a/tools/perf/util/bpf-loader.h b/tools/perf/util/bpf-loader.h
new file mode 100644
index 0000000..d78d5dd
--- /dev/null
+++ b/tools/perf/util/bpf-loader.h
@@ -0,0 +1,44 @@
+/*
+ * Copyright (C) 2015, Wang Nan <wangnan0@huawei.com>
+ * Copyright (C) 2015, Huawei Inc.
+ */
+#ifndef __BPF_LOADER_H
+#define __BPF_LOADER_H
+
+#include <linux/compiler.h>
+#include <string.h>
+#include "debug.h"
+
+#ifdef HAVE_LIBBPF_SUPPORT
+int bpf__prepare_load(const char *filename);
+int bpf__strerror_prepare_load(const char *filename, int err,
+ char *buf, size_t size);
+
+void bpf__clear(void);
+#else
+static inline int bpf__prepare_load(const char *filename __maybe_unused)
+{
+ pr_debug("ERROR: eBPF object loading is disabled during compiling.\n");
+ return -1;
+}
+
+static inline void bpf__clear(void) { }
+
+static inline int
+__bpf_strerror(char *buf, size_t size)
+{
+ strncpy(buf,
+ "ERROR: eBPF object loading is disabled during compiling.\n",
+ size);
+ return 0;
+}
+
+static inline int
+bpf__strerror_prepare_load(const char *filename __maybe_unused,
+ int err __maybe_unused,
+ char *buf, size_t size)
+{
+ return __bpf_strerror(buf, size);
+}
+#endif
+#endif
--
1.8.3.4
next prev parent reply other threads:[~2015-08-10 6:22 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 ` Wang Nan [this message]
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 ` [PATCH 14/27] perf test: Enable 'perf test' run as test targets Wang Nan
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-3-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®