From: Wang Nan <wangnan0@huawei.com>
To: <acme@redhat.com>
Cc: <linux-kernel@vger.kernel.org>, <pi3orama@163.com>,
Wang Nan <wangnan0@huawei.com>,
Brendan Gregg <brendan.d.gregg@gmail.com>,
"Daniel Borkmann" <daniel@iogearbox.net>,
David Ahern <dsahern@gmail.com>, He Kuang <hekuang@huawei.com>,
Jiri Olsa <jolsa@kernel.org>, Kaixu Xia <xiakaixu@huawei.com>,
Masami Hiramatsu <masami.hiramatsu.pt@hitachi.com>,
Namhyung Kim <namhyung@kernel.org>,
Paul Mackerras <paulus@samba.org>,
Peter Zijlstra <a.p.zijlstra@chello.nl>,
Zefan Li <lizefan@huawei.com>
Subject: [PATCH 01/22] perf ebpf: Add the libbpf glue
Date: Wed, 23 Sep 2015 11:22:22 +0000 [thread overview]
Message-ID: <1443007363-124182-2-git-send-email-wangnan0@huawei.com> (raw)
In-Reply-To: <1443007363-124182-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. Following patches will enrich these two files.
Signed-off-by: Wang Nan <wangnan0@huawei.com>
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.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: Paul Mackerras <paulus@samba.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/ebpf-6yw9eg0ej3l4jnqhinngkw86@git.kernel.org
---
tools/perf/util/bpf-loader.c | 57 ++++++++++++++++++++++++++++++++++++++++++++
tools/perf/util/bpf-loader.h | 29 ++++++++++++++++++++++
2 files changed, 86 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..ab56073
--- /dev/null
+++ b/tools/perf/util/bpf-loader.c
@@ -0,0 +1,57 @@
+/*
+ * bpf-loader.c
+ *
+ * Copyright (C) 2015 Wang Nan <wangnan0@huawei.com>
+ * Copyright (C) 2015 Huawei Inc.
+ */
+
+#include <bpf/libbpf.h>
+#include <linux/err.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)
+
+struct bpf_object *bpf__prepare_load(const char *filename)
+{
+ struct bpf_object *obj;
+ static bool libbpf_initialized;
+
+ if (!libbpf_initialized) {
+ libbpf_set_print(libbpf_warning,
+ libbpf_info,
+ libbpf_debug);
+ libbpf_initialized = true;
+ }
+
+ obj = bpf_object__open(filename);
+ if (!obj) {
+ pr_debug("bpf: failed to load %s\n", filename);
+ return ERR_PTR(-EINVAL);
+ }
+
+ return obj;
+}
+
+void bpf__clear(void)
+{
+ struct bpf_object *obj, *tmp;
+
+ bpf_object__for_each_safe(obj, tmp)
+ bpf_object__close(obj);
+}
diff --git a/tools/perf/util/bpf-loader.h b/tools/perf/util/bpf-loader.h
new file mode 100644
index 0000000..f402d7c
--- /dev/null
+++ b/tools/perf/util/bpf-loader.h
@@ -0,0 +1,29 @@
+/*
+ * 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 <linux/err.h>
+#include <string.h>
+#include "debug.h"
+
+struct bpf_object;
+
+#ifdef HAVE_LIBBPF_SUPPORT
+struct bpf_object *bpf__prepare_load(const char *filename);
+
+void bpf__clear(void);
+#else
+static inline struct bpf_object *
+bpf__prepare_load(const char *filename __maybe_unused)
+{
+ pr_debug("ERROR: eBPF object loading is disabled during compiling.\n");
+ return ERR_PTR(-ENOTSUP);
+}
+
+static inline void bpf__clear(void) { }
+#endif
+#endif
--
1.8.3.4
next prev parent reply other threads:[~2015-09-23 11:28 UTC|newest]
Thread overview: 24+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-09-23 11:22 [GIT PULL 00/22] perf tools: filtering events using eBPF programs Wang Nan
2015-09-23 11:22 ` Wang Nan [this message]
2015-09-23 11:22 ` [PATCH 02/22] perf tools: Enable passing bpf object file to --event Wang Nan
2015-09-23 11:22 ` [PATCH 03/22] perf record, bpf: Create probe points for BPF programs Wang Nan
2015-09-23 11:22 ` [PATCH 04/22] perf record: Load eBPF object into kernel Wang Nan
2015-09-23 11:22 ` [PATCH 05/22] perf tools: Collect perf_evsel in BPF object files Wang Nan
2015-09-23 11:22 ` [PATCH 06/22] perf tools: Attach eBPF program to perf event Wang Nan
2015-09-23 11:22 ` [PATCH 07/22] perf record: Add clang options for compiling BPF scripts Wang Nan
2015-09-23 11:22 ` [PATCH 08/22] perf tools: Compile scriptlets to BPF objects when passing '.c' to --event Wang Nan
2015-09-23 11:22 ` [PATCH 09/22] perf test: Enforce LLVM test for BPF test Wang Nan
2015-09-23 11:22 ` [PATCH 10/22] perf test: Add 'perf test BPF' Wang Nan
2015-09-23 11:22 ` [PATCH 11/22] perf probe: Reset args and nargs for probe_trace_event when failure Wang Nan
2015-09-23 11:22 ` [PATCH 12/22] bpf tools: Load a program with different instances using preprocessor Wang Nan
2015-09-23 11:22 ` [PATCH 13/22] perf tools: Add BPF_PROLOGUE config options for further patches Wang Nan
2015-09-23 11:22 ` [PATCH 14/22] perf tools: Compile dwarf-regs.c if CONFIG_BPF_PROLOGUE is on Wang Nan
2015-09-23 11:22 ` [PATCH 15/22] perf tools: Add prologue for BPF programs for fetching arguments Wang Nan
2015-09-23 11:22 ` [PATCH 16/22] perf tools: Generate prologue for BPF programs Wang Nan
2015-09-23 11:22 ` [PATCH 17/22] perf tools: Use same BPF program if arguments are identical Wang Nan
2015-09-23 11:22 ` [PATCH 18/22] perf record: Support custom vmlinux path Wang Nan
2015-09-23 11:22 ` [PATCH 19/22] perf tools: Allow BPF program attach to uprobe events Wang Nan
2015-09-23 11:22 ` [PATCH 20/22] perf test: Enforce LLVM test, add kbuild test Wang Nan
2015-09-23 11:22 ` [PATCH 21/22] perf test: Test BPF prologue Wang Nan
2015-09-23 11:22 ` [PATCH 22/22] perf probe: Fix module probing with shortname Wang Nan
2015-09-23 13:46 ` [GIT PULL 00/22] perf tools: filtering events using eBPF programs 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=1443007363-124182-2-git-send-email-wangnan0@huawei.com \
--to=wangnan0@huawei.com \
--cc=a.p.zijlstra@chello.nl \
--cc=acme@redhat.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