From: Andrii Nakryiko <andrii.nakryiko@gmail.com>
To: Martin KaFai Lau <kafai@fb.com>
Cc: bpf <bpf@vger.kernel.org>, Alexei Starovoitov <ast@kernel.org>,
Daniel Borkmann <daniel@iogearbox.net>,
David Miller <davem@davemloft.net>,
Kernel Team <kernel-team@fb.com>,
Networking <netdev@vger.kernel.org>
Subject: Re: [PATCH bpf-next 5/5] bpftool: Support dumping a map with btf_vmlinux_value_type_id
Date: Tue, 14 Jan 2020 17:49:00 -0800 [thread overview]
Message-ID: <CAEf4BzYgvq+s09d7eKhf_dd-Goh-V3DRHWmMM+=k0=Ce=zQ2ug@mail.gmail.com> (raw)
In-Reply-To: <20200114224426.3028966-1-kafai@fb.com>
On Tue, Jan 14, 2020 at 2:46 PM Martin KaFai Lau <kafai@fb.com> wrote:
>
> This patch makes bpftool support dumping a map's value properly
> when the map's value type is a type of the running kernel's btf.
> (i.e. map_info.btf_vmlinux_value_type_id is set instead of
> map_info.btf_value_type_id). The first usecase is for the
> BPF_MAP_TYPE_STRUCT_OPS.
>
> Signed-off-by: Martin KaFai Lau <kafai@fb.com>
> ---
> tools/bpf/bpftool/map.c | 43 +++++++++++++++++++++++++++++++----------
> 1 file changed, 33 insertions(+), 10 deletions(-)
>
> diff --git a/tools/bpf/bpftool/map.c b/tools/bpf/bpftool/map.c
> index 4c5b15d736b6..d25f3b2355ad 100644
> --- a/tools/bpf/bpftool/map.c
> +++ b/tools/bpf/bpftool/map.c
> @@ -20,6 +20,7 @@
> #include "btf.h"
> #include "json_writer.h"
> #include "main.h"
> +#include "libbpf_internal.h"
>
> const char * const map_type_name[] = {
> [BPF_MAP_TYPE_UNSPEC] = "unspec",
> @@ -252,6 +253,7 @@ static int do_dump_btf(const struct btf_dumper *d,
> struct bpf_map_info *map_info, void *key,
> void *value)
> {
> + __u32 value_id;
> int ret;
>
> /* start of key-value pair */
> @@ -265,9 +267,12 @@ static int do_dump_btf(const struct btf_dumper *d,
> goto err_end_obj;
> }
>
> + value_id = map_info->btf_vmlinux_value_type_id ?
> + : map_info->btf_value_type_id;
> +
> if (!map_is_per_cpu(map_info->type)) {
> jsonw_name(d->jw, "value");
> - ret = btf_dumper_type(d, map_info->btf_value_type_id, value);
> + ret = btf_dumper_type(d, value_id, value);
> } else {
> unsigned int i, n, step;
>
> @@ -279,8 +284,7 @@ static int do_dump_btf(const struct btf_dumper *d,
> jsonw_start_object(d->jw);
> jsonw_int_field(d->jw, "cpu", i);
> jsonw_name(d->jw, "value");
> - ret = btf_dumper_type(d, map_info->btf_value_type_id,
> - value + i * step);
> + ret = btf_dumper_type(d, value_id, value + i * step);
> jsonw_end_object(d->jw);
> if (ret)
> break;
> @@ -932,6 +936,27 @@ static int maps_have_btf(int *fds, int nb_fds)
> return 1;
> }
>
> +static struct btf *get_map_kv_btf(const struct bpf_map_info *info)
> +{
> + struct btf *btf = NULL;
> +
> + if (info->btf_vmlinux_value_type_id) {
> + btf = bpf_find_kernel_btf();
If there are multiple maps we are dumping, it might become quite
costly to re-read and re-parse kernel BTF all the time. Can we lazily
load it, when required, and cache instead?
> + if (IS_ERR(btf))
> + p_err("failed to get kernel btf");
> + } else if (info->btf_value_type_id) {
> + int err;
> +
> + err = btf__get_from_id(info->btf_id, &btf);
> + if (err || !btf) {
> + p_err("failed to get btf");
> + btf = err ? ERR_PTR(err) : ERR_PTR(-ESRCH);
> + }
> + }
> +
> + return btf;
> +}
> +
> static int
> map_dump(int fd, struct bpf_map_info *info, json_writer_t *wtr,
> bool show_header)
> @@ -952,13 +977,11 @@ map_dump(int fd, struct bpf_map_info *info, json_writer_t *wtr,
> prev_key = NULL;
>
> if (wtr) {
> - if (info->btf_id) {
> - err = btf__get_from_id(info->btf_id, &btf);
> - if (err || !btf) {
> - err = err ? : -ESRCH;
> - p_err("failed to get btf");
> - goto exit_free;
> - }
> + btf = get_map_kv_btf(info);
> + if (IS_ERR(btf)) {
> + err = PTR_ERR(btf);
> + btf = NULL;
> + goto exit_free;
> }
>
> if (show_header) {
> --
> 2.17.1
>
next prev parent reply other threads:[~2020-01-15 1:49 UTC|newest]
Thread overview: 19+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-01-14 22:43 [PATCH bpf-next 0/5] bpftool: Support dumping a map with btf_vmlinux_value_type_id Martin KaFai Lau
2020-01-14 22:44 ` [PATCH bpf-next 1/5] bpftool: Fix a leak of btf object Martin KaFai Lau
2020-01-15 1:10 ` Andrii Nakryiko
2020-01-15 5:46 ` Martin Lau
2020-01-15 6:40 ` Andrii Nakryiko
2020-01-16 8:00 ` Paul Chaignon
2020-01-14 22:44 ` [PATCH bpf-next 2/5] bpftool: Fix missing BTF output for json during map dump Martin KaFai Lau
2020-01-15 1:34 ` Andrii Nakryiko
2020-01-15 5:54 ` Martin Lau
2020-01-15 6:36 ` Andrii Nakryiko
2020-01-14 22:44 ` [PATCH bpf-next 3/5] libbpf: Expose bpf_find_kernel_btf to libbpf_internal.h Martin KaFai Lau
2020-01-15 1:43 ` Andrii Nakryiko
2020-01-15 5:56 ` Martin Lau
2020-01-14 22:44 ` [PATCH bpf-next 4/5] bpftool: Add struct_ops map name Martin KaFai Lau
2020-01-15 1:45 ` Andrii Nakryiko
2020-01-14 22:44 ` [PATCH bpf-next 5/5] bpftool: Support dumping a map with btf_vmlinux_value_type_id Martin KaFai Lau
2020-01-15 1:49 ` Andrii Nakryiko [this message]
2020-01-15 6:04 ` Martin Lau
2020-01-15 6:39 ` Andrii Nakryiko
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='CAEf4BzYgvq+s09d7eKhf_dd-Goh-V3DRHWmMM+=k0=Ce=zQ2ug@mail.gmail.com' \
--to=andrii.nakryiko@gmail.com \
--cc=ast@kernel.org \
--cc=bpf@vger.kernel.org \
--cc=daniel@iogearbox.net \
--cc=davem@davemloft.net \
--cc=kafai@fb.com \
--cc=kernel-team@fb.com \
--cc=netdev@vger.kernel.org \
/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).