leandrof/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

selftests/bpf: Add new bpf_iter context structs to fix build on old kernels

Browse Source 
Add bpf_iter__bpf_map_elem and bpf_iter__bpf_sk_storage_map to bpf_iter.h.

Fixes: 3b1c420bd8 ("selftests/bpf: Add a test for bpf sk_storage_map iterator")
Fixes: 2a7c2fff7d ("selftests/bpf: Add test for bpf hash map iterators")
Signed-off-by: Andrii Nakryiko <andriin@fb.com>
Signed-off-by: Daniel Borkmann <daniel@iogearbox.net>
Acked-by: Yonghong Song <yhs@fb.com>
Link: https://lore.kernel.org/bpf/20200727233345.1686358-1-andriin@fb.com
This commit is contained in:
Andrii Nakryiko 2020-07-27 16:33:45 -07:00 committed by Daniel Borkmann
parent e1613b5714
commit 363885d7c6
1 changed files with 18 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
tools/testing/selftests/bpf/progs/bpf_iter.h
View File

@ -11,6 +11,8 @@
#define tcp6_sock tcp6_sock___not_used #define tcp6_sock tcp6_sock___not_used
#define bpf_iter__udp bpf_iter__udp___not_used #define bpf_iter__udp bpf_iter__udp___not_used
#define udp6_sock udp6_sock___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" #include "vmlinux.h"
#undef bpf_iter_meta #undef bpf_iter_meta
#undef bpf_iter__bpf_map #undef bpf_iter__bpf_map
@ -22,6 +24,8 @@
#undef tcp6_sock #undef tcp6_sock
#undef bpf_iter__udp #undef bpf_iter__udp
#undef udp6_sock #undef udp6_sock
#undef bpf_iter__bpf_map_elem
#undef bpf_iter__bpf_sk_storage_map
struct bpf_iter_meta { struct bpf_iter_meta {
struct seq_file *seq; struct seq_file *seq;
@ -78,3 +82,17 @@ struct udp6_sock {
struct udp_sock udp; struct udp_sock udp;
struct ipv6_pinfo inet6; struct ipv6_pinfo inet6;
} __attribute__((preserve_access_index)); } __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;
};