diff options
author | Florent Revest <revest@chromium.org> | 2020-12-08 18:36:23 +0100 |
---|---|---|
committer | Alexei Starovoitov <ast@kernel.org> | 2020-12-08 18:23:36 -0800 |
commit | b60da4955f53d1f50e44351a9c3a37a92503079e (patch) | |
tree | 35605a7a6667b10c8dc1354aa76751d4f63f9126 /net/core/filter.c | |
parent | 8bdd8e275ede9786d845b3ec952836e61fd824e9 (diff) | |
download | linux-stable-b60da4955f53d1f50e44351a9c3a37a92503079e.tar.gz linux-stable-b60da4955f53d1f50e44351a9c3a37a92503079e.tar.bz2 linux-stable-b60da4955f53d1f50e44351a9c3a37a92503079e.zip |
bpf: Only provide bpf_sock_from_file with CONFIG_NET
This moves the bpf_sock_from_file definition into net/core/filter.c
which only gets compiled with CONFIG_NET and also moves the helper proto
usage next to other tracing helpers that are conditional on CONFIG_NET.
This avoids
ld: kernel/trace/bpf_trace.o: in function `bpf_sock_from_file':
bpf_trace.c:(.text+0xe23): undefined reference to `sock_from_file'
When compiling a kernel with BPF and without NET.
Reported-by: kernel test robot <lkp@intel.com>
Reported-by: Randy Dunlap <rdunlap@infradead.org>
Signed-off-by: Florent Revest <revest@chromium.org>
Signed-off-by: Alexei Starovoitov <ast@kernel.org>
Acked-by: Randy Dunlap <rdunlap@infradead.org>
Acked-by: Martin KaFai Lau <kafai@fb.com>
Acked-by: KP Singh <kpsingh@kernel.org>
Link: https://lore.kernel.org/bpf/20201208173623.1136863-1-revest@chromium.org
Diffstat (limited to 'net/core/filter.c')
-rw-r--r-- | net/core/filter.c | 18 |
1 files changed, 18 insertions, 0 deletions
diff --git a/net/core/filter.c b/net/core/filter.c index 77001a35768f..255aeee72402 100644 --- a/net/core/filter.c +++ b/net/core/filter.c @@ -10413,6 +10413,24 @@ const struct bpf_func_proto bpf_skc_to_udp6_sock_proto = { .ret_btf_id = &btf_sock_ids[BTF_SOCK_TYPE_UDP6], }; +BPF_CALL_1(bpf_sock_from_file, struct file *, file) +{ + return (unsigned long)sock_from_file(file); +} + +BTF_ID_LIST(bpf_sock_from_file_btf_ids) +BTF_ID(struct, socket) +BTF_ID(struct, file) + +const struct bpf_func_proto bpf_sock_from_file_proto = { + .func = bpf_sock_from_file, + .gpl_only = false, + .ret_type = RET_PTR_TO_BTF_ID_OR_NULL, + .ret_btf_id = &bpf_sock_from_file_btf_ids[0], + .arg1_type = ARG_PTR_TO_BTF_ID, + .arg1_btf_id = &bpf_sock_from_file_btf_ids[1], +}; + static const struct bpf_func_proto * bpf_sk_base_func_proto(enum bpf_func_id func_id) { |