Skip to content

BPF token support in libbpf's BPF object

Andrii Nakryiko bpf 3 versions – 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 · linked by author and title

  1. v3 Latest10 patches 1 replyApplied 10/10
  2. v28 patches 4 repliesSuperseded
  3. v18 patches 17 repliesSuperseded

Changes in v3 from the cover letter

- move some stray feature cache refactorings into patch #4 (Alexei);
- add LIBBPF_BPF_TOKEN_PATH envvar support (Alexei);

Patches in v3 All 10 applied

#Subject and filesSizeRepliesApplied
1/10bpf: fail BPF_TOKEN_CREATE if no delegation option was set on BPF FSkernel/bpf/token.c+9 -10 repliesApplied
2/10libbpf: split feature detectors definitions from cached resultstools/lib/bpf/libbpf.c+12 -60 repliesApplied
3/10libbpf: further decouple feature checking logic from bpf_objecttools/lib/bpf/bpf.c tools/lib/bpf/libbpf.c tools/lib/bpf/libbpf_internal.h+22 -110 repliesApplied
4/10libbpf: move feature detection code into its own filetools/lib/bpf/Build tools/lib/bpf/elf.c tools/lib/bpf/features.c +3 more+479 -4660 repliesApplied
5/10libbpf: wire up token_fd into feature probing logictools/lib/bpf/bpf.c tools/lib/bpf/features.c tools/lib/bpf/libbpf.c +2 more+66 -460 repliesApplied
6/10libbpf: wire up BPF token support at BPF object leveltools/lib/bpf/btf.c tools/lib/bpf/libbpf.c tools/lib/bpf/libbpf.h +1 more+158 -120 repliesApplied
7/10selftests/bpf: add BPF object loading tests with explicit token passingtools/testing/selftests/bpf/prog_tests/token.c tools/testing/selftests/bpf/progs/priv_map.c tools/testing/selftests/bpf/progs/priv_prog.c+185 -00 repliesApplied
8/10selftests/bpf: add tests for BPF object load with implicit tokentools/testing/selftests/bpf/prog_tests/token.c+76 -00 repliesApplied
9/10libbpf: support BPF token path setting through LIBBPF_BPF_TOKEN_PATH envvartools/lib/bpf/libbpf.c tools/lib/bpf/libbpf.h+21 -60 repliesApplied
10/10selftests/bpf: add tests for LIBBPF_BPF_TOKEN_PATH envvartools/testing/selftests/bpf/prog_tests/token.c+112 -00 repliesApplied

Reviews trailers per patch

7 of 10 patches have a Reviewed-by or Acked-by.

PatchChristian BraunerJohn Fastabend
1/10A-b A-b
2/10A-b
3/10A-b
4/10A-b
5/10A-b
6/10
7/10A-b
8/10A-b
9/10
10/10

Trailers given in replies are filled; those carried in the patches from earlier versions are outlined with dashes.

Read the v3 thread

Cover letter [PATCH v3 bpf-next 00/10] BPF token support in libbpf's BPF object

Add fuller support for BPF token in high-level BPF object APIs. This is the most frequently used way to work with BPF using libbpf, so supporting BPF token there is critical.

Patch #1 is improving kernel-side BPF_TOKEN_CREATE behavior by rejecting to create "empty" BPF token with no delegation. This seems like saner behavior which also makes libbpf's caching better overall. If we ever want to create BPF token with no delegate_xxx options set on BPF FS, we can use a new flag to enable that.

Patches #2-#5 refactor libbpf internals, mostly feature detection code, to prepare it from BPF token FD.

Patch #6 adds options to pass BPF token into BPF object open options. It also adds implicit BPF token creation logic to BPF object load step, even without any explicit involvement of the user. If the environment is setup properly, BPF token will be created transparently and used implicitly. This allows for all existing application to gain BPF token support by just linking with latest version of libbpf library. No source code modifications are required. All that under assumption that privileged container management agent properly set up default BPF FS instance at /sys/bpf/fs to allow BPF token creation.

Patches #7-#8 adds more selftests, validating BPF object APIs work as expected under unprivileged user namespaced conditions in the presence of BPF token.

Patch #9 extends libbpf with LIBBPF_BPF_TOKEN_PATH envvar knowledge, which can be used to override custom BPF FS location used for implicit BPF token creation logic without needing to adjust application code. This allows admins or container managers to mount BPF token-enabled BPF FS at non-standard location without the need to coordinate with applications. LIBBPF_BPF_TOKEN_PATH can also be used to disable BPF token implicit creation by setting it to an empty value. Patch #10 tests this new envvar functionality.

v2->v3:
- move some stray feature cache refactorings into patch #4 (Alexei);
- add LIBBPF_BPF_TOKEN_PATH envvar support (Alexei);
v1->v2:
- remove minor code redundancies (Eduard, John);
- add acks and rebase.

Andrii Nakryiko (10):
bpf: fail BPF_TOKEN_CREATE if no delegation option was set on BPF FS
libbpf: split feature detectors definitions from cached results
libbpf: further decouple feature checking logic from bpf_object
libbpf: move feature detection code into its own file
libbpf: wire up token_fd into feature probing logic
libbpf: wire up BPF token support at BPF object level selftests/bpf: add BPF object loading tests with explicit token
passing
selftests/bpf: add tests for BPF object load with implicit token
libbpf: support BPF token path setting through LIBBPF_BPF_TOKEN_PATH
envvar
selftests/bpf: add tests for LIBBPF_BPF_TOKEN_PATH envvar

 kernel/bpf/token.c                            |  10 +-
 tools/lib/bpf/Build                           |   2 +-
 tools/lib/bpf/bpf.c                           |   9 +-
 tools/lib/bpf/btf.c                           |   7 +-
 tools/lib/bpf/elf.c                           |   2 -
 tools/lib/bpf/features.c                      | 478 +++++++++++++++
 tools/lib/bpf/libbpf.c                        | 573 ++++--------------
 tools/lib/bpf/libbpf.h                        |  37 +-
 tools/lib/bpf/libbpf_internal.h               |  36 +-
 tools/lib/bpf/libbpf_probes.c                 |   8 +-
 tools/lib/bpf/str_error.h                     |   3 +
 .../testing/selftests/bpf/prog_tests/token.c  | 347 +++++++++++
 tools/testing/selftests/bpf/progs/priv_map.c  |  13 +
 tools/testing/selftests/bpf/progs/priv_prog.c |  13 +
 14 files changed, 1065 insertions(+), 473 deletions(-)
 create mode 100644 tools/lib/bpf/features.c
 create mode 100644 tools/testing/selftests/bpf/progs/priv_map.c
 create mode 100644 tools/testing/selftests/bpf/progs/priv_prog.c
Signature · 1 line
2.34.1