Piteball/android_kernel_google_msm
1
0
Fork 0
mirror of https://github.com/followmsi/android_kernel_google_msm.git synced 2024-11-06 23:17:41 +00:00
Code Issues Projects Releases Wiki Activity

ipv6: Don't depend on per socket memory for neighbour discovery messages

Browse source 
[ Upstream commit 25a6e6b84f ]

Allocating skbs when sending out neighbour discovery messages
currently uses sock_alloc_send_skb() based on a per net namespace
socket and thus share a socket wmem buffer space.

If a netdevice is temporarily unable to transmit due to carrier
loss or for other reasons, the queued up ndisc messages will cosnume
all of the wmem space and will thus prevent from any more skbs to
be allocated even for netdevices that are able to transmit packets.

The number of neighbour discovery messages sent is very limited,
use of alloc_skb() bypasses the socket wmem buffer size enforcement
while the manual call to skb_set_owner_w() maintains the socket
reference needed for the IPv6 output path.

This patch has orginally been posted by Eric Dumazet in a modified
form.

Signed-off-by: Thomas Graf <tgraf@suug.ch>
Cc: Eric Dumazet <eric.dumazet@gmail.com>
Cc: Hannes Frederic Sowa <hannes@stressinduktion.org>
Cc: Stephen Warren <swarren@wwwdotorg.org>
Cc: Fabio Estevam <festevam@gmail.com>
Tested-by: Fabio Estevam <fabio.estevam@freescale.com>
Tested-by: Stephen Warren <swarren@nvidia.com>
Acked-by: Hannes Frederic Sowa <hannes@stressinduktion.org>
Signed-off-by: David S. Miller <davem@davemloft.net>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Thomas Graf 2013-09-03 13:37:01 +02:00 committed by Greg Kroah-Hartman
parent 055c396300
commit cce0727ab0
1 changed files with 9 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
net/ipv6/ndisc.c
View file

@ -441,7 +441,6 @@ struct sk_buff *ndisc_build_skb(struct net_device *dev,
int hlen = LL_RESERVED_SPACE(dev); int hlen = LL_RESERVED_SPACE(dev);
int tlen = dev->needed_tailroom; int tlen = dev->needed_tailroom;
int len; int len;
int err;
u8 *opt; u8 *opt;
if (!dev->addr_len) if (!dev->addr_len)
@ -451,14 +450,12 @@ struct sk_buff *ndisc_build_skb(struct net_device *dev,
if (llinfo) if (llinfo)
len += ndisc_opt_addr_space(dev); len += ndisc_opt_addr_space(dev);
skb = sock_alloc_send_skb(sk, skb = alloc_skb((MAX_HEADER + sizeof(struct ipv6hdr) +
(MAX_HEADER + sizeof(struct ipv6hdr) + len + hlen + tlen), GFP_ATOMIC);
len + hlen + tlen),
1, &err);
if (!skb) { if (!skb) {
ND_PRINTK0(KERN_ERR ND_PRINTK0(KERN_ERR
"ICMPv6 ND: %s() failed to allocate an skb, err=%d.\n", "ICMPv6 ND: %s() failed to allocate an skb.\n",
__func__, err); __func__);
return NULL; return NULL;
} }
@ -486,6 +483,11 @@ struct sk_buff *ndisc_build_skb(struct net_device *dev,
csum_partial(hdr, csum_partial(hdr,
len, 0)); len, 0));
/* Manually assign socket ownership as we avoid calling
* sock_alloc_send_pskb() to bypass wmem buffer limits
*/
skb_set_owner_w(skb, sk);
return skb; return skb;
} }