| Message ID | 20240924163423.76635-1-alexei.starovoitov@gmail.com (mailing list archive) |
|---|---|
| State | Accepted |
| Delegated to: | BPF |
| Headers | show |
| Series | [GIT,PULL] BPF struct_fd changes for 6.12 | expand |
| Context | Check | Description |
|---|---|---|
| netdev/tree_selection | success | Pull request for net, async |
| netdev/build_32bit | success | Errors and warnings before: 601 this patch: 601 |
| netdev/build_tools | success | Errors and warnings before: 2 this patch: 2 |
| netdev/build_clang | success | Errors and warnings before: 1095 this patch: 1095 |
| netdev/verify_signedoff | success | Signed-off-by tag matches author and committer |
| netdev/verify_fixes | success | Fixes tag looks correct |
| netdev/build_allmodconfig_warn | fail | Errors and warnings before: 15199 this patch: 15203 |
| netdev/build_clang_rust | success | No Rust files in patch. Skipping build |
| netdev/kdoc | success | Errors and warnings before: 83 this patch: 83 |
The pull request you sent on Tue, 24 Sep 2024 18:34:23 +0200:
> https://git.kernel.org/pub/scm/linux/kernel/git/bpf/bpf-next.git tags/bpf-next-6.12-struct-fd
has been merged into torvalds/linux.git:
https://git.kernel.org/torvalds/c/fa8380a06bd0523e51f826520aac1beb8c585521
Thank you!
Hi Linus, The following changes since commit de12c3391bce10504c0e7bd767516c74110cfce1: add struct fd constructors, get rid of __to_fd() (2024-08-12 22:01:15 -0400) are available in the Git repository at: https://git.kernel.org/pub/scm/linux/kernel/git/bpf/bpf-next.git tags/bpf-next-6.12-struct-fd for you to fetch changes up to 37d3dd663f7485bf3e444f40abee3c68f53158cb: bpf: convert bpf_token_create() to CLASS(fd, ...) (2024-09-12 18:58:02 -0700) ---------------------------------------------------------------- Since Al's first 3 patches for struct_fd landed in https://lore.kernel.org/all/20240923034731.GF3413968@ZenIV/ This pull includes struct_fd BPF changes from Al and Andrii. Note the pull includes Andrii's merge commit for Al's vfs/stable-struct_fd branch with 3 already landed patches that Andrii applied back in August when Al created the stable branch. These 8 patches were developed on top. The last minute rebases are frown upon, so we didn't rebase and I don't see a way in git to avoid this extra commit. fwiw the rebased commits are in bpf-next/struct_fd_latest branch in unlikely case you prefer that. The following diff stat is concatenated from two 'git request-pull' commands, since I couldn't make it to generate both patch list and diff stat correctly. Either patch list was ok or diff stat. I hope that's ok, since doing 'git pull bpf-next.git tags/bpf-next-6.12-struct-fd' gives me exactly this result. There should be no conflicts. Signed-off-by: Alexei Starovoitov <ast@kernel.org> ---------------------------------------------------------------- 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 (3): Merge remote-tracking branch 'vfs/stable-struct_fd' 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(-)