Commit f623f83a authored by Paolo Abeni's avatar Paolo Abeni Committed by David S. Miller

geneve: avoid indirect calls in GRO path, when possible

In the most common setups, the geneve tunnels use an inner
ethernet encapsulation. In the GRO path, when such condition is
true, we can call directly the relevant GRO helper and avoid
a few indirect calls.
Signed-off-by: default avatarPaolo Abeni <pabeni@redhat.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 4867d750
...@@ -533,14 +533,16 @@ static struct sk_buff *geneve_gro_receive(struct sock *sk, ...@@ -533,14 +533,16 @@ static struct sk_buff *geneve_gro_receive(struct sock *sk,
} }
} }
skb_gro_pull(skb, gh_len);
skb_gro_postpull_rcsum(skb, gh, gh_len);
type = gh->proto_type; type = gh->proto_type;
if (likely(type == htons(ETH_P_TEB)))
return call_gro_receive(eth_gro_receive, head, skb);
ptype = gro_find_receive_by_type(type); ptype = gro_find_receive_by_type(type);
if (!ptype) if (!ptype)
goto out; goto out;
skb_gro_pull(skb, gh_len);
skb_gro_postpull_rcsum(skb, gh, gh_len);
pp = call_gro_receive(ptype->callbacks.gro_receive, head, skb); pp = call_gro_receive(ptype->callbacks.gro_receive, head, skb);
flush = 0; flush = 0;
...@@ -563,6 +565,10 @@ static int geneve_gro_complete(struct sock *sk, struct sk_buff *skb, ...@@ -563,6 +565,10 @@ static int geneve_gro_complete(struct sock *sk, struct sk_buff *skb,
gh_len = geneve_hlen(gh); gh_len = geneve_hlen(gh);
type = gh->proto_type; type = gh->proto_type;
/* since skb->encapsulation is set, eth_gro_complete() sets the inner mac header */
if (likely(type == htons(ETH_P_TEB)))
return eth_gro_complete(skb, nhoff + gh_len);
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 + gh_len); err = ptype->callbacks.gro_complete(skb, nhoff + gh_len);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment