summaryrefslogtreecommitdiffstats
path: root/kernel
diff options
context:
space:
mode:
authorAlexei Starovoitov <ast@fb.com>2016-03-09 18:56:49 -0800
committerDavid S. Miller <davem@davemloft.net>2016-03-09 23:26:51 -0500
commitb8cdc05173f05d212627b7aba7ec47fa334a79f2 (patch)
tree0f22256fd7e864e2770e2b7c6f7ee494457ac11c /kernel
parent3b8377dca1fd1974d245b2a04a708fc434761c65 (diff)
downloadblackbird-obmc-linux-b8cdc05173f05d212627b7aba7ec47fa334a79f2.tar.gz
blackbird-obmc-linux-b8cdc05173f05d212627b7aba7ec47fa334a79f2.zip
bpf: bpf_stackmap_copy depends on CONFIG_PERF_EVENTS
0-day bot reported build error: kernel/built-in.o: In function `map_lookup_elem': >> kernel/bpf/.tmp_syscall.o:(.text+0x329b3c): undefined reference to `bpf_stackmap_copy' when CONFIG_BPF_SYSCALL is set and CONFIG_PERF_EVENTS is not. Add weak definition to resolve it. This code path in map_lookup_elem() is never taken when CONFIG_PERF_EVENTS is not set. Fixes: 557c0c6e7df8 ("bpf: convert stackmap to pre-allocation") Reported-by: Fengguang Wu <fengguang.wu@intel.com> Signed-off-by: Alexei Starovoitov <ast@kernel.org> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'kernel')
-rw-r--r--kernel/bpf/syscall.c5
1 files changed, 5 insertions, 0 deletions
diff --git a/kernel/bpf/syscall.c b/kernel/bpf/syscall.c
index 2978d0d08869..2a2efe1bc76c 100644
--- a/kernel/bpf/syscall.c
+++ b/kernel/bpf/syscall.c
@@ -244,6 +244,11 @@ static void __user *u64_to_ptr(__u64 val)
return (void __user *) (unsigned long) val;
}
+int __weak bpf_stackmap_copy(struct bpf_map *map, void *key, void *value)
+{
+ return -ENOTSUPP;
+}
+
/* last field in 'union bpf_attr' used by this command */
#define BPF_MAP_LOOKUP_ELEM_LAST_FIELD value
OpenPOWER on IntegriCloud