bpf: add bpffs/bpftool dump for prog_array and map_in_map maps
Subsystems (4)
cover bpf: add bpffs/bpftool dump for prog_array and map_in_map maps
The support to dump program array and map_in_map maps for bpffs and bpftool is added. Patch #1 added bpffs support and Patch #2 added bpftool support. Please see individual patches for example output.
Yonghong Song (2):
bpf: add bpffs pretty print for program array map tools/bpf: bpftool: support prog array map and map of maps
kernel/bpf/arraymap.c | 25 ++++++++++++++++++++++++- tools/bpf/bpftool/map.c | 11 +++-------- 2 files changed, 27 insertions(+), 9 deletions(-)
Signature · 1 line
2.17.1
PATCH 1/2 bpf: add bpffs pretty print for program array map
Added bpffs pretty print for program array map. For a particular array index, if the program array points to a valid program, the "<index>: <prog_id>" will be printed out like
0: 6
which means bpf program with id "6" is installed at index "0".
--- kernel/bpf/arraymap.c | 25 ++++++++++++++++++++++++- 1 file changed, 24 insertions(+), 1 deletion(-)
kernel/bpf/arraymap.c +24 -1
@@ -553,6 +553,29 @@ static void bpf_fd_array_map_clear(struct bpf_map *map)fd_array_map_delete_elem (map, &i); } +static void prog_array_map_seq_show_elem (struct bpf_map *map,void *key, +struct seq_file *m) +{ +void **elem, *ptr; +u32 prog_id; + +rcu_read_lock (); + + elem =array_map_lookup_elem (map, key); +if (elem) { + ptr =READ_ONCE (*elem); +if (ptr) { +seq_printf (m,"%u: " , *(u32 *)key); + prog_id =prog_fd_array_sys_lookup_elem (ptr); +btf_type_seq_show (map->btf, map->btf_value_type_id, + &prog_id, m); +seq_puts (m,"\n" ); + } + } + +rcu_read_unlock (); +} +const struct bpf_map_ops prog_array_map_ops = { .map_alloc_check = fd_array_map_alloc_check, .map_alloc = array_map_alloc,
@@ -564,7 +587,7 @@ const struct bpf_map_ops prog_array_map_ops = { .map_fd_put_ptr = prog_fd_array_put_ptr, .map_fd_sys_lookup_elem = prog_fd_array_sys_lookup_elem, .map_release_uref = bpf_fd_array_map_clear, - .map_check_btf = map_check_no_btf, + .map_seq_show_elem = prog_array_map_seq_show_elem, }; static struct bpf_event_entry *bpf_event_entry_gen(struct file *perf_file,
Signature · 1 line
2.17.1
PATCH 2/2 tools/bpf: bpftool: support prog array map and map of maps
In reply to Yonghong SongCurrently, prog array map and map of maps are not supported in bpftool. This patch added the support. Different from other map types, for prog array map and map of maps, the key returned bpf_get_next_key() may not point to a valid value. So for these two map types, no error will be printed out when such a scenario happens.
The following is the plain and json dump if btf is not available:
$ ./bpftool map dump id 10
key: 08 00 00 00 value: 5c 01 00 00
Found 1 element
$ ./bpftool -jp map dump id 10
[{
"key": ["0x08","0x00","0x00","0x00"
],
"value": ["0x5c","0x01","0x00","0x00"
]
}]If the BTF is available, the dump looks below:
$ ./bpftool map dump id 2
[{
"key": 0,
"value": 7
}
]
$ ./bpftool -jp map dump id 2
[{
"key": ["0x00","0x00","0x00","0x00"
],
"value": ["0x07","0x00","0x00","0x00"
],
"formatted": {
"key": 0,
"value": 7
}
}]--- tools/bpf/bpftool/map.c | 11 +++-------- 1 file changed, 3 insertions(+), 8 deletions(-)
tools/bpf/bpftool/map.c +3 -8
@@ -673,12 +673,6 @@ static int do_dump(int argc, char **argv)if (fd <0 )return -1 ; -if (map_is_map_of_maps (info.type) ||map_is_map_of_progs (info.type)) { -p_err ("Dumping maps of maps and program maps not supported" ); -close (fd); -return -1 ; - } - key =malloc (info.key_size); value =alloc_value (&info);if (!key || !value) {
@@ -732,7 +726,9 @@ static int do_dump(int argc, char **argv) }else {print_entry_plain (&info, key, value); } - }else { + num_elems++; + }else if (!map_is_map_of_maps (info.type) && + !map_is_map_of_progs (info.type)) {if (json_output) {jsonw_name (json_wtr,"key" );print_hex_data_json (key, info.key_size);
@@ -749,7 +745,6 @@ static int do_dump(int argc, char **argv) } prev_key = key; - num_elems++; }if (json_output)
Signature · 1 line
2.17.1
Alexei Starovoitov
AppliedQuoted 4 lines · Yonghong Song
The support to dump program array and
map_in_mapmaps for bpffs and bpftool is added. Patch #1 added bpffs support and Patch #2 added bpftool support. Please see individual patches for example output.
Applied, Thanks