Skip to content

riscv: BPF JIT fix, optimizations and far jumps support

Björn Töpel bpf linux-riscv netdev 2 versions – Applied

Status from this message: Applied, thanks!

Get series with b4
b4 am [email protected]

Versions newest first · linked by author and title

  1. v2 Latest9 patches 23 repliesApplied
  2. v18 patches 7 repliesSuperseded

Patches in v2 Applied

#Subject and filesSizeRepliesApplied
1/9riscv, bpf: fix broken BPF tail callsarch/riscv/net/bpf_jit_comp.c+11 -21 reply
2/9riscv, bpf: add support for far branchingarch/riscv/net/bpf_jit_comp.c+188 -1643 replies
3/9riscv, bpf: add support for far branching when emitting tail callarch/riscv/net/bpf_jit_comp.c+3 -191 reply
4/9riscv, bpf: add support for far jumps and exitsarch/riscv/net/bpf_jit_comp.c+17 -201 reply
5/9riscv, bpf: optimize BPF tail callsarch/riscv/net/bpf_jit_comp.c+7 -61 reply
6/9riscv, bpf: provide RISC-V specific JIT image alloc/freearch/riscv/include/asm/pgtable.h arch/riscv/net/bpf_jit_comp.c+17 -09 replies
7/9riscv, bpf: optimize callsarch/riscv/net/bpf_jit_comp.c+64 -374 replies
8/9riscv, bpf: add missing uapi header for BPF_PROG_TYPE_PERF_EVENT programsarch/riscv/include/uapi/asm/bpf_perf_event.h tools/include/uapi/asm/bpf_perf_event.h+11 -01 reply
9/9riscv, perf: add arch specific perf_arch_bpf_user_pt_regsarch/riscv/include/asm/perf_event.h+4 -01 reply

Reviews trailers per patch

8 of 9 patches have a Reviewed-by or Acked-by.

PatchLuke NelsonPalmer Dabbelt
1/9R-b A-b
2/9R-b
3/9R-b A-b
4/9R-b
5/9R-b A-b
6/9R-b A-b
7/9
8/9R-b A-b
9/9R-b A-b

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

Read the v2 thread

Cover letter [PATCH bpf-next v2 0/9] riscv: BPF JIT fix, optimizations and far jumps support

Hi!

This series contain one non-critical fix, support for far jumps. and some optimizations for the BPF JIT.

Previously, the JIT only supported 12b branch targets for conditional branches, and 21b for unconditional branches. Starting with this series, 32b branching is supported.

As part of supporting far jumps, branch relaxation was introduced. The idea is to start with a pessimistic jump (e.g. auipc/jalr) and for each pass the JIT will have an opportunity to pick a better instruction (e.g. jal) and shrink the image. Instead of two passes, the JIT requires more passes. It typically converges after 3 passes.

The optimizations mentioned in the subject are for calls and tail calls. In the tail call generation we can save one instruction by using the offset in jalr. Calls are optimized by doing (auipc)/jal(r) relative jumps instead of loading the entire absolute address and doing jalr. This required that the JIT image allocator was made RISC-V specific, so we can ensure that the JIT image and the kernel text are in range (32b).

The last two patches of the series is not critical to the series, but are two UAPI build issues for BPF events. A closer look from the RV-folks would be much appreciated.

The test_bpf.ko module, selftests/bpf/test_verifier and selftests/seccomp/seccomp_bpf pass all tests.

RISC-V is still missing proper kprobe and tracepoint support, so a lot of BPF selftests cannot be run.

Thanks,
Björn

v1->v2: [1]
* Removed unused function parameter from emit_branch()
* Added patch to support far branch in tail call emit

[1] https://lore.kernel.org/bpf/[email protected]/

Björn Töpel (9):
riscv, bpf: fix broken BPF tail calls
riscv, bpf: add support for far branching
riscv, bpf: add support for far branching when emitting tail call riscv, bpf: add support for far jumps and exits
riscv, bpf: optimize BPF tail calls
riscv, bpf: provide RISC-V specific JIT image alloc/free riscv, bpf: optimize calls
riscv, bpf: add missing uapi header for BPF_PROG_TYPE_PERF_EVENT
programs
riscv, perf: add arch specific perf_arch_bpf_user_pt_regs

 arch/riscv/include/asm/perf_event.h          |   4 +
 arch/riscv/include/asm/pgtable.h             |   4 +
 arch/riscv/include/uapi/asm/bpf_perf_event.h |   9 +
 arch/riscv/net/bpf_jit_comp.c                | 531 ++++++++++---------
 tools/include/uapi/asm/bpf_perf_event.h      |   2 +
 5 files changed, 312 insertions(+), 238 deletions(-)
 create mode 100644 arch/riscv/include/uapi/asm/bpf_perf_event.h
Signature · 1 line
2.20.1