udp: Don't discard reuseport selection when group has connections
When BPF socket lookup prog selects a socket that belongs to a reuseport group, and the reuseport group has connected sockets in it, the socket selected by reuseport will be discarded, and socket returned by BPF socket lookup will be used instead. Modify this behavior so that the socket selected by reuseport running after BPF socket lookup always gets used. Ignore the fact that the reuseport group might have connections because it is only relevant when scoring sockets during regular hashtable-based lookup. Fixes:72f7e9440e
("udp: Run SK_LOOKUP BPF program on socket lookup") Fixes:6d4201b138
("udp6: Run SK_LOOKUP BPF program on socket lookup") Signed-off-by: Jakub Sitnicki <jakub@cloudflare.com> Signed-off-by: Alexei Starovoitov <ast@kernel.org> Acked-by: Kuniyuki Iwashima <kuniyu@amazon.co.jp> Link: https://lore.kernel.org/bpf/20200722161720.940831-2-jakub@cloudflare.com
This commit is contained in:
Родитель
f3c93a93b5
Коммит
c8a2983c4d
|
@ -155,9 +155,6 @@ static struct sock *lookup_reuseport(struct net *net, struct sock *sk,
|
|||
hash = udp6_ehashfn(net, daddr, hnum, saddr, sport);
|
||||
reuse_sk = reuseport_select_sock(sk, hash, skb,
|
||||
sizeof(struct udphdr));
|
||||
/* Fall back to scoring if group has connections */
|
||||
if (reuseport_has_conns(sk, false))
|
||||
return NULL;
|
||||
}
|
||||
return reuse_sk;
|
||||
}
|
||||
|
|
Загрузка…
Ссылка в новой задаче