diff options
| author | Eric Dumazet <eric.dumazet@gmail.com> | 2012-04-10 20:08:39 +0000 |
|---|---|---|
| committer | Ben Hutchings <ben@decadent.org.uk> | 2012-05-11 13:14:22 +0100 |
| commit | 34b0788a13e9c65440e3d736a91f75964356ad67 (patch) | |
| tree | 1bc7592bfca557e68dc4d7e81dfa7055da3e4aa6 /net/core/skbuff.c | |
| parent | 65355aea86b2a70cbc7cbe14466702bc5a4e2217 (diff) | |
| download | kernel_samsung_smdk4412-34b0788a13e9c65440e3d736a91f75964356ad67.zip kernel_samsung_smdk4412-34b0788a13e9c65440e3d736a91f75964356ad67.tar.gz kernel_samsung_smdk4412-34b0788a13e9c65440e3d736a91f75964356ad67.tar.bz2 | |
net: allow pskb_expand_head() to get maximum tailroom
[ Upstream commit 87151b8689d890dfb495081f7be9b9e257f7a2df ]
Marc Merlin reported many order-1 allocations failures in TX path on its
wireless setup, that dont make any sense with MTU=1500 network, and non
SG capable hardware.
Turns out part of the problem comes from pskb_expand_head() not using
ksize() to get exact head size given by kmalloc(). Doing the same thing
than __alloc_skb() allows more tailroom in skb and can prevent future
reallocations.
As a bonus, struct skb_shared_info becomes cache line aligned.
Reported-by: Marc MERLIN <marc@merlins.org>
Tested-by: Marc MERLIN <marc@merlins.org>
Signed-off-by: Eric Dumazet <eric.dumazet@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Signed-off-by: Ben Hutchings <ben@decadent.org.uk>
Diffstat (limited to 'net/core/skbuff.c')
| -rw-r--r-- | net/core/skbuff.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/net/core/skbuff.c b/net/core/skbuff.c index 29cb392..2ec200de 100644 --- a/net/core/skbuff.c +++ b/net/core/skbuff.c @@ -903,9 +903,11 @@ int pskb_expand_head(struct sk_buff *skb, int nhead, int ntail, goto adjust_others; } - data = kmalloc(size + sizeof(struct skb_shared_info), gfp_mask); + data = kmalloc(size + SKB_DATA_ALIGN(sizeof(struct skb_shared_info)), + gfp_mask); if (!data) goto nodata; + size = SKB_WITH_OVERHEAD(ksize(data)); /* Copy only real data... and, alas, header. This should be * optimized for the cases when header is void. |