net: move ip_packet_offload and ipv6_packet_offload to net_hotdata

These structures are used in GRO and GSO paths.

v2: ipv6_packet_offload definition depends on CONFIG_INET

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-7-edumazet@google.com
Signed-off-by: Jakub Kicinski <kuba@kernel.org>

diff --git a/include/net/hotdata.h b/include/net/hotdata.h
index dc50b200a94b6b935cd79d8e0406a61209fdc68e..d8ce20d3215d3cf13a23fa81619a1c52627f2913 100644 (file)
--- a/include/net/hotdata.h
+++ b/include/net/hotdata.h
@@ -3,9 +3,14 @@
 #define _NET_HOTDATA_H
 
 #include <linux/types.h>
+#include <linux/netdevice.h>
 
 /* Read mostly data used in network fast paths. */
 struct net_hotdata {
+#if IS_ENABLED(CONFIG_INET)
+       struct packet_offload   ip_packet_offload;
+       struct packet_offload   ipv6_packet_offload;
+#endif
        struct list_head        offload_base;
        struct list_head        ptype_all;
        int                     gro_normal_batch;

diff --git a/net/ipv4/af_inet.c b/net/ipv4/af_inet.c
index 5daebdcbca326aa1fc042e1e1ff1e82a18bd283d..08dda6955562ea6b89e02b8299b03ab52b342f27 100644 (file)
--- a/net/ipv4/af_inet.c
+++ b/net/ipv4/af_inet.c
@@ -1904,14 +1904,6 @@ static int ipv4_proc_init(void);
  *     IP protocol layer initialiser
  */
 
-static struct packet_offload ip_packet_offload __read_mostly = {
-       .type = cpu_to_be16(ETH_P_IP),
-       .callbacks = {
-               .gso_segment = inet_gso_segment,
-               .gro_receive = inet_gro_receive,
-               .gro_complete = inet_gro_complete,
-       },
-};
 
 static const struct net_offload ipip_offload = {
        .callbacks = {
@@ -1938,7 +1930,15 @@ static int __init ipv4_offload_init(void)
        if (ipip_offload_init() < 0)
                pr_crit("%s: Cannot add IPIP protocol offload\n", __func__);
 
-       dev_add_offload(&ip_packet_offload);
+       net_hotdata.ip_packet_offload = (struct packet_offload) {
+               .type = cpu_to_be16(ETH_P_IP),
+               .callbacks = {
+                       .gso_segment = inet_gso_segment,
+                       .gro_receive = inet_gro_receive,
+                       .gro_complete = inet_gro_complete,
+               },
+       };
+       dev_add_offload(&net_hotdata.ip_packet_offload);
        return 0;
 }
 

diff --git a/net/ipv6/ip6_offload.c b/net/ipv6/ip6_offload.c
index cca64c7809bee9a0360cbfab6a645d3f8d2ffea3..b41e35af69ea2835aa47d6ca01d9b109d4092462 100644 (file)
--- a/net/ipv6/ip6_offload.c
+++ b/net/ipv6/ip6_offload.c
@@ -419,14 +419,6 @@ static int ip4ip6_gro_complete(struct sk_buff *skb, int nhoff)
        return inet_gro_complete(skb, nhoff);
 }
 
-static struct packet_offload ipv6_packet_offload __read_mostly = {
-       .type = cpu_to_be16(ETH_P_IPV6),
-       .callbacks = {
-               .gso_segment = ipv6_gso_segment,
-               .gro_receive = ipv6_gro_receive,
-               .gro_complete = ipv6_gro_complete,
-       },
-};
 
 static struct sk_buff *sit_gso_segment(struct sk_buff *skb,
                                       netdev_features_t features)
@@ -486,7 +478,15 @@ static int __init ipv6_offload_init(void)
        if (ipv6_exthdrs_offload_init() < 0)
                pr_crit("%s: Cannot add EXTHDRS protocol offload\n", __func__);
 
-       dev_add_offload(&ipv6_packet_offload);
+       net_hotdata.ipv6_packet_offload = (struct packet_offload) {
+               .type = cpu_to_be16(ETH_P_IPV6),
+               .callbacks = {
+                       .gso_segment = ipv6_gso_segment,
+                       .gro_receive = ipv6_gro_receive,
+                       .gro_complete = ipv6_gro_complete,
+               },
+       };
+       dev_add_offload(&net_hotdata.ipv6_packet_offload);
 
        inet_add_offload(&sit_offload, IPPROTO_IPV6);
        inet6_add_offload(&ip6ip6_offload, IPPROTO_IPV6);