Skip to content

bpf: Prepare to support stack arguments

Yonghong Song 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 Latest9 patches 0 repliesApplied 9/9
  2. v29 patches 4 repliesSuperseded
  3. v19 patches 13 repliesSuperseded

Changes in v3 from the cover letter

- v2: https://lore.kernel.org/bpf/[email protected]/
- Fix a mark_chain_precision issue by rewriting helper reg_from_argno().

Patches in v3 All 9 applied

#Subject and filesSizeRepliesApplied
1/9bpf: Remove unused parameter from check_map_kptr_access()kernel/bpf/verifier.c+2 -20 repliesApplied
2/9bpf: Fix tail_call_reachable leakkernel/bpf/verifier.c+3 -00 repliesApplied
3/9bpf: Remove WARN_ON_ONCE in check_kfunc_mem_size_reg()kernel/bpf/verifier.c+0 -20 repliesApplied
4/9bpf: Refactor to avoid redundant calculation of bpf_reg_statekernel/bpf/verifier.c+98 -1250 repliesApplied
5/9bpf: Refactor to handle memory and size togetherkernel/bpf/verifier.c+28 -290 repliesApplied
6/9bpf: Rename existing argno to argkernel/bpf/verifier.c+27 -270 repliesApplied
7/9bpf: Prepare verifier logs for upcoming kfunc stack argumentsinclude/linux/bpf_verifier.h kernel/bpf/verifier.c tools/testing/selftests/bpf/prog_tests/bpf_nf.c +27 more+497 -3960 repliesApplied
8/9bpf: Introduce bpf register BPF_REG_PARAMSinclude/linux/filter.h kernel/bpf/core.c tools/testing/selftests/bpf/prog_tests/ctx_rewrite.c +3 more+62 -610 repliesApplied
9/9bpf: Reuse MAX_BPF_FUNC_ARGS for maximum number of argumentsinclude/linux/bpf.h+5 -00 repliesApplied

Reviews trailers per patch

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

PatchPuranjay MohanKumar Kartikeya DwivediAmery Hung
1/9A-b A-b
2/9A-b
3/9A-b
4/9A-b A-b R-b
5/9A-b A-b
6/9A-b
7/9
8/9A-b A-b
9/9A-b A-b

Trailers given in replies are filled; those carried in the patches from earlier versions are outlined with dashes. Scroll the table sideways for all 3 reviewers.

Read the v3 thread

Cover letter [PATCH bpf-next v3 0/9] bpf: Prepare to support stack arguments

The patch set prepares to support stack arguments for bpf functions and kfuncs. The major changes include:
- Avoid redundant calculation of bpf_reg_state. For stack arguments, there exists no corresponding register number.
- Refactor check_kfunc_mem_size_reg() to have bpf_reg_state's for both mem_reg and size_reg.
- Allow verifier logs to print stack arguments if there is no corresponding register.

Please see individual patches for details.

Changelogs:
v2 -> v3:
- v2: https://lore.kernel.org/bpf/[email protected]/
- Fix a mark_chain_precision issue by rewriting helper reg_from_argno().
v1 -> v2:
- v1: https://lore.kernel.org/bpf/[email protected]/
- Major change to patch 7. In v1, the argno has type u32 to
represent registers and arguments. This works but error prone
as u32 is too easy to mess and leak. This version uses a struct type to represent argno which makes things more explicit and easy to reason.

Yonghong Song (9):
bpf: Remove unused parameter from check_map_kptr_access()
bpf: Fix tail_call_reachable leak
bpf: Remove WARN_ON_ONCE in check_kfunc_mem_size_reg()
bpf: Refactor to avoid redundant calculation of bpf_reg_state
bpf: Refactor to handle memory and size together
bpf: Rename existing argno to arg
bpf: Prepare verifier logs for upcoming kfunc stack arguments
bpf: Introduce bpf register BPF_REG_PARAMS
bpf: Reuse MAX_BPF_FUNC_ARGS for maximum number of arguments

 include/linux/bpf.h                           |   5 +
 include/linux/bpf_verifier.h                  |   1 +
 include/linux/filter.h                        |   5 +-
 kernel/bpf/core.c                             |   4 +-
 kernel/bpf/verifier.c                         | 843 ++++++++++--------
 .../testing/selftests/bpf/prog_tests/bpf_nf.c |  22 +-
 .../selftests/bpf/prog_tests/cb_refs.c        |   2 +-
 .../selftests/bpf/prog_tests/ctx_rewrite.c    |  14 +-
 .../selftests/bpf/prog_tests/kfunc_call.c     |   2 +-
 .../selftests/bpf/prog_tests/linked_list.c    |   4 +-
 .../selftests/bpf/progs/cgrp_kfunc_failure.c  |  14 +-
 .../selftests/bpf/progs/cpumask_failure.c     |  10 +-
 .../testing/selftests/bpf/progs/dynptr_fail.c |  22 +-
 .../selftests/bpf/progs/file_reader_fail.c    |   4 +-
 tools/testing/selftests/bpf/progs/irq.c       |   4 +-
 tools/testing/selftests/bpf/progs/iters.c     |   6 +-
 .../selftests/bpf/progs/iters_state_safety.c  |  14 +-
 .../selftests/bpf/progs/iters_testmod.c       |   4 +-
 .../selftests/bpf/progs/iters_testmod_seq.c   |   4 +-
 .../selftests/bpf/progs/map_kptr_fail.c       |   2 +-
 .../selftests/bpf/progs/percpu_alloc_fail.c   |   4 +-
 .../testing/selftests/bpf/progs/rbtree_fail.c |   6 +-
 .../bpf/progs/refcounted_kptr_fail.c          |   2 +-
 .../testing/selftests/bpf/progs/stream_fail.c |   2 +-
 .../selftests/bpf/progs/task_kfunc_failure.c  |  18 +-
 .../selftests/bpf/progs/task_work_fail.c      |   6 +-
 .../selftests/bpf/progs/test_bpf_nf_fail.c    |   8 +-
 .../bpf/progs/test_kfunc_dynptr_param.c       |   2 +-
 .../bpf/progs/test_kfunc_param_nullable.c     |   2 +-
 .../selftests/bpf/progs/verifier_bits_iter.c  |   4 +-
 .../bpf/progs/verifier_bpf_fastcall.c         |  24 +-
 .../selftests/bpf/progs/verifier_may_goto_1.c |  12 +-
 .../bpf/progs/verifier_ref_tracking.c         |   6 +-
 .../selftests/bpf/progs/verifier_sdiv.c       |  64 +-
 .../selftests/bpf/progs/verifier_vfs_reject.c |   8 +-
 .../testing/selftests/bpf/progs/wq_failures.c |   2 +-
 tools/testing/selftests/bpf/verifier/calls.c  |  14 +-
 37 files changed, 625 insertions(+), 545 deletions(-)
Signature · 1 line
2.52.0