udp: Don't pass udptable to IPv6 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 IPv6
stack: __udp6_lib_lookup() and __udp6_lib_mcast_deliver().

__udp6_lib_err() is renamed to udpv6_err() as its wrapper
is no longer needed.

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

diff --git a/include/net/ipv6_stubs.h b/include/net/ipv6_stubs.h
index d3013e721b1441158e732b04d94078c0a7e9aa6a..907681cecde8eb69506cb1c0a8259a7b7dab1e3a 100644 (file)
--- a/include/net/ipv6_stubs.h
+++ b/include/net/ipv6_stubs.h
@@ -83,10 +83,9 @@ struct ipv6_bpf_stub {
        int (*inet6_bind)(struct sock *sk, struct sockaddr_unsized *uaddr, int addr_len,
                          u32 flags);
        struct sock *(*udp6_lib_lookup)(const struct net *net,
-                                    const struct in6_addr *saddr, __be16 sport,
-                                    const struct in6_addr *daddr, __be16 dport,
-                                    int dif, int sdif, struct udp_table *tbl,
-                                    struct sk_buff *skb);
+                                       const struct in6_addr *saddr, __be16 sport,
+                                       const struct in6_addr *daddr, __be16 dport,
+                                       int dif, int sdif, struct sk_buff *skb);
        int (*ipv6_setsockopt)(struct sock *sk, int level, int optname,
                               sockptr_t optval, unsigned int optlen);
        int (*ipv6_getsockopt)(struct sock *sk, int level, int optname,

diff --git a/include/net/udp.h b/include/net/udp.h
index 76f401988353e0948904bf63e81e7c4d194e5f03..adec74531ee14d111f47f6ca01b2ed16c63adca4 100644 (file)
--- a/include/net/udp.h
+++ b/include/net/udp.h
@@ -449,8 +449,7 @@ struct sock *udp6_lib_lookup(const struct net *net,
 struct sock *__udp6_lib_lookup(const struct net *net,
                               const struct in6_addr *saddr, __be16 sport,
                               const struct in6_addr *daddr, __be16 dport,
-                              int dif, int sdif, struct udp_table *tbl,
-                              struct sk_buff *skb);
+                              int dif, int sdif, struct sk_buff *skb);
 struct sock *udp6_lib_lookup_skb(const struct sk_buff *skb,
                                 __be16 sport, __be16 dport);
 int udp_read_skb(struct sock *sk, skb_read_actor_t recv_actor);

diff --git a/net/core/filter.c b/net/core/filter.c
index 78b548158fb059320828301359bc2e6e95b4caf7..b66d985785f774b2cccf87d3eaeff3335bc59ede 100644 (file)
--- a/net/core/filter.c
+++ b/net/core/filter.c
@@ -6904,8 +6904,7 @@ static struct sock *sk_lookup(struct net *net, struct bpf_sock_tuple *tuple,
                        sk = ipv6_bpf_stub->udp6_lib_lookup(net,
                                                            src6, tuple->ipv6.sport,
                                                            dst6, tuple->ipv6.dport,
-                                                           dif, sdif,
-                                                           net->ipv4.udp_table, NULL);
+                                                           dif, sdif, NULL);
 #endif
        }
 

diff --git a/net/ipv4/udp_diag.c b/net/ipv4/udp_diag.c
index a010d05062a08972d2f24b2ee19520e6654d5360..0899c60cce53eddd52a0ff316ef1f2a0d1a165c9 100644 (file)
--- a/net/ipv4/udp_diag.c
+++ b/net/ipv4/udp_diag.c
@@ -44,11 +44,11 @@ static int udp_dump_one(struct udp_table *tbl,
 #if IS_ENABLED(CONFIG_IPV6)
        else if (req->sdiag_family == AF_INET6)
                sk = __udp6_lib_lookup(net,
-                               (struct in6_addr *)req->id.idiag_src,
-                               req->id.idiag_sport,
-                               (struct in6_addr *)req->id.idiag_dst,
-                               req->id.idiag_dport,
-                               req->id.idiag_if, 0, tbl, NULL);
+                                      (struct in6_addr *)req->id.idiag_src,
+                                      req->id.idiag_sport,
+                                      (struct in6_addr *)req->id.idiag_dst,
+                                      req->id.idiag_dport,
+                                      req->id.idiag_if, 0, NULL);
 #endif
        if (sk && !refcount_inc_not_zero(&sk->sk_refcnt))
                sk = NULL;
