Commit 17edea21 authored by Cong Wang's avatar Cong Wang Committed by Alexei Starovoitov
Browse files

sock_map: Relax config dependency to CONFIG_NET 



Currently sock_map still has Kconfig dependency on CONFIG_INET,
but there is no actual functional dependency on it after we
introduce ->psock_update_sk_prot().

We have to extend it to CONFIG_NET now as we are going to
support AF_UNIX.

Signed-off-by: default avatarCong Wang <cong.wang@bytedance.com>
Signed-off-by: default avatarAlexei Starovoitov <ast@kernel.org>
Link: https://lore.kernel.org/bpf/20210704190252.11866-2-xiyou.wangcong@gmail.com
parent 1554a080

include/linux/bpf.h

+20 −18
Original line number Diff line number Diff line
@@ -1887,6 +1887,12 @@ void bpf_map_offload_map_free(struct bpf_map *map); 
int bpf_prog_test_run_syscall(struct bpf_prog *prog,

			      const union bpf_attr *kattr,

			      union bpf_attr __user *uattr);



int sock_map_get_from_fd(const union bpf_attr *attr, struct bpf_prog *prog);

int sock_map_prog_detach(const union bpf_attr *attr, enum bpf_prog_type ptype);

int sock_map_update_elem_sys(struct bpf_map *map, void *key, void *value, u64 flags);

void sock_map_unhash(struct sock *sk);

void sock_map_close(struct sock *sk, long timeout);

#else

static inline int bpf_prog_offload_init(struct bpf_prog *prog,

					union bpf_attr *attr)
@@ -1919,24 +1925,6 @@ static inline int bpf_prog_test_run_syscall(struct bpf_prog *prog, 
{

	return -ENOTSUPP;

}

#endif /* CONFIG_NET && CONFIG_BPF_SYSCALL */



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

int sock_map_get_from_fd(const union bpf_attr *attr, struct bpf_prog *prog);

int sock_map_prog_detach(const union bpf_attr *attr, enum bpf_prog_type ptype);

int sock_map_update_elem_sys(struct bpf_map *map, void *key, void *value, u64 flags);

void sock_map_unhash(struct sock *sk);

void sock_map_close(struct sock *sk, long timeout);



void bpf_sk_reuseport_detach(struct sock *sk);

int bpf_fd_reuseport_array_lookup_elem(struct bpf_map *map, void *key,

				       void *value);

int bpf_fd_reuseport_array_update_elem(struct bpf_map *map, void *key,

				       void *value, u64 map_flags);

#else

static inline void bpf_sk_reuseport_detach(struct sock *sk)

{

}



#ifdef CONFIG_BPF_SYSCALL

static inline int sock_map_get_from_fd(const union bpf_attr *attr,
@@ -1956,7 +1944,21 @@ static inline int sock_map_update_elem_sys(struct bpf_map *map, void *key, void 
{

	return -EOPNOTSUPP;

}

#endif /* CONFIG_BPF_SYSCALL */

#endif /* CONFIG_NET && CONFIG_BPF_SYSCALL */



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

void bpf_sk_reuseport_detach(struct sock *sk);

int bpf_fd_reuseport_array_lookup_elem(struct bpf_map *map, void *key,

				       void *value);

int bpf_fd_reuseport_array_update_elem(struct bpf_map *map, void *key,

				       void *value, u64 map_flags);

#else

static inline void bpf_sk_reuseport_detach(struct sock *sk)

{

}



#ifdef CONFIG_BPF_SYSCALL

static inline int bpf_fd_reuseport_array_lookup_elem(struct bpf_map *map,

						     void *key, void *value)

{

kernel/bpf/Kconfig

+1 −1
Original line number Diff line number Diff line
@@ -29,7 +29,7 @@ config BPF_SYSCALL 
	select IRQ_WORK

	select TASKS_TRACE_RCU

	select BINARY_PRINTF

	select NET_SOCK_MSG if INET

	select NET_SOCK_MSG if NET

	default n

	help

	  Enable the bpf() system call that allows to manipulate BPF programs

net/core/Makefile

+0 −2
Original line number Diff line number Diff line
@@ -33,8 +33,6 @@ obj-$(CONFIG_HWBM) += hwbm.o 
obj-$(CONFIG_NET_DEVLINK) += devlink.o

obj-$(CONFIG_GRO_CELLS) += gro_cells.o

obj-$(CONFIG_FAILOVER) += failover.o

ifeq ($(CONFIG_INET),y)

obj-$(CONFIG_NET_SOCK_MSG) += skmsg.o

obj-$(CONFIG_BPF_SYSCALL) += sock_map.o

endif

obj-$(CONFIG_BPF_SYSCALL) += bpf_sk_storage.o