Skip to content

bpf: Support new insns from cpu v4

Yonghong Song bpf 2 versions – In review

Get series with b4
b4 am [email protected]

Versions newest first · linked by author and title

  1. v5 Latest16 of 17 patches 11 repliesIn review 16 of 17 applied
  2. v416 of 17 patches 1 replySuperseded

Changes in v5 from the cover letter

. for v4, patch 8/17 missed in mailing list and patchwork, so resend. . rebase on top of master

16 of 17 patches are in this archive. The cover letter announces 17.

Patches in v5 16 of 17 applied

#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+181 -270 repliesApplied
2/17bpf: Support new sign-extension mov insnsarch/x86/net/bpf_jit_comp.c kernel/bpf/core.c kernel/bpf/verifier.c+197 -310 repliesApplied
3/17bpf: Handle sign-extenstin ctx member accesseskernel/bpf/verifier.c+6 -00 repliesApplied
4/17bpf: Support new unconditional bswap instructionarch/x86/net/bpf_jit_comp.c kernel/bpf/core.c kernel/bpf/verifier.c+20 -20 repliesApplied
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 repliesApplied
6/17bpf: Fix jit blinding with new sdiv/smov insnsinclude/linux/filter.h kernel/bpf/core.c+12 -60 repliesApplied
7/17bpf: Support new 32bit offset jmp instructionarch/x86/net/bpf_jit_comp.c kernel/bpf/core.c kernel/bpf/verifier.c+56 -237 repliesApplied
9/17selftests/bpf: Fix a test_verifier failuretools/testing/selftests/bpf/verifier/basic_instr.c+3 -30 repliesApplied
10/17selftests/bpf: Add a cpuv4 test runner for cpu=v4 testingtools/testing/selftests/bpf/.gitignore tools/testing/selftests/bpf/Makefile+26 -42 repliesApplied
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+133 -00 repliesApplied
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+215 -00 repliesApplied
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+61 -00 repliesApplied
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+783 -00 repliesApplied
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+46 -00 repliesApplied
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+265 -10 repliesApplied
17/17docs/bpf: Add documentation for new instructionsDocumentation/bpf/bpf_design_QA.rst Documentation/bpf/standardization/instruction-set.rst+79 -412 repliesApplied

Reviews trailers per patch

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

PatchEduard Zingerman
1/17A-b
2/17A-b
3/17A-b
4/17A-b
5/17A-b
6/17A-b
7/17A-b
9/17A-b
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 v5 thread

Cover letter [PATCH bpf-next v5 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. The llvm patch ([2]) has been merged into llvm-project 'main' branch.

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

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:
v4 -> v5:
. for v4, patch 8/17 missed in mailing list and patchwork, so resend. . rebase on top of master
v3 -> v4:
. some minor asm syntax adjustment based on llvm change. . add clang version and target arch guard for new tests
so they can still compile with old llvm compilers.
. some changes to the bpf doc.
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   | 115 ++-
 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                         | 348 ++++++--
 tools/include/uapi/linux/bpf.h                |   1 +
 tools/testing/selftests/bpf/.gitignore        |   2 +
 tools/testing/selftests/bpf/Makefile          |  28 +-
 .../selftests/bpf/bpf_testmod/bpf_testmod.c   |   9 +-
 .../selftests/bpf/prog_tests/test_ldsx_insn.c | 139 ++++
 .../selftests/bpf/prog_tests/verifier.c       |  10 +
 .../selftests/bpf/progs/test_ldsx_insn.c      | 118 +++
 .../selftests/bpf/progs/verifier_bswap.c      |  59 ++
 .../selftests/bpf/progs/verifier_gotol.c      |  44 +
 .../selftests/bpf/progs/verifier_ldsx.c       | 131 +++
 .../selftests/bpf/progs/verifier_movsx.c      | 213 +++++
 .../selftests/bpf/progs/verifier_sdiv.c       | 781 ++++++++++++++++++
 .../selftests/bpf/verifier/basic_instr.c      |   6 +-
 21 files changed, 2251 insertions(+), 170 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