Merge branch 'fix-libbpf-s-bpf_object-and-bpf-subskel-interoperability'

Browse source

Andrii Nakryiko says:

====================
Fix libbpf's bpf_object and BPF subskel interoperability

Fix libbpf's global data map mmap()'ing logic to make BPF objects loaded
through generic bpf_object__load() API interoperable with BPF subskeleton
instantiated from such BPF object. The issue is in re-mmap()'ing of global
data maps after BPF object is loaded into kernel, which is currently done in
BPF skeleton-specific code, and should instead be done in generic and common
bpf_object_load() logic.

See patch #2 for the fix, patch #3 for the selftests.  Patch #1 is preliminary
fix for existing spin_lock selftests which currently works by accident.
====================

Link: https://lore.kernel.org/r/20241023043908.3834423-1-andrii@kernel.org
Signed-off-by: Alexei Starovoitov <ast@kernel.org>

...

This commit is contained in:

Alexei Starovoitov 2024-10-23 22:15:09 -07:00

parent c94ffb3ba4 80a54566b7

commit 39b8ab1519

3 changed files with 117 additions and 46 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

83

tools/lib/bpf/libbpf.c

View file

76

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

View file

4

tools/testing/selftests/bpf/progs/test_spin_lock_fail.c

View file