]> git.proxmox.com Git - mirror_ubuntu-eoan-kernel.git/commitdiff
bpf: bpf_stackmap_copy depends on CONFIG_PERF_EVENTS
authorAlexei Starovoitov <ast@fb.com>
Thu, 10 Mar 2016 02:56:49 +0000 (18:56 -0800)
committerDavid S. Miller <davem@davemloft.net>
Thu, 10 Mar 2016 04:26:51 +0000 (23:26 -0500)
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>
kernel/bpf/syscall.c

index 2978d0d08869a4b8fd641e18aaaaa00e05bbc170..2a2efe1bc76c7a2ef2e0a4af3ebec7f988a4b4a6 100644 (file)
@@ -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