diff options
| author | Yonghong Song <[email protected]> | 2020-08-05 05:50:58 +0000 |
|---|---|---|
| committer | Alexei Starovoitov <[email protected]> | 2020-08-06 23:39:14 +0000 |
| commit | 74fc097de327b37e8fe3ff580ce7ffaa7c1740dd (patch) | |
| tree | 89c462f3b9f1fa1ea8e5d22f67d2f21fbf2766e1 /tools/lib/bpf/libbpf.c | |
| parent | bpf: Change uapi for bpf iterator map elements (diff) | |
| download | kernel-74fc097de327b37e8fe3ff580ce7ffaa7c1740dd.tar.gz kernel-74fc097de327b37e8fe3ff580ce7ffaa7c1740dd.zip | |
tools/bpf: Support new uapi for map element bpf iterator
Previous commit adjusted kernel uapi for map
element bpf iterator. This patch adjusted libbpf API
due to uapi change. bpftool and bpf_iter selftests
are also changed accordingly.
Signed-off-by: Yonghong Song <[email protected]>
Signed-off-by: Alexei Starovoitov <[email protected]>
Acked-by: Andrii Nakryiko <[email protected]>
Acked-by: John Fastabend <[email protected]>
Link: https://lore.kernel.org/bpf/[email protected]
Diffstat (limited to 'tools/lib/bpf/libbpf.c')
| -rw-r--r-- | tools/lib/bpf/libbpf.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/tools/lib/bpf/libbpf.c b/tools/lib/bpf/libbpf.c index 7be04e45d29c..0a06124f7999 100644 --- a/tools/lib/bpf/libbpf.c +++ b/tools/lib/bpf/libbpf.c @@ -8306,10 +8306,8 @@ bpf_program__attach_iter(struct bpf_program *prog, if (!OPTS_VALID(opts, bpf_iter_attach_opts)) return ERR_PTR(-EINVAL); - if (OPTS_HAS(opts, map_fd)) { - target_fd = opts->map_fd; - link_create_opts.flags = BPF_ITER_LINK_MAP_FD; - } + link_create_opts.iter_info = OPTS_GET(opts, link_info, (void *)0); + link_create_opts.iter_info_len = OPTS_GET(opts, link_info_len, 0); prog_fd = bpf_program__fd(prog); if (prog_fd < 0) { |