diff options
| author | Eric Dumazet <eric.dumazet@gmail.com> | 2010-08-26 22:03:08 -0700 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2010-08-26 22:03:08 -0700 |
| commit | 40d0802b3eb47d57e2d57a5244a18cbbe9632e13 (patch) | |
| tree | fd45987286080e1f711c2448f6fbdc7d362a0241 /net/8021q/vlan_core.c | |
| parent | 250ad8f55c06eb866cfb57f8d3ea6ff961a7d1d7 (diff) | |
| download | lwn-40d0802b3eb47d57e2d57a5244a18cbbe9632e13.tar.gz lwn-40d0802b3eb47d57e2d57a5244a18cbbe9632e13.zip | |
gro: __napi_gro_receive() optimizations
compare_ether_header() can have a special implementation on 64 bit
arches if CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS is defined.
__napi_gro_receive() and vlan_gro_common() can avoid a conditional
branch to perform device match.
On x86_64, __napi_gro_receive() has now 38 instructions instead of 53
As gcc-4.4.3 still choose to not inline it, add inline keyword to this
performance critical function.
Signed-off-by: Eric Dumazet <eric.dumazet@gmail.com>
CC: Herbert Xu <herbert@gondor.apana.org.au>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/8021q/vlan_core.c')
| -rw-r--r-- | net/8021q/vlan_core.c | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/net/8021q/vlan_core.c b/net/8021q/vlan_core.c index 07eeb5b99dce..3438c01bbacf 100644 --- a/net/8021q/vlan_core.c +++ b/net/8021q/vlan_core.c @@ -105,9 +105,12 @@ vlan_gro_common(struct napi_struct *napi, struct vlan_group *grp, goto drop; for (p = napi->gro_list; p; p = p->next) { - NAPI_GRO_CB(p)->same_flow = - p->dev == skb->dev && !compare_ether_header( - skb_mac_header(p), skb_gro_mac_header(skb)); + unsigned long diffs; + + diffs = (unsigned long)p->dev ^ (unsigned long)skb->dev; + diffs |= compare_ether_header(skb_mac_header(p), + skb_gro_mac_header(skb)); + NAPI_GRO_CB(p)->same_flow = !diffs; NAPI_GRO_CB(p)->flush = 0; } |