Skip to content

Teach libbpf to "fix up" BPF verifier log

Andrii Nakryiko bpf 1 version Applied

Status from this message: This series was applied to bpf/bpf-next.git (master)

Get series with b4
b4 am [email protected]

Versions newest first

  1. v1 Latest10 patches 4 repliesApplied 10/10

Patches in v1 All 10 applied

#Subject and filesSizeRepliesApplied
1/10libbpf: fix anonymous type check in CO-RE logictools/lib/bpf/relo_core.c+1 -10 repliesApplied
2/10libbpf: drop unhelpful "program too large" guesstools/lib/bpf/libbpf.c+0 -40 repliesApplied
3/10libbpf: fix logic for finding matching program for CO-RE relocationtools/lib/bpf/libbpf.c+3 -20 repliesApplied
4/10libbpf: avoid joining .BTF.ext data with BPF programs by section nametools/lib/bpf/btf.c tools/lib/bpf/libbpf.c tools/lib/bpf/libbpf_internal.h+65 -290 repliesApplied
5/10selftests/bpf: add CO-RE relos and SEC("?...") to linked_funcs selfteststools/testing/selftests/bpf/prog_tests/linked_funcs.c tools/testing/selftests/bpf/progs/linked_funcs1.c tools/testing/selftests/bpf/progs/linked_funcs2.c+18 -20 repliesApplied
6/10libbpf: record subprog-resolved CO-RE relocations unconditionallytools/lib/bpf/libbpf.c+12 -150 repliesApplied
7/10libbpf: refactor CO-RE relo human description formatting routinetools/lib/bpf/relo_core.c+38 -262 repliesApplied
8/10libbpf: simplify bpf_core_parse_spec() signaturetools/lib/bpf/relo_core.c+15 -190 repliesApplied
9/10libbpf: fix up verifier log for unguarded failed CO-RE relostools/lib/bpf/libbpf.c tools/lib/bpf/relo_core.c tools/lib/bpf/relo_core.h+154 -42 repliesApplied
10/10selftests/bpf: add libbpf's log fixup logic selfteststools/testing/selftests/bpf/prog_tests/log_fixup.c tools/testing/selftests/bpf/progs/test_log_fixup.c tools/testing/selftests/bpf/test_progs.h+163 -00 repliesApplied

Reviews trailers per patch

No Reviewed-by, Acked-by or Tested-by trailers for v1 yet.

Read the v1 thread

Cover letter [PATCH bpf-next 00/10] Teach libbpf to "fix up" BPF verifier log

This patch set teaches libbpf to enhance BPF verifier log with human-readable and relevant information about failed CO-RE relocation. Patch #9 is the main one with the new logic. See relevant commit messages for some more details.

All the other patches are either fixing various bugs detected while working on this feature, most prominently a bug with libbpf not handling CO-RE relocations for SEC("?...") programs, or are refactoring libbpf internals to allow for easier reuse of CO-RE relo lookup and formatting logic.

Andrii Nakryiko (10):
libbpf: fix anonymous type check in CO-RE logic
libbpf: drop unhelpful "program too large" guess
libbpf: fix logic for finding matching program for CO-RE relocation
libbpf: avoid joining .BTF.ext data with BPF programs by section name selftests/bpf: add CO-RE relos and SEC("?...") to linked_funcs
selftests
libbpf: record subprog-resolved CO-RE relocations unconditionally
libbpf: refactor CO-RE relo human description formatting routine
libbpf: simplify bpf_core_parse_spec() signature
libbpf: fix up verifier log for unguarded failed CO-RE relos selftests/bpf: add libbpf's log fixup logic selftests

 tools/lib/bpf/btf.c                           |   9 +-
 tools/lib/bpf/libbpf.c                        | 252 ++++++++++++++----
 tools/lib/bpf/libbpf_internal.h               |   7 +
 tools/lib/bpf/relo_core.c                     | 104 ++++----
 tools/lib/bpf/relo_core.h                     |   6 +
 .../selftests/bpf/prog_tests/linked_funcs.c   |   6 +
 .../selftests/bpf/prog_tests/log_fixup.c      | 114 ++++++++
 .../selftests/bpf/progs/linked_funcs1.c       |   7 +-
 .../selftests/bpf/progs/linked_funcs2.c       |   7 +-
 .../selftests/bpf/progs/test_log_fixup.c      |  38 +++
 tools/testing/selftests/bpf/test_progs.h      |  11 +
 11 files changed, 464 insertions(+), 97 deletions(-)
 create mode 100644 tools/testing/selftests/bpf/prog_tests/log_fixup.c
 create mode 100644 tools/testing/selftests/bpf/progs/test_log_fixup.c
Signature · 1 line
2.30.2