korg/linux
0
0
Fork 0
mirror of https://mirrors.bfsu.edu.cn/git/linux.git synced 2024-11-13 14:24:11 +08:00
Code Issues Packages Projects Releases Wiki Activity

net: move ip_packet_offload and ipv6_packet_offload to net_hotdata

Browse Source 
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>
This commit is contained in:
Eric Dumazet 2024-03-06 16:00:19 +00:00 committed by Jakub Kicinski
parent edbc666cdc
commit 61a0be1a53
3 changed files with 23 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
include/net/hotdata.h
View File

@ -3,9 +3,14 @@
#define _NET_HOTDATA_H #define _NET_HOTDATA_H
#include <linux/types.h> #include <linux/types.h>
#include <linux/netdevice.h>
/* Read mostly data used in network fast paths. */ /* Read mostly data used in network fast paths. */
struct net_hotdata { 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 offload_base;
struct list_head ptype_all; struct list_head ptype_all;
int gro_normal_batch; int gro_normal_batch;

18
net/ipv4/af_inet.c
View File

@ -1904,14 +1904,6 @@ static int ipv4_proc_init(void);
* IP protocol layer initialiser * 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 = { static const struct net_offload ipip_offload = {
.callbacks = { .callbacks = {
@ -1938,7 +1930,15 @@ static int __init ipv4_offload_init(void)
if (ipip_offload_init() < 0) if (ipip_offload_init() < 0)
pr_crit("%s: Cannot add IPIP protocol offload\n", __func__); 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; return 0;
} }

18
net/ipv6/ip6_offload.c
View File

@ -419,14 +419,6 @@ static int ip4ip6_gro_complete(struct sk_buff *skb, int nhoff)
return inet_gro_complete(skb, 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, static struct sk_buff *sit_gso_segment(struct sk_buff *skb,
netdev_features_t features) netdev_features_t features)
@ -486,7 +478,15 @@ static int __init ipv6_offload_init(void)
if (ipv6_exthdrs_offload_init() < 0) if (ipv6_exthdrs_offload_init() < 0)
pr_crit("%s: Cannot add EXTHDRS protocol offload\n", __func__); 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); inet_add_offload(&sit_offload, IPPROTO_IPV6);
inet6_add_offload(&ip6ip6_offload, IPPROTO_IPV6); inet6_add_offload(&ip6ip6_offload, IPPROTO_IPV6);