From: Jiri Olsa <jolsa@redhat.com>
To: Song Liu <songliubraving@fb.com>
Cc: netdev@vger.kernel.org, linux-kernel@vger.kernel.org,
ast@kernel.org, daniel@iogearbox.net, kernel-team@fb.com,
peterz@infradead.org, acme@redhat.com, jolsa@kernel.org,
namhyung@kernel.org
Subject: Re: [PATCH v3 perf,bpf 10/11] perf, bpf: enable annotation of bpf program
Date: Mon, 18 Feb 2019 00:06:46 +0100 [thread overview]
Message-ID: <20190217230646.GL7443@krava> (raw)
In-Reply-To: <20190215215354.3114006-11-songliubraving@fb.com>
On Fri, Feb 15, 2019 at 01:53:53PM -0800, Song Liu wrote:
SNIP
> diff --git a/tools/perf/util/bpf-event.c b/tools/perf/util/bpf-event.c
> index 52507435c464..6c363adc781a 100644
> --- a/tools/perf/util/bpf-event.c
> +++ b/tools/perf/util/bpf-event.c
> @@ -25,12 +25,60 @@ static int snprintf_hex(char *buf, size_t size, unsigned char *data, size_t len)
> return ret;
> }
>
please move PERF_BPF_EVENT_PROG_LOAD/PERF_BPF_EVENT_PROG_UNLOAD
handling code below into separate patch from the bpf disassembly
code
thanks,
jirka
> +static int machine__process_bpf_event_load(struct machine *machine __maybe_unused,
> + union perf_event *event,
> + struct perf_sample *sample __maybe_unused)
> +{
> + struct bpf_prog_info_linear *info_linear;
> + struct bpf_prog_info_node *info_node;
> + struct perf_env *env = machine->env;
> + int id = event->bpf_event.id;
> + unsigned int i;
> +
> + /* perf-record, no need to handle bpf-event */
> + if (env == NULL)
> + return 0;
> +
> + info_node = perf_env__find_bpf_prog_info(env, id);
> + if (!info_node)
> + return 0;
> + info_linear = info_node->info_linear;
> +
> + for (i = 0; i < info_linear->info.nr_jited_ksyms; i++) {
> + u64 *addrs = (u64 *)(info_linear->info.jited_ksyms);
> + u64 addr = addrs[i];
> + struct map *map;
> +
> + map = map_groups__find(&machine->kmaps, addr);
> +
> + if (map) {
> + map->dso->binary_type = DSO_BINARY_TYPE__BPF_PROG_INFO;
> + map->dso->bpf_prog.id = id;
> + map->dso->bpf_prog.sub_id = i;
> + map->dso->bpf_prog.env = env;
> + }
> + }
> + return 0;
> +}
> +
> int machine__process_bpf_event(struct machine *machine __maybe_unused,
> union perf_event *event,
> struct perf_sample *sample __maybe_unused)
> {
> if (dump_trace)
> perf_event__fprintf_bpf_event(event, stdout);
> +
> + switch (event->bpf_event.type) {
> + case PERF_BPF_EVENT_PROG_LOAD:
> + return machine__process_bpf_event_load(machine, event, sample);
> +
> + case PERF_BPF_EVENT_PROG_UNLOAD:
> + break;
> + default:
> + pr_debug("unexpected bpf_event type of %d\n",
> + event->bpf_event.type);
> + break;
> + }
> return 0;
> }
>
> diff --git a/tools/perf/util/bpf-event.h b/tools/perf/util/bpf-event.h
> index b9ec394dc7c7..ab4a975b7e05 100644
> --- a/tools/perf/util/bpf-event.h
> +++ b/tools/perf/util/bpf-event.h
> @@ -2,6 +2,10 @@
> #ifndef __PERF_BPF_EVENT_H
> #define __PERF_BPF_EVENT_H
>
> +#include <bpf/bpf.h>
> +#include <bpf/btf.h>
> +#include <bpf/libbpf.h>
> +#include <linux/btf.h>
> #include <linux/compiler.h>
> #include <linux/rbtree.h>
> #include "event.h"
> diff --git a/tools/perf/util/dso.c b/tools/perf/util/dso.c
> index 62c8cf622607..1798192bf0f9 100644
> --- a/tools/perf/util/dso.c
> +++ b/tools/perf/util/dso.c
> @@ -181,6 +181,7 @@ int dso__read_binary_type_filename(const struct dso *dso,
> case DSO_BINARY_TYPE__KALLSYMS:
> case DSO_BINARY_TYPE__GUEST_KALLSYMS:
> case DSO_BINARY_TYPE__JAVA_JIT:
> + case DSO_BINARY_TYPE__BPF_PROG_INFO:
> case DSO_BINARY_TYPE__NOT_FOUND:
> ret = -1;
> break;
> diff --git a/tools/perf/util/dso.h b/tools/perf/util/dso.h
> index 8c8a7abe809d..f20d319463f1 100644
> --- a/tools/perf/util/dso.h
> +++ b/tools/perf/util/dso.h
> @@ -14,6 +14,8 @@
> #include "namespaces.h"
> #include "build-id.h"
>
> +struct perf_env;
> +
> enum dso_binary_type {
> DSO_BINARY_TYPE__KALLSYMS = 0,
> DSO_BINARY_TYPE__GUEST_KALLSYMS,
> @@ -34,6 +36,7 @@ enum dso_binary_type {
> DSO_BINARY_TYPE__KCORE,
> DSO_BINARY_TYPE__GUEST_KCORE,
> DSO_BINARY_TYPE__OPENEMBEDDED_DEBUGINFO,
> + DSO_BINARY_TYPE__BPF_PROG_INFO,
> DSO_BINARY_TYPE__NOT_FOUND,
> };
>
> @@ -177,17 +180,25 @@ struct dso {
> struct auxtrace_cache *auxtrace_cache;
> int comp;
>
> - /* dso data file */
> - struct {
> - struct rb_root cache;
> - int fd;
> - int status;
> - u32 status_seen;
> - size_t file_size;
> - struct list_head open_entry;
> - u64 debug_frame_offset;
> - u64 eh_frame_hdr_offset;
> - } data;
> + union {
> + /* dso data file */
> + struct {
> + struct rb_root cache;
> + int fd;
> + int status;
> + u32 status_seen;
> + size_t file_size;
> + struct list_head open_entry;
> + u64 debug_frame_offset;
> + u64 eh_frame_hdr_offset;
> + } data;
> + /* bpf prog information */
> + struct {
> + u32 id;
> + u32 sub_id;
> + struct perf_env *env;
> + } bpf_prog;
> + };
>
> union { /* Tool specific area */
> void *priv;
> diff --git a/tools/perf/util/symbol.c b/tools/perf/util/symbol.c
> index 48efad6d0f90..33ae59e89da2 100644
> --- a/tools/perf/util/symbol.c
> +++ b/tools/perf/util/symbol.c
> @@ -1441,6 +1441,7 @@ static bool dso__is_compatible_symtab_type(struct dso *dso, bool kmod,
> case DSO_BINARY_TYPE__BUILD_ID_CACHE_DEBUGINFO:
> return true;
>
> + case DSO_BINARY_TYPE__BPF_PROG_INFO:
> case DSO_BINARY_TYPE__NOT_FOUND:
> default:
> return false;
> --
> 2.17.1
>
next prev parent reply other threads:[~2019-02-17 23:06 UTC|newest]
Thread overview: 32+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-02-15 21:53 [PATCH v3 perf,bpf 00/11] perf annotation of BPF programs Song Liu
2019-02-15 21:53 ` [PATCH v3 perf,bpf 01/11] perf, bpf: consider events with attr.bpf_event as side-band events Song Liu
2019-02-15 21:53 ` [PATCH v3 perf,bpf 02/11] bpf: libbpf: introduce bpf_program__get_prog_info_linear() Song Liu
2019-02-15 21:53 ` [PATCH v3 perf,bpf 03/11] bpf: bpftool: use bpf_program__get_prog_info_linear() in prog.c:do_dump() Song Liu
2019-02-15 21:53 ` [PATCH v3 perf,bpf 04/11] perf, bpf: synthesize bpf events with bpf_program__get_prog_info_linear() Song Liu
2019-02-15 21:53 ` [PATCH v3 perf,bpf 05/11] perf, bpf: save bpf_prog_info in a rbtree in perf_env Song Liu
2019-02-17 23:05 ` Jiri Olsa
2019-02-19 5:52 ` Song Liu
2019-02-19 8:51 ` Jiri Olsa
2019-02-19 14:21 ` Song Liu
2019-02-17 23:05 ` Jiri Olsa
2019-02-17 23:06 ` Jiri Olsa
2019-02-15 21:53 ` [PATCH v3 perf,bpf 06/11] perf, bpf: save bpf_prog_info information as headers to perf.data Song Liu
2019-02-17 23:05 ` Jiri Olsa
2019-02-15 21:53 ` [PATCH v3 perf,bpf 07/11] perf, bpf: save btf in a rbtree in perf_env Song Liu
2019-02-15 21:53 ` [PATCH v3 perf,bpf 08/11] perf, bpf: save btf information as headers to perf.data Song Liu
2019-02-17 14:58 ` Namhyung Kim
2019-02-17 23:05 ` Jiri Olsa
2019-02-17 23:06 ` Jiri Olsa
2019-02-17 23:06 ` Jiri Olsa
2019-02-19 5:48 ` Song Liu
2019-02-15 21:53 ` [PATCH v3 perf,bpf 09/11] perf-top: add option --no-bpf-event Song Liu
2019-02-15 21:53 ` [PATCH v3 perf,bpf 10/11] perf, bpf: enable annotation of bpf program Song Liu
2019-02-17 23:05 ` Jiri Olsa
2019-02-17 23:06 ` Jiri Olsa
2019-02-17 23:06 ` Jiri Olsa
2019-02-17 23:06 ` Jiri Olsa
2019-02-17 23:06 ` Jiri Olsa [this message]
2019-02-15 21:53 ` [PATCH v3 perf,bpf 11/11] perf, bpf: save information about short living bpf programs Song Liu
2019-02-17 23:05 ` Jiri Olsa
2019-02-17 21:57 ` [PATCH v3 perf,bpf 00/11] perf annotation of BPF programs Jiri Olsa
2019-02-17 22:04 ` Jiri Olsa
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=20190217230646.GL7443@krava \
--to=jolsa@redhat.com \
--cc=acme@redhat.com \
--cc=ast@kernel.org \
--cc=daniel@iogearbox.net \
--cc=jolsa@kernel.org \
--cc=kernel-team@fb.com \
--cc=linux-kernel@vger.kernel.org \
--cc=namhyung@kernel.org \
--cc=netdev@vger.kernel.org \
--cc=peterz@infradead.org \
--cc=songliubraving@fb.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 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.