udp: Don't pass udptable to IPv4 socket lookup functions.

Since UDP and UDP-Lite had dedicated socket hash tables for
each, we have had to pass the pointer down to many socket
lookup functions.

UDP-Lite gone, and we do not need to do that.

Let's fetch net->ipv4.udp_table only where needed in IPv4
stack: __udp4_lib_lookup(), __udp4_lib_mcast_deliver(),
and udp_diag_dump().

Some functions are renamed as the wrapper functions are no
longer needed.

  __udp4_lib_err()     -> udp_err()
  __udp_diag_destroy() -> udp_diag_destroy()
  udp_dump_one()       -> udp_diag_dump_one()
  udp_dump()           -> udp_diag_dump()

Signed-off-by: Kuniyuki Iwashima <kuniyu@google.com>
Reviewed-by: Willem de Bruijn <willemb@google.com>
Link: https://patch.msgid.link/20260311052020.1213705-15-kuniyu@google.com
Signed-off-by: Jakub Kicinski <kuba@kernel.org>

diff --git a/include/net/udp.h b/include/net/udp.h
index adec74531ee14d111f47f6ca01b2ed16c63adca4..8262e2b215b4e4e31597b06579a62f01f5b7eca1 100644 (file)
--- a/include/net/udp.h
+++ b/include/net/udp.h
@@ -437,9 +437,8 @@ int udp_lib_setsockopt(struct sock *sk, int level, int optname,
 struct sock *udp4_lib_lookup(const struct net *net, __be32 saddr, __be16 sport,
                             __be32 daddr, __be16 dport, int dif);
 struct sock *__udp4_lib_lookup(const struct net *net, __be32 saddr,
-                              __be16 sport,
-                              __be32 daddr, __be16 dport, int dif, int sdif,
-                              struct udp_table *tbl, struct sk_buff *skb);
+                              __be16 sport, __be32 daddr, __be16 dport,
+                              int dif, int sdif, struct sk_buff *skb);
 struct sock *udp4_lib_lookup_skb(const struct sk_buff *skb,
                                 __be16 sport, __be16 dport);
 struct sock *udp6_lib_lookup(const struct net *net,

diff --git a/net/core/filter.c b/net/core/filter.c
index b66d985785f774b2cccf87d3eaeff3335bc59ede..2f023999f0464c4b9f1c68dca7e026687d17d3be 100644 (file)
--- a/net/core/filter.c
+++ b/net/core/filter.c
@@ -6889,7 +6889,7 @@ static struct sock *sk_lookup(struct net *net, struct bpf_sock_tuple *tuple,
                else
                        sk = __udp4_lib_lookup(net, src4, tuple->ipv4.sport,
                                               dst4, tuple->ipv4.dport,
-                                              dif, sdif, net->ipv4.udp_table, NULL);
+                                              dif, sdif, NULL);
 #if IS_ENABLED(CONFIG_IPV6)
        } else {
                struct in6_addr *src6 = (struct in6_addr *)&tuple->ipv6.saddr;

diff --git a/net/ipv4/udp.c b/net/ipv4/udp.c
index fd0bad44d111f6e474989b786508ad55191da224..dff803e7d6a812db6364a6aca3690685c2b7be59 100644 (file)
--- a/net/ipv4/udp.c
+++ b/net/ipv4/udp.c
@@ -673,9 +673,10 @@ EXPORT_IPV6_MOD(udp4_hash4);
  * harder than this. -DaveM
  */
 struct sock *__udp4_lib_lookup(const struct net *net, __be32 saddr,
-               __be16 sport, __be32 daddr, __be16 dport, int dif,
-               int sdif, struct udp_table *udptable, struct sk_buff *skb)
+                              __be16 sport, __be32 daddr, __be16 dport,
+                              int dif, int sdif, struct sk_buff *skb)
 {
+       struct udp_table *udptable = net->ipv4.udp_table;
        unsigned short hnum = ntohs(dport);
        struct udp_hslot *hslot2;
        struct sock *result, *sk;
@@ -741,14 +742,13 @@ done:
 EXPORT_SYMBOL_GPL(__udp4_lib_lookup);
 
 static inline struct sock *__udp4_lib_lookup_skb(struct sk_buff *skb,
-                                                __be16 sport, __be16 dport,
-                                                struct udp_table *udptable)
+                                                __be16 sport, __be16 dport)
 {
        const struct iphdr *iph = ip_hdr(skb);
 
        return __udp4_lib_lookup(dev_net(skb->dev), iph->saddr, sport,
                                 iph->daddr, dport, inet_iif(skb),
-                                inet_sdif(skb), udptable, skb);
+                                inet_sdif(skb), skb);
 }
 
 struct sock *udp4_lib_lookup_skb(const struct sk_buff *skb,
@@ -756,14 +756,12 @@ struct sock *udp4_lib_lookup_skb(const struct sk_buff *skb,
 {
        const u16 offset = NAPI_GRO_CB(skb)->network_offsets[skb->encapsulation];
        const struct iphdr *iph = (struct iphdr *)(skb->data + offset);
-       struct net *net = dev_net(skb->dev);
        int iif, sdif;
 
        inet_get_iif_sdif(skb, &iif, &sdif);
 
-       return __udp4_lib_lookup(net, iph->saddr, sport,
-                                iph->daddr, dport, iif,
-                                sdif, net->ipv4.udp_table, NULL);
+       return __udp4_lib_lookup(dev_net(skb->dev), iph->saddr, sport,
+                                iph->daddr, dport, iif, sdif, NULL);
 }
 
 /* Must be called under rcu_read_lock().
@@ -775,8 +773,7 @@ struct sock *udp4_lib_lookup(const struct net *net, __be32 saddr, __be16 sport,
 {
        struct sock *sk;
 
-       sk = __udp4_lib_lookup(net, saddr, sport, daddr, dport,
-                              dif, 0, net->ipv4.udp_table, NULL);
+       sk = __udp4_lib_lookup(net, saddr, sport, daddr, dport, dif, 0, NULL);
        if (sk && !refcount_inc_not_zero(&sk->sk_refcnt))
                sk = NULL;
        return sk;
@@ -866,7 +863,6 @@ static int __udp4_lib_err_encap_no_sk(struct sk_buff *skb, u32 info)
 static struct sock *__udp4_lib_err_encap(struct net *net,
                                         const struct iphdr *iph,
                                         struct udphdr *uh,
-                                        struct udp_table *udptable,
                                         struct sock *sk,
                                         struct sk_buff *skb, u32 info)
 {
@@ -894,8 +890,7 @@ static struct sock *__udp4_lib_err_encap(struct net *net,
        }
 
        sk = __udp4_lib_lookup(net, iph->daddr, uh->source,
-                              iph->saddr, uh->dest, skb->dev->ifindex, 0,
-                              udptable, NULL);
+                              iph->saddr, uh->dest, skb->dev->ifindex, 0, NULL);
        if (sk) {
                up = udp_sk(sk);
 
@@ -924,29 +919,28 @@ out:
  * header points to the first 8 bytes of the udp header.  We need
  * to find the appropriate port.
  */
-
-static int __udp4_lib_err(struct sk_buff *skb, u32 info, struct udp_table *udptable)
+int udp_err(struct sk_buff *skb, u32 info)
 {
-       struct inet_sock *inet;
        const struct iphdr *iph = (const struct iphdr *)skb->data;
-       struct udphdr *uh = (struct udphdr *)(skb->data+(iph->ihl<<2));
        const int type = icmp_hdr(skb)->type;
        const int code = icmp_hdr(skb)->code;
+       struct net *net = dev_net(skb->dev);
+       struct inet_sock *inet;
        bool tunnel = false;
+       struct udphdr *uh;
        struct sock *sk;
        int harderr;
        int err;
-       struct net *net = dev_net(skb->dev);
 
+       uh = (struct udphdr *)(skb->data + (iph->ihl << 2));
        sk = __udp4_lib_lookup(net, iph->daddr, uh->dest,
                               iph->saddr, uh->source, skb->dev->ifindex,
-                              inet_sdif(skb), udptable, NULL);
+                              inet_sdif(skb), NULL);
 
        if (!sk || READ_ONCE(udp_sk(sk)->encap_type)) {
                /* No socket for error: try tunnels before discarding */
                if (static_branch_unlikely(&udp_encap_needed_key)) {
-                       sk = __udp4_lib_err_encap(net, iph, uh, udptable, sk, skb,
-                                                 info);
+                       sk = __udp4_lib_err_encap(net, iph, uh, sk, skb, info);
                        if (!sk)
                                return 0;
                } else
@@ -1019,11 +1013,6 @@ out:
        return 0;
 }
 
-int udp_err(struct sk_buff *skb, u32 info)
-{
-       return __udp4_lib_err(skb, info, dev_net(skb->dev)->ipv4.udp_table);
-}
-
 /*
  * Throw away all pending data and cancel the corking. Socket is locked.
  */
@@ -2491,18 +2480,24 @@ EXPORT_IPV6_MOD(udp_sk_rx_dst_set);
 static int __udp4_lib_mcast_deliver(struct net *net, struct sk_buff *skb,
                                    struct udphdr  *uh,
                                    __be32 saddr, __be32 daddr,
-                                   struct udp_table *udptable,
                                    int proto)
 {
-       struct sock *sk, *first = NULL;
+       struct udp_table *udptable = net->ipv4.udp_table;
+       unsigned int hash2, hash2_any, offset;
        unsigned short hnum = ntohs(uh->dest);
-       struct udp_hslot *hslot = udp_hashslot(udptable, net, hnum);
-       unsigned int hash2 = 0, hash2_any = 0, use_hash2 = (hslot->count > 10);
-       unsigned int offset = offsetof(typeof(*sk), sk_node);
+       struct sock *sk, *first = NULL;
        int dif = skb->dev->ifindex;
        int sdif = inet_sdif(skb);
        struct hlist_node *node;
+       struct udp_hslot *hslot;
        struct sk_buff *nskb;
+       bool use_hash2;
+
+       hash2_any = 0;
+       hash2 = 0;
+       hslot = udp_hashslot(udptable, net, hnum);
+       use_hash2 = hslot->count > 10;
+       offset = offsetof(typeof(*sk), sk_node);
 
        if (use_hash2) {
                hash2_any = ipv4_portaddr_hash(net, htonl(INADDR_ANY), hnum) &
@@ -2607,15 +2602,14 @@ static int udp_unicast_rcv_skb(struct sock *sk, struct sk_buff *skb,
  *     All we need to do is get the socket, and then do a checksum.
  */
 
-static int __udp4_lib_rcv(struct sk_buff *skb, struct udp_table *udptable,
-                         int proto)
+static int __udp4_lib_rcv(struct sk_buff *skb, int proto)
 {
+       struct rtable *rt = skb_rtable(skb);
+       struct net *net = dev_net(skb->dev);
        struct sock *sk = NULL;
-       struct udphdr *uh;
        unsigned short ulen;
-       struct rtable *rt = skb_rtable(skb);
        __be32 saddr, daddr;
-       struct net *net = dev_net(skb->dev);
+       struct udphdr *uh;
        bool refcounted;
        int drop_reason;
 
@@ -2667,10 +2661,9 @@ static int __udp4_lib_rcv(struct sk_buff *skb, struct udp_table *udptable,
        }
 
        if (rt->rt_flags & (RTCF_BROADCAST|RTCF_MULTICAST))
-               return __udp4_lib_mcast_deliver(net, skb, uh,
-                                               saddr, daddr, udptable, proto);
+               return __udp4_lib_mcast_deliver(net, skb, uh, saddr, daddr, proto);
 
-       sk = __udp4_lib_lookup_skb(skb, uh->source, uh->dest, udptable);
+       sk = __udp4_lib_lookup_skb(skb, uh->source, uh->dest);
        if (sk)
                return udp_unicast_rcv_skb(sk, skb, uh);
 no_sk:
@@ -2854,7 +2847,7 @@ enum skb_drop_reason udp_v4_early_demux(struct sk_buff *skb)
 
 int udp_rcv(struct sk_buff *skb)
 {
-       return __udp4_lib_rcv(skb, dev_net(skb->dev)->ipv4.udp_table, IPPROTO_UDP);
+       return __udp4_lib_rcv(skb, IPPROTO_UDP);
 }
 
 static void udp_destroy_sock(struct sock *sk)

diff --git a/net/ipv4/udp_diag.c b/net/ipv4/udp_diag.c
index 0899c60cce53eddd52a0ff316ef1f2a0d1a165c9..f4b24e628cf8ded821d0c1887dd6ca5b83c4c8e2 100644 (file)
--- a/net/ipv4/udp_diag.c
+++ b/net/ipv4/udp_diag.c
@@ -24,23 +24,24 @@ static int sk_diag_dump(struct sock *sk, struct sk_buff *skb,
                                 net_admin);
 }
 
-static int udp_dump_one(struct udp_table *tbl,
-                       struct netlink_callback *cb,
-                       const struct inet_diag_req_v2 *req)
+static int udp_diag_dump_one(struct netlink_callback *cb,
+                            const struct inet_diag_req_v2 *req)
 {
        struct sk_buff *in_skb = cb->skb;
-       int err;
        struct sock *sk = NULL;
        struct sk_buff *rep;
-       struct net *net = sock_net(in_skb->sk);
+       struct net *net;
+       int err;
+
+       net = sock_net(in_skb->sk);
 
        rcu_read_lock();
        if (req->sdiag_family == AF_INET)
                /* src and dst are swapped for historical reasons */
                sk = __udp4_lib_lookup(net,
-                               req->id.idiag_src[0], req->id.idiag_sport,
-                               req->id.idiag_dst[0], req->id.idiag_dport,
-                               req->id.idiag_if, 0, tbl, NULL);
+                                      req->id.idiag_src[0], req->id.idiag_sport,
+                                      req->id.idiag_dst[0], req->id.idiag_dport,
+                                      req->id.idiag_if, 0, NULL);
 #if IS_ENABLED(CONFIG_IPV6)
        else if (req->sdiag_family == AF_INET6)
                sk = __udp6_lib_lookup(net,
@@ -85,14 +86,15 @@ out_nosk:
        return err;
 }
 
-static void udp_dump(struct udp_table *table, struct sk_buff *skb,
-                    struct netlink_callback *cb,
-                    const struct inet_diag_req_v2 *r)
+static void udp_diag_dump(struct sk_buff *skb, struct netlink_callback *cb,
+                         const struct inet_diag_req_v2 *r)
 {
        bool net_admin = netlink_net_capable(cb->skb, CAP_NET_ADMIN);
        struct net *net = sock_net(skb->sk);
        int num, s_num, slot, s_slot;
+       struct udp_table *table;
 
+       table = net->ipv4.udp_table;
        s_slot = cb->args[0];
        num = s_num = cb->args[1];
 
@@ -139,18 +141,6 @@ done:
        cb->args[1] = num;
 }
 
-static void udp_diag_dump(struct sk_buff *skb, struct netlink_callback *cb,
-                         const struct inet_diag_req_v2 *r)
-{
-       udp_dump(sock_net(cb->skb->sk)->ipv4.udp_table, skb, cb, r);
-}
-
-static int udp_diag_dump_one(struct netlink_callback *cb,
-                            const struct inet_diag_req_v2 *req)
-{
-       return udp_dump_one(sock_net(cb->skb->sk)->ipv4.udp_table, cb, req);
-}
-
 static void udp_diag_get_info(struct sock *sk, struct inet_diag_msg *r,
                void *info)
 {
@@ -159,9 +149,8 @@ static void udp_diag_get_info(struct sock *sk, struct inet_diag_msg *r,
 }
 
 #ifdef CONFIG_INET_DIAG_DESTROY
-static int __udp_diag_destroy(struct sk_buff *in_skb,
-                             const struct inet_diag_req_v2 *req,
-                             struct udp_table *tbl)
+static int udp_diag_destroy(struct sk_buff *in_skb,
+                           const struct inet_diag_req_v2 *req)
 {
        struct net *net = sock_net(in_skb->sk);
        struct sock *sk;
@@ -171,18 +160,17 @@ static int __udp_diag_destroy(struct sk_buff *in_skb,
 
        if (req->sdiag_family == AF_INET)
                sk = __udp4_lib_lookup(net,
-                               req->id.idiag_dst[0], req->id.idiag_dport,
-                               req->id.idiag_src[0], req->id.idiag_sport,
-                               req->id.idiag_if, 0, tbl, NULL);
+                                      req->id.idiag_dst[0], req->id.idiag_dport,
+                                      req->id.idiag_src[0], req->id.idiag_sport,
+                                      req->id.idiag_if, 0, NULL);
 #if IS_ENABLED(CONFIG_IPV6)
        else if (req->sdiag_family == AF_INET6) {
                if (ipv6_addr_v4mapped((struct in6_addr *)req->id.idiag_dst) &&
                    ipv6_addr_v4mapped((struct in6_addr *)req->id.idiag_src))
                        sk = __udp4_lib_lookup(net,
-                                       req->id.idiag_dst[3], req->id.idiag_dport,
-                                       req->id.idiag_src[3], req->id.idiag_sport,
-                                       req->id.idiag_if, 0, tbl, NULL);
-
+                                              req->id.idiag_dst[3], req->id.idiag_dport,
+                                              req->id.idiag_src[3], req->id.idiag_sport,
+                                              req->id.idiag_if, 0, NULL);
                else
                        sk = __udp6_lib_lookup(net,
                                               (struct in6_addr *)req->id.idiag_dst,
@@ -216,13 +204,6 @@ static int __udp_diag_destroy(struct sk_buff *in_skb,
 
        return err;
 }
-
-static int udp_diag_destroy(struct sk_buff *in_skb,
-                           const struct inet_diag_req_v2 *req)
-{
-       return __udp_diag_destroy(in_skb, req, sock_net(in_skb->sk)->ipv4.udp_table);
-}
-
 #endif
 
 static const struct inet_diag_handler udp_diag_handler = {

diff --git a/net/ipv4/udp_offload.c b/net/ipv4/udp_offload.c
index 6b1654c1ad4ac0b7c611c338d75632f1974f842b..98e92da726b5ec1ce2d12f8de2642f9c11f056a4 100644 (file)
--- a/net/ipv4/udp_offload.c
+++ b/net/ipv4/udp_offload.c
@@ -869,8 +869,7 @@ static struct sock *udp4_gro_lookup_skb(struct sk_buff *skb, __be16 sport,
        inet_get_iif_sdif(skb, &iif, &sdif);
 
        return __udp4_lib_lookup(net, iph->saddr, sport,
-                                iph->daddr, dport, iif,
-                                sdif, net->ipv4.udp_table, NULL);
+                                iph->daddr, dport, iif, sdif, NULL);
 }
 
 INDIRECT_CALLABLE_SCOPE