[PATCH net-next] ebpf: bpf_map_*: fix linker error on avr32 and openrisc arch

[PATCH net-next] ebpf: bpf_map_*: fix linker error on avr32 and openrisc arch

[Daniel Borkmann]

Fengguang reported, that on openrisc and avr32 architectures, we
get the following linker errors on *_defconfig builds that have
no bpf syscall support:

  net/built-in.o:(.rodata+0x1cd0): undefined reference to `bpf_map_lookup_elem_proto'
  net/built-in.o:(.rodata+0x1cd4): undefined reference to `bpf_map_update_elem_proto'
  net/built-in.o:(.rodata+0x1cd8): undefined reference to `bpf_map_delete_elem_proto'

Fix it up by providing built-in weak definitions of the symbols,
so they can be overridden when the syscall is enabled. I think
the issue might be that gcc is not able to optimize all that away.
This patch fixes the linker errors for me, tested with Fengguang's
make.cross [1] script.

  [1] https://git.kernel.org/cgit/linux/kernel/git/wfg/lkp-tests.git/plain/sbin/make.cross

Reported-by: Fengguang Wu <fengguang.wu@intel.com>
Fixes: d4052c4aea0c ("ebpf: remove CONFIG_BPF_SYSCALL ifdefs in socket filter code")
Signed-off-by: Daniel Borkmann <daniel@iogearbox.net>
---
 kernel/bpf/core.c | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/kernel/bpf/core.c b/kernel/bpf/core.c
index a64e7a2..50603ae 100644
--- a/kernel/bpf/core.c
+++ b/kernel/bpf/core.c
@@ -656,6 +656,11 @@ void bpf_prog_free(struct bpf_prog *fp)
 }
 EXPORT_SYMBOL_GPL(bpf_prog_free);
 
+/* Weak definitions of helper functions in case we don't have bpf syscall. */
+const struct bpf_func_proto bpf_map_lookup_elem_proto __weak;
+const struct bpf_func_proto bpf_map_update_elem_proto __weak;
+const struct bpf_func_proto bpf_map_delete_elem_proto __weak;
+
 /* To execute LD_ABS/LD_IND instructions __bpf_prog_run() may call
  * skb_copy_bits(), so provide a weak definition of it for NET-less config.
  */
-- 
1.9.3

Re: [PATCH net-next] ebpf: bpf_map_*: fix linker error on avr32 and openrisc arch

[Alexei Starovoitov]

On 3/5/15 2:27 PM, Daniel Borkmann wrote:
> Fengguang reported, that on openrisc and avr32 architectures, we
> get the following linker errors on *_defconfig builds that have
> no bpf syscall support:
>
>    net/built-in.o:(.rodata+0x1cd0): undefined reference to `bpf_map_lookup_elem_proto'
>    net/built-in.o:(.rodata+0x1cd4): undefined reference to `bpf_map_update_elem_proto'
>    net/built-in.o:(.rodata+0x1cd8): undefined reference to `bpf_map_delete_elem_proto'
>
> Fix it up by providing built-in weak definitions of the symbols,
> so they can be overridden when the syscall is enabled. I think
> the issue might be that gcc is not able to optimize all that away.
> This patch fixes the linker errors for me, tested with Fengguang's
> make.cross [1] script.
>
>    [1] https://git.kernel.org/cgit/linux/kernel/git/wfg/lkp-tests.git/plain/sbin/make.cross
>
> Reported-by: Fengguang Wu <fengguang.wu@intel.com>
> Fixes: d4052c4aea0c ("ebpf: remove CONFIG_BPF_SYSCALL ifdefs in socket filter code")
> Signed-off-by: Daniel Borkmann <daniel@iogearbox.net>

Acked-by: Alexei Starovoitov <ast@plumgrid.com>

thanks :)

Re: [PATCH net-next] ebpf: bpf_map_*: fix linker error on avr32 and openrisc arch

[David Miller]

From: Daniel Borkmann <daniel@iogearbox.net>
Date: Thu,  5 Mar 2015 23:27:51 +0100

> Fengguang reported, that on openrisc and avr32 architectures, we
> get the following linker errors on *_defconfig builds that have
> no bpf syscall support:
> 
>   net/built-in.o:(.rodata+0x1cd0): undefined reference to `bpf_map_lookup_elem_proto'
>   net/built-in.o:(.rodata+0x1cd4): undefined reference to `bpf_map_update_elem_proto'
>   net/built-in.o:(.rodata+0x1cd8): undefined reference to `bpf_map_delete_elem_proto'
> 
> Fix it up by providing built-in weak definitions of the symbols,
> so they can be overridden when the syscall is enabled. I think
> the issue might be that gcc is not able to optimize all that away.
> This patch fixes the linker errors for me, tested with Fengguang's
> make.cross [1] script.
> 
>   [1] https://git.kernel.org/cgit/linux/kernel/git/wfg/lkp-tests.git/plain/sbin/make.cross
> 
> Reported-by: Fengguang Wu <fengguang.wu@intel.com>
> Fixes: d4052c4aea0c ("ebpf: remove CONFIG_BPF_SYSCALL ifdefs in socket filter code")
> Signed-off-by: Daniel Borkmann <daniel@iogearbox.net>

Applied, thanks.

Re: [PATCH net-next] ebpf: bpf_map_*: fix linker error on avr32 and openrisc arch

[Or Gerlitz]

On Fri, Mar 6, 2015 at 12:27 AM, Daniel Borkmann <daniel@iogearbox.net> wrote:
> Fengguang reported, that on openrisc and avr32 architectures, we
> get the following linker errors on *_defconfig builds that have
> no bpf syscall support:
>   net/built-in.o:(.rodata+0x1cd0): undefined reference to `bpf_map_lookup_elem_proto'
>   net/built-in.o:(.rodata+0x1cd4): undefined reference to `bpf_map_update_elem_proto'
>   net/built-in.o:(.rodata+0x1cd8): undefined reference to `bpf_map_delete_elem_proto'
>
> Fix it up by providing built-in weak definitions of the symbols,
> so they can be overridden when the syscall is enabled. I think
> the issue might be that gcc is not able to optimize all that away.
> This patch fixes the linker errors for me, tested with Fengguang's
> make.cross [1] script.
>
>   [1] https://git.kernel.org/cgit/linux/kernel/git/wfg/lkp-tests.git/plain/sbin/make.cross
>
> Reported-by: Fengguang Wu <fengguang.wu@intel.com>
> Fixes: d4052c4aea0c ("ebpf: remove CONFIG_BPF_SYSCALL ifdefs in socket filter code")


isn't that a 4.0-rc commit? if this is the case, this is for net, not net-next

Re: [PATCH net-next] ebpf: bpf_map_*: fix linker error on avr32 and openrisc arch

[Daniel Borkmann]

On 03/06/2015 08:20 AM, Or Gerlitz wrote:
> On Fri, Mar 6, 2015 at 12:27 AM, Daniel Borkmann <daniel@iogearbox.net> wrote:
...
>> Fixes: d4052c4aea0c ("ebpf: remove CONFIG_BPF_SYSCALL ifdefs in socket filter code")
>
> isn't that a 4.0-rc commit? if this is the case, this is for net, not net-next

Nope, that commit is only in net-next.