net: remove duplicate reuseport_lookup functions

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

diff --git a/net/ipv4/udp.c b/net/ipv4/udp.c
index 42a96b3..3abe8a1 100644 (file)
--- a/net/ipv4/udp.c
+++ b/net/ipv4/udp.c
@@ -406,9 +406,9 @@ static int compute_score(struct sock *sk, struct net *net,
        return score;
 }
 
-static u32 udp_ehashfn(const struct net *net, const __be32 laddr,
-                      const __u16 lport, const __be32 faddr,
-                      const __be16 fport)
+INDIRECT_CALLABLE_SCOPE
+u32 udp_ehashfn(const struct net *net, const __be32 laddr, const __u16 lport,
+               const __be32 faddr, const __be16 fport)
 {
        static u32 udp_ehash_secret __read_mostly;
 
@@ -418,22 +418,6 @@ static u32 udp_ehashfn(const struct net *net, const __be32 laddr,
                              udp_ehash_secret + net_hash_mix(net));
 }
 
-static struct sock *lookup_reuseport(struct net *net, struct sock *sk,
-                                    struct sk_buff *skb,
-                                    __be32 saddr, __be16 sport,
-                                    __be32 daddr, unsigned short hnum)
-{
-       struct sock *reuse_sk = NULL;
-       u32 hash;
-
-       if (sk->sk_reuseport && sk->sk_state != TCP_ESTABLISHED) {
-               hash = udp_ehashfn(net, daddr, hnum, saddr, sport);
-               reuse_sk = reuseport_select_sock(sk, hash, skb,
-                                                sizeof(struct udphdr));
-       }
-       return reuse_sk;
-}
-
 /* called with rcu_read_lock() */
 static struct sock *udp4_lib_lookup2(struct net *net,
                                     __be32 saddr, __be16 sport,
@@ -451,14 +435,31 @@ static struct sock *udp4_lib_lookup2(struct net *net,
                score = compute_score(sk, net, saddr, sport,
                                      daddr, hnum, dif, sdif);
                if (score > badness) {
-                       result = lookup_reuseport(net, sk, skb,
-                                                 saddr, sport, daddr, hnum);
+                       badness = score;
+
+                       if (sk->sk_state == TCP_ESTABLISHED) {
+                               result = sk;
+                               continue;
+                       }
+
+                       result = inet_lookup_reuseport(net, sk, skb, sizeof(struct udphdr),
+                                                      saddr, sport, daddr, hnum, udp_ehashfn);
+                       if (!result) {
+                               result = sk;
+                               continue;
+                       }
+
                        /* Fall back to scoring if group has connections */
-                       if (result && !reuseport_has_conns(sk))
+                       if (!reuseport_has_conns(sk))
                                return result;
 
-                       result = result ? : sk;
-                       badness = score;
+                       /* Reuseport logic returned an error, keep original score. */
+                       if (IS_ERR(result))
+                               continue;
+
+                       badness = compute_score(result, net, saddr, sport,
+                                               daddr, hnum, dif, sdif);
+
                }
        }
        return result;
@@ -481,7 +482,8 @@ static struct sock *udp4_lookup_run_bpf(struct net *net,
        if (no_reuseport || IS_ERR_OR_NULL(sk))
                return sk;
 
-       reuse_sk = lookup_reuseport(net, sk, skb, saddr, sport, daddr, hnum);
+       reuse_sk = inet_lookup_reuseport(net, sk, skb, sizeof(struct udphdr),
+                                        saddr, sport, daddr, hnum, udp_ehashfn);
        if (reuse_sk)
                sk = reuse_sk;
        return sk;
@@ -1553,7 +1555,7 @@ int __udp_enqueue_schedule_skb(struct sock *sk, struct sk_buff *skb)
        spin_unlock(&list->lock);
 
        if (!sock_flag(sk, SOCK_DEAD))
-               sk->sk_data_ready(sk);
+               INDIRECT_CALL_1(sk->sk_data_ready, sock_def_readable, sk);
 
        busylock_release(busy);
        return 0;