@@ -185,11 +185,11 @@ static int __udp_diag_destroy(struct sk_buff *in_skb,
 
                else
                        sk = __udp6_lib_lookup(net,
-                                       (struct in6_addr *)req->id.idiag_dst,
-                                       req->id.idiag_dport,
-                                       (struct in6_addr *)req->id.idiag_src,
-                                       req->id.idiag_sport,
-                                       req->id.idiag_if, 0, tbl, NULL);
+                                              (struct in6_addr *)req->id.idiag_dst,
+                                              req->id.idiag_dport,
+                                              (struct in6_addr *)req->id.idiag_src,
+                                              req->id.idiag_sport,
+                                              req->id.idiag_if, 0, NULL);
        }
 #endif
        else {

diff --git a/net/ipv6/udp.c b/net/ipv6/udp.c
index 5ba399218d0730344105fe5416eba0910729e4e5..dd958e2b552b1ce1dc078909b5d7c85bc836e929 100644 (file)
--- a/net/ipv6/udp.c
+++ b/net/ipv6/udp.c
@@ -344,9 +344,9 @@ static void udp6_hash4(struct sock *sk)
 struct sock *__udp6_lib_lookup(const struct net *net,
                               const struct in6_addr *saddr, __be16 sport,
                               const struct in6_addr *daddr, __be16 dport,
-                              int dif, int sdif, struct udp_table *udptable,
-                              struct sk_buff *skb)
+                              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;
@@ -406,14 +406,13 @@ done:
 EXPORT_SYMBOL_GPL(__udp6_lib_lookup);
 
 static struct sock *__udp6_lib_lookup_skb(struct sk_buff *skb,
-                                         __be16 sport, __be16 dport,
-                                         struct udp_table *udptable)
+                                         __be16 sport, __be16 dport)
 {
        const struct ipv6hdr *iph = ipv6_hdr(skb);
 
        return __udp6_lib_lookup(dev_net(skb->dev), &iph->saddr, sport,
                                 &iph->daddr, dport, inet6_iif(skb),
-                                inet6_sdif(skb), udptable, skb);
+                                inet6_sdif(skb), skb);
 }
 
 struct sock *udp6_lib_lookup_skb(const struct sk_buff *skb,
@@ -421,14 +420,12 @@ struct sock *udp6_lib_lookup_skb(const struct sk_buff *skb,
 {
        const u16 offset = NAPI_GRO_CB(skb)->network_offsets[skb->encapsulation];
        const struct ipv6hdr *iph = (struct ipv6hdr *)(skb->data + offset);
-       struct net *net = dev_net(skb->dev);
        int iif, sdif;
 
        inet6_get_iif_sdif(skb, &iif, &sdif);
 
-       return __udp6_lib_lookup(net, &iph->saddr, sport,
-                                &iph->daddr, dport, iif,
-                                sdif, net->ipv4.udp_table, NULL);
+       return __udp6_lib_lookup(dev_net(skb->dev), &iph->saddr, sport,
+                                &iph->daddr, dport, iif, sdif, NULL);
 }
 
 /* Must be called under rcu_read_lock().
@@ -440,8 +437,7 @@ struct sock *udp6_lib_lookup(const struct net *net, const struct in6_addr *saddr
 {
        struct sock *sk;
 
-       sk =  __udp6_lib_lookup(net, saddr, sport, daddr, dport,
-                               dif, 0, net->ipv4.udp_table, NULL);
+       sk =  __udp6_lib_lookup(net, saddr, sport, daddr, dport, dif, 0, NULL);
        if (sk && !refcount_inc_not_zero(&sk->sk_refcnt))
                sk = NULL;
        return sk;
@@ -642,7 +638,6 @@ static int __udp6_lib_err_encap_no_sk(struct sk_buff *skb,
 static struct sock *__udp6_lib_err_encap(struct net *net,
                                         const struct ipv6hdr *hdr, int offset,
                                         struct udphdr *uh,
-                                        struct udp_table *udptable,
                                         struct sock *sk,
                                         struct sk_buff *skb,
                                         struct inet6_skb_parm *opt,
@@ -673,7 +668,7 @@ static struct sock *__udp6_lib_err_encap(struct net *net,
 
        sk = __udp6_lib_lookup(net, &hdr->daddr, uh->source,
                               &hdr->saddr, uh->dest,
-                              inet6_iif(skb), 0, udptable, skb);
+                              inet6_iif(skb), 0, skb);
        if (sk) {
                up = udp_sk(sk);
 
@@ -694,29 +689,28 @@ out:
        return sk;
 }
 
-static int __udp6_lib_err(struct sk_buff *skb, struct inet6_skb_parm *opt,
-                         u8 type, u8 code, int offset, __be32 info,
-                         struct udp_table *udptable)
+static int udpv6_err(struct sk_buff *skb, struct inet6_skb_parm *opt,
+                    u8 type, u8 code, int offset, __be32 info)
 {
-       struct ipv6_pinfo *np;
        const struct ipv6hdr *hdr = (const struct ipv6hdr *)skb->data;
-       const struct in6_addr *saddr = &hdr->saddr;
-       const struct in6_addr *daddr = seg6_get_daddr(skb, opt) ? : &hdr->daddr;
-       struct udphdr *uh = (struct udphdr *)(skb->data+offset);
+       struct udphdr *uh = (struct udphdr *)(skb->data + offset);
+       const struct in6_addr *saddr, *daddr;
+       struct net *net = dev_net(skb->dev);
+       struct ipv6_pinfo *np;
        bool tunnel = false;
        struct sock *sk;
        int harderr;
        int err;
-       struct net *net = dev_net(skb->dev);
 
+       daddr = seg6_get_daddr(skb, opt) ? : &hdr->daddr;
+       saddr = &hdr->saddr;
        sk = __udp6_lib_lookup(net, daddr, uh->dest, saddr, uh->source,
-                              inet6_iif(skb), inet6_sdif(skb), udptable, NULL);
+                              inet6_iif(skb), inet6_sdif(skb), NULL);
 
        if (!sk || READ_ONCE(udp_sk(sk)->encap_type)) {
                /* No socket for error: try tunnels before discarding */
                if (static_branch_unlikely(&udpv6_encap_needed_key)) {
-                       sk = __udp6_lib_err_encap(net, hdr, offset, uh,
-                                                 udptable, sk, skb,
+                       sk = __udp6_lib_err_encap(net, hdr, offset, uh, sk, skb,
                                                  opt, type, code, info);
                        if (!sk)
                                return 0;
@@ -808,14 +802,6 @@ static int __udpv6_queue_rcv_skb(struct sock *sk, struct sk_buff *skb)
        return 0;
 }
 
-static __inline__ int udpv6_err(struct sk_buff *skb,
-                               struct inet6_skb_parm *opt, u8 type,
-                               u8 code, int offset, __be32 info)
-{
-       return __udp6_lib_err(skb, opt, type, code, offset, info,
-                             dev_net(skb->dev)->ipv4.udp_table);
-}
-
 static int udpv6_queue_rcv_one_skb(struct sock *sk, struct sk_buff *skb)
 {
        enum skb_drop_reason drop_reason = SKB_DROP_REASON_NOT_SPECIFIED;
@@ -947,19 +933,27 @@ static void udp6_csum_zero_error(struct sk_buff *skb)
  * so we don't need to lock the hashes.
  */
 static int __udp6_lib_mcast_deliver(struct net *net, struct sk_buff *skb,
-               const struct in6_addr *saddr, const struct in6_addr *daddr,
-               struct udp_table *udptable, int proto)
+                                   const struct in6_addr *saddr,
+                                   const struct in6_addr *daddr,
+                                   int proto)
 {
-       struct sock *sk, *first = NULL;
+       struct udp_table *udptable = net->ipv4.udp_table;
        const struct udphdr *uh = udp_hdr(skb);
+       unsigned int hash2, hash2_any, offset;
        unsigned short hnum = ntohs(uh->dest);
-       struct udp_hslot *hslot = udp_hashslot(udptable, net, hnum);
-       unsigned int offset = offsetof(typeof(*sk), sk_node);
-       unsigned int hash2 = 0, hash2_any = 0, use_hash2 = (hslot->count > 10);
-       int dif = inet6_iif(skb);
+       struct sock *sk, *first = NULL;
        int sdif = inet6_sdif(skb);
+       int dif = inet6_iif(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 = ipv6_portaddr_hash(net, &in6addr_any, hnum) &
@@ -1069,8 +1063,7 @@ static int udp6_csum_init(struct sk_buff *skb, struct udphdr *uh)
        return 0;
 }
 
-static int __udp6_lib_rcv(struct sk_buff *skb, struct udp_table *udptable,
-                         int proto)
+static int __udp6_lib_rcv(struct sk_buff *skb, int proto)
 {
        enum skb_drop_reason reason = SKB_DROP_REASON_NOT_SPECIFIED;
        const struct in6_addr *saddr, *daddr;
@@ -1139,11 +1132,10 @@ static int __udp6_lib_rcv(struct sk_buff *skb, struct udp_table *udptable,
         *      Multicast receive code
         */
        if (ipv6_addr_is_multicast(daddr))
-               return __udp6_lib_mcast_deliver(net, skb,
-                               saddr, daddr, udptable, proto);
+               return __udp6_lib_mcast_deliver(net, skb, saddr, daddr, proto);
 
        /* Unicast */
-       sk = __udp6_lib_lookup_skb(skb, uh->source, uh->dest, udptable);
+       sk = __udp6_lib_lookup_skb(skb, uh->source, uh->dest);
        if (sk) {
                if (!uh->check && !udp_get_no_check6_rx(sk))
                        goto report_csum_error;
@@ -1261,7 +1253,7 @@ void udp_v6_early_demux(struct sk_buff *skb)
 
 INDIRECT_CALLABLE_SCOPE int udpv6_rcv(struct sk_buff *skb)
 {
-       return __udp6_lib_rcv(skb, dev_net(skb->dev)->ipv4.udp_table, IPPROTO_UDP);
+       return __udp6_lib_rcv(skb, IPPROTO_UDP);
 }
 
 /*

diff --git a/net/ipv6/udp_offload.c b/net/ipv6/udp_offload.c
index e003b8494dc0e900994e6d4d2928f6bb8dd5787e..778afc7453ce536c0110aa8986641e93a5961a87 100644 (file)
--- a/net/ipv6/udp_offload.c
+++ b/net/ipv6/udp_offload.c
@@ -128,8 +128,7 @@ static struct sock *udp6_gro_lookup_skb(struct sk_buff *skb, __be16 sport,
        inet6_get_iif_sdif(skb, &iif, &sdif);
 
        return __udp6_lib_lookup(net, &iph->saddr, sport,
-                                &iph->daddr, dport, iif,
-                                sdif, net->ipv4.udp_table, NULL);
+                                &iph->daddr, dport, iif, sdif, NULL);
 }
 
 struct sk_buff *udp6_gro_receive(struct list_head *head, struct sk_buff *skb)