bpftool: Support dumping metadata
Dump metadata in the 'bpftool prog' list if it's present. For some formatting some BTF code is put directly in the metadata dumping. Sanity checks on the map and the kind of the btf_type to make sure we are actually dumping what we are expecting. A helper jsonw_reset is added to json writer so we can reuse the same json writer without having extraneous commas. Sample output: $ bpftool prog 6: cgroup_skb name prog tag bcf7977d3b93787c gpl [...] btf_id 4 metadata: a = "foo" b = 1 $ bpftool prog --json --pretty [{ "id": 6, [...] "btf_id": 4, "metadata": { "a": "foo", "b": 1 } } ] Signed-off-by: YiFei Zhu <zhuyifei@google.com> Signed-off-by: Stanislav Fomichev <sdf@google.com> Signed-off-by: Alexei Starovoitov <ast@kernel.org> Cc: YiFei Zhu <zhuyifei1999@gmail.com> Link: https://lore.kernel.org/bpf/20200915234543.3220146-5-sdf@google.com
This commit is contained in:

committed by
Alexei Starovoitov

parent
5d23328dcc
commit
aff52e685e
@@ -119,6 +119,12 @@ void jsonw_pretty(json_writer_t *self, bool on)
|
||||
self->pretty = on;
|
||||
}
|
||||
|
||||
void jsonw_reset(json_writer_t *self)
|
||||
{
|
||||
assert(self->depth == 0);
|
||||
self->sep = '\0';
|
||||
}
|
||||
|
||||
/* Basic blocks */
|
||||
static void jsonw_begin(json_writer_t *self, int c)
|
||||
{
|
||||
|
Reference in New Issue
Block a user