Skip to content

Commit

Permalink
gro: Nasty optimisations for page frags in skb_gro_receive
Browse files Browse the repository at this point in the history
This patch reverses the direction of the frags array copy in
skb_gro_receive in order simplify the loop conditional.  It
also avoids touching the first element of the original frags
array.

Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
Signed-off-by: David S. Miller <davem@davemloft.net>
  • Loading branch information
Herbert Xu authored and David S. Miller committed May 27, 2009
1 parent cb18978 commit 66e92fc
Showing 1 changed file with 15 additions and 10 deletions.
25 changes: 15 additions & 10 deletions net/core/skbuff.c
Original file line number Diff line number Diff line change
Expand Up @@ -2676,21 +2676,26 @@ int skb_gro_receive(struct sk_buff **head, struct sk_buff *skb)
goto merge;
else if (headlen <= offset) {
skb_frag_t *frag;
int i;
skb_frag_t *frag2;
int i = skb_shinfo(skb)->nr_frags;
int nr_frags = skb_shinfo(p)->nr_frags + i;

offset -= headlen;

if (skb_shinfo(p)->nr_frags + skb_shinfo(skb)->nr_frags >
MAX_SKB_FRAGS)
if (nr_frags > MAX_SKB_FRAGS)
return -E2BIG;

skb_shinfo(skb)->frags[0].page_offset += offset - headlen;
skb_shinfo(skb)->frags[0].size -= offset - headlen;
skb_shinfo(p)->nr_frags = nr_frags;
skb_shinfo(skb)->nr_frags = 0;

frag = skb_shinfo(p)->frags + skb_shinfo(p)->nr_frags;
for (i = 0; i < skb_shinfo(skb)->nr_frags; i++)
*frag++ = skb_shinfo(skb)->frags[i];
frag = skb_shinfo(p)->frags + nr_frags;
frag2 = skb_shinfo(skb)->frags + i;
do {
*--frag = *--frag2;
} while (--i);

skb_shinfo(p)->nr_frags += skb_shinfo(skb)->nr_frags;
skb_shinfo(skb)->nr_frags = 0;
frag->page_offset += offset;
frag->size -= offset;

skb->truesize -= skb->data_len;
skb->len -= skb->data_len;
Expand Down

0 comments on commit 66e92fc

Please sign in to comment.