diff options
author | David S. Miller | 2019-08-11 23:49:34 +0200 |
---|---|---|
committer | David S. Miller | 2019-08-11 23:49:34 +0200 |
commit | 9481382b36fe1dbdada9303ebd6b9dba915da989 (patch) | |
tree | 704dfcc13581c9aae6fe2a4669d668b4b27207ac /tools/bpf/bpftool/common.c | |
parent | net/tls: swap sk_write_space on close (diff) | |
parent | Merge branch 'bpf-bpftool-pinning-error-msg' (diff) | |
download | kernel-qcow2-linux-9481382b36fe1dbdada9303ebd6b9dba915da989.tar.gz kernel-qcow2-linux-9481382b36fe1dbdada9303ebd6b9dba915da989.tar.xz kernel-qcow2-linux-9481382b36fe1dbdada9303ebd6b9dba915da989.zip |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/bpf/bpf
Daniel Borkmann says:
====================
pull-request: bpf 2019-08-11
The following pull-request contains BPF updates for your *net* tree.
The main changes are:
1) x64 JIT code generation fix for backward-jumps to 1st insn, from Alexei.
2) Fix buggy multi-closing of BTF file descriptor in libbpf, from Andrii.
3) Fix libbpf_num_possible_cpus() to make it thread safe, from Takshak.
4) Fix bpftool to dump an error if pinning fails, from Jakub.
====================
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'tools/bpf/bpftool/common.c')
-rw-r--r-- | tools/bpf/bpftool/common.c | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/tools/bpf/bpftool/common.c b/tools/bpf/bpftool/common.c index 5215e0870bcb..6a71324be628 100644 --- a/tools/bpf/bpftool/common.c +++ b/tools/bpf/bpftool/common.c @@ -204,7 +204,11 @@ int do_pin_fd(int fd, const char *name) if (err) return err; - return bpf_obj_pin(fd, name); + err = bpf_obj_pin(fd, name); + if (err) + p_err("can't pin the object (%s): %s", name, strerror(errno)); + + return err; } int do_pin_any(int argc, char **argv, int (*get_fd_by_id)(__u32)) @@ -237,7 +241,7 @@ int do_pin_any(int argc, char **argv, int (*get_fd_by_id)(__u32)) fd = get_fd_by_id(id); if (fd < 0) { - p_err("can't get prog by id (%u): %s", id, strerror(errno)); + p_err("can't open object by id (%u): %s", id, strerror(errno)); return -1; } |