udp: move udpv4_offload and udpv6_offload to net_hotdata

These structures are used in GRO and GSO paths.
Move them to net_hodata for better cache locality.

v2: udpv6_offload definition depends on CONFIG_INET=y

Signed-off-by: Eric Dumazet <edumazet@google.com>
Acked-by: Soheil Hassas Yeganeh <soheil@google.com>
Reviewed-by: David Ahern <dsahern@kernel.org>
Link: https://lore.kernel.org/r/20240306160031.874438-12-edumazet@google.com
Signed-off-by: Jakub Kicinski <kuba@kernel.org>

diff --git a/include/net/hotdata.h b/include/net/hotdata.h
index a8f7e5e826fb749965573a5bcf13825a973c16ae..daeee8ce8084e885984716113779750ca7b72147 100644 (file)
--- a/include/net/hotdata.h
+++ b/include/net/hotdata.h
@@ -11,8 +11,10 @@ struct net_hotdata {
 #if IS_ENABLED(CONFIG_INET)
        struct packet_offload   ip_packet_offload;
        struct net_offload      tcpv4_offload;
+       struct net_offload      udpv4_offload;
        struct packet_offload   ipv6_packet_offload;
        struct net_offload      tcpv6_offload;
+       struct net_offload      udpv6_offload;
 #endif
        struct list_head        offload_base;
        struct list_head        ptype_all;

diff --git a/net/ipv4/udp_offload.c b/net/ipv4/udp_offload.c
index 6c95d28d0c4a7e56d587a986113b3711f8de964c..b9880743765c6c24c28bea095f16f0cf091664ce 100644 (file)
--- a/net/ipv4/udp_offload.c
+++ b/net/ipv4/udp_offload.c
@@ -737,15 +737,14 @@ INDIRECT_CALLABLE_SCOPE int udp4_gro_complete(struct sk_buff *skb, int nhoff)
        return udp_gro_complete(skb, nhoff, udp4_lib_lookup_skb);
 }
 
-static const struct net_offload udpv4_offload = {
-       .callbacks = {
-               .gso_segment = udp4_ufo_fragment,
-               .gro_receive  = udp4_gro_receive,
-               .gro_complete = udp4_gro_complete,
-       },
-};
-
 int __init udpv4_offload_init(void)
 {
-       return inet_add_offload(&udpv4_offload, IPPROTO_UDP);
+       net_hotdata.udpv4_offload = (struct net_offload) {
+               .callbacks = {
+                       .gso_segment = udp4_ufo_fragment,
+                       .gro_receive  = udp4_gro_receive,
+                       .gro_complete = udp4_gro_complete,
+               },
+       };
+       return inet_add_offload(&net_hotdata.udpv4_offload, IPPROTO_UDP);
 }

diff --git a/net/ipv6/udp_offload.c b/net/ipv6/udp_offload.c
index 6b95ba241ebe2af7e5f2760d8a9c1d78f08579c5..312bcaeea96fb78ac488124cf7795aa834392c64 100644 (file)
--- a/net/ipv6/udp_offload.c
+++ b/net/ipv6/udp_offload.c
@@ -192,20 +192,19 @@ INDIRECT_CALLABLE_SCOPE int udp6_gro_complete(struct sk_buff *skb, int nhoff)
        return udp_gro_complete(skb, nhoff, udp6_lib_lookup_skb);
 }
 
-static const struct net_offload udpv6_offload = {
-       .callbacks = {
-               .gso_segment    =       udp6_ufo_fragment,
-               .gro_receive    =       udp6_gro_receive,
-               .gro_complete   =       udp6_gro_complete,
-       },
-};
-
-int udpv6_offload_init(void)
+int __init udpv6_offload_init(void)
 {
-       return inet6_add_offload(&udpv6_offload, IPPROTO_UDP);
+       net_hotdata.udpv6_offload = (struct net_offload) {
+               .callbacks = {
+                       .gso_segment    =       udp6_ufo_fragment,
+                       .gro_receive    =       udp6_gro_receive,
+                       .gro_complete   =       udp6_gro_complete,
+               },
+       };
+       return inet6_add_offload(&net_hotdata.udpv6_offload, IPPROTO_UDP);
 }
 
 int udpv6_offload_exit(void)
 {
-       return inet6_del_offload(&udpv6_offload, IPPROTO_UDP);
+       return inet6_del_offload(&net_hotdata.udpv6_offload, IPPROTO_UDP);
 }