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

bpf: Clean up sockmap related Kconfigs 



As suggested by John, clean up sockmap related Kconfigs:

Reduce the scope of CONFIG_BPF_STREAM_PARSER down to TCP stream
parser, to reflect its name.

Make the rest sockmap code simply depend on CONFIG_BPF_SYSCALL
and CONFIG_INET, the latter is still needed at this point because
of TCP/UDP proto update. And leave CONFIG_NET_SOCK_MSG untouched,
as it is used by non-sockmap cases.

Signed-off-by: default avatarCong Wang <cong.wang@bytedance.com>
Signed-off-by: default avatarAlexei Starovoitov <ast@kernel.org>
Reviewed-by: default avatarLorenz Bauer <lmb@cloudflare.com>
Acked-by: default avatarJohn Fastabend <john.fastabend@gmail.com>
Acked-by: default avatarJakub Sitnicki <jakub@cloudflare.com>
Link: https://lore.kernel.org/bpf/20210223184934.6054-2-xiyou.wangcong@gmail.com
parent a83586a7

include/linux/bpf.h

+12 −14
Original line number Diff line number Diff line
@@ -1778,7 +1778,7 @@ static inline void bpf_map_offload_map_free(struct bpf_map *map) 
}

#endif /* CONFIG_NET && CONFIG_BPF_SYSCALL */



#if defined(CONFIG_BPF_STREAM_PARSER)

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

int sock_map_prog_update(struct bpf_map *map, struct bpf_prog *prog,

			 struct bpf_prog *old, u32 which);

int sock_map_get_from_fd(const union bpf_attr *attr, struct bpf_prog *prog);
@@ -1786,7 +1786,18 @@ 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_prog_update(struct bpf_map *map,

				       struct bpf_prog *prog,

				       struct bpf_prog *old, u32 which)
@@ -1811,20 +1822,7 @@ static inline int sock_map_update_elem_sys(struct bpf_map *map, void *key, void 
{

	return -EOPNOTSUPP;

}

#endif /* CONFIG_BPF_STREAM_PARSER */



#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)

{

include/linux/bpf_types.h

+2 −4
Original line number Diff line number Diff line
@@ -103,10 +103,6 @@ BPF_MAP_TYPE(BPF_MAP_TYPE_HASH_OF_MAPS, htab_of_maps_map_ops) 
BPF_MAP_TYPE(BPF_MAP_TYPE_DEVMAP, dev_map_ops)

BPF_MAP_TYPE(BPF_MAP_TYPE_DEVMAP_HASH, dev_map_hash_ops)

BPF_MAP_TYPE(BPF_MAP_TYPE_SK_STORAGE, sk_storage_map_ops)

#if defined(CONFIG_BPF_STREAM_PARSER)

BPF_MAP_TYPE(BPF_MAP_TYPE_SOCKMAP, sock_map_ops)

BPF_MAP_TYPE(BPF_MAP_TYPE_SOCKHASH, sock_hash_ops)

#endif

#ifdef CONFIG_BPF_LSM

BPF_MAP_TYPE(BPF_MAP_TYPE_INODE_STORAGE, inode_storage_map_ops)

#endif
@@ -116,6 +112,8 @@ BPF_MAP_TYPE(BPF_MAP_TYPE_CPUMAP, cpu_map_ops) 
BPF_MAP_TYPE(BPF_MAP_TYPE_XSKMAP, xsk_map_ops)

#endif

#ifdef CONFIG_INET

BPF_MAP_TYPE(BPF_MAP_TYPE_SOCKMAP, sock_map_ops)

BPF_MAP_TYPE(BPF_MAP_TYPE_SOCKHASH, sock_hash_ops)

BPF_MAP_TYPE(BPF_MAP_TYPE_REUSEPORT_SOCKARRAY, reuseport_array_ops)

#endif

#endif

include/linux/skmsg.h

+18 −0
Original line number Diff line number Diff line
@@ -71,7 +71,9 @@ struct sk_psock_link { 
};



struct sk_psock_parser {

#if IS_ENABLED(CONFIG_BPF_STREAM_PARSER)

	struct strparser		strp;

#endif

	bool				enabled;

	void (*saved_data_ready)(struct sock *sk);

};
@@ -305,9 +307,25 @@ static inline void sk_psock_report_error(struct sk_psock *psock, int err) 


struct sk_psock *sk_psock_init(struct sock *sk, int node);



#if IS_ENABLED(CONFIG_BPF_STREAM_PARSER)

int sk_psock_init_strp(struct sock *sk, struct sk_psock *psock);

void sk_psock_start_strp(struct sock *sk, struct sk_psock *psock);

void sk_psock_stop_strp(struct sock *sk, struct sk_psock *psock);

#else

static inline int sk_psock_init_strp(struct sock *sk, struct sk_psock *psock)

{

	return -EOPNOTSUPP;

}



static inline void sk_psock_start_strp(struct sock *sk, struct sk_psock *psock)

{

}



static inline void sk_psock_stop_strp(struct sock *sk, struct sk_psock *psock)

{

}

#endif



void sk_psock_start_verdict(struct sock *sk, struct sk_psock *psock);

void sk_psock_stop_verdict(struct sock *sk, struct sk_psock *psock);

include/net/tcp.h

+9 −7
Original line number Diff line number Diff line
@@ -2222,25 +2222,27 @@ void tcp_update_ulp(struct sock *sk, struct proto *p, 
	__MODULE_INFO(alias, alias_userspace, name);		\

	__MODULE_INFO(alias, alias_tcp_ulp, "tcp-ulp-" name)



#ifdef CONFIG_NET_SOCK_MSG

struct sk_msg;

struct sk_psock;



#ifdef CONFIG_BPF_STREAM_PARSER

#ifdef CONFIG_BPF_SYSCALL

struct proto *tcp_bpf_get_proto(struct sock *sk, struct sk_psock *psock);

void tcp_bpf_clone(const struct sock *sk, struct sock *newsk);

#else

static inline void tcp_bpf_clone(const struct sock *sk, struct sock *newsk)

{

}

#endif /* CONFIG_BPF_STREAM_PARSER */

#endif /* CONFIG_BPF_SYSCALL */



#ifdef CONFIG_NET_SOCK_MSG

int tcp_bpf_sendmsg_redir(struct sock *sk, struct sk_msg *msg, u32 bytes,

			  int flags);

int __tcp_bpf_recvmsg(struct sock *sk, struct sk_psock *psock,

		      struct msghdr *msg, int len, int flags);

#endif /* CONFIG_NET_SOCK_MSG */



#if !defined(CONFIG_BPF_SYSCALL) || !defined(CONFIG_NET_SOCK_MSG)

static inline void tcp_bpf_clone(const struct sock *sk, struct sock *newsk)

{

}

#endif



#ifdef CONFIG_CGROUP_BPF

static inline void bpf_skops_init_skb(struct bpf_sock_ops_kern *skops,

				      struct sk_buff *skb,

include/net/udp.h

+2 −2
Original line number Diff line number Diff line
@@ -515,9 +515,9 @@ static inline struct sk_buff *udp_rcv_segment(struct sock *sk, 
	return segs;

}



#ifdef CONFIG_BPF_STREAM_PARSER

#ifdef CONFIG_BPF_SYSCALL

struct sk_psock;

struct proto *udp_bpf_get_proto(struct sock *sk, struct sk_psock *psock);

#endif /* BPF_STREAM_PARSER */

#endif



#endif	/* _UDP_H */