xiaomi-sm8450/android_kernel_xiaomi_sm8450
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

net: export inet_lookup_reuseport and inet6_lookup_reuseport

Browse Source 
[ Upstream commit ce796e60b3b196b61fcc565df195443cbb846ef0 ]

Rename the existing reuseport helpers for IPv4 and IPv6 so that they
can be invoked in the follow up commit. Export them so that building
DCCP and IPv6 as a module works.

No change in functionality.

Reviewed-by: Kuniyuki Iwashima <kuniyu@amazon.com>
Signed-off-by: Lorenz Bauer <lmb@isovalent.com>
Link: https://lore.kernel.org/r/20230720-so-reuseport-v6-3-7021b683cdae@isovalent.com
Signed-off-by: Martin KaFai Lau <martin.lau@kernel.org>
Stable-dep-of: 50aee97d1511 ("udp: Avoid call to compute_score on multiple sites")
Signed-off-by: Sasha Levin <sashal@kernel.org>
This commit is contained in:
Lorenz Bauer
2023-07-20 17:30:07 +02:00
committed by Greg Kroah-Hartman
parent dfc56ff5ec
commit 0ce990e6ef
4 changed files with 30 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
include/net/inet6_hashtables.h
View File

@@ -48,6 +48,13 @@ struct sock *__inet6_lookup_established(struct net *net,
const u16 hnum, const int dif, const u16 hnum, const int dif,
const int sdif); const int sdif);
struct sock *inet6_lookup_reuseport(struct net *net, struct sock *sk,
struct sk_buff *skb, int doff,
const struct in6_addr *saddr,
__be16 sport,
const struct in6_addr *daddr,
unsigned short hnum);
struct sock *inet6_lookup_listener(struct net *net, struct sock *inet6_lookup_listener(struct net *net,
struct inet_hashinfo *hashinfo, struct inet_hashinfo *hashinfo,
struct sk_buff *skb, int doff, struct sk_buff *skb, int doff,

5
include/net/inet_hashtables.h
View File

@@ -313,6 +313,11 @@ struct sock *__inet_lookup_established(struct net *net,
const __be32 daddr, const u16 hnum, const __be32 daddr, const u16 hnum,
const int dif, const int sdif); const int dif, const int sdif);
struct sock *inet_lookup_reuseport(struct net *net, struct sock *sk,
struct sk_buff *skb, int doff,
__be32 saddr, __be16 sport,
__be32 daddr, unsigned short hnum);
static inline struct sock * static inline struct sock *
inet_lookup_established(struct net *net, struct inet_hashinfo *hashinfo, inet_lookup_established(struct net *net, struct inet_hashinfo *hashinfo,
const __be32 saddr, const __be16 sport, const __be32 saddr, const __be16 sport,

15
net/ipv4/inet_hashtables.c
View File

@@ -252,10 +252,10 @@ 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 sock *inet_lookup_reuseport(struct net *net, struct sock *sk,
struct sk_buff *skb, int doff, struct sk_buff *skb, int doff,
__be32 saddr, __be16 sport, __be32 saddr, __be16 sport,
__be32 daddr, unsigned short hnum) __be32 daddr, unsigned short hnum)
{ {
struct sock *reuse_sk = NULL; struct sock *reuse_sk = NULL;
u32 phash; u32 phash;
@@ -266,6 +266,7 @@ static inline struct sock *lookup_reuseport(struct net *net, struct sock *sk,
} }
return reuse_sk; return reuse_sk;
} }
EXPORT_SYMBOL_GPL(inet_lookup_reuseport);
/* /*
* Here are some nice properties to exploit here. The BSD API * Here are some nice properties to exploit here. The BSD API
@@ -290,8 +291,8 @@ static struct sock *inet_lhash2_lookup(struct net *net,
sk = (struct sock *)icsk; sk = (struct sock *)icsk;
score = compute_score(sk, net, hnum, daddr, dif, sdif); score = compute_score(sk, net, hnum, daddr, dif, sdif);
if (score > hiscore) { if (score > hiscore) {
result = lookup_reuseport(net, sk, skb, doff, result = inet_lookup_reuseport(net, sk, skb, doff,
saddr, sport, daddr, hnum); saddr, sport, daddr, hnum);
if (result) if (result)
return result; return result;
@@ -320,7 +321,7 @@ static inline struct sock *inet_lookup_run_bpf(struct net *net,
if (no_reuseport || IS_ERR_OR_NULL(sk)) if (no_reuseport || IS_ERR_OR_NULL(sk))
return sk; return sk;
reuse_sk = lookup_reuseport(net, sk, skb, doff, saddr, sport, daddr, hnum); reuse_sk = inet_lookup_reuseport(net, sk, skb, doff, saddr, sport, daddr, hnum);
if (reuse_sk) if (reuse_sk)
sk = reuse_sk; sk = reuse_sk;
return sk; return sk;

19
net/ipv6/inet6_hashtables.c
View File

@@ -113,12 +113,12 @@ 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 sock *inet6_lookup_reuseport(struct net *net, struct sock *sk,
struct sk_buff *skb, int doff, struct sk_buff *skb, int doff,
const struct in6_addr *saddr, const struct in6_addr *saddr,
__be16 sport, __be16 sport,
const struct in6_addr *daddr, const struct in6_addr *daddr,
unsigned short hnum) unsigned short hnum)
{ {
struct sock *reuse_sk = NULL; struct sock *reuse_sk = NULL;
u32 phash; u32 phash;
@@ -129,6 +129,7 @@ static inline struct sock *lookup_reuseport(struct net *net, struct sock *sk,
} }
return reuse_sk; return reuse_sk;
} }
EXPORT_SYMBOL_GPL(inet6_lookup_reuseport);
/* called with rcu_read_lock() */ /* called with rcu_read_lock() */
static struct sock *inet6_lhash2_lookup(struct net *net, static struct sock *inet6_lhash2_lookup(struct net *net,
@@ -146,8 +147,8 @@ static struct sock *inet6_lhash2_lookup(struct net *net,
sk = (struct sock *)icsk; sk = (struct sock *)icsk;
score = compute_score(sk, net, hnum, daddr, dif, sdif); score = compute_score(sk, net, hnum, daddr, dif, sdif);
if (score > hiscore) { if (score > hiscore) {
result = lookup_reuseport(net, sk, skb, doff, result = inet6_lookup_reuseport(net, sk, skb, doff,
saddr, sport, daddr, hnum); saddr, sport, daddr, hnum);
if (result) if (result)
return result; return result;
@@ -178,7 +179,7 @@ static inline struct sock *inet6_lookup_run_bpf(struct net *net,
if (no_reuseport || IS_ERR_OR_NULL(sk)) if (no_reuseport || IS_ERR_OR_NULL(sk))
return sk; return sk;
reuse_sk = lookup_reuseport(net, sk, skb, doff, saddr, sport, daddr, hnum); reuse_sk = inet6_lookup_reuseport(net, sk, skb, doff, saddr, sport, daddr, hnum);
if (reuse_sk) if (reuse_sk)
sk = reuse_sk; sk = reuse_sk;
return sk; return sk;