diff options
| author | Alexei Starovoitov <ast@kernel.org> | 2024-12-16 19:52:55 +0300 |
|---|---|---|
| committer | Alexei Starovoitov <ast@kernel.org> | 2024-12-16 19:53:59 +0300 |
| commit | 06103dccbbd29408255a409f6f98f7f02387dc93 (patch) | |
| tree | 9833a4232056648a326183bea4c5e12c2085f984 /include/linux/bpf_verifier.h | |
| parent | 00a5acdbf39816ad23b8db3255c366bbc77e69af (diff) | |
| parent | 78d4f34e2115b517bcbfe7ec0d018bbbb6f9b0b8 (diff) | |
| download | linux-06103dccbbd29408255a409f6f98f7f02387dc93.tar.xz | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/bpf/bpf
Cross-merge bpf fixes after downstream PR.
No conflicts.
Adjacent changes in:
Auto-merging include/linux/bpf.h
Auto-merging include/linux/bpf_verifier.h
Auto-merging kernel/bpf/btf.c
Auto-merging kernel/bpf/verifier.c
Auto-merging kernel/trace/bpf_trace.c
Auto-merging tools/testing/selftests/bpf/progs/test_tp_btf_nullable.c
Signed-off-by: Alexei Starovoitov <ast@kernel.org>
Diffstat (limited to 'include/linux/bpf_verifier.h')
| -rw-r--r-- | include/linux/bpf_verifier.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/include/linux/bpf_verifier.h b/include/linux/bpf_verifier.h index de09ac3067ae..32c23f2a3086 100644 --- a/include/linux/bpf_verifier.h +++ b/include/linux/bpf_verifier.h @@ -664,6 +664,7 @@ struct bpf_subprog_info { bool args_cached: 1; /* true if bpf_fastcall stack region is used by functions that can't be inlined */ bool keep_fastcall_stack: 1; + bool changes_pkt_data: 1; enum priv_stack_mode priv_stack_mode; u8 arg_cnt; |