net: remove duplicate reuseport_lookup functions

[platform/kernel/linux-starfive.git] / net / ipv4 / inet_hashtables.c

diff --git a/net/ipv4/inet_hashtables.c b/net/ipv4/inet_hashtables.c
index ecb8384..0a7a726 100644 (file)
--- a/net/ipv4/inet_hashtables.c
+++ b/net/ipv4/inet_hashtables.c
@@ -28,9 +28,9 @@
 #include <net/tcp.h>
 #include <net/sock_reuseport.h>
 
-static u32 inet_ehashfn(const struct net *net, const __be32 laddr,
-                       const __u16 lport, const __be32 faddr,
-                       const __be16 fport)
+u32 inet_ehashfn(const struct net *net, const __be32 laddr,
+                const __u16 lport, const __be32 faddr,
+                const __be16 fport)
 {
        static u32 inet_ehash_secret __read_mostly;
 
@@ -39,6 +39,7 @@ static u32 inet_ehashfn(const struct net *net, const __be32 laddr,
        return __inet_ehashfn(laddr, lport, faddr, fport,
                              inet_ehash_secret + net_hash_mix(net));
 }
+EXPORT_SYMBOL_GPL(inet_ehashfn);
 
 /* This function handles inet_sock, but also timewait and request sockets
  * for IPv4/IPv6.
@@ -332,16 +333,20 @@ static inline int compute_score(struct sock *sk, struct net *net,
        return score;
 }
 
+INDIRECT_CALLABLE_DECLARE(inet_ehashfn_t udp_ehashfn);
+
 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)
+                                  __be32 daddr, unsigned short hnum,
+                                  inet_ehashfn_t *ehashfn)
 {
        struct sock *reuse_sk = NULL;
        u32 phash;
 
        if (sk->sk_reuseport) {
-               phash = inet_ehashfn(net, daddr, hnum, saddr, sport);
+               phash = INDIRECT_CALL_2(ehashfn, udp_ehashfn, inet_ehashfn,
+                                       net, daddr, hnum, saddr, sport);
                reuse_sk = reuseport_select_sock(sk, phash, skb, doff);
        }
        return reuse_sk;
@@ -371,7 +376,7 @@ static struct sock *inet_lhash2_lookup(struct net *net,
                score = compute_score(sk, net, hnum, daddr, dif, sdif);
                if (score > hiscore) {
                        result = inet_lookup_reuseport(net, sk, skb, doff,
-                                                      saddr, sport, daddr, hnum);
+                                                      saddr, sport, daddr, hnum, inet_ehashfn);
                        if (result)
                                return result;
 
@@ -400,7 +405,8 @@ static inline struct sock *inet_lookup_run_bpf(struct net *net,
        if (no_reuseport || IS_ERR_OR_NULL(sk))
                return sk;
 
-       reuse_sk = inet_lookup_reuseport(net, sk, skb, doff, saddr, sport, daddr, hnum);
+       reuse_sk = inet_lookup_reuseport(net, sk, skb, doff, saddr, sport, daddr, hnum,
+                                        inet_ehashfn);
        if (reuse_sk)
                sk = reuse_sk;
        return sk;