Commit 92acdc58 authored by Daniel Borkmann's avatar Daniel Borkmann Committed by Alexei Starovoitov
Browse files

bpf, net: Rework cookie generator as per-cpu one 



With its use in BPF, the cookie generator can be called very frequently
in particular when used out of cgroup v2 hooks (e.g. connect / sendmsg)
and attached to the root cgroup, for example, when used in v1/v2 mixed
environments. In particular, when there's a high churn on sockets in the
system there can be many parallel requests to the bpf_get_socket_cookie()
and bpf_get_netns_cookie() helpers which then cause contention on the
atomic counter.

As similarly done in f991bd2e ("fs: introduce a per-cpu last_ino
allocator"), add a small helper library that both can use for the 64 bit
counters. Given this can be called from different contexts, we also need
to deal with potential nested calls even though in practice they are
considered extremely rare. One idea as suggested by Eric Dumazet was
to use a reverse counter for this situation since we don't expect 64 bit
overflows anyways; that way, we can avoid bigger gaps in the 64 bit
counter space compared to just batch-wise increase. Even on machines
with small number of cores (e.g. 4) the cookie generation shrinks from
min/max/med/avg (ns) of 22/50/40/38.9 down to 10/35/14/17.3 when run
in parallel from multiple CPUs.

Signed-off-by: default avatarDaniel Borkmann <daniel@iogearbox.net>
Signed-off-by: default avatarAlexei Starovoitov <ast@kernel.org>
Reviewed-by: default avatarEric Dumazet <edumazet@google.com>
Acked-by: default avatarMartin KaFai Lau <kafai@fb.com>
Cc: Eric Dumazet <eric.dumazet@gmail.com>
Link: https://lore.kernel.org/bpf/8a80b8d27d3c49f9a14e1d5213c19d8be87d1dc8.1601477936.git.daniel@iogearbox.net
parent b426ce83

include/linux/cookie.h

0 → 100644
+51 −0
Original line number Diff line number Diff line 
/* SPDX-License-Identifier: GPL-2.0 */

#ifndef __LINUX_COOKIE_H

#define __LINUX_COOKIE_H



#include <linux/atomic.h>

#include <linux/percpu.h>

#include <asm/local.h>



struct pcpu_gen_cookie {

	local_t nesting;

	u64 last;

} __aligned(16);



struct gen_cookie {

	struct pcpu_gen_cookie __percpu *local;

	atomic64_t forward_last ____cacheline_aligned_in_smp;

	atomic64_t reverse_last;

};



#define COOKIE_LOCAL_BATCH	4096



#define DEFINE_COOKIE(name)						\

	static DEFINE_PER_CPU(struct pcpu_gen_cookie, __##name);	\

	static struct gen_cookie name = {				\

		.local		= &__##name,				\

		.forward_last	= ATOMIC64_INIT(0),			\

		.reverse_last	= ATOMIC64_INIT(0),			\

	}



static __always_inline u64 gen_cookie_next(struct gen_cookie *gc)

{

	struct pcpu_gen_cookie *local = this_cpu_ptr(gc->local);

	u64 val;



	if (likely(local_inc_return(&local->nesting) == 1)) {

		val = local->last;

		if (__is_defined(CONFIG_SMP) &&

		    unlikely((val & (COOKIE_LOCAL_BATCH - 1)) == 0)) {

			s64 next = atomic64_add_return(COOKIE_LOCAL_BATCH,

						       &gc->forward_last);

			val = next - COOKIE_LOCAL_BATCH;

		}

		local->last = ++val;

	} else {

		val = atomic64_dec_return(&gc->reverse_last);

	}

	local_dec(&local->nesting);

	return val;

}



#endif /* __LINUX_COOKIE_H */

include/linux/sock_diag.h

+13 −1
Original line number Diff line number Diff line
@@ -25,7 +25,19 @@ void sock_diag_unregister(const struct sock_diag_handler *h); 
void sock_diag_register_inet_compat(int (*fn)(struct sk_buff *skb, struct nlmsghdr *nlh));

void sock_diag_unregister_inet_compat(int (*fn)(struct sk_buff *skb, struct nlmsghdr *nlh));



u64 sock_gen_cookie(struct sock *sk);

u64 __sock_gen_cookie(struct sock *sk);



static inline u64 sock_gen_cookie(struct sock *sk)

{

	u64 cookie;



	preempt_disable();

	cookie = __sock_gen_cookie(sk);

	preempt_enable();



	return cookie;

}



int sock_diag_check_cookie(struct sock *sk, const __u32 *cookie);

void sock_diag_save_cookie(struct sock *sk, __u32 *cookie);

include/net/net_namespace.h

+1 −1
Original line number Diff line number Diff line
@@ -230,7 +230,7 @@ extern struct list_head net_namespace_list; 
struct net *get_net_ns_by_pid(pid_t pid);

struct net *get_net_ns_by_fd(int fd);



u64 net_gen_cookie(struct net *net);

u64 __net_gen_cookie(struct net *net);



#ifdef CONFIG_SYSCTL

void ipx_register_sysctl(void);

kernel/bpf/reuseport_array.c

+1 −1
Original line number Diff line number Diff line
@@ -191,7 +191,7 @@ int bpf_fd_reuseport_array_lookup_elem(struct bpf_map *map, void *key, 
	rcu_read_lock();

	sk = reuseport_array_lookup_elem(map, key);

	if (sk) {

		*(u64 *)value = sock_gen_cookie(sk);

		*(u64 *)value = __sock_gen_cookie(sk);

		err = 0;

	} else {

		err = -ENOENT;

net/core/filter.c

+5 −5
Original line number Diff line number Diff line
@@ -4232,7 +4232,7 @@ const struct bpf_func_proto bpf_xdp_output_proto = { 


BPF_CALL_1(bpf_get_socket_cookie, struct sk_buff *, skb)

{

	return skb->sk ? sock_gen_cookie(skb->sk) : 0;

	return skb->sk ? __sock_gen_cookie(skb->sk) : 0;

}



static const struct bpf_func_proto bpf_get_socket_cookie_proto = {
@@ -4244,7 +4244,7 @@ static const struct bpf_func_proto bpf_get_socket_cookie_proto = { 


BPF_CALL_1(bpf_get_socket_cookie_sock_addr, struct bpf_sock_addr_kern *, ctx)

{

	return sock_gen_cookie(ctx->sk);

	return __sock_gen_cookie(ctx->sk);

}



static const struct bpf_func_proto bpf_get_socket_cookie_sock_addr_proto = {
@@ -4256,7 +4256,7 @@ static const struct bpf_func_proto bpf_get_socket_cookie_sock_addr_proto = { 


BPF_CALL_1(bpf_get_socket_cookie_sock, struct sock *, ctx)

{

	return sock_gen_cookie(ctx);

	return __sock_gen_cookie(ctx);

}



static const struct bpf_func_proto bpf_get_socket_cookie_sock_proto = {
@@ -4268,7 +4268,7 @@ static const struct bpf_func_proto bpf_get_socket_cookie_sock_proto = { 


BPF_CALL_1(bpf_get_socket_cookie_sock_ops, struct bpf_sock_ops_kern *, ctx)

{

	return sock_gen_cookie(ctx->sk);

	return __sock_gen_cookie(ctx->sk);

}



static const struct bpf_func_proto bpf_get_socket_cookie_sock_ops_proto = {
@@ -4281,7 +4281,7 @@ static const struct bpf_func_proto bpf_get_socket_cookie_sock_ops_proto = { 
static u64 __bpf_get_netns_cookie(struct sock *sk)

{

#ifdef CONFIG_NET_NS

	return net_gen_cookie(sk ? sk->sk_net.net : &init_net);

	return __net_gen_cookie(sk ? sk->sk_net.net : &init_net);

#else

	return 0;

#endif

CRA Git | Maintained and supported by SUSTech CRA and CCSE