diff options
| author | Andrii Nakryiko <[email protected]> | 2022-12-20 16:09:40 -0800 |
|---|---|---|
| committer | Andrii Nakryiko <[email protected]> | 2022-12-20 16:09:40 -0800 |
| commit | 7b43df6c6ec38c9097420902a1c8165c4b25bf70 (patch) | |
| tree | de49f97a208943fa022a576c99a155dff69f46fd | |
| parent | 1520e8466d683b6c5e1aa53aa65165ebd5da46cf (diff) | |
| parent | e7f0d5cdd023d8fa53d9ca541b9a55f0eb45618c (diff) | |
Merge branch 'bpftool: improve error handing for missing .BTF section'
Changbin Du says:
====================
Display error message for missing ".BTF" section and clean up empty
vmlinux.h file.
v3:
- fix typo and make error message consistent. (Andrii Nakryiko)
- split out perf change.
v2:
- remove vmlinux specific error info.
- use builtin target .DELETE_ON_ERROR: to delete empty vmlinux.h
====================
Signed-off-by: Andrii Nakryiko <[email protected]>
| -rw-r--r-- | tools/bpf/bpftool/Makefile | 3 | ||||
| -rw-r--r-- | tools/lib/bpf/btf.c | 1 | ||||
| -rw-r--r-- | tools/testing/selftests/bpf/Makefile | 3 |
3 files changed, 7 insertions, 0 deletions
diff --git a/tools/bpf/bpftool/Makefile b/tools/bpf/bpftool/Makefile index 787b857d3fb5..313fd1b09189 100644 --- a/tools/bpf/bpftool/Makefile +++ b/tools/bpf/bpftool/Makefile @@ -289,3 +289,6 @@ FORCE: .PHONY: all FORCE bootstrap clean install-bin install uninstall .PHONY: doc doc-clean doc-install doc-uninstall .DEFAULT_GOAL := all + +# Delete partially updated (corrupted) files on error +.DELETE_ON_ERROR: diff --git a/tools/lib/bpf/btf.c b/tools/lib/bpf/btf.c index 8cbcef959456..b03250007018 100644 --- a/tools/lib/bpf/btf.c +++ b/tools/lib/bpf/btf.c @@ -1003,6 +1003,7 @@ static struct btf *btf_parse_elf(const char *path, struct btf *base_btf, err = 0; if (!btf_data) { + pr_warn("failed to find '%s' ELF section in %s\n", BTF_ELF_SEC, path); err = -ENOENT; goto done; } diff --git a/tools/testing/selftests/bpf/Makefile b/tools/testing/selftests/bpf/Makefile index c22c43bbee19..205e8c3c346a 100644 --- a/tools/testing/selftests/bpf/Makefile +++ b/tools/testing/selftests/bpf/Makefile @@ -626,3 +626,6 @@ EXTRA_CLEAN := $(TEST_CUSTOM_PROGS) $(SCRATCH_DIR) $(HOST_SCRATCH_DIR) \ liburandom_read.so) .PHONY: docs docs-clean + +# Delete partially updated (corrupted) files on error +.DELETE_ON_ERROR: |