| Message ID | ef5aa34bd772ec9b6759cf0fde2d2854b3e98913.1741275846.git.pabeni@redhat.com (mailing list archive) |
|---|---|
| State | Superseded |
| Delegated to: | Netdev Maintainers |
| Headers | show |
| Series | udp_tunnel: GRO optimizations | expand |
On Thu, Mar 6, 2025 at 4:57 PM Paolo Abeni <pabeni@redhat.com> wrote: > > Most UDP tunnels bind a socket to a local port, with ANY address, no > peer and no interface index specified. > Additionally it's quite common to have a single tunnel device per > namespace. > > Track in each namespace the UDP tunnel socket respecting the above. > When only a single one is present, store a reference in the netns. > > When such reference is not NULL, UDP tunnel GRO lookup just need to > match the incoming packet destination port vs the socket local port. > > The tunnel socket never set the reuse[port] flag[s], when bound to no > address and interface, no other socket can exist in the same netns > matching the specified local port. > > Signed-off-by: Paolo Abeni <pabeni@redhat.com> > --- ... > static int __net_init udp_pernet_init(struct net *net) > { > +#if IS_ENABLED(CONFIG_NET_UDP_TUNNEL) > + int i; > + > + /* No tunnel is configured */ > + for (i = 0; i < ARRAY_SIZE(net->ipv4.udp_tunnel_gro); ++i) { > + INIT_HLIST_HEAD(&net->ipv4.udp_tunnel_gro[i].list); > + rcu_assign_pointer(net->ipv4.udp_tunnel_gro[1].sk, NULL); typo : [i] is what you meant (instead of [1]) > + } > +#endif > udp_sysctl_init(net); > udp_set_table(net); > > diff --git a/net/ipv4/udp_offload.c b/net/ipv4/udp_offload.c > index c1a85b300ee87..ac6dd2703190e 100644 > --- a/net/ipv4/udp_offload.c > +++ b/net/ipv4/udp_offload.c > @@ -12,6 +12,38 @@ > #include <net/udp.h> > #include <net/protocol.h> > #include <net/inet_common.h> > +#include <net/udp_tunnel.h> > + > +#if IS_ENABLED(CONFIG_NET_UDP_TUNNEL) > +static DEFINE_SPINLOCK(udp_tunnel_gro_lock); > + > +void udp_tunnel_update_gro_lookup(struct net *net, struct sock *sk, bool add) > +{ > + bool is_ipv6 = sk->sk_family == AF_INET6; > + struct udp_sock *tup, *up = udp_sk(sk); > + struct udp_tunnel_gro *udp_tunnel_gro; > + > + spin_lock(&udp_tunnel_gro_lock); > + udp_tunnel_gro = &net->ipv4.udp_tunnel_gro[is_ipv6]; > + if (add) > + hlist_add_head(&up->tunnel_list, &udp_tunnel_gro->list); > + else > + hlist_del_init(&up->tunnel_list); > + > + if (udp_tunnel_gro->list.first && > + !udp_tunnel_gro->list.first->next) { > + tup = hlist_entry(udp_tunnel_gro->list.first, struct udp_sock, > + tunnel_list); > + > + rcu_assign_pointer(udp_tunnel_gro->sk, (struct sock *)tup); > + } else { > + rcu_assign_pointer(udp_tunnel_gro->sk, NULL); > + } > + > + spin_unlock(&udp_tunnel_gro_lock); > +} > +EXPORT_SYMBOL_GPL(udp_tunnel_update_gro_lookup); > +#endif > > static struct sk_buff *__skb_udp_tunnel_segment(struct sk_buff *skb, > netdev_features_t features, > @@ -631,8 +663,13 @@ static struct sock *udp4_gro_lookup_skb(struct sk_buff *skb, __be16 sport, > { > const struct iphdr *iph = skb_gro_network_header(skb); > struct net *net = dev_net_rcu(skb->dev); > + struct sock *sk; > int iif, sdif; > > + sk = udp_tunnel_sk(net, false); > + if (sk && dport == htons(sk->sk_num)) > + return sk; > + > inet_get_iif_sdif(skb, &iif, &sdif); > > return __udp4_lib_lookup(net, iph->saddr, sport, > diff --git a/net/ipv4/udp_tunnel_core.c b/net/ipv4/udp_tunnel_core.c > index 619a53eb672da..b969c997c89c7 100644 > --- a/net/ipv4/udp_tunnel_core.c > +++ b/net/ipv4/udp_tunnel_core.c > @@ -58,6 +58,15 @@ int udp_sock_create4(struct net *net, struct udp_port_cfg *cfg, > } > EXPORT_SYMBOL(udp_sock_create4); > > +static inline bool sk_saddr_any(struct sock *sk) > +{ > +#if IS_ENABLED(CONFIG_IPV6) > + return ipv6_addr_any(&sk->sk_v6_rcv_saddr); > +#else > + return !sk->sk_rcv_saddr; > +#endif > +} > + > void setup_udp_tunnel_sock(struct net *net, struct socket *sock, > struct udp_tunnel_sock_cfg *cfg) > { > @@ -80,6 +89,9 @@ void setup_udp_tunnel_sock(struct net *net, struct socket *sock, > udp_sk(sk)->gro_complete = cfg->gro_complete; > > udp_tunnel_encap_enable(sk); > + > + if (!sk->sk_dport && !sk->sk_bound_dev_if && sk_saddr_any(sock->sk)) > + udp_tunnel_update_gro_lookup(net, sock->sk, true); > } > EXPORT_SYMBOL_GPL(setup_udp_tunnel_sock); > > diff --git a/net/ipv6/udp.c b/net/ipv6/udp.c > index 3a0d6c5a8286b..3087022d18a55 100644 > --- a/net/ipv6/udp.c > +++ b/net/ipv6/udp.c > @@ -46,6 +46,7 @@ > #include <net/tcp_states.h> > #include <net/ip6_checksum.h> > #include <net/ip6_tunnel.h> > +#include <net/udp_tunnel.h> > #include <net/xfrm.h> > #include <net/inet_hashtables.h> > #include <net/inet6_hashtables.h> > @@ -1824,6 +1825,7 @@ void udpv6_destroy_sock(struct sock *sk) > } > if (udp_test_bit(ENCAP_ENABLED, sk)) { > static_branch_dec(&udpv6_encap_needed_key); In ipv4, you removed the static_branch_dec(&udp_encap_needed_key); > + udp_tunnel_cleanup_gro(sk); > udp_encap_disable(); > } > } > diff --git a/net/ipv6/udp_offload.c b/net/ipv6/udp_offload.c > index 404212dfc99ab..d8445ac1b2e43 100644 > --- a/net/ipv6/udp_offload.c > +++ b/net/ipv6/udp_offload.c > @@ -118,8 +118,13 @@ static struct sock *udp6_gro_lookup_skb(struct sk_buff *skb, __be16 sport, > { > const struct ipv6hdr *iph = skb_gro_network_header(skb); > struct net *net = dev_net_rcu(skb->dev); > + struct sock *sk; > int iif, sdif; > > + sk = udp_tunnel_sk(net, true); > + if (sk && dport == htons(sk->sk_num)) > + return sk; > + > inet6_get_iif_sdif(skb, &iif, &sdif); > > return __udp6_lib_lookup(net, &iph->saddr, sport, > -- > 2.48.1 >
Hi, On 3/6/25 5:35 PM, Eric Dumazet wrote: >> static int __net_init udp_pernet_init(struct net *net) >> { >> +#if IS_ENABLED(CONFIG_NET_UDP_TUNNEL) >> + int i; >> + >> + /* No tunnel is configured */ >> + for (i = 0; i < ARRAY_SIZE(net->ipv4.udp_tunnel_gro); ++i) { >> + INIT_HLIST_HEAD(&net->ipv4.udp_tunnel_gro[i].list); >> + rcu_assign_pointer(net->ipv4.udp_tunnel_gro[1].sk, NULL); > > typo : [i] is what you meant (instead of [1]) Whoops... I guess testing did not discovered that because the pointer is only touched after a tunnel is initialized. I'll fix in v2. >> @@ -1824,6 +1825,7 @@ void udpv6_destroy_sock(struct sock *sk) >> } >> if (udp_test_bit(ENCAP_ENABLED, sk)) { >> static_branch_dec(&udpv6_encap_needed_key); > > In ipv4, you removed the static_branch_dec(&udp_encap_needed_key); I replaced such statement with udp_encap_disable(), which in turn does the same. Still is a left-over from a previous revision of the patch, when I intended to do all the cleanup in udp_encap_disable(). In v2 I'll avoid the unneeded ipv4 change. Thanks for the review, Paolo
Paolo Abeni wrote: > Most UDP tunnels bind a socket to a local port, with ANY address, no > peer and no interface index specified. > Additionally it's quite common to have a single tunnel device per > namespace. > > Track in each namespace the UDP tunnel socket respecting the above. > When only a single one is present, store a reference in the netns. > > When such reference is not NULL, UDP tunnel GRO lookup just need to > match the incoming packet destination port vs the socket local port. > > The tunnel socket never set the reuse[port] flag[s], when bound to no > address and interface, no other socket can exist in the same netns > matching the specified local port. > > Signed-off-by: Paolo Abeni <pabeni@redhat.com> > diff --git a/net/ipv4/udp_offload.c b/net/ipv4/udp_offload.c > index c1a85b300ee87..ac6dd2703190e 100644 > --- a/net/ipv4/udp_offload.c > +++ b/net/ipv4/udp_offload.c > @@ -12,6 +12,38 @@ > #include <net/udp.h> > #include <net/protocol.h> > #include <net/inet_common.h> > +#include <net/udp_tunnel.h> > + > +#if IS_ENABLED(CONFIG_NET_UDP_TUNNEL) > +static DEFINE_SPINLOCK(udp_tunnel_gro_lock); > + > +void udp_tunnel_update_gro_lookup(struct net *net, struct sock *sk, bool add) > +{ > + bool is_ipv6 = sk->sk_family == AF_INET6; > + struct udp_sock *tup, *up = udp_sk(sk); > + struct udp_tunnel_gro *udp_tunnel_gro; > + > + spin_lock(&udp_tunnel_gro_lock); > + udp_tunnel_gro = &net->ipv4.udp_tunnel_gro[is_ipv6]; It's a bit odd to have an ipv6 member in netns.ipv4. Does it significantly simplify the code vs a separate entry in netns.ipv6? > + if (add) > + hlist_add_head(&up->tunnel_list, &udp_tunnel_gro->list); > + else > + hlist_del_init(&up->tunnel_list); > + > + if (udp_tunnel_gro->list.first && > + !udp_tunnel_gro->list.first->next) { > + tup = hlist_entry(udp_tunnel_gro->list.first, struct udp_sock, > + tunnel_list); > + > + rcu_assign_pointer(udp_tunnel_gro->sk, (struct sock *)tup); > + } else { > + rcu_assign_pointer(udp_tunnel_gro->sk, NULL); > + } > + > + spin_unlock(&udp_tunnel_gro_lock); > +} > +EXPORT_SYMBOL_GPL(udp_tunnel_update_gro_lookup); > +#endif > > static struct sk_buff *__skb_udp_tunnel_segment(struct sk_buff *skb, > netdev_features_t features, > @@ -631,8 +663,13 @@ static struct sock *udp4_gro_lookup_skb(struct sk_buff *skb, __be16 sport, > { > const struct iphdr *iph = skb_gro_network_header(skb); > struct net *net = dev_net_rcu(skb->dev); > + struct sock *sk; > int iif, sdif; > > + sk = udp_tunnel_sk(net, false); > + if (sk && dport == htons(sk->sk_num)) > + return sk; > + This improves tunnel performance at a slight cost to everything else, by having the tunnel check before the normal socket path. Does a 5% best case gain warrant that? Not snark, I don't have a good answer. > inet_get_iif_sdif(skb, &iif, &sdif); > > return __udp4_lib_lookup(net, iph->saddr, sport,
On 3/6/25 8:46 PM, Willem de Bruijn wrote: > Paolo Abeni wrote: >> Most UDP tunnels bind a socket to a local port, with ANY address, no >> peer and no interface index specified. >> Additionally it's quite common to have a single tunnel device per >> namespace. >> >> Track in each namespace the UDP tunnel socket respecting the above. >> When only a single one is present, store a reference in the netns. >> >> When such reference is not NULL, UDP tunnel GRO lookup just need to >> match the incoming packet destination port vs the socket local port. >> >> The tunnel socket never set the reuse[port] flag[s], when bound to no >> address and interface, no other socket can exist in the same netns >> matching the specified local port. >> >> Signed-off-by: Paolo Abeni <pabeni@redhat.com> > >> diff --git a/net/ipv4/udp_offload.c b/net/ipv4/udp_offload.c >> index c1a85b300ee87..ac6dd2703190e 100644 >> --- a/net/ipv4/udp_offload.c >> +++ b/net/ipv4/udp_offload.c >> @@ -12,6 +12,38 @@ >> #include <net/udp.h> >> #include <net/protocol.h> >> #include <net/inet_common.h> >> +#include <net/udp_tunnel.h> >> + >> +#if IS_ENABLED(CONFIG_NET_UDP_TUNNEL) >> +static DEFINE_SPINLOCK(udp_tunnel_gro_lock); >> + >> +void udp_tunnel_update_gro_lookup(struct net *net, struct sock *sk, bool add) >> +{ >> + bool is_ipv6 = sk->sk_family == AF_INET6; >> + struct udp_sock *tup, *up = udp_sk(sk); >> + struct udp_tunnel_gro *udp_tunnel_gro; >> + >> + spin_lock(&udp_tunnel_gro_lock); >> + udp_tunnel_gro = &net->ipv4.udp_tunnel_gro[is_ipv6]; > > It's a bit odd to have an ipv6 member in netns.ipv4. Does it > significantly simplify the code vs a separate entry in netns.ipv6? The code complexity should not change much. I place both the ipv4 and ipv6 data there to allow cache-line based optimization, as all the netns fast-path fields are under struct netns_ipv4. Currently the UDP tunnel related fields share the same cache-line of `udp_table`. >> @@ -631,8 +663,13 @@ static struct sock *udp4_gro_lookup_skb(struct sk_buff *skb, __be16 sport, >> { >> const struct iphdr *iph = skb_gro_network_header(skb); >> struct net *net = dev_net_rcu(skb->dev); >> + struct sock *sk; >> int iif, sdif; >> >> + sk = udp_tunnel_sk(net, false); >> + if (sk && dport == htons(sk->sk_num)) >> + return sk; >> + > > This improves tunnel performance at a slight cost to everything else, > by having the tunnel check before the normal socket path. > > Does a 5% best case gain warrant that? Not snark, I don't have a > good answer. We enter this function only when udp_encap_needed_key is true: ~an UDP tunnel has been configured[1]. When tunnels are enabled, AFAIK the single tunnel device is the most common and most relevant scenario, and in such setup this gives measurable performance improvement. Other tunnel-based scenarios will see the additional cost of a single conditional (using data on an already hot cacheline, due to the above layout). If you are concerned about such cost, I can add an additional static branch protecting the above code chunk, so that the conditional will be performed only when there is a single UDP tunnel configured. Please, let me know. Thanks, Paolo [1] to be more accurate: an UDP tunnel or an UDP socket with GRO enabled
On Thu, Mar 6, 2025 at 4:20 PM Paolo Abeni <pabeni@redhat.com> wrote: > > On 3/6/25 8:46 PM, Willem de Bruijn wrote: > > Paolo Abeni wrote: > >> Most UDP tunnels bind a socket to a local port, with ANY address, no > >> peer and no interface index specified. > >> Additionally it's quite common to have a single tunnel device per > >> namespace. > >> > >> Track in each namespace the UDP tunnel socket respecting the above. > >> When only a single one is present, store a reference in the netns. > >> > >> When such reference is not NULL, UDP tunnel GRO lookup just need to > >> match the incoming packet destination port vs the socket local port. > >> > >> The tunnel socket never set the reuse[port] flag[s], when bound to no > >> address and interface, no other socket can exist in the same netns > >> matching the specified local port. > >> > >> Signed-off-by: Paolo Abeni <pabeni@redhat.com> > > > >> diff --git a/net/ipv4/udp_offload.c b/net/ipv4/udp_offload.c > >> index c1a85b300ee87..ac6dd2703190e 100644 > >> --- a/net/ipv4/udp_offload.c > >> +++ b/net/ipv4/udp_offload.c > >> @@ -12,6 +12,38 @@ > >> #include <net/udp.h> > >> #include <net/protocol.h> > >> #include <net/inet_common.h> > >> +#include <net/udp_tunnel.h> > >> + > >> +#if IS_ENABLED(CONFIG_NET_UDP_TUNNEL) > >> +static DEFINE_SPINLOCK(udp_tunnel_gro_lock); > >> + > >> +void udp_tunnel_update_gro_lookup(struct net *net, struct sock *sk, bool add) > >> +{ > >> + bool is_ipv6 = sk->sk_family == AF_INET6; > >> + struct udp_sock *tup, *up = udp_sk(sk); > >> + struct udp_tunnel_gro *udp_tunnel_gro; > >> + > >> + spin_lock(&udp_tunnel_gro_lock); > >> + udp_tunnel_gro = &net->ipv4.udp_tunnel_gro[is_ipv6]; > > > > It's a bit odd to have an ipv6 member in netns.ipv4. Does it > > significantly simplify the code vs a separate entry in netns.ipv6? > > The code complexity should not change much. I place both the ipv4 and > ipv6 data there to allow cache-line based optimization, as all the netns > fast-path fields are under struct netns_ipv4. > > Currently the UDP tunnel related fields share the same cache-line of > `udp_table`. That's reason enough. Since you have to respin, please add a comment in the commit message. It looked surprising at first read. > >> @@ -631,8 +663,13 @@ static struct sock *udp4_gro_lookup_skb(struct sk_buff *skb, __be16 sport, > >> { > >> const struct iphdr *iph = skb_gro_network_header(skb); > >> struct net *net = dev_net_rcu(skb->dev); > >> + struct sock *sk; > >> int iif, sdif; > >> > >> + sk = udp_tunnel_sk(net, false); > >> + if (sk && dport == htons(sk->sk_num)) > >> + return sk; > >> + > > > > This improves tunnel performance at a slight cost to everything else, > > by having the tunnel check before the normal socket path. > > > > Does a 5% best case gain warrant that? Not snark, I don't have a > > good answer. > > We enter this function only when udp_encap_needed_key is true: ~an UDP > tunnel has been configured[1]. > > When tunnels are enabled, AFAIK the single tunnel device is the most > common and most relevant scenario, and in such setup this gives > measurable performance improvement. Other tunnel-based scenarios will > see the additional cost of a single conditional (using data on an > already hot cacheline, due to the above layout). > > If you are concerned about such cost, I can add an additional static > branch protecting the above code chunk, so that the conditional will be > performed only when there is a single UDP tunnel configured. Please, let > me know. > > Thanks, > > Paolo > > [1] to be more accurate: an UDP tunnel or an UDP socket with GRO enabled Oh right, not all regular UDP GRO. That is okay then.
diff --git a/include/linux/udp.h b/include/linux/udp.h index 0807e21cfec95..895240177f4f4 100644 --- a/include/linux/udp.h +++ b/include/linux/udp.h @@ -101,6 +101,13 @@ struct udp_sock { /* Cache friendly copy of sk->sk_peek_off >= 0 */ bool peeking_with_offset; + + /* + * Accounting for the tunnel GRO fastpath. + * Unprotected by compilers guard, as it uses space available in + * the last UDP socket cacheline. + */ + struct hlist_node tunnel_list; }; #define udp_test_bit(nr, sk) \ @@ -219,4 +226,13 @@ static inline void udp_allow_gso(struct sock *sk) #define IS_UDPLITE(__sk) (__sk->sk_protocol == IPPROTO_UDPLITE) +static inline struct sock *udp_tunnel_sk(const struct net *net, bool is_ipv6) +{ +#if IS_ENABLED(CONFIG_NET_UDP_TUNNEL) + return rcu_dereference(net->ipv4.udp_tunnel_gro[is_ipv6].sk); +#else + return NULL; +#endif +} + #endif /* _LINUX_UDP_H */ diff --git a/include/net/netns/ipv4.h b/include/net/netns/ipv4.h index 650b2dc9199f4..6373e3f17da84 100644 --- a/include/net/netns/ipv4.h +++ b/include/net/netns/ipv4.h @@ -47,6 +47,11 @@ struct sysctl_fib_multipath_hash_seed { }; #endif +struct udp_tunnel_gro { + struct sock __rcu *sk; + struct hlist_head list; +}; + struct netns_ipv4 { /* Cacheline organization can be found documented in * Documentation/networking/net_cachelines/netns_ipv4_sysctl.rst. @@ -85,6 +90,11 @@ struct netns_ipv4 { struct inet_timewait_death_row tcp_death_row; struct udp_table *udp_table; +#if IS_ENABLED(CONFIG_NET_UDP_TUNNEL) + /* Not in a pernet subsys because need to be available at GRO stage */ + struct udp_tunnel_gro udp_tunnel_gro[2]; +#endif + #ifdef CONFIG_SYSCTL struct ctl_table_header *forw_hdr; struct ctl_table_header *frags_hdr; @@ -277,4 +287,5 @@ struct netns_ipv4 { struct hlist_head *inet_addr_lst; struct delayed_work addr_chk_work; }; + #endif diff --git a/include/net/udp.h b/include/net/udp.h index 6e89520e100dc..a772510b2aa58 100644 --- a/include/net/udp.h +++ b/include/net/udp.h @@ -290,6 +290,7 @@ static inline void udp_lib_init_sock(struct sock *sk) struct udp_sock *up = udp_sk(sk); skb_queue_head_init(&up->reader_queue); + INIT_HLIST_NODE(&up->tunnel_list); up->forward_threshold = sk->sk_rcvbuf >> 2; set_bit(SOCK_CUSTOM_SOCKOPT, &sk->sk_socket->flags); } diff --git a/include/net/udp_tunnel.h b/include/net/udp_tunnel.h index a93dc51f6323e..eda0f3e2f65fa 100644 --- a/include/net/udp_tunnel.h +++ b/include/net/udp_tunnel.h @@ -203,6 +203,24 @@ static inline void udp_tunnel_encap_enable(struct sock *sk) udp_encap_enable(); } +#if IS_ENABLED(CONFIG_NET_UDP_TUNNEL) +void udp_tunnel_update_gro_lookup(struct net *net, struct sock *sk, bool add); +#else +static inline void udp_tunnel_update_gro_lookup(struct net *net, + struct sock *sk, bool add) {} +#endif + +static inline void udp_tunnel_cleanup_gro(struct sock *sk) +{ + struct udp_sock *up = udp_sk(sk); + struct net *net = sock_net(sk); + + if (!up->tunnel_list.pprev) + return; + + udp_tunnel_update_gro_lookup(net, sk, false); +} + #define UDP_TUNNEL_NIC_MAX_TABLES 4 enum udp_tunnel_nic_info_flags { diff --git a/net/ipv4/udp.c b/net/ipv4/udp.c index 17c7736d83494..d1aa96ac52888 100644 --- a/net/ipv4/udp.c +++ b/net/ipv4/udp.c @@ -2891,8 +2891,10 @@ void udp_destroy_sock(struct sock *sk) if (encap_destroy) encap_destroy(sk); } - if (udp_test_bit(ENCAP_ENABLED, sk)) - static_branch_dec(&udp_encap_needed_key); + if (udp_test_bit(ENCAP_ENABLED, sk)) { + udp_tunnel_cleanup_gro(sk); + udp_encap_disable(); + } } } @@ -3804,6 +3806,15 @@ static void __net_init udp_set_table(struct net *net) static int __net_init udp_pernet_init(struct net *net) { +#if IS_ENABLED(CONFIG_NET_UDP_TUNNEL) + int i; + + /* No tunnel is configured */ + for (i = 0; i < ARRAY_SIZE(net->ipv4.udp_tunnel_gro); ++i) { + INIT_HLIST_HEAD(&net->ipv4.udp_tunnel_gro[i].list); + rcu_assign_pointer(net->ipv4.udp_tunnel_gro[1].sk, NULL); + } +#endif udp_sysctl_init(net); udp_set_table(net); diff --git a/net/ipv4/udp_offload.c b/net/ipv4/udp_offload.c index c1a85b300ee87..ac6dd2703190e 100644 --- a/net/ipv4/udp_offload.c +++ b/net/ipv4/udp_offload.c @@ -12,6 +12,38 @@ #include <net/udp.h> #include <net/protocol.h> #include <net/inet_common.h> +#include <net/udp_tunnel.h> + +#if IS_ENABLED(CONFIG_NET_UDP_TUNNEL) +static DEFINE_SPINLOCK(udp_tunnel_gro_lock); + +void udp_tunnel_update_gro_lookup(struct net *net, struct sock *sk, bool add) +{ + bool is_ipv6 = sk->sk_family == AF_INET6; + struct udp_sock *tup, *up = udp_sk(sk); + struct udp_tunnel_gro *udp_tunnel_gro; + + spin_lock(&udp_tunnel_gro_lock); + udp_tunnel_gro = &net->ipv4.udp_tunnel_gro[is_ipv6]; + if (add) + hlist_add_head(&up->tunnel_list, &udp_tunnel_gro->list); + else + hlist_del_init(&up->tunnel_list); + + if (udp_tunnel_gro->list.first && + !udp_tunnel_gro->list.first->next) { + tup = hlist_entry(udp_tunnel_gro->list.first, struct udp_sock, + tunnel_list); + + rcu_assign_pointer(udp_tunnel_gro->sk, (struct sock *)tup); + } else { + rcu_assign_pointer(udp_tunnel_gro->sk, NULL); + } + + spin_unlock(&udp_tunnel_gro_lock); +} +EXPORT_SYMBOL_GPL(udp_tunnel_update_gro_lookup); +#endif static struct sk_buff *__skb_udp_tunnel_segment(struct sk_buff *skb, netdev_features_t features, @@ -631,8 +663,13 @@ static struct sock *udp4_gro_lookup_skb(struct sk_buff *skb, __be16 sport, { const struct iphdr *iph = skb_gro_network_header(skb); struct net *net = dev_net_rcu(skb->dev); + struct sock *sk; int iif, sdif; + sk = udp_tunnel_sk(net, false); + if (sk && dport == htons(sk->sk_num)) + return sk; + inet_get_iif_sdif(skb, &iif, &sdif); return __udp4_lib_lookup(net, iph->saddr, sport, diff --git a/net/ipv4/udp_tunnel_core.c b/net/ipv4/udp_tunnel_core.c index 619a53eb672da..b969c997c89c7 100644 --- a/net/ipv4/udp_tunnel_core.c +++ b/net/ipv4/udp_tunnel_core.c @@ -58,6 +58,15 @@ int udp_sock_create4(struct net *net, struct udp_port_cfg *cfg, } EXPORT_SYMBOL(udp_sock_create4); +static inline bool sk_saddr_any(struct sock *sk) +{ +#if IS_ENABLED(CONFIG_IPV6) + return ipv6_addr_any(&sk->sk_v6_rcv_saddr); +#else + return !sk->sk_rcv_saddr; +#endif +} + void setup_udp_tunnel_sock(struct net *net, struct socket *sock, struct udp_tunnel_sock_cfg *cfg) { @@ -80,6 +89,9 @@ void setup_udp_tunnel_sock(struct net *net, struct socket *sock, udp_sk(sk)->gro_complete = cfg->gro_complete; udp_tunnel_encap_enable(sk); + + if (!sk->sk_dport && !sk->sk_bound_dev_if && sk_saddr_any(sock->sk)) + udp_tunnel_update_gro_lookup(net, sock->sk, true); } EXPORT_SYMBOL_GPL(setup_udp_tunnel_sock); diff --git a/net/ipv6/udp.c b/net/ipv6/udp.c index 3a0d6c5a8286b..3087022d18a55 100644 --- a/net/ipv6/udp.c +++ b/net/ipv6/udp.c @@ -46,6 +46,7 @@ #include <net/tcp_states.h> #include <net/ip6_checksum.h> #include <net/ip6_tunnel.h> +#include <net/udp_tunnel.h> #include <net/xfrm.h> #include <net/inet_hashtables.h> #include <net/inet6_hashtables.h> @@ -1824,6 +1825,7 @@ void udpv6_destroy_sock(struct sock *sk) } if (udp_test_bit(ENCAP_ENABLED, sk)) { static_branch_dec(&udpv6_encap_needed_key); + udp_tunnel_cleanup_gro(sk); udp_encap_disable(); } } diff --git a/net/ipv6/udp_offload.c b/net/ipv6/udp_offload.c index 404212dfc99ab..d8445ac1b2e43 100644 --- a/net/ipv6/udp_offload.c +++ b/net/ipv6/udp_offload.c @@ -118,8 +118,13 @@ static struct sock *udp6_gro_lookup_skb(struct sk_buff *skb, __be16 sport, { const struct ipv6hdr *iph = skb_gro_network_header(skb); struct net *net = dev_net_rcu(skb->dev); + struct sock *sk; int iif, sdif; + sk = udp_tunnel_sk(net, true); + if (sk && dport == htons(sk->sk_num)) + return sk; + inet6_get_iif_sdif(skb, &iif, &sdif); return __udp6_lib_lookup(net, &iph->saddr, sport,
Most UDP tunnels bind a socket to a local port, with ANY address, no peer and no interface index specified. Additionally it's quite common to have a single tunnel device per namespace. Track in each namespace the UDP tunnel socket respecting the above. When only a single one is present, store a reference in the netns. When such reference is not NULL, UDP tunnel GRO lookup just need to match the incoming packet destination port vs the socket local port. The tunnel socket never set the reuse[port] flag[s], when bound to no address and interface, no other socket can exist in the same netns matching the specified local port. Signed-off-by: Paolo Abeni <pabeni@redhat.com> --- include/linux/udp.h | 16 ++++++++++++++++ include/net/netns/ipv4.h | 11 +++++++++++ include/net/udp.h | 1 + include/net/udp_tunnel.h | 18 ++++++++++++++++++ net/ipv4/udp.c | 15 +++++++++++++-- net/ipv4/udp_offload.c | 37 +++++++++++++++++++++++++++++++++++++ net/ipv4/udp_tunnel_core.c | 12 ++++++++++++ net/ipv6/udp.c | 2 ++ net/ipv6/udp_offload.c | 5 +++++ 9 files changed, 115 insertions(+), 2 deletions(-)