selftests/bpf: add new bpf_iter context structs to fix build on old kernels
Subsystems (5)
PATCH 1/1 selftests/bpf: add new bpf_iter context structs to fix build on old kernels
Add bpf_iter__bpf_map_elem and bpf_iter__bpf_sk_storage_map to bpf_iter.h
Cc Yonghong Song <[email protected]>
Fixes 3b1c420bd882 ("selftests/bpf: Add a test for bpf sk_storage_map iterator")
Fixes 2a7c2fff7dd6 ("selftests/bpf: Add test for bpf hash map iterators")
Signed-off-by Andrii Nakryiko <[email protected]>
--- tools/testing/selftests/bpf/progs/bpf_iter.h | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+)
tools/testing/selftests/bpf/progs/bpf_iter.h +18 -0
@@ -11,6 +11,8 @@#define tcp6_sock tcp6_sock___not_used#define bpf_iter__udp bpf_iter__udp___not_used#define udp6_sock udp6_sock___not_used +#define bpf_iter__bpf_map_elem bpf_iter__bpf_map_elem___not_used +#define bpf_iter__bpf_sk_storage_map bpf_iter__bpf_sk_storage_map___not_used#include "vmlinux.h" #undef bpf_iter_meta#undef bpf_iter__bpf_map
@@ -22,6 +24,8 @@#undef tcp6_sock#undef bpf_iter__udp#undef udp6_sock +#undef bpf_iter__bpf_map_elem +#undef bpf_iter__bpf_sk_storage_mapstruct bpf_iter_meta {struct seq_file *seq;
@@ -78,3 +82,17 @@ struct udp6_sock {struct udp_sock udp;struct ipv6_pinfo inet6; } __attribute__((preserve_access_index)); + +struct bpf_iter__bpf_map_elem { +struct bpf_iter_meta *meta; +struct bpf_map *map; +void *key; +void *value; +}; + +struct bpf_iter__bpf_sk_storage_map { +struct bpf_iter_meta *meta; +struct bpf_map *map; +struct sock *sk; +void *value; +};
Signature · 1 line
2.24.1
Quoted 6 lines · Andrii Nakryiko
Add
bpf_iter__bpf_map_elemandbpf_iter__bpf_sk_storage_maptobpf_iter.hCc Yonghong Song <[email protected]>Fixes 3b1c420bd882 ("selftests/bpf: Add a test for bpf sk_storage_map iterator")Fixes 2a7c2fff7dd6 ("selftests/bpf: Add test for bpf hash map iterators")Signed-off-by Andrii Nakryiko <[email protected]>
Acked-by Yonghong Song <[email protected]>
Quoted 6 lines · Andrii Nakryiko
Add
bpf_iter__bpf_map_elemandbpf_iter__bpf_sk_storage_maptobpf_iter.hCc Yonghong Song <[email protected]>Fixes 3b1c420bd882 ("selftests/bpf: Add a test for bpf sk_storage_map iterator")Fixes 2a7c2fff7dd6 ("selftests/bpf: Add test for bpf hash map iterators")Signed-off-by Andrii Nakryiko <[email protected]>
Applied, thanks!