Commit 60f27075 authored by Dave Marchevsky's avatar Dave Marchevsky Committed by Andrii Nakryiko

bpftool: Migrate -1 err checks of libbpf fn calls

Per [0], callers of libbpf functions with LIBBPF_STRICT_DIRECT_ERRS set
should handle negative error codes of various values (e.g. -EINVAL).
Migrate two callsites which were explicitly checking for -1 only to
handle the new scheme.

  [0]: https://github.com/libbpf/libbpf/wiki/Libbpf-1.0-migration-guide#direct-error-code-returning-libbpf_strict_direct_errsSigned-off-by: default avatarDave Marchevsky <davemarchevsky@fb.com>
Signed-off-by: default avatarAndrii Nakryiko <andrii@kernel.org>
Acked-by: default avatarQuentin Monnet <quentin@isovalent.com>
Link: https://lore.kernel.org/bpf/20211101224357.2651181-2-davemarchevsky@fb.com
parent cc0356d6
...@@ -52,7 +52,7 @@ static int dump_prog_id_as_func_ptr(const struct btf_dumper *d, ...@@ -52,7 +52,7 @@ static int dump_prog_id_as_func_ptr(const struct btf_dumper *d,
/* Get the bpf_prog's name. Obtain from func_info. */ /* Get the bpf_prog's name. Obtain from func_info. */
prog_fd = bpf_prog_get_fd_by_id(prog_id); prog_fd = bpf_prog_get_fd_by_id(prog_id);
if (prog_fd == -1) if (prog_fd < 0)
goto print; goto print;
prog_info = bpf_program__get_prog_info_linear(prog_fd, prog_info = bpf_program__get_prog_info_linear(prog_fd,
......
...@@ -252,7 +252,7 @@ static struct res do_one_id(const char *id_str, work_func func, void *data, ...@@ -252,7 +252,7 @@ static struct res do_one_id(const char *id_str, work_func func, void *data,
} }
fd = bpf_map_get_fd_by_id(id); fd = bpf_map_get_fd_by_id(id);
if (fd == -1) { if (fd < 0) {
p_err("can't get map by id (%lu): %s", id, strerror(errno)); p_err("can't get map by id (%lu): %s", id, strerror(errno));
res.nr_errs++; res.nr_errs++;
return res; return res;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment