diff options
| author |   Alexei Starovoitov <ast@kernel.org> | 2021-11-12 10:19:10 -0800 |
|---|---|---|
| committer | Alexei Starovoitov <ast@kernel.org> | 2021-11-12 10:19:10 -0800 |
| commit | 7cc595a60187bcfaf8a8013539900154eccb4d3f (patch) | |
| tree | 293ae437aeb1c13fd0ead6e9d4291326a64e97e5 /net/core | |
| parent | bpftool: Enable libbpf's strict mode by default (diff) | |
| parent | bpf: Introduce btf_tracing_ids (diff) | |
| download | wireguard-linux-7cc595a60187bcfaf8a8013539900154eccb4d3f.tar.xz wireguard-linux-7cc595a60187bcfaf8a8013539900154eccb4d3f.zip | |
Merge branch 'introduce btf_tracing_ids'
Song Liu says:
====================
Changes v2 => v3:
1. Fix bug in task_iter.c. (Kernel test robot <lkp@intel.com>)
Changes v1 => v2:
1. Add patch 2/2. (Alexei)
1/2 fixes issue with btf_task_struct_ids w/o CONFIG_DEBUG_INFO_BTF.
2/2 replaces btf_task_struct_ids with easier to understand btf_tracing_ids.
====================
Signed-off-by: Alexei Starovoitov <ast@kernel.org>
Diffstat (limited to 'net/core')
| -rw-r--r-- | net/core/filter.c | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/net/core/filter.c b/net/core/filter.c index 315a58466fc9..46f09a8fba20 100644 --- a/net/core/filter.c +++ b/net/core/filter.c @@ -10611,14 +10611,10 @@ void bpf_prog_change_xdp(struct bpf_prog *prev_prog, struct bpf_prog *prog) bpf_dispatcher_change_prog(BPF_DISPATCHER_PTR(xdp), prev_prog, prog); } -#ifdef CONFIG_DEBUG_INFO_BTF -BTF_ID_LIST_GLOBAL(btf_sock_ids) +BTF_ID_LIST_GLOBAL(btf_sock_ids, MAX_BTF_SOCK_TYPE) #define BTF_SOCK_TYPE(name, type) BTF_ID(struct, type) BTF_SOCK_TYPE_xxx #undef BTF_SOCK_TYPE -#else -u32 btf_sock_ids[MAX_BTF_SOCK_TYPE]; -#endif BPF_CALL_1(bpf_skc_to_tcp6_sock, struct sock *, sk) { |