nagai/kernel
3
0
Fork 0
forked from mirrors/linux
Code Pull requests Activity

inet: Extract helper for selecting socket from reuseport group

Browse source 
Prepare for calling into reuseport from __inet_lookup_listener as well.

Signed-off-by: Jakub Sitnicki <jakub@cloudflare.com>
Signed-off-by: Alexei Starovoitov <ast@kernel.org>
Acked-by: Andrii Nakryiko <andriin@fb.com>
Link: https://lore.kernel.org/bpf/20200717103536.397595-4-jakub@cloudflare.com
This commit is contained in:
Jakub Sitnicki 2020-07-17 12:35:24 +02:00 committed by Alexei Starovoitov
parent e9ddbb7707
commit 80b373f74f
1 changed files with 20 additions and 9 deletions
repo.diff.show_diff_stats Download patch file Download diff file Expand all files Collapse all files

29
net/ipv4/inet_hashtables.c
View file

@ -246,6 +246,21 @@ static inline int compute_score(struct sock *sk, struct net *net,
return score; return score;
} }
static inline struct sock *lookup_reuseport(struct net *net, struct sock *sk,
struct sk_buff *skb, int doff,
__be32 saddr, __be16 sport,
__be32 daddr, unsigned short hnum)
{
struct sock *reuse_sk = NULL;
u32 phash;
if (sk->sk_reuseport) {
phash = inet_ehashfn(net, daddr, hnum, saddr, sport);
reuse_sk = reuseport_select_sock(sk, phash, skb, doff);
}
return reuse_sk;
}
/* /*
* Here are some nice properties to exploit here. The BSD API * Here are some nice properties to exploit here. The BSD API
* does not allow a listening sock to specify the remote port nor the * does not allow a listening sock to specify the remote port nor the
@ -265,21 +280,17 @@ static struct sock *inet_lhash2_lookup(struct net *net,
struct inet_connection_sock *icsk; struct inet_connection_sock *icsk;
struct sock *sk, *result = NULL; struct sock *sk, *result = NULL;
int score, hiscore = 0; int score, hiscore = 0;
u32 phash = 0;
inet_lhash2_for_each_icsk_rcu(icsk, &ilb2->head) { inet_lhash2_for_each_icsk_rcu(icsk, &ilb2->head) {
sk = (struct sock *)icsk; sk = (struct sock *)icsk;
score = compute_score(sk, net, hnum, daddr, score = compute_score(sk, net, hnum, daddr,
dif, sdif, exact_dif); dif, sdif, exact_dif);
if (score > hiscore) { if (score > hiscore) {
if (sk->sk_reuseport) { result = lookup_reuseport(net, sk, skb, doff,
phash = inet_ehashfn(net, daddr, hnum, saddr, sport, daddr, hnum);
saddr, sport); if (result)
result = reuseport_select_sock(sk, phash, return result;
skb, doff);
if (result)
return result;
}
result = sk; result = sk;
hiscore = score; hiscore = score;
} }