net: remove duplicate sk_lookup helpers

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

diff --git a/net/ipv6/udp.c b/net/ipv6/udp.c
index b7c972a..4b8974a 100644 (file)
--- a/net/ipv6/udp.c
+++ b/net/ipv6/udp.c
@@ -71,11 +71,12 @@ int udpv6_init_sock(struct sock *sk)
        return 0;
 }
 
-static u32 udp6_ehashfn(const struct net *net,
-                       const struct in6_addr *laddr,
-                       const u16 lport,
-                       const struct in6_addr *faddr,
-                       const __be16 fport)
+INDIRECT_CALLABLE_SCOPE
+u32 udp6_ehashfn(const struct net *net,
+                const struct in6_addr *laddr,
+                const u16 lport,
+                const struct in6_addr *faddr,
+                const __be16 fport)
 {
        static u32 udp6_ehash_secret __read_mostly;
        static u32 udp_ipv6_hash_secret __read_mostly;
@@ -160,24 +161,6 @@ static int compute_score(struct sock *sk, struct net *net,
        return score;
 }
 
-static struct sock *lookup_reuseport(struct net *net, struct sock *sk,
-                                    struct sk_buff *skb,
-                                    const struct in6_addr *saddr,
-                                    __be16 sport,
-                                    const struct in6_addr *daddr,
-                                    unsigned int hnum)
-{
-       struct sock *reuse_sk = NULL;
-       u32 hash;
-
-       if (sk->sk_reuseport && sk->sk_state != TCP_ESTABLISHED) {
-               hash = udp6_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 *udp6_lib_lookup2(struct net *net,
                const struct in6_addr *saddr, __be16 sport,
@@ -194,44 +177,35 @@ static struct sock *udp6_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 = inet6_lookup_reuseport(net, sk, skb, sizeof(struct udphdr),
+                                                       saddr, sport, daddr, hnum, udp6_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(sk, net, saddr, sport,
+                                               daddr, hnum, dif, sdif);
                }
        }
        return result;
 }
 
-static inline struct sock *udp6_lookup_run_bpf(struct net *net,
-                                              struct udp_table *udptable,
-                                              struct sk_buff *skb,
-                                              const struct in6_addr *saddr,
-                                              __be16 sport,
-                                              const struct in6_addr *daddr,
-                                              u16 hnum, const int dif)
-{
-       struct sock *sk, *reuse_sk;
-       bool no_reuseport;
-
-       if (udptable != net->ipv4.udp_table)
-               return NULL; /* only UDP is supported */
-
-       no_reuseport = bpf_sk_lookup_run_v6(net, IPPROTO_UDP, saddr, sport,
-                                           daddr, hnum, dif, &sk);
-       if (no_reuseport || IS_ERR_OR_NULL(sk))
-               return sk;
-
-       reuse_sk = lookup_reuseport(net, sk, skb, saddr, sport, daddr, hnum);
-       if (reuse_sk)
-               sk = reuse_sk;
-       return sk;
-}
-
 /* rcu_read_lock() must be held */
 struct sock *__udp6_lib_lookup(struct net *net,
                               const struct in6_addr *saddr, __be16 sport,
@@ -256,9 +230,11 @@ struct sock *__udp6_lib_lookup(struct net *net,
                goto done;
 
        /* Lookup redirect from BPF */
-       if (static_branch_unlikely(&bpf_sk_lookup_enabled)) {
-               sk = udp6_lookup_run_bpf(net, udptable, skb,
-                                        saddr, sport, daddr, hnum, dif);
+       if (static_branch_unlikely(&bpf_sk_lookup_enabled) &&
+           udptable == net->ipv4.udp_table) {
+               sk = inet6_lookup_run_sk_lookup(net, IPPROTO_UDP, skb, sizeof(struct udphdr),
+                                               saddr, sport, daddr, hnum, dif,
+                                               udp6_ehashfn);
                if (sk) {
                        result = sk;
                        goto done;
@@ -1798,6 +1774,7 @@ struct proto udpv6_prot = {
        .sysctl_wmem_offset     = offsetof(struct net, ipv4.sysctl_udp_wmem_min),
        .sysctl_rmem_offset     = offsetof(struct net, ipv4.sysctl_udp_rmem_min),
        .obj_size               = sizeof(struct udp6_sock),
+       .ipv6_pinfo_offset = offsetof(struct udp6_sock, inet6),
        .h.udp_table            = NULL,
        .diag_destroy           = udp_abort,
 };