Skip to content

Commit edbca12

Browse files
netoptimizerAlexei Starovoitov
authored andcommitted
samples/bpf: Fix broken xdp_rxq_info due to map order assumptions
In the days of using bpf_load.c the order in which the 'maps' sections were defines in BPF side (*_kern.c) file, were used by userspace side to identify the map via using the map order as an index. In effect the order-index is created based on the order the maps sections are stored in the ELF-object file, by the LLVM compiler. This have also carried over in libbpf via API bpf_map__next(NULL, obj) to extract maps in the order libbpf parsed the ELF-object file. When BTF based maps were introduced a new section type ".maps" were created. I found that the LLVM compiler doesn't create the ".maps" sections in the order they are defined in the C-file. The order in the ELF file is based on the order the map pointer is referenced in the code. This combination of changes lead to xdp_rxq_info mixing up the map file-descriptors in userspace, resulting in very broken behaviour, but without warning the user. This patch fix issue by instead using bpf_object__find_map_by_name() to find maps via their names. (Note, this is the ELF name, which can be longer than the name the kernel retains). Fixes: be5bca4 ("samples: bpf: convert some XDP samples from bpf_load to libbpf") Fixes: 451d1dc ("samples: bpf: update map definition to new syntax BTF-defined map") Signed-off-by: Jesper Dangaard Brouer <[email protected]> Signed-off-by: Alexei Starovoitov <[email protected]> Acked-by: Toke Høiland-Jørgensen <[email protected]> Acked-by: Andrii Nakryiko <[email protected]> Link: https://lore.kernel.org/bpf/157529025128.29832.5953245340679936909.stgit@firesoul
1 parent 099ffd7 commit edbca12

File tree

1 file changed

+3
-3
lines changed

1 file changed

+3
-3
lines changed

samples/bpf/xdp_rxq_info_user.c

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -489,9 +489,9 @@ int main(int argc, char **argv)
489489
if (bpf_prog_load_xattr(&prog_load_attr, &obj, &prog_fd))
490490
return EXIT_FAIL;
491491

492-
map = bpf_map__next(NULL, obj);
493-
stats_global_map = bpf_map__next(map, obj);
494-
rx_queue_index_map = bpf_map__next(stats_global_map, obj);
492+
map = bpf_object__find_map_by_name(obj, "config_map");
493+
stats_global_map = bpf_object__find_map_by_name(obj, "stats_global_map");
494+
rx_queue_index_map = bpf_object__find_map_by_name(obj, "rx_queue_index_map");
495495
if (!map || !stats_global_map || !rx_queue_index_map) {
496496
printf("finding a map in obj file failed\n");
497497
return EXIT_FAIL;

0 commit comments

Comments
 (0)