From: Wang Nan <wangnan0@huawei.com>
To: <acme@redhat.com>, <ast@fb.com>
Cc: <lizefan@huawei.com>, <hekuang@huawei.com>,
<linux-kernel@vger.kernel.org>, <pi3orama@163.com>, <joe@ovn.org>,
Wang Nan <wangnan0@huawei.com>, Jiri Olsa <jolsa@kernel.org>
Subject: [PATCH v3 24/30] perf clang jit: Retrive fd of BPF map from its offset
Date: Sat, 26 Nov 2016 07:03:48 +0000 [thread overview]
Message-ID: <20161126070354.141764-25-wangnan0@huawei.com> (raw)
In-Reply-To: <20161126070354.141764-1-wangnan0@huawei.com>
bpf__map_fd() is introduced to retrive fd of a BPF map through its
offset in BPF object. This function is going be used in further
commits which allow scripts jitted by builtin clang access BPF maps.
Signed-off-by: Wang Nan <wangnan0@huawei.com>
Cc: Arnaldo Carvalho de Melo <acme@redhat.com>
Cc: Alexei Starovoitov <ast@fb.com>
Cc: He Kuang <hekuang@huawei.com>
Cc: Jiri Olsa <jolsa@kernel.org>
Cc: Zefan Li <lizefan@huawei.com>
Cc: pi3orama@163.com
---
tools/perf/util/bpf-loader.c | 37 +++++++++++++++++++++++++++++++++++++
tools/perf/util/bpf-loader.h | 19 +++++++++++++++++++
2 files changed, 56 insertions(+)
diff --git a/tools/perf/util/bpf-loader.c b/tools/perf/util/bpf-loader.c
index 81c6fed..86aa99b 100644
--- a/tools/perf/util/bpf-loader.c
+++ b/tools/perf/util/bpf-loader.c
@@ -19,6 +19,7 @@
#include "parse-events.h"
#include "llvm-utils.h"
#include "c++/clang-c.h"
+#include "asm/bug.h" // for WARN_ONCE
#define DEFINE_PRINT_FN(name, level) \
static int libbpf_##name(const char *fmt, ...) \
@@ -1644,6 +1645,28 @@ int bpf__setup_stdout(struct perf_evlist *evlist __maybe_unused)
return 0;
}
+int bpf__map_fd(struct bpf_object *obj, void *jit_map)
+{
+ struct bpf_obj_priv *priv = bpf_object__priv(obj);
+ struct bpf_map *map;
+ size_t map_offset;
+ void *map_base;
+
+ if (IS_ERR(priv))
+ return PTR_ERR(priv);
+ if (!priv)
+ return -EINVAL;
+
+ map_base = priv->map_base;
+ map_offset = jit_map - map_base;
+ map = bpf_object__find_map_by_offset(obj, map_offset);
+ WARN_ONCE(IS_ERR(map), "can't find map offset %zu from '%s'\n",
+ map_offset, bpf_object__name(obj));
+ if (IS_ERR(map))
+ return -ENOENT;
+ return bpf_map__fd(map);
+}
+
#define ERRNO_OFFSET(e) ((e) - __BPF_LOADER_ERRNO__START)
#define ERRCODE_OFFSET(c) ERRNO_OFFSET(BPF_LOADER_ERRNO__##c)
#define NR_ERRNO (__BPF_LOADER_ERRNO__END - __BPF_LOADER_ERRNO__START)
@@ -1825,3 +1848,17 @@ int bpf__strerror_setup_stdout(struct perf_evlist *evlist __maybe_unused,
bpf__strerror_end(buf, size);
return 0;
}
+
+int bpf__strerror_map_fd(struct bpf_object *obj, void *jit_map,
+ int err, char *buf, size_t size)
+{
+ struct bpf_obj_priv *priv = bpf_object__priv(obj);
+ ptrdiff_t offset = priv ? jit_map - priv->map_base : jit_map - NULL;
+
+ bpf__strerror_head(err, buf, size);
+ bpf__strerror_entry(EINVAL, "No map in BPF object %s", bpf_object__name(obj));
+ bpf__strerror_entry(ENOENT, "Can't find map offset %lx in BPF object %s",
+ (unsigned long)offset, bpf_object__name(obj));
+ bpf__strerror_end(buf, size);
+ return 0;
+}
diff --git a/tools/perf/util/bpf-loader.h b/tools/perf/util/bpf-loader.h
index f2b737b..c40812b 100644
--- a/tools/perf/util/bpf-loader.h
+++ b/tools/perf/util/bpf-loader.h
@@ -84,6 +84,9 @@ 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__map_fd(struct bpf_object *obj, void *jit_map);
+int bpf__strerror_map_fd(struct bpf_object *obj, void *jit_map,
+ int err, char *buf, size_t size);
#else
static inline struct bpf_object *
bpf__prepare_load(const char *filename __maybe_unused,
@@ -136,6 +139,13 @@ bpf__setup_stdout(struct perf_evlist *evlist __maybe_unused)
}
static inline int
+bpf__map_fd(struct bpf_object *obj __maybe_unused,
+ void *map_ptr __maybe_unused)
+{
+ return -ENOTSUP;
+}
+
+static inline int
__bpf_strerror(char *buf, size_t size)
{
if (!size)
@@ -196,5 +206,14 @@ bpf__strerror_setup_stdout(struct perf_evlist *evlist __maybe_unused,
{
return __bpf_strerror(buf, size);
}
+
+static inline int
+bpf__strerror_map_fd(struct bpf_object *obj __maybe_unused,
+ void *jit_map __maybe_unused,
+ int err __maybe_unused,
+ char *buf, size_t size);
+{
+ return __bpf_strerror(buf, size);
+}
#endif
#endif
--
2.10.1
next prev parent reply other threads:[~2016-11-26 7:07 UTC|newest]
Thread overview: 73+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-11-26 7:03 [PATCH v3 00/30] perf clang: Builtin clang and perfhook support Wang Nan
2016-11-26 7:03 ` [PATCH v3 01/30] tools lib bpf: Add missing BPF functions Wang Nan
2016-11-26 17:10 ` Alexei Starovoitov
2016-12-02 10:37 ` [tip:perf/core] " tip-bot for Wang Nan
2016-11-26 7:03 ` [PATCH v3 02/30] tools lib bpf: Add private field for bpf_object Wang Nan
2016-11-26 17:11 ` Alexei Starovoitov
2016-12-02 10:37 ` [tip:perf/core] " tip-bot for Wang Nan
2016-11-26 7:03 ` [PATCH v3 03/30] tools lib bpf: Retrive bpf_map through offset of bpf_map_def Wang Nan
2016-11-26 17:12 ` Alexei Starovoitov
2016-12-02 10:38 ` [tip:perf/core] " tip-bot for Wang Nan
2016-11-26 7:03 ` [PATCH v3 04/30] perf tools: Introduce perf hooks Wang Nan
2016-12-02 10:38 ` [tip:perf/core] " tip-bot for Wang Nan
2016-11-26 7:03 ` [PATCH v3 05/30] perf tools: Pass context to perf hook functions Wang Nan
2016-12-06 8:21 ` [tip:perf/core] " tip-bot for Wang Nan
2016-11-26 7:03 ` [PATCH v3 06/30] perf llvm: Extract helpers in llvm-utils.c Wang Nan
2016-12-06 8:21 ` [tip:perf/core] " tip-bot for Wang Nan
2016-11-26 7:03 ` [PATCH v3 07/30] tools build: Add feature detection for LLVM Wang Nan
2016-12-06 8:22 ` [tip:perf/core] " tip-bot for Wang Nan
2016-11-26 7:03 ` [PATCH v3 08/30] tools build: Add feature detection for clang Wang Nan
2016-12-06 8:22 ` [tip:perf/core] " tip-bot for Wang Nan
2016-11-26 7:03 ` [PATCH v3 09/30] perf build: Add clang and llvm compile and linking support Wang Nan
2016-12-06 8:23 ` [tip:perf/core] " tip-bot for Wang Nan
2016-11-26 7:03 ` [PATCH v3 10/30] perf clang: Add builtin clang support ant test case Wang Nan
2016-11-26 17:17 ` Alexei Starovoitov
2016-11-28 7:41 ` Wangnan (F)
2016-12-02 15:44 ` Arnaldo Carvalho de Melo
2016-12-05 2:36 ` Wangnan (F)
2016-12-05 4:41 ` Wangnan (F)
2017-01-17 13:38 ` Arnaldo Carvalho de Melo
2016-12-05 16:51 ` Alexei Starovoitov
2016-12-05 21:02 ` Arnaldo Carvalho de Melo
2016-12-05 21:48 ` Arnaldo Carvalho de Melo
2016-12-06 2:07 ` Wangnan (F)
2016-12-06 13:43 ` Arnaldo Carvalho de Melo
2016-12-06 19:19 ` Arnaldo Carvalho de Melo
2016-12-06 21:02 ` Arnaldo Carvalho de Melo
2016-12-06 8:23 ` [tip:perf/core] " tip-bot for Wang Nan
2016-11-26 7:03 ` [PATCH v3 11/30] perf clang: Use real file system for #include Wang Nan
2016-12-06 8:24 ` [tip:perf/core] " tip-bot for Wang Nan
2016-11-26 7:03 ` [PATCH v3 12/30] perf clang: Allow passing CFLAGS to builtin clang Wang Nan
2016-12-06 8:25 ` [tip:perf/core] " tip-bot for Wang Nan
2016-11-26 7:03 ` [PATCH v3 13/30] perf clang: Update test case to use real BPF script Wang Nan
2016-12-06 8:25 ` [tip:perf/core] " tip-bot for Wang Nan
2016-11-26 7:03 ` [PATCH v3 14/30] perf clang: Support compile IR to BPF object and add testcase Wang Nan
2016-11-26 17:25 ` Alexei Starovoitov
2016-11-28 6:32 ` Wangnan (F)
2016-11-28 10:31 ` Wangnan (F)
2016-11-28 19:33 ` Alexei Starovoitov
2016-12-06 8:26 ` [tip:perf/core] " tip-bot for Wang Nan
2016-11-26 7:03 ` [PATCH v3 15/30] perf clang: Compile BPF script use builtin clang support Wang Nan
2016-12-06 8:26 ` [tip:perf/core] perf clang: Compile BPF script using " tip-bot for Wang Nan
2016-11-26 7:03 ` [PATCH v3 16/30] perf clang: Pass full path to builtin clang Wang Nan
2016-11-26 7:03 ` [PATCH v3 17/30] perf clang: Pass CFLAGS " Wang Nan
2016-11-26 7:03 ` [PATCH v3 18/30] perf clang jit: Wrap llvm::Module using PerfModule Wang Nan
2016-11-26 7:03 ` [PATCH v3 19/30] perf clang jit: Insignt BPF and JIT functions in a Module Wang Nan
2016-11-26 17:32 ` Alexei Starovoitov
2016-11-26 7:03 ` [PATCH v3 20/30] perf clang jit: add PerfModule::doJIT to JIT perfhook functions Wang Nan
2016-11-26 17:29 ` Alexei Starovoitov
2016-11-28 6:42 ` Wangnan (F)
2016-11-26 7:03 ` [PATCH v3 21/30] perf clang jit: Export functions for jitted code Wang Nan
2016-11-26 7:03 ` [PATCH v3 22/30] perf clang jit: Actually JIT and hook in bpf loader Wang Nan
2016-11-26 7:03 ` [PATCH v3 23/30] perf clang jit: Collect the lowest address in maps section as map_base Wang Nan
2016-11-26 7:03 ` Wang Nan [this message]
2016-11-26 7:03 ` [PATCH v3 25/30] perf clang jit: Allow jitted perf hook access BPF maps Wang Nan
2016-11-26 17:09 ` Alexei Starovoitov
2016-11-26 7:03 ` [PATCH v3 26/30] perf clang: Link BPF functions declaration into perf Wang Nan
2016-11-26 17:40 ` Alexei Starovoitov
2016-11-30 16:12 ` Arnaldo Carvalho de Melo
2016-12-01 1:56 ` [PATCH v3 26/30 - cleanup] " Wang Nan
2016-11-26 7:03 ` [PATCH v3 27/30] perf clang: Declare BPF functions for BPF scripts automatically Wang Nan
2016-11-26 7:03 ` [PATCH v3 28/30] perf clang: Include helpers to BPF scripts Wang Nan
2016-11-26 7:03 ` [PATCH v3 29/30] perf clang builtin: Define hook helpers by default Wang Nan
2016-11-26 7:03 ` [PATCH v3 30/30] perf clang jit: Export getpid() to perf hook 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=20161126070354.141764-25-wangnan0@huawei.com \
--to=wangnan0@huawei.com \
--cc=acme@redhat.com \
--cc=ast@fb.com \
--cc=hekuang@huawei.com \
--cc=joe@ovn.org \
--cc=jolsa@kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=lizefan@huawei.com \
--cc=pi3orama@163.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®