Skip to content

libbpf: auto-resize relocatable LOAD/STORE instructions

Andrii Nakryiko bpf netdev 2 versions – Applied

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

Get series with b4
b4 am [email protected]

Versions newest first · linked by author and title

  1. v3 Latest4 patches 0 repliesApplied 4/4
  2. v24 patches 2 repliesSuperseded

Changes in v3 from the cover letter

- fix copyright (Alexei);

Patches in v3 All 4 applied

#Subject and filesSizeRepliesApplied
1/4libbpf: skip CO-RE relocations for not loaded BPF programstools/lib/bpf/libbpf.c+5 -00 repliesApplied
2/4libbpf: support safe subset of load/store instruction resizing with CO-REtools/lib/bpf/libbpf.c+136 -80 repliesApplied
3/4libbpf: allow specifying both ELF and raw BTF for CO-RE BTF overridetools/lib/bpf/libbpf.c+1 -10 repliesApplied
4/4selftests/bpf: validate libbpf's auto-sizing of LD/ST/STX instructionstools/testing/selftests/bpf/prog_tests/core_autosize.c tools/testing/selftests/bpf/progs/test_core_autosize.c+397 -00 repliesApplied

Reviews trailers per patch

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

Read the v3 thread

Cover letter [PATCH v3 bpf-next 0/4] libbpf: auto-resize relocatable LOAD/STORE instructions

Patch set implements logic in libbpf to auto-adjust memory size (1-, 2-, 4-, 8-bytes) of load/store (LD/ST/STX) instructions which have BPF CO-RE field offset relocation associated with it. In practice this means transparent handling of 32-bit kernels, both pointer and unsigned integers. Signed integers are not relocatable with zero-extending loads/stores, so libbpf poisons them and generates a warning. If/when BPF gets support for sign-extending loads/stores, it would be possible to automatically relocate them as well.

All the details are contained in patch #2 comments and commit message. Patch #3 is a simple change in libbpf to make advanced testing with custom BTF easier. Patch #4 validates correct uses of auto-resizable loads, as well as check that libbpf fails invalid uses. Patch #1 skips CO-RE relocation for programs that had bpf_program__set_autoload(prog, false) set on them, reducing warnings and noise.

v2->v3:
- fix copyright (Alexei);
v1->v2:
- more consistent names for instruction mem size convertion routines (Alexei);
- extended selftests to use relocatable STX instructions (Alexei);
- added a fix for skipping CO-RE relocation for non-loadable programs.

Cc Luka Perkov <[email protected]>
Cc Tony Ambardar <[email protected]>

Andrii Nakryiko (4):
libbpf: skip CO-RE relocations for not loaded BPF programs
libbpf: support safe subset of load/store instruction resizing with
CO-RE
libbpf: allow specifying both ELF and raw BTF for CO-RE BTF override selftests/bpf: validate libbpf's auto-sizing of LD/ST/STX instructions

 tools/lib/bpf/libbpf.c                        | 151 +++++++++++-
 .../selftests/bpf/prog_tests/core_autosize.c  | 225 ++++++++++++++++++
 .../selftests/bpf/progs/test_core_autosize.c  | 172 +++++++++++++
 3 files changed, 539 insertions(+), 9 deletions(-)
 create mode 100644 tools/testing/selftests/bpf/prog_tests/core_autosize.c
 create mode 100644 tools/testing/selftests/bpf/progs/test_core_autosize.c
Signature · 1 line
2.24.1