diff options
| author | Eric Dumazet <edumazet@google.com> | 2012-04-30 04:10:34 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2012-04-30 21:35:49 -0400 |
| commit | d7e8883cfcf4851afe74fb380cc62b7fa9cf66ba (patch) | |
| tree | 1b513349c4f1c7edf7991de2016b3a2ed1083deb /include/linux | |
| parent | 8d4057a938481351dc690fbe23e8c72af08d5890 (diff) | |
net: make GRO aware of skb->head_frag
GRO can check if skb to be merged has its skb->head mapped to a page
fragment, instead of a kmalloc() area.
We 'upgrade' skb->head as a fragment in itself
This avoids the frag_list fallback, and permits to build true GRO skb
(one sk_buff and up to 16 fragments), using less memory.
This reduces number of cache misses when user makes its copy, since a
single sk_buff is fetched.
This is a followup of patch "net: allow skb->head to be a page fragment"
Signed-off-by: Eric Dumazet <edumazet@google.com>
Cc: Ilpo Järvinen <ilpo.jarvinen@helsinki.fi>
Cc: Herbert Xu <herbert@gondor.apana.org.au>
Cc: Maciej Żenczykowski <maze@google.com>
Cc: Neal Cardwell <ncardwell@google.com>
Cc: Tom Herbert <therbert@google.com>
Cc: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
Cc: Ben Hutchings <bhutchings@solarflare.com>
Cc: Matt Carlson <mcarlson@broadcom.com>
Cc: Michael Chan <mchan@broadcom.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'include/linux')
| -rw-r--r-- | include/linux/netdevice.h | 2 | ||||
| -rw-r--r-- | include/linux/skbuff.h | 1 |
2 files changed, 3 insertions, 0 deletions
diff --git a/include/linux/netdevice.h b/include/linux/netdevice.h index e0b70e961e61..7f377fb8b527 100644 --- a/include/linux/netdevice.h +++ b/include/linux/netdevice.h | |||
| @@ -1509,6 +1509,8 @@ struct napi_gro_cb { | |||
| 1509 | 1509 | ||
| 1510 | /* Free the skb? */ | 1510 | /* Free the skb? */ |
| 1511 | int free; | 1511 | int free; |
| 1512 | #define NAPI_GRO_FREE 1 | ||
| 1513 | #define NAPI_GRO_FREE_STOLEN_HEAD 2 | ||
| 1512 | }; | 1514 | }; |
| 1513 | 1515 | ||
| 1514 | #define NAPI_GRO_CB(skb) ((struct napi_gro_cb *)(skb)->cb) | 1516 | #define NAPI_GRO_CB(skb) ((struct napi_gro_cb *)(skb)->cb) |
diff --git a/include/linux/skbuff.h b/include/linux/skbuff.h index 9d28a22a8554..2c75e98953b2 100644 --- a/include/linux/skbuff.h +++ b/include/linux/skbuff.h | |||
| @@ -561,6 +561,7 @@ static inline struct rtable *skb_rtable(const struct sk_buff *skb) | |||
| 561 | extern void kfree_skb(struct sk_buff *skb); | 561 | extern void kfree_skb(struct sk_buff *skb); |
| 562 | extern void consume_skb(struct sk_buff *skb); | 562 | extern void consume_skb(struct sk_buff *skb); |
| 563 | extern void __kfree_skb(struct sk_buff *skb); | 563 | extern void __kfree_skb(struct sk_buff *skb); |
| 564 | extern struct kmem_cache *skbuff_head_cache; | ||
| 564 | extern struct sk_buff *__alloc_skb(unsigned int size, | 565 | extern struct sk_buff *__alloc_skb(unsigned int size, |
| 565 | gfp_t priority, int fclone, int node); | 566 | gfp_t priority, int fclone, int node); |
| 566 | extern struct sk_buff *build_skb(void *data, unsigned int frag_size); | 567 | extern struct sk_buff *build_skb(void *data, unsigned int frag_size); |
