Re: [PATCH v11 bpf-next 02/12] bpftool: Recognize insn_array map type

[Anton Protopopov <a.s.protopopov@gmail.com>]

On 25/11/05 09:21AM, bot+bpf-ci@kernel.org wrote:
> > diff --git a/tools/bpf/bpftool/Documentation/bpftool-map.rst b/tools/bpf/bpftool/Documentation/bpftool-map.rst
> > index 252e4c538..1af3305ea 100644
> > --- a/tools/bpf/bpftool/Documentation/bpftool-map.rst
> > +++ b/tools/bpf/bpftool/Documentation/bpftool-map.rst
> > @@ -55,7 +55,8 @@ MAP COMMANDS
> >  |     | **devmap** | **devmap_hash** | **sockmap** | **cpumap** | **xskmap** | **sockhash**
> >  |     | **cgroup_storage** | **reuseport_sockarray** | **percpu_cgroup_storage**
> >  |     | **queue** | **stack** | **sk_storage** | **struct_ops** | **ringbuf** | **inode_storage**
> > -|     | **task_storage** | **bloom_filter** | **user_ringbuf** | **cgrp_storage** | **arena** }
> > +|     | **task_storage** | **bloom_filter** | **user_ringbuf** | **cgrp_storage** | **arena**
> > +|     | **insn_array** }
> >
> >  DESCRIPTION
> >  ===========
> > diff --git a/tools/bpf/bpftool/map.c b/tools/bpf/bpftool/map.c
> > index c9de44a45..7ebf7dbcf 100644
> > --- a/tools/bpf/bpftool/map.c
> > +++ b/tools/bpf/bpftool/map.c
> > @@ -1477,7 +1477,8 @@ static int do_help(int argc, char **argv)
> >  		"                 devmap | devmap_hash | sockmap | cpumap | xskmap | sockhash |\n"
> >  		"                 cgroup_storage | reuseport_sockarray | percpu_cgroup_storage |\n"
> >  		"                 queue | stack | sk_storage | struct_ops | ringbuf | inode_storage |\n"
> > -		"                 task_storage | bloom_filter | user_ringbuf | cgrp_storage | arena }\n"
> > +		"                 task_storage | bloom_filter | user_ringbuf | cgrp_storage | arena |\n"
> > +		"                 insn_array }\n"
> >  		"       " HELP_SPEC_OPTIONS " |\n"
> >  		"                    {-f|--bpffs} | {-n|--nomount} }\n"
> >  		"",
> 
> The commit message says "Teach bpftool to recognize instruction array
> map type" but this change only updates documentation strings. Shouldn't
> libbpf's map_type_name[] array in tools/lib/bpf/libbpf.c also be
> updated? Without that, when bpftool displays an insn_array map through
> show_map_header_json() or the plain output function, it will call
> libbpf_bpf_map_type_str() which returns NULL for BPF_MAP_TYPE_INSN_ARRAY,
> causing bpftool to fall back to printing "type 39" instead of "insn_array".

It's done in an adjacent commit.

> 
> ---
> AI reviewed your patch. Please fix the bug or email reply why it's not a bug.
> See: https://github.com/kernel-patches/vmtest/blob/master/ci/claude/README.md
> 
> CI run summary: https://github.com/kernel-patches/bpf/actions/runs/19096860051