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

Commit 5f103c5d authored by John Fastabend's avatar John Fastabend Committed by Daniel Borkmann
Browse files

bpf: only build sockmap with CONFIG_INET 



The sockmap infrastructure is only aware of TCP sockets at the
moment. In the future we plan to add UDP. In both cases CONFIG_NET
should be built-in.

So lets only build sockmap if CONFIG_INET is enabled.

Signed-off-by: default avatarJohn Fastabend <john.fastabend@gmail.com>
Signed-off-by: default avatarDaniel Borkmann <daniel@iogearbox.net>
parent c20a71a7

include/linux/bpf.h

+1 −1
Original line number Diff line number Diff line
@@ -554,7 +554,7 @@ static inline bool bpf_prog_is_dev_bound(struct bpf_prog_aux *aux) 
}

#endif /* CONFIG_NET && CONFIG_BPF_SYSCALL */



#if defined(CONFIG_STREAM_PARSER) && defined(CONFIG_BPF_SYSCALL)

#if defined(CONFIG_STREAM_PARSER) && defined(CONFIG_BPF_SYSCALL) && defined(CONFIG_INET)

struct sock  *__sock_map_lookup_elem(struct bpf_map *map, u32 key);

int sock_map_prog(struct bpf_map *map, struct bpf_prog *prog, u32 type);

#else

include/linux/bpf_types.h

+1 −1
Original line number Diff line number Diff line
@@ -42,7 +42,7 @@ BPF_MAP_TYPE(BPF_MAP_TYPE_ARRAY_OF_MAPS, array_of_maps_map_ops) 
BPF_MAP_TYPE(BPF_MAP_TYPE_HASH_OF_MAPS, htab_of_maps_map_ops)

#ifdef CONFIG_NET

BPF_MAP_TYPE(BPF_MAP_TYPE_DEVMAP, dev_map_ops)

#ifdef CONFIG_STREAM_PARSER

#if defined(CONFIG_STREAM_PARSER) && defined(CONFIG_INET)

BPF_MAP_TYPE(BPF_MAP_TYPE_SOCKMAP, sock_map_ops)

#endif

BPF_MAP_TYPE(BPF_MAP_TYPE_CPUMAP, cpu_map_ops)

kernel/bpf/Makefile

+2 −0
Original line number Diff line number Diff line
@@ -9,9 +9,11 @@ obj-$(CONFIG_BPF_SYSCALL) += devmap.o 
obj-$(CONFIG_BPF_SYSCALL) += cpumap.o

obj-$(CONFIG_BPF_SYSCALL) += offload.o

ifeq ($(CONFIG_STREAM_PARSER),y)

ifeq ($(CONFIG_INET),y)

obj-$(CONFIG_BPF_SYSCALL) += sockmap.o

endif

endif

endif

ifeq ($(CONFIG_PERF_EVENTS),y)

obj-$(CONFIG_BPF_SYSCALL) += stackmap.o

endif