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 v5 perf,bpf 07/15] perf, bpf: save bpf_prog_info information as headers to perf.data
Date: Mon, 4 Mar 2019 14:52:51 +0100 [thread overview]
Message-ID: <20190304135251.GG19809@krava> (raw)
In-Reply-To: <20190228050643.958685-8-songliubraving@fb.com>
On Wed, Feb 27, 2019 at 09:06:35PM -0800, Song Liu wrote:
> This patch enables perf-record to save bpf_prog_info information as
> headers to perf.data. A new header type HEADER_BPF_PROG_INFO is
> introduced for this data.
>
> Signed-off-by: Song Liu <songliubraving@fb.com>
> ---
> tools/perf/util/header.c | 143 ++++++++++++++++++++++++++++++++++++++-
> tools/perf/util/header.h | 1 +
> 2 files changed, 143 insertions(+), 1 deletion(-)
>
> diff --git a/tools/perf/util/header.c b/tools/perf/util/header.c
> index 4b88de5e9192..16f5bedb0b7d 100644
> --- a/tools/perf/util/header.c
> +++ b/tools/perf/util/header.c
> @@ -18,6 +18,7 @@
> #include <sys/utsname.h>
> #include <linux/time64.h>
> #include <dirent.h>
> +#include <bpf/libbpf.h>
>
> #include "evlist.h"
> #include "evsel.h"
> @@ -39,6 +40,7 @@
> #include "tool.h"
> #include "time-utils.h"
> #include "units.h"
> +#include "bpf-event.h"
>
> #include "sane_ctype.h"
>
> @@ -1074,6 +1076,51 @@ static int write_clockid(struct feat_fd *ff,
> sizeof(ff->ph->env.clockid_res_ns));
> }
>
> +static int write_bpf_prog_info(struct feat_fd *ff,
> + struct perf_evlist *evlist __maybe_unused)
> +{
> + struct perf_env *env = &ff->ph->env;
> + struct rb_root *root;
> + struct rb_node *next;
> + u32 count = 0;
> + int ret;
> +
> + down_read(&env->bpf_progs.lock);
> +
> + root = &env->bpf_progs.infos;
> + next = rb_first(root);
> + while (next) {
> + ++count;
> + next = rb_next(next);
> + }
> +
> + ret = do_write(ff, &count, sizeof(count));
> +
> + if (ret < 0)
> + goto out;
> +
> + next = rb_first(root);
> + while (next) {
> + struct bpf_prog_info_node *node;
> + size_t len;
> +
> + node = rb_entry(next, struct bpf_prog_info_node, rb_node);
> + next = rb_next(&node->rb_node);
> + len = sizeof(struct bpf_prog_info_linear) +
> + node->info_linear->data_len;
> +
> + /* before writing to file, translate address to offset */
> + bpf_program__bpil_addr_to_offs(node->info_linear);
> + ret = do_write(ff, node->info_linear, len);
> + bpf_program__bpil_offs_to_addr(node->info_linear);
what's the reason to call this before the error check?
thanks,
jirka
> + if (ret < 0)
> + goto out;
> + }
> +out:
> + up_read(&env->bpf_progs.lock);
> + return ret;
> +}
SNIP
next prev parent reply other threads:[~2019-03-04 13:52 UTC|newest]
Thread overview: 38+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-02-28 5:06 [PATCH v5 perf,bpf 00/15] perf annotation of BPF programs Song Liu
2019-02-28 5:06 ` [PATCH v5 perf,bpf 01/15] perf, bpf: consider events with attr.bpf_event as side-band events Song Liu
2019-02-28 5:06 ` [PATCH v5 perf,bpf 02/15] bpf: libbpf: introduce bpf_program__get_prog_info_linear() Song Liu
2019-02-28 5:06 ` [PATCH v5 perf,bpf 03/15] bpf: bpftool: use bpf_program__get_prog_info_linear() in prog.c:do_dump() Song Liu
2019-02-28 5:06 ` [PATCH v5 perf,bpf 04/15] perf, bpf: synthesize bpf events with bpf_program__get_prog_info_linear() Song Liu
2019-02-28 5:06 ` [PATCH v5 perf,bpf 05/15] perf: change prototype of perf_event__synthesize_bpf_events() Song Liu
2019-02-28 5:06 ` [PATCH v5 perf,bpf 06/15] perf, bpf: save bpf_prog_info in a rbtree in perf_env Song Liu
2019-02-28 5:06 ` [PATCH v5 perf,bpf 07/15] perf, bpf: save bpf_prog_info information as headers to perf.data Song Liu
2019-03-04 13:52 ` Jiri Olsa
2019-03-04 19:36 ` Song Liu
2019-03-04 20:23 ` Jiri Olsa
2019-03-04 20:31 ` Song Liu
2019-03-04 13:52 ` Jiri Olsa
2019-03-04 13:52 ` Jiri Olsa [this message]
2019-03-04 19:41 ` Song Liu
2019-03-04 20:37 ` Jiri Olsa
2019-03-04 13:52 ` Jiri Olsa
2019-02-28 5:06 ` [PATCH v5 perf,bpf 08/15] perf, bpf: save btf in a rbtree in perf_env Song Liu
2019-03-04 13:52 ` Jiri Olsa
2019-03-04 19:43 ` Song Liu
2019-03-04 20:31 ` Jiri Olsa
2019-03-04 13:53 ` Jiri Olsa
2019-02-28 5:06 ` [PATCH v5 perf,bpf 09/15] perf, bpf: save btf information as headers to perf.data Song Liu
2019-03-04 13:52 ` Jiri Olsa
2019-02-28 5:06 ` [PATCH v5 perf,bpf 10/15] perf-top: add option --no-bpf-event Song Liu
2019-02-28 5:06 ` [PATCH v5 perf,bpf 11/15] perf: add -lopcodes to feature-libbfd Song Liu
2019-02-28 5:06 ` [PATCH v5 perf,bpf 12/15] perf, bpf: enable annotation of bpf program Song Liu
2019-03-04 13:52 ` Jiri Olsa
2019-03-04 13:53 ` Jiri Olsa
2019-03-04 20:52 ` Song Liu
2019-03-04 13:53 ` Jiri Olsa
2019-03-04 19:45 ` Song Liu
2019-03-04 20:37 ` Jiri Olsa
2019-03-04 20:43 ` Song Liu
2019-02-28 5:06 ` [PATCH v5 perf,bpf 13/15] perf, bpf: process PERF_BPF_EVENT_PROG_LOAD for annotation Song Liu
2019-03-04 13:53 ` Jiri Olsa
2019-02-28 5:06 ` [PATCH v5 perf,bpf 14/15] perf: introduce side band thread Song Liu
2019-02-28 5:06 ` [PATCH v5 perf,bpf 15/15] perf, bpf: save bpf_prog_info and btf of short living bpf programs Song Liu
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=20190304135251.GG19809@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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).