Skip to content

bpf: Support new insns from cpu v4

Yonghong Song bpf 3 versions – In review

Get series with b4
b4 am [email protected]

Versions newest first · linked by author and title

  1. v3 Latest17 patches 6 repliesIn review
  2. v215 patches 35 repliesSuperseded
  3. v1 RFC13 patches 6 repliesSuperseded

Changes in v3 from the cover letter

. add missed disasm change from v2.
. handle signed load of ctx fields properly.
. fix some interpreter sdiv/smod error when bpf_jit_enable = 0. . fix some verifier range bounding errors.
. add more C tests.
RFCv1 -> v2:
. add more verifier supports for signed extend load and mov insns. . rename some insn names to be more consistent with intel practice. . add cpuv4 test runner for test progs.
. add more unit and C tests.
. add documentation.

Patches in v3 No applies recorded yet

#Subject and filesSizeRepliesApplied
1/17bpf: Support new sign-extension load insnsarch/x86/net/bpf_jit_comp.c include/linux/filter.h include/uapi/linux/bpf.h +3 more+191 -272 replies
2/17bpf: Support new sign-extension mov insnsarch/x86/net/bpf_jit_comp.c kernel/bpf/core.c kernel/bpf/verifier.c+205 -310 replies
3/17bpf: Handle sign-extenstin ctx member accesseskernel/bpf/verifier.c+6 -00 replies
4/17bpf: Support new unconditional bswap instructionarch/x86/net/bpf_jit_comp.c kernel/bpf/core.c kernel/bpf/verifier.c+20 -20 replies
5/17bpf: Support new signed div/mod instructions.arch/x86/net/bpf_jit_comp.c kernel/bpf/core.c kernel/bpf/verifier.c+117 -260 replies
6/17bpf: Fix jit blinding with new sdiv/smov insnsinclude/linux/filter.h kernel/bpf/core.c+12 -60 replies
7/17bpf: Support new 32bit offset jmp instructionarch/x86/net/bpf_jit_comp.c kernel/bpf/core.c kernel/bpf/verifier.c+56 -230 replies
8/17bpf: Add kernel/bpftool asm support for new instructionskernel/bpf/disasm.c+51 -61 reply
9/17selftests/bpf: Fix a test_verifier failuretools/testing/selftests/bpf/verifier/basic_instr.c+3 -30 replies
10/17selftests/bpf: Add a cpuv4 test runner for cpu=v4 testingtools/testing/selftests/bpf/.gitignore tools/testing/selftests/bpf/Makefile+16 -40 replies
11/17selftests/bpf: Add unit tests for new sign-extension load insnstools/testing/selftests/bpf/prog_tests/verifier.c tools/testing/selftests/bpf/progs/verifier_ldsx.c+119 -02 replies
12/17selftests/bpf: Add unit tests for new sign-extension mov insnstools/testing/selftests/bpf/prog_tests/verifier.c tools/testing/selftests/bpf/progs/verifier_movsx.c+201 -00 replies
13/17selftests/bpf: Add unit tests for new bswap insnstools/testing/selftests/bpf/prog_tests/verifier.c tools/testing/selftests/bpf/progs/verifier_bswap.c+47 -00 replies
14/17selftests/bpf: Add unit tests for new sdiv/smod insnstools/testing/selftests/bpf/prog_tests/verifier.c tools/testing/selftests/bpf/progs/verifier_sdiv.c+769 -00 replies
15/17selftests/bpf: Add unit tests for new gotol insntools/testing/selftests/bpf/prog_tests/verifier.c tools/testing/selftests/bpf/progs/verifier_gotol.c+32 -00 replies
16/17selftests/bpf: Test ldsx with more complex casestools/testing/selftests/bpf/bpf_testmod/bpf_testmod.c tools/testing/selftests/bpf/prog_tests/test_ldsx_insn.c tools/testing/selftests/bpf/progs/test_ldsx_insn.c+244 -10 replies
17/17docs/bpf: Add documentation for new instructionsDocumentation/bpf/bpf_design_QA.rst Documentation/bpf/standardization/instruction-set.rst+70 -400 replies

Reviews trailers per patch

1 of 17 patches has a Reviewed-by or Acked-by of their own; the series has one for all of them.

PatchEduard ZingermanQuentin Monnet
SeriesA-b
1/17
2/17
3/17
4/17
5/17
6/17
7/17
8/17A-b
9/17
10/17
11/17
12/17
13/17
14/17
15/17
16/17
17/17

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 bpf-next v3 00/17] bpf: Support new insns from cpu v4

