Merge branch 'libbpf: rename btf__get_from_id() and btf__load() APIs, support split BTF'

Browse source

Quentin Monnet says:

====================

As part of the effort to move towards a v1.0 for libbpf [0], this set
improves some confusing function names related to BTF loading from and to
the kernel:

- btf__load() becomes btf__load_into_kernel().
- btf__get_from_id becomes btf__load_from_kernel_by_id().
- A new version btf__load_from_kernel_by_id_split() extends the former to
  add support for split BTF.

The last patch is a trivial change to bpftool to add support for dumping
split BTF objects by referencing them by their id (and not only by their
BTF path).

[0] https://github.com/libbpf/libbpf/wiki/Libbpf:-the-road-to-v1.0#btfh-apis

v3:
- Use libbpf_err_ptr() in btf__load_from_kernel_by_id(), ERR_PTR() in
  bpftool's get_map_kv_btf().
- Move the definition of btf__load_from_kernel_by_id() closer to the
  btf__parse() group in btf.h (move the legacy function with it).
- Fix a bug on the return value in libbpf_find_prog_btf_id(), as a new
  patch.
- Move the btf__free() fixes to their own patch.
- Add "Fixes:" tags to relevant patches.

v2:
- Remove deprecation marking of legacy functions (patch 4/6 from v1).
- Make btf__load_from_kernel_by_id{,_split}() return the btf struct, adjust
  surrounding code and call btf__free() when missing.
- Add new functions to v0.5.0 API (and not v0.6.0).
====================

Signed-off-by: Andrii Nakryiko <andrii@kernel.org>

...

This commit is contained in:

Andrii Nakryiko 2021-07-29 17:03:42 -07:00

parent d36216429f 211ab78f76

commit f309b4ba98

11 changed files with 90 additions and 47 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download patch file Download diff file Expand all files Collapse all files

8

tools/bpf/bpftool/btf.c

View file

6

tools/bpf/bpftool/btf_dumper.c

View file

14

tools/bpf/bpftool/map.c

View file

29

tools/bpf/bpftool/prog.c

View file

33

tools/lib/bpf/btf.c

View file

6

tools/lib/bpf/btf.h

View file

11

tools/lib/bpf/libbpf.c

View file

3

tools/lib/bpf/libbpf.map

View file

11

tools/perf/util/bpf-event.c

View file

12

tools/perf/util/bpf_counter.c

View file

4

tools/testing/selftests/bpf/prog_tests/btf.c

View file