aboutsummaryrefslogtreecommitdiffstats
path: root/net/ipv4
diff options
context:
space:
mode:
authorEric Dumazet <eric.dumazet@gmail.com>2010-11-16 15:36:42 -0500
committerDavid S. Miller <davem@davemloft.net>2010-11-18 14:02:23 -0500
commit57e1ab6eaddc9f2c358cd4afb497cda6e3c6821a (patch)
tree8fada8cae194efa4c23a0efdc6e9483d9e278f97 /net/ipv4
parent4c3710afbc333c33100739dec10662b4ee64e219 (diff)
igmp: refine skb allocations
IGMP allocates MTU sized skbs. This may fail for large MTU (order-2 allocations), so add a fallback to try lower sizes. Signed-off-by: Eric Dumazet <eric.dumazet@gmail.com> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/ipv4')
-rw-r--r--net/ipv4/igmp.c17
1 files changed, 13 insertions, 4 deletions
diff --git a/net/ipv4/igmp.c b/net/ipv4/igmp.c
index 50f6bc1a002a..e0e77e297de3 100644
--- a/net/ipv4/igmp.c
+++ b/net/ipv4/igmp.c
@@ -300,6 +300,8 @@ igmp_scount(struct ip_mc_list *pmc, int type, int gdeleted, int sdeleted)
300 return scount; 300 return scount;
301} 301}
302 302
303#define igmp_skb_size(skb) (*(unsigned int *)((skb)->cb))
304
303static struct sk_buff *igmpv3_newpack(struct net_device *dev, int size) 305static struct sk_buff *igmpv3_newpack(struct net_device *dev, int size)
304{ 306{
305 struct sk_buff *skb; 307 struct sk_buff *skb;
@@ -308,9 +310,16 @@ static struct sk_buff *igmpv3_newpack(struct net_device *dev, int size)
308 struct igmpv3_report *pig; 310 struct igmpv3_report *pig;
309 struct net *net = dev_net(dev); 311 struct net *net = dev_net(dev);
310 312
311 skb = alloc_skb(size + LL_ALLOCATED_SPACE(dev), GFP_ATOMIC); 313 while (1) {
312 if (skb == NULL) 314 skb = alloc_skb(size + LL_ALLOCATED_SPACE(dev),
313 return NULL; 315 GFP_ATOMIC | __GFP_NOWARN);
316 if (skb)
317 break;
318 size >>= 1;
319 if (size < 256)
320 return NULL;
321 }
322 igmp_skb_size(skb) = size;
314 323
315 { 324 {
316 struct flowi fl = { .oif = dev->ifindex, 325 struct flowi fl = { .oif = dev->ifindex,
@@ -399,7 +408,7 @@ static struct sk_buff *add_grhead(struct sk_buff *skb, struct ip_mc_list *pmc,
399 return skb; 408 return skb;
400} 409}
401 410
402#define AVAILABLE(skb) ((skb) ? ((skb)->dev ? (skb)->dev->mtu - (skb)->len : \ 411#define AVAILABLE(skb) ((skb) ? ((skb)->dev ? igmp_skb_size(skb) - (skb)->len : \
403 skb_tailroom(skb)) : 0) 412 skb_tailroom(skb)) : 0)
404 413
405static struct sk_buff *add_grec(struct sk_buff *skb, struct ip_mc_list *pmc, 414static struct sk_buff *add_grec(struct sk_buff *skb, struct ip_mc_list *pmc,