Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 88e85a7d authored by Masahiro Yamada's avatar Masahiro Yamada Committed by David S. Miller
Browse files

bpfilter: check compiler capability in Kconfig 



With the brand-new syntax extension of Kconfig, we can directly
check the compiler capability in the configuration phase.

If the cc-can-link.sh fails, the BPFILTER_UMH is automatically
hidden by the dependency.

I also deleted 'default n', which is no-op.

Signed-off-by: default avatarMasahiro Yamada <yamada.masahiro@socionext.com>
Acked-by: default avatarDaniel Borkmann <daniel@iogearbox.net>
Acked-by: default avatarAlexei Starovoitov <ast@kernel.org>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 82be2ab1

Makefile

+0 −5
Original line number Diff line number Diff line
@@ -507,11 +507,6 @@ ifeq ($(shell $(CONFIG_SHELL) $(srctree)/scripts/gcc-goto.sh $(CC) $(KBUILD_CFLA 
  KBUILD_AFLAGS += -DCC_HAVE_ASM_GOTO

endif



ifeq ($(shell $(CONFIG_SHELL) $(srctree)/scripts/cc-can-link.sh $(CC)), y)

  CC_CAN_LINK := y

  export CC_CAN_LINK

endif



# The expansion should be delayed until arch/$(SRCARCH)/Makefile is included.

# Some architectures define CROSS_COMPILE in arch/$(SRCARCH)/Makefile.

# CC_VERSION_TEXT is referenced from Kconfig (so it needs export),

net/Makefile

+0 −4
Original line number Diff line number Diff line
@@ -20,11 +20,7 @@ obj-$(CONFIG_TLS) += tls/ 
obj-$(CONFIG_XFRM)		+= xfrm/

obj-$(CONFIG_UNIX)		+= unix/

obj-$(CONFIG_NET)		+= ipv6/

ifneq ($(CC_CAN_LINK),y)

$(warning CC cannot link executables. Skipping bpfilter.)

else

obj-$(CONFIG_BPFILTER)		+= bpfilter/

endif

obj-$(CONFIG_PACKET)		+= packet/

obj-$(CONFIG_NET_KEY)		+= key/

obj-$(CONFIG_BRIDGE)		+= bridge/

net/bpfilter/Kconfig

+1 −1
Original line number Diff line number Diff line 
menuconfig BPFILTER

	bool "BPF based packet filtering framework (BPFILTER)"

	default n

	depends on NET && BPF && INET

	help

	  This builds experimental bpfilter framework that is aiming to
@@ -9,6 +8,7 @@ menuconfig BPFILTER 
if BPFILTER

config BPFILTER_UMH

	tristate "bpfilter kernel module with user mode helper"

	depends on $(success,$(srctree)/scripts/cc-can-link.sh $(CC))

	default m

	help

	  This builds bpfilter kernel module with embedded user mode helper

scripts/cc-can-link.sh

+1 −1
Original line number Diff line number Diff line 
#!/bin/sh

# SPDX-License-Identifier: GPL-2.0



cat << "END" | $@ -x c - -o /dev/null >/dev/null 2>&1 && echo "y"

cat << "END" | $@ -x c - -o /dev/null >/dev/null 2>&1

#include <stdio.h>

int main(void)

{