| Message ID | 20190706044420.1582763-1-andriin@fb.com |
|---|---|
| State | Accepted |
| Delegated to: | BPF Maintainers |
| Headers | show |
| Series | [bpf-next] selftests/bpf: fix test_attach_probe map definition | expand |
On 7/5/19 9:44 PM, Andrii Nakryiko wrote: > ef99b02b23ef ("libbpf: capture value in BTF type info for BTF-defined map > defs") changed BTF-defined maps syntax, while independently merged > 1e8611bbdfc9 ("selftests/bpf: add kprobe/uprobe selftests") added new > test using outdated syntax of maps. This patch fixes this test after > corresponding patch sets were merged. > > Fixes: ef99b02b23ef ("libbpf: capture value in BTF type info for BTF-defined map defs") > Fixes: 1e8611bbdfc9 ("selftests/bpf: add kprobe/uprobe selftests") > Signed-off-by: Andrii Nakryiko <andriin@fb.com> Acked-by: Yonghong Song <yhs@fb.com> > --- > .../testing/selftests/bpf/progs/test_attach_probe.c | 13 +++++-------- > 1 file changed, 5 insertions(+), 8 deletions(-) > > diff --git a/tools/testing/selftests/bpf/progs/test_attach_probe.c b/tools/testing/selftests/bpf/progs/test_attach_probe.c > index 7a7c5cd728c8..63a8dfef893b 100644 > --- a/tools/testing/selftests/bpf/progs/test_attach_probe.c > +++ b/tools/testing/selftests/bpf/progs/test_attach_probe.c > @@ -6,14 +6,11 @@ > #include "bpf_helpers.h" > > struct { > - int type; > - int max_entries; > - int *key; > - int *value; > -} results_map SEC(".maps") = { > - .type = BPF_MAP_TYPE_ARRAY, > - .max_entries = 4, > -}; > + __uint(type, BPF_MAP_TYPE_ARRAY); > + __uint(max_entries, 4); > + __type(key, int); > + __type(value, int); > +} results_map SEC(".maps"); > > SEC("kprobe/sys_nanosleep") > int handle_sys_nanosleep_entry(struct pt_regs *ctx) >
On 07/06/2019 06:44 AM, Andrii Nakryiko wrote: > ef99b02b23ef ("libbpf: capture value in BTF type info for BTF-defined map > defs") changed BTF-defined maps syntax, while independently merged > 1e8611bbdfc9 ("selftests/bpf: add kprobe/uprobe selftests") added new > test using outdated syntax of maps. This patch fixes this test after > corresponding patch sets were merged. > > Fixes: ef99b02b23ef ("libbpf: capture value in BTF type info for BTF-defined map defs") > Fixes: 1e8611bbdfc9 ("selftests/bpf: add kprobe/uprobe selftests") > Signed-off-by: Andrii Nakryiko <andriin@fb.com> Applied, thanks!
diff --git a/tools/testing/selftests/bpf/progs/test_attach_probe.c b/tools/testing/selftests/bpf/progs/test_attach_probe.c index 7a7c5cd728c8..63a8dfef893b 100644 --- a/tools/testing/selftests/bpf/progs/test_attach_probe.c +++ b/tools/testing/selftests/bpf/progs/test_attach_probe.c @@ -6,14 +6,11 @@ #include "bpf_helpers.h" struct { - int type; - int max_entries; - int *key; - int *value; -} results_map SEC(".maps") = { - .type = BPF_MAP_TYPE_ARRAY, - .max_entries = 4, -}; + __uint(type, BPF_MAP_TYPE_ARRAY); + __uint(max_entries, 4); + __type(key, int); + __type(value, int); +} results_map SEC(".maps"); SEC("kprobe/sys_nanosleep") int handle_sys_nanosleep_entry(struct pt_regs *ctx)
ef99b02b23ef ("libbpf: capture value in BTF type info for BTF-defined map defs") changed BTF-defined maps syntax, while independently merged 1e8611bbdfc9 ("selftests/bpf: add kprobe/uprobe selftests") added new test using outdated syntax of maps. This patch fixes this test after corresponding patch sets were merged. Fixes: ef99b02b23ef ("libbpf: capture value in BTF type info for BTF-defined map defs") Fixes: 1e8611bbdfc9 ("selftests/bpf: add kprobe/uprobe selftests") Signed-off-by: Andrii Nakryiko <andriin@fb.com> --- .../testing/selftests/bpf/progs/test_attach_probe.c | 13 +++++-------- 1 file changed, 5 insertions(+), 8 deletions(-)