aboutsummaryrefslogtreecommitdiffstats
path: root/init
diff options
context:
space:
mode:
authorAlexei Starovoitov <ast@plumgrid.com>2014-10-23 21:41:08 -0400
committerDavid S. Miller <davem@davemloft.net>2014-10-27 19:09:59 -0400
commitf89b7755f517cdbb755d7543eef986ee9d54e654 (patch)
treebf491bea6418b0442900d864237e0028f7c35162 /init
parent8ae3c911b9efcca653c552a9c74957a6cb04a87d (diff)
bpf: split eBPF out of NET
introduce two configs: - hidden CONFIG_BPF to select eBPF interpreter that classic socket filters depend on - visible CONFIG_BPF_SYSCALL (default off) that tracing and sockets can use that solves several problems: - tracing and others that wish to use eBPF don't need to depend on NET. They can use BPF_SYSCALL to allow loading from userspace or select BPF to use it directly from kernel in NET-less configs. - in 3.18 programs cannot be attached to events yet, so don't force it on - when the rest of eBPF infra is there in 3.19+, it's still useful to switch it off to minimize kernel size bloat-o-meter on x64 shows: add/remove: 0/60 grow/shrink: 0/2 up/down: 0/-15601 (-15601) tested with many different config combinations. Hopefully didn't miss anything. Signed-off-by: Alexei Starovoitov <ast@plumgrid.com> Acked-by: Daniel Borkmann <dborkman@redhat.com> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'init')
-rw-r--r--init/Kconfig14
1 files changed, 14 insertions, 0 deletions
diff --git a/init/Kconfig b/init/Kconfig
index 3ee28ae02cc8..2081a4d3d917 100644
--- a/init/Kconfig
+++ b/init/Kconfig
@@ -1341,6 +1341,10 @@ config SYSCTL_ARCH_UNALIGN_ALLOW
1341config HAVE_PCSPKR_PLATFORM 1341config HAVE_PCSPKR_PLATFORM
1342 bool 1342 bool
1343 1343
1344# interpreter that classic socket filters depend on
1345config BPF
1346 bool
1347
1344menuconfig EXPERT 1348menuconfig EXPERT
1345 bool "Configure standard kernel features (expert users)" 1349 bool "Configure standard kernel features (expert users)"
1346 # Unhide debug options, to make the on-by-default options visible 1350 # Unhide debug options, to make the on-by-default options visible
@@ -1521,6 +1525,16 @@ config EVENTFD
1521 1525
1522 If unsure, say Y. 1526 If unsure, say Y.
1523 1527
1528# syscall, maps, verifier
1529config BPF_SYSCALL
1530 bool "Enable bpf() system call" if EXPERT
1531 select ANON_INODES
1532 select BPF
1533 default n
1534 help
1535 Enable the bpf() system call that allows to manipulate eBPF
1536 programs and maps via file descriptors.
1537
1524config SHMEM 1538config SHMEM
1525 bool "Use full shmem filesystem" if EXPERT 1539 bool "Use full shmem filesystem" if EXPERT
1526 default y 1540 default y