OpenE2K
/
dwarves
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

btf_encoder: Improve ELF error reporting 

libelf provides an errno/strerror-like facility. This commit updates
various error messages to include helpful error text.

Committer testing:

Before:

  $ pahole /tmp
  btf_elf__new: cannot read /tmp ELF file.
  ctf__new: cannot read /tmp ELF file.
  pahole: file '/tmp' has no supported type information.
  $

After:

  $ pahole /tmp
  btf_elf__new: cannot read /tmp ELF file: invalid file descriptor.
  ctf__new: cannot read /tmp ELF file.
  pahole: file '/tmp' has no supported type information.
  $

Signed-off-by: Giuliano Procida <gprocida@google.com>
Tested-by: Arnaldo Carvalho de Melo <acme@redhat.com>
Cc: Alexei Starovoitov <ast@kernel.org>
Cc: Andrii Nakryiko <andrii@kernel.org>
Cc: Matthias Maennich <maennich@google.com>
Cc: bpf@vger.kernel.org
Cc: dwarves@vger.kernel.org
Cc: kernel-team@android.com
Cc: kernel-team@fb.com
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
This commit is contained in:
Giuliano Procida 2021-01-25 13:06:22 +00:00 committed by Arnaldo Carvalho de Melo
parent 1bb49897dd
commit 7453895e01
1 changed files with 11 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
libbtf.c
View File

@ -109,8 +109,8 @@ try_as_raw_btf:
btfe->elf = elf_begin(btfe->in_fd, ELF_C_READ_MMAP, NULL);
if (!btfe->elf) {
fprintf(stderr, "%s: cannot read %s ELF file.\n",
__func__, filename);
fprintf(stderr, "%s: cannot read %s ELF file: %s.\n",
__func__, filename, elf_errmsg(elf_errno()));
goto errout;
}
}
@ -706,13 +706,15 @@ static int btf_elf__write(const char *filename, struct btf *btf)
}
if (elf_version(EV_CURRENT) == EV_NONE) {
fprintf(stderr, "Cannot set libelf version.\n");
fprintf(stderr, "Cannot set libelf version: %s.\n",
elf_errmsg(elf_errno()));
goto out;
}
elf = elf_begin(fd, ELF_C_RDWR, NULL);
if (elf == NULL) {
fprintf(stderr, "Cannot update ELF file.\n");
fprintf(stderr, "Cannot update ELF file: %s.\n",
elf_errmsg(elf_errno()));
goto out;
}
@ -720,7 +722,8 @@ static int btf_elf__write(const char *filename, struct btf *btf)
ehdr = gelf_getehdr(elf, &ehdr_mem);
if (ehdr == NULL) {
fprintf(stderr, "%s: elf_getehdr failed.\n", __func__);
fprintf(stderr, "%s: elf_getehdr failed: %s.\n", __func__,
elf_errmsg(elf_errno()));
goto out;
}
@ -763,6 +766,9 @@ static int btf_elf__write(const char *filename, struct btf *btf)
if (elf_update(elf, ELF_C_NULL) >= 0 &&
elf_update(elf, ELF_C_WRITE) >= 0)
err = 0;
else
fprintf(stderr, "%s: elf_update failed: %s.\n",
__func__, elf_errmsg(elf_errno()));
} else {
const char *llvm_objcopy;
char tmp_fn[PATH_MAX];