net: remove duplicate sk_lookup helpers

Now that inet[6]_lookup_reuseport are parameterised on the ehashfn
we can remove two sk_lookup helpers.

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-6-7021b683cdae@isovalent.com
Signed-off-by: Martin KaFai Lau <martin.lau@kernel.org>

diff --git a/include/net/inet6_hashtables.h b/include/net/inet6_hashtables.h
index f89320b6fee315081abf18f61b22c4a78b3b32e1..a6722d6ef80fa6bfbc69b40da979c506e353badd 100644 (file)
--- a/include/net/inet6_hashtables.h
+++ b/include/net/inet6_hashtables.h
@@ -73,6 +73,15 @@ struct sock *inet6_lookup_listener(struct net *net,
                                   const unsigned short hnum,
                                   const int dif, const int sdif);
 
+struct sock *inet6_lookup_run_sk_lookup(struct net *net,
+                                       int protocol,
+                                       struct sk_buff *skb, int doff,
+                                       const struct in6_addr *saddr,
+                                       const __be16 sport,
+                                       const struct in6_addr *daddr,
+                                       const u16 hnum, const int dif,
+                                       inet6_ehashfn_t *ehashfn);
+
 static inline struct sock *__inet6_lookup(struct net *net,
                                          struct inet_hashinfo *hashinfo,
                                          struct sk_buff *skb, int doff,

diff --git a/include/net/inet_hashtables.h b/include/net/inet_hashtables.h
index ddfa2e67fdb51a85f8b033c08809d1dadce5f719..c0532cc7587f713a54032de37545c1497cead2dd 100644 (file)
--- a/include/net/inet_hashtables.h
+++ b/include/net/inet_hashtables.h
@@ -393,6 +393,13 @@ struct sock *inet_lookup_reuseport(struct net *net, struct sock *sk,
                                   __be32 daddr, unsigned short hnum,
                                   inet_ehashfn_t *ehashfn);
 
+struct sock *inet_lookup_run_sk_lookup(struct net *net,
+                                      int protocol,
+                                      struct sk_buff *skb, int doff,
+                                      __be32 saddr, __be16 sport,
+                                      __be32 daddr, u16 hnum, const int dif,
+                                      inet_ehashfn_t *ehashfn);
+
 static inline struct sock *
        inet_lookup_established(struct net *net, struct inet_hashinfo *hashinfo,
                                const __be32 saddr, const __be16 sport,

diff --git a/net/ipv4/inet_hashtables.c b/net/ipv4/inet_hashtables.c
index e9cec4807694b876f3d15e1c88db6c1c6e74e58a..6a872b8fb0d35573941edbf6df75319c9eff9d6d 100644 (file)
--- a/net/ipv4/inet_hashtables.c
+++ b/net/ipv4/inet_hashtables.c
@@ -403,25 +403,23 @@ static struct sock *inet_lhash2_lookup(struct net *net,
        return result;
 }
 
-static inline struct sock *inet_lookup_run_bpf(struct net *net,
-                                              struct inet_hashinfo *hashinfo,
-                                              struct sk_buff *skb, int doff,
-                                              __be32 saddr, __be16 sport,
-                                              __be32 daddr, u16 hnum, const int dif)
+struct sock *inet_lookup_run_sk_lookup(struct net *net,
+                                      int protocol,
+                                      struct sk_buff *skb, int doff,
+                                      __be32 saddr, __be16 sport,
+                                      __be32 daddr, u16 hnum, const int dif,
+                                      inet_ehashfn_t *ehashfn)
 {
        struct sock *sk, *reuse_sk;
        bool no_reuseport;
 
-       if (hashinfo != net->ipv4.tcp_death_row.hashinfo)
-               return NULL; /* only TCP is supported */
-
-       no_reuseport = bpf_sk_lookup_run_v4(net, IPPROTO_TCP, saddr, sport,
+       no_reuseport = bpf_sk_lookup_run_v4(net, protocol, saddr, sport,
                                            daddr, hnum, dif, &sk);
        if (no_reuseport || IS_ERR_OR_NULL(sk))
                return sk;
 
        reuse_sk = inet_lookup_reuseport(net, sk, skb, doff, saddr, sport, daddr, hnum,
-                                        inet_ehashfn);
+                                        ehashfn);
        if (reuse_sk)
                sk = reuse_sk;
        return sk;
@@ -439,9 +437,11 @@ struct sock *__inet_lookup_listener(struct net *net,
        unsigned int hash2;
 
        /* Lookup redirect from BPF */
-       if (static_branch_unlikely(&bpf_sk_lookup_enabled)) {
-               result = inet_lookup_run_bpf(net, hashinfo, skb, doff,
-                                            saddr, sport, daddr, hnum, dif);
+       if (static_branch_unlikely(&bpf_sk_lookup_enabled) &&
+           hashinfo == net->ipv4.tcp_death_row.hashinfo) {
+               result = inet_lookup_run_sk_lookup(net, IPPROTO_TCP, skb, doff,
+                                                  saddr, sport, daddr, hnum, dif,
+                                                  inet_ehashfn);
                if (result)
                        goto done;
        }

diff --git a/net/ipv4/udp.c b/net/ipv4/udp.c
index 3abe8a1520daa9a6a94c2e2d83232e3f870bc680..456fb6ee6ee8e2854d76dad79e053b8a0bb96155 100644 (file)
--- a/net/ipv4/udp.c
+++ b/net/ipv4/udp.c
@@ -465,30 +465,6 @@ static struct sock *udp4_lib_lookup2(struct net *net,
        return result;
 }
 
-static struct sock *udp4_lookup_run_bpf(struct net *net,
-                                       struct udp_table *udptable,
-                                       struct sk_buff *skb,
-                                       __be32 saddr, __be16 sport,
-                                       __be32 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_v4(net, IPPROTO_UDP, saddr, sport,
-                                           daddr, hnum, dif, &sk);
-       if (no_reuseport || IS_ERR_OR_NULL(sk))
-               return sk;
-
-       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;
-}
-
 /* UDP is nearly always wildcards out the wazoo, it makes no sense to try
  * harder than this. -DaveM
  */
@@ -513,9 +489,11 @@ struct sock *__udp4_lib_lookup(struct net *net, __be32 saddr,
                goto done;
 
        /* Lookup redirect from BPF */
-       if (static_branch_unlikely(&bpf_sk_lookup_enabled)) {
-               sk = udp4_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 = inet_lookup_run_sk_lookup(net, IPPROTO_UDP, skb, sizeof(struct udphdr),
+                                              saddr, sport, daddr, hnum, dif,
+                                              udp_ehashfn);
                if (sk) {
                        result = sk;
                        goto done;

diff --git a/net/ipv6/inet6_hashtables.c b/net/ipv6/inet6_hashtables.c
index f76dbbb293329664e871c97fa1e59a3b3e6202be..7c9700c7c9c874a2c8437329e0f509e6275d387f 100644 (file)
--- a/net/ipv6/inet6_hashtables.c
+++ b/net/ipv6/inet6_hashtables.c
@@ -177,31 +177,30 @@ static struct sock *inet6_lhash2_lookup(struct net *net,
        return result;
 }
 
-static inline struct sock *inet6_lookup_run_bpf(struct net *net,
-                                               struct inet_hashinfo *hashinfo,
-                                               struct sk_buff *skb, int doff,
-                                               const struct in6_addr *saddr,
-                                               const __be16 sport,
-                                               const struct in6_addr *daddr,
-                                               const u16 hnum, const int dif)
+struct sock *inet6_lookup_run_sk_lookup(struct net *net,
+                                       int protocol,
+                                       struct sk_buff *skb, int doff,
+                                       const struct in6_addr *saddr,
+                                       const __be16 sport,
+                                       const struct in6_addr *daddr,
+                                       const u16 hnum, const int dif,
+                                       inet6_ehashfn_t *ehashfn)
 {
        struct sock *sk, *reuse_sk;
        bool no_reuseport;
 
-       if (hashinfo != net->ipv4.tcp_death_row.hashinfo)
-               return NULL; /* only TCP is supported */
-
-       no_reuseport = bpf_sk_lookup_run_v6(net, IPPROTO_TCP, saddr, sport,
+       no_reuseport = bpf_sk_lookup_run_v6(net, protocol, saddr, sport,
                                            daddr, hnum, dif, &sk);
        if (no_reuseport || IS_ERR_OR_NULL(sk))
                return sk;
 
        reuse_sk = inet6_lookup_reuseport(net, sk, skb, doff,
-                                         saddr, sport, daddr, hnum, inet6_ehashfn);
+                                         saddr, sport, daddr, hnum, ehashfn);
        if (reuse_sk)
                sk = reuse_sk;
        return sk;
 }
+EXPORT_SYMBOL_GPL(inet6_lookup_run_sk_lookup);
 
 struct sock *inet6_lookup_listener(struct net *net,
                struct inet_hashinfo *hashinfo,
@@ -215,9 +214,11 @@ struct sock *inet6_lookup_listener(struct net *net,
        unsigned int hash2;
 
        /* Lookup redirect from BPF */
-       if (static_branch_unlikely(&bpf_sk_lookup_enabled)) {
-               result = inet6_lookup_run_bpf(net, hashinfo, skb, doff,
-                                             saddr, sport, daddr, hnum, dif);
+       if (static_branch_unlikely(&bpf_sk_lookup_enabled) &&
+           hashinfo == net->ipv4.tcp_death_row.hashinfo) {
+               result = inet6_lookup_run_sk_lookup(net, IPPROTO_TCP, skb, doff,
+                                                   saddr, sport, daddr, hnum, dif,
+                                                   inet6_ehashfn);
                if (result)
                        goto done;
        }

diff --git a/net/ipv6/udp.c b/net/ipv6/udp.c
index 918ca1771710df53b96a7237c2a5575a906999b2..4b8974a8c7a3b76f65e0ee8d7756e0c096d618f8 100644 (file)
--- a/net/ipv6/udp.c
+++ b/net/ipv6/udp.c
@@ -206,32 +206,6 @@ static struct sock *udp6_lib_lookup2(struct net *net,
        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 = inet6_lookup_reuseport(net, sk, skb, sizeof(struct udphdr),
-                                         saddr, sport, daddr, hnum, udp6_ehashfn);
-       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;