From: Yonghong Song <yhs@fb.com>
To: <bpf@vger.kernel.org>
Cc: Alexei Starovoitov <ast@kernel.org>,
Cong Wang <xiyou.wangcong@gmail.com>,
Daniel Borkmann <daniel@iogearbox.net>, <kernel-team@fb.com>,
Andrii Nakryiko <andrii@kernel.org>
Subject: [PATCH bpf-next v5 10/12] bpftool: print subprog address properly
Date: Fri, 26 Feb 2021 12:49:31 -0800 [thread overview]
Message-ID: <20210226204931.3885458-1-yhs@fb.com> (raw)
In-Reply-To: <20210226204920.3884074-1-yhs@fb.com>
With later hashmap example, using bpftool xlated output may
look like:
int dump_task(struct bpf_iter__task * ctx):
; struct task_struct *task = ctx->task;
0: (79) r2 = *(u64 *)(r1 +8)
; if (task == (void *)0 || called > 0)
...
19: (18) r2 = subprog[+17]
30: (18) r2 = subprog[+25]
...
36: (95) exit
__u64 check_hash_elem(struct bpf_map * map, __u32 * key, __u64 * val,
struct callback_ctx * data):
; struct bpf_iter__task *ctx = data->ctx;
37: (79) r5 = *(u64 *)(r4 +0)
...
55: (95) exit
__u64 check_percpu_elem(struct bpf_map * map, __u32 * key,
__u64 * val, void * unused):
; check_percpu_elem(struct bpf_map *map, __u32 *key, __u64 *val, void *unused)
56: (bf) r6 = r3
...
83: (18) r2 = subprog[-47]
Acked-by: Andrii Nakryiko <andrii@kernel.org>
Signed-off-by: Yonghong Song <yhs@fb.com>
---
tools/bpf/bpftool/xlated_dumper.c | 3 +++
1 file changed, 3 insertions(+)
diff --git a/tools/bpf/bpftool/xlated_dumper.c b/tools/bpf/bpftool/xlated_dumper.c
index 8608cd68cdd0..6fc3e6f7f40c 100644
--- a/tools/bpf/bpftool/xlated_dumper.c
+++ b/tools/bpf/bpftool/xlated_dumper.c
@@ -196,6 +196,9 @@ static const char *print_imm(void *private_data,
else if (insn->src_reg == BPF_PSEUDO_MAP_VALUE)
snprintf(dd->scratch_buff, sizeof(dd->scratch_buff),
"map[id:%u][0]+%u", insn->imm, (insn + 1)->imm);
+ else if (insn->src_reg == BPF_PSEUDO_FUNC)
+ snprintf(dd->scratch_buff, sizeof(dd->scratch_buff),
+ "subprog[%+d]", insn->imm);
else
snprintf(dd->scratch_buff, sizeof(dd->scratch_buff),
"0x%llx", (unsigned long long)full_imm);
--
2.24.1
next prev parent reply other threads:[~2021-02-26 20:50 UTC|newest]
Thread overview: 14+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-02-26 20:49 [PATCH bpf-next v5 00/12] bpf: add bpf_for_each_map_elem() helper Yonghong Song
2021-02-26 20:49 ` [PATCH bpf-next v5 01/12] bpf: factor out visit_func_call_insn() in check_cfg() Yonghong Song
2021-02-26 20:49 ` [PATCH bpf-next v5 02/12] bpf: factor out verbose_invalid_scalar() Yonghong Song
2021-02-26 20:49 ` [PATCH bpf-next v5 03/12] bpf: refactor check_func_call() to allow callback function Yonghong Song
2021-02-26 20:49 ` [PATCH bpf-next v5 04/12] bpf: change return value of verifier function add_subprog() Yonghong Song
2021-02-26 20:49 ` [PATCH bpf-next v5 05/12] bpf: add bpf_for_each_map_elem() helper Yonghong Song
2021-02-26 21:29 ` Alexei Starovoitov
2021-02-26 20:49 ` [PATCH bpf-next v5 06/12] bpf: add hashtab support for " Yonghong Song
2021-02-26 20:49 ` [PATCH bpf-next v5 07/12] bpf: add arraymap " Yonghong Song
2021-02-26 20:49 ` [PATCH bpf-next v5 08/12] libbpf: move function is_ldimm64() earlier in libbpf.c Yonghong Song
2021-02-26 20:49 ` [PATCH bpf-next v5 09/12] libbpf: support subprog address relocation Yonghong Song
2021-02-26 20:49 ` Yonghong Song [this message]
2021-02-26 20:49 ` [PATCH bpf-next v5 11/12] selftests/bpf: add hashmap test for bpf_for_each_map_elem() helper Yonghong Song
2021-02-26 20:49 ` [PATCH bpf-next v5 12/12] selftests/bpf: add arraymap " Yonghong Song
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=20210226204931.3885458-1-yhs@fb.com \
--to=yhs@fb.com \
--cc=andrii@kernel.org \
--cc=ast@kernel.org \
--cc=bpf@vger.kernel.org \
--cc=daniel@iogearbox.net \
--cc=kernel-team@fb.com \
--cc=xiyou.wangcong@gmail.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