Skip to content

BPF follow ups to struct fd refactorings

Andrii Nakryiko bpf linux-fsdevel linux-security-module selinux 1 version In review

Get series with b4
b4 am [email protected]

Versions newest first

  1. v1 Latest8 patches 9 repliesIn review

Patches in v1 No applies recorded yet

#Subject and filesSizeRepliesApplied
1/8bpf: convert __bpf_prog_get() to CLASS(fd, ...)kernel/bpf/syscall.c+9 -220 replies
2/8bpf: switch fdget_raw() uses to CLASS(fd_raw, ...)kernel/bpf/bpf_inode_storage.c+8 -160 replies
3/8bpf: factor out fetching bpf_map from FD and adding it to used_maps listkernel/bpf/verifier.c+66 -492 replies
4/8bpf: switch maps to CLASS(fd, ...)include/linux/bpf.h kernel/bpf/map_in_map.c kernel/bpf/syscall.c +2 more+58 -1390 replies
5/8bpf: trivial conversions for fdget()kernel/bpf/btf.c kernel/bpf/syscall.c kernel/bpf/token.c+9 -210 replies
6/8bpf: more trivial fdget() conversionskernel/bpf/syscall.c+7 -150 replies
7/8security,bpf: constify struct path in bpf_token_create() LSM hookinclude/linux/lsm_hook_defs.h include/linux/security.h security/security.c +1 more+5 -53 replies
8/8bpf: convert bpf_token_create() to CLASS(fd, ...)kernel/bpf/token.c+23 -420 replies

Reviews trailers per patch

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

PatchAndrii NakryikoChristian BraunerPaul Moore
1/8A-b R-b
2/8R-b
3/8
4/8R-b
5/8R-b
6/8R-b
7/8A-b
8/8A-b R-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 v1 thread

Cover letter [PATCH bpf-next 0/8] BPF follow ups to struct fd refactorings

This patch set extracts all the BPF-related changes done in [0] into a separate series based on top of stable-struct_fd branch ([1]) merged into bpf-next tree. There are also a few changes, additions, and adjustments:

- patch subjects adjusted to use "bpf: " prefix consistently;
- patch #2 is extracting bpf-related changes from original patch #19 ("fdget_raw() users: switch to CLASS(fd_raw, ...)") and is ordered a bit earlier in this patch set;
- patch #3 is reimplemented and replaces original patch #17
("bpf: resolve_pseudo_ldimm64(): take handling of a single ldimm64 insn into helper") completely;
- in patch #4 ("bpf: switch maps to CLASS(fd, ...)"), which was originally

    patch #18 ("bpf maps: switch to CLASS(fd, ...)"), I've combined
    __bpf_get_map() and bpf_file_to_map() into __bpf_get_map(), as the latter
    is only used from it and makes no sense to keep separate;
  - as part of rebasing patch #4, I adjusted newly added in patch #3
    add_used_map_from_fd() function to use CLASS(fd, ...), as now
    __bpf_get_map() doesn't do its own fdput() anymore. This made unnecessary
    any further bpf_map_inc() changes, because we still rely on struct fd to
    keep map's file reference alive;
  - patches #5 and #6 are BPF-specific bits extracted from original patch #23
    ("fdget(), trivial conversions") and #24 ("fdget(), more trivial conversions");

- patch #7 constifies security_bpf_token_create() LSM hook;
- patch #8 is original patch #35 ("convert bpf_token_create()"), with path_get()+path_put() removed now that LSM hook above was adjusted.

All these patches were pushed into a separate bpf-next/struct_fd branch ([2]). They were also merged into bpf-next/for-next so they can get early testing in linux-next.

[0] https://lore.kernel.org/bpf/20240730050927.GC5334@ZenIV/
[1] https://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs.git/log/?h=stable-struct_fd
[2] https://git.kernel.org/pub/scm/linux/kernel/git/bpf/bpf-next.git/log/?h=struct_fd

Al Viro (6):
bpf: convert __bpf_prog_get() to CLASS(fd, ...)
bpf: switch fdget_raw() uses to CLASS(fd_raw, ...)
bpf: switch maps to CLASS(fd, ...)
bpf: trivial conversions for fdget()
bpf: more trivial fdget() conversions
bpf: convert bpf_token_create() to CLASS(fd, ...)

Andrii Nakryiko (2):
bpf: factor out fetching bpf_map from FD and adding it to used_maps
list
security,bpf: constify struct path in bpf_token_create() LSM hook

 include/linux/bpf.h            |  11 +-
 include/linux/lsm_hook_defs.h  |   2 +-
 include/linux/security.h       |   4 +-
 kernel/bpf/bpf_inode_storage.c |  24 ++---
 kernel/bpf/btf.c               |  11 +-
 kernel/bpf/map_in_map.c        |  38 ++-----
 kernel/bpf/syscall.c           | 181 +++++++++------------------------
 kernel/bpf/token.c             |  74 +++++---------
 kernel/bpf/verifier.c          | 110 +++++++++++---------
 net/core/sock_map.c            |  23 ++---
 security/security.c            |   2 +-
 security/selinux/hooks.c       |   2 +-
 12 files changed, 179 insertions(+), 303 deletions(-)
Signature · 1 line
2.43.5