In previous discussion ([1]), it is agreed that we should introduce cpu version 4 (llvm flag -mcpu=v4) which contains some instructions which can simplify code, make code easier to understand, fix the existing problem, or simply for feature completeness. More specifically, the following new insns are proposed:
. sign extended load
. sign extended mov
. bswap
. signed div/mod
. ja with 32-bit offset

This patch set added kernel support for insns proposed in [1] except BPF_ST which already has full kernel support. Beside the above proposed insns, LLVM will generate BPF_ST insn as well under -mcpu=v4 ([2]).

The patchset implements interpreter, jit and verifier support for these new insns.

To test this patch set, you need to have latest llvm from 'main' branch of llvm-project repo and apply [2] on top of it.

For this patch set, I tested cpu v2/v3/v4 and the selftests are all passed. I also tested selftests introduced in this patch set with additional changes beside normal jit testing (bpf_jit_enable = 1 and bpf_jit_harden = 0)
- bpf_jit_enable = 0
- bpf_jit_enable = 1 and bpf_jit_harden = 1
and both testing passed.

[1] https://lore.kernel.org/bpf/[email protected]/
[2] https://reviews.llvm.org/D144829

Changelogs:
v2 -> v3:
. add missed disasm change from v2.
. handle signed load of ctx fields properly.
. fix some interpreter sdiv/smod error when bpf_jit_enable = 0. . fix some verifier range bounding errors.
. add more C tests.
RFCv1 -> v2:
. add more verifier supports for signed extend load and mov insns. . rename some insn names to be more consistent with intel practice. . add cpuv4 test runner for test progs.
. add more unit and C tests.
. add documentation.

Yonghong Song (17):
bpf: Support new sign-extension load insns
bpf: Support new sign-extension mov insns
bpf: Handle sign-extenstin ctx member accesses
bpf: Support new unconditional bswap instruction
bpf: Support new signed div/mod instructions.
bpf: Fix jit blinding with new sdiv/smov insns
bpf: Support new 32bit offset jmp instruction
bpf: Add kernel/bpftool asm support for new instructions selftests/bpf: Fix a test_verifier failure selftests/bpf: Add a cpuv4 test runner for cpu=v4 testing selftests/bpf: Add unit tests for new sign-extension load insns selftests/bpf: Add unit tests for new sign-extension mov insns selftests/bpf: Add unit tests for new bswap insns selftests/bpf: Add unit tests for new sdiv/smod insns selftests/bpf: Add unit tests for new gotol insn selftests/bpf: Test ldsx with more complex cases docs/bpf: Add documentation for new instructions

 Documentation/bpf/bpf_design_QA.rst           |   5 -
 .../bpf/standardization/instruction-set.rst   | 105 ++-
 arch/x86/net/bpf_jit_comp.c                   | 141 +++-
 include/linux/filter.h                        |  17 +-
 include/uapi/linux/bpf.h                      |   1 +
 kernel/bpf/core.c                             | 196 ++++-
 kernel/bpf/disasm.c                           |  57 +-
 kernel/bpf/verifier.c                         | 366 +++++++--
 tools/include/uapi/linux/bpf.h                |   1 +
 tools/testing/selftests/bpf/.gitignore        |   2 +
 tools/testing/selftests/bpf/Makefile          |  18 +-
 .../selftests/bpf/bpf_testmod/bpf_testmod.c   |   9 +-
 .../selftests/bpf/prog_tests/test_ldsx_insn.c | 124 +++
 .../selftests/bpf/prog_tests/verifier.c       |  10 +
 .../selftests/bpf/progs/test_ldsx_insn.c      | 112 +++
 .../selftests/bpf/progs/verifier_bswap.c      |  45 +
 .../selftests/bpf/progs/verifier_gotol.c      |  30 +
 .../selftests/bpf/progs/verifier_ldsx.c       | 117 +++
 .../selftests/bpf/progs/verifier_movsx.c      | 199 +++++
 .../selftests/bpf/progs/verifier_sdiv.c       | 767 ++++++++++++++++++
 .../selftests/bpf/verifier/basic_instr.c      |   6 +-
 21 files changed, 2159 insertions(+), 169 deletions(-)
 create mode 100644 tools/testing/selftests/bpf/prog_tests/test_ldsx_insn.c
 create mode 100644 tools/testing/selftests/bpf/progs/test_ldsx_insn.c
 create mode 100644 tools/testing/selftests/bpf/progs/verifier_bswap.c
 create mode 100644 tools/testing/selftests/bpf/progs/verifier_gotol.c
 create mode 100644 tools/testing/selftests/bpf/progs/verifier_ldsx.c
 create mode 100644 tools/testing/selftests/bpf/progs/verifier_movsx.c
 create mode 100644 tools/testing/selftests/bpf/progs/verifier_sdiv.c
Signature · 1 line
2.34.1