Skip to content

support bpf_fastcall patterns for calls to kfuncs

Eduard Zingerman 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 Latest6 patches 0 repliesApplied 6/6
  2. v25 patches 8 repliesSuperseded
  3. v13 patches 14 repliesSuperseded

Changes in v3 from the cover letter

- added a patch fixing arch_mask handling in test_loader, otherwise newly added tests for the feature were skipped (a fix for regression introduced by a recent commit);
- fixed warning regarding unused 'params' variable;
- applied stylistical fixes suggested by Yonghong;
- added acks from Yonghong;

Patches in v3 All 6 applied

#Subject and filesSizeRepliesApplied
1/6bpf: rename nocsr -> bpf_fastcall in verifierinclude/linux/bpf.h include/linux/bpf_verifier.h kernel/bpf/helpers.c +1 more+84 -850 repliesApplied
2/6selftests/bpf: rename nocsr -> bpf_fastcall in selfteststools/testing/selftests/bpf/prog_tests/verifier.c tools/testing/selftests/bpf/progs/verifier_bpf_fastcall.c+15 -150 repliesApplied
3/6bpf: support bpf_fastcall patterns for kfuncskernel/bpf/verifier.c+34 -10 repliesApplied
4/6bpf: allow bpf_fastcall for bpf_cast_to_kern_ctx and bpf_rdonly_castkernel/bpf/verifier.c+3 -00 repliesApplied
5/6selftests/bpf: by default use arch mask allowing all archstools/testing/selftests/bpf/test_loader.c+1 -10 repliesApplied
6/6selftests/bpf: check if bpf_fastcall is recognized for kfuncstools/testing/selftests/bpf/progs/verifier_bpf_fastcall.c+55 -00 repliesApplied

Reviews trailers per patch

5 of 6 patches have a Reviewed-by or Acked-by.

PatchYonghong Song
1/6A-b
2/6A-b
3/6A-b
4/6A-b
5/6
6/6A-b

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 0/6] support bpf_fastcall patterns for calls to kfuncs

As an extension of [1], allow bpf_fastcall patterns for kfuncs:
- pattern rules are the same as for helpers;
- spill/fill removal is allowed only for kfuncs listed in the is_fastcall_kfunc_call (under assumption that such kfuncs would always be members of special_kfunc_list).

Allow bpf_fastcall rewrite for bpf_cast_to_kern_ctx() and bpf_rdonly_cast() in order to conjure selftests for this feature.

After this patch-set verifier would rewrite the program below:

r2 = 1
*(u64 *)(r10 - 32) = r2
call %[bpf_cast_to_kern_ctx]
r2 = *(u64 *)(r10 - 32)
r0 = r2;"

As follows:

r2 = 1 /* spill/fill at r10[-32] is removed */
r0 = r1 /* replacement for bpf_cast_to_kern_ctx() */ r0 = r2
exit

Also, attribute used by LLVM implementation of the feature had been changed from no_caller_saved_registers to bpf_fastcall (see [2]). This patch-set replaces references to nocsr by references to bpf_fastcall to keep LLVM and Kernel parts in sync.

[1] no_caller_saved_registers attribute for helper calls

    https://lore.kernel.org/bpf/[email protected]/
[2] [BPF] introduce __attribute__((bpf_fastcall))
    https://github.com/llvm/llvm-project/pull/105417

Changes v2->v3:
- added a patch fixing arch_mask handling in test_loader, otherwise newly added tests for the feature were skipped (a fix for regression introduced by a recent commit);
- fixed warning regarding unused 'params' variable;
- applied stylistical fixes suggested by Yonghong;
- added acks from Yonghong;

Changes v1->v2:
- added two patches replacing all mentions of nocsr by bpf_fastcall (suggested by Andrii);
- removed KF_NOCSR flag (suggested by Yonghong).

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

Eduard Zingerman (6):
bpf: rename nocsr -> bpf_fastcall in verifier selftests/bpf: rename nocsr -> bpf_fastcall in selftests
bpf: support bpf_fastcall patterns for kfuncs
bpf: allow bpf_fastcall for bpf_cast_to_kern_ctx and bpf_rdonly_cast selftests/bpf: by default use arch mask allowing all archs selftests/bpf: check if bpf_fastcall is recognized for kfuncs

 include/linux/bpf.h                           |   6 +-
 include/linux/bpf_verifier.h                  |  18 +-
 kernel/bpf/helpers.c                          |   2 +-
 kernel/bpf/verifier.c                         | 181 +++++++++++-------
 .../selftests/bpf/prog_tests/verifier.c       |   4 +-
 ...rifier_nocsr.c => verifier_bpf_fastcall.c} |  81 ++++++--
 tools/testing/selftests/bpf/test_loader.c     |   2 +-
 7 files changed, 192 insertions(+), 102 deletions(-)
 rename tools/testing/selftests/bpf/progs/{verifier_nocsr.c => verifier_bpf_fastcall.c} (89%)
Signature · 1 line
2.45.2