openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

vlan/8021q: avoid retpoline overhead on GRO 

The two most popular headers going after VLAN are IPv4 and IPv6.
Retpoline overhead for them is addressed only in dev_gro_receive(),
when they lie right after the outermost Ethernet header.
Use the indirect call wrappers in VLAN GRO receive code to reduce
the penalty on receiving tagged frames (when hardware stripping is
off or not available).

Signed-off-by: Alexander Lobakin <alobakin@pm.me>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
Alexander Lobakin 2021-03-18 18:42:34 +00:00 committed by David S. Miller
parent 86af2c82c2
commit 4a6e7ec93a
1 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
net/8021q/vlan_core.c
View File

@ -4,6 +4,7 @@
#include <linux/if_vlan.h> #include <linux/if_vlan.h>
#include <linux/netpoll.h> #include <linux/netpoll.h>
#include <linux/export.h> #include <linux/export.h>
#include <net/gro.h>
#include "vlan.h" #include "vlan.h"
bool vlan_do_receive(struct sk_buff **skbp) bool vlan_do_receive(struct sk_buff **skbp)
@ -495,7 +496,10 @@ static struct sk_buff *vlan_gro_receive(struct list_head *head,
skb_gro_pull(skb, sizeof(*vhdr)); skb_gro_pull(skb, sizeof(*vhdr));
skb_gro_postpull_rcsum(skb, vhdr, sizeof(*vhdr)); skb_gro_postpull_rcsum(skb, vhdr, sizeof(*vhdr));
pp = call_gro_receive(ptype->callbacks.gro_receive, head, skb);
pp = indirect_call_gro_receive_inet(ptype->callbacks.gro_receive,
ipv6_gro_receive, inet_gro_receive,
head, skb);
out_unlock: out_unlock:
rcu_read_unlock(); rcu_read_unlock();
@ -515,7 +519,9 @@ static int vlan_gro_complete(struct sk_buff *skb, int nhoff)
rcu_read_lock(); rcu_read_lock();
ptype = gro_find_complete_by_type(type); ptype = gro_find_complete_by_type(type);
if (ptype) if (ptype)
err = ptype->callbacks.gro_complete(skb, nhoff + sizeof(*vhdr)); err = INDIRECT_CALL_INET(ptype->callbacks.gro_complete,
ipv6_gro_complete, inet_gro_complete,
skb, nhoff + sizeof(*vhdr));
rcu_read_unlock(); rcu_read_unlock();
return err; return err;