diff options
| author | Mike Waychison <mikew@google.com> | 2012-01-04 12:52:32 +0000 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2012-01-05 13:20:40 -0500 |
| commit | 3464645a10f80ce39bc90c5494a3e92387947818 (patch) | |
| tree | dc47cf6f3965f09d65fc9bd5e628cebc9d6b3eec | |
| parent | ea81875ae07aeaca285afd2771425f771294c93c (diff) | |
| download | linux-3.10-3464645a10f80ce39bc90c5494a3e92387947818.tar.gz linux-3.10-3464645a10f80ce39bc90c5494a3e92387947818.tar.bz2 linux-3.10-3464645a10f80ce39bc90c5494a3e92387947818.zip | |
virtio_net: Pass gfp flags when allocating rx buffers.
Currently, the refill path for RX buffers will always allocate the
buffers as GFP_ATOMIC, even if we are in process context. This will
fail to apply memory pressure as the worker thread will not contribute
to the freeing of memory.
Fix this by changing add_recvbuf_small to use the gfp variant allocator,
__netdev_alloc_skb_ip_align().
Signed-off-by: Mike Waychison <mikew@google.com>
Acked-by: Rusty Russell <rusty@rustcorp.com.au>
Signed-off-by: David S. Miller <davem@davemloft.net>
| -rw-r--r-- | drivers/net/virtio_net.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/net/virtio_net.c b/drivers/net/virtio_net.c index 2055386eda5..76fe14efb2b 100644 --- a/drivers/net/virtio_net.c +++ b/drivers/net/virtio_net.c @@ -156,6 +156,7 @@ static void set_skb_frag(struct sk_buff *skb, struct page *page, *len -= size; } +/* Called from bottom half context */ static struct sk_buff *page_to_skb(struct virtnet_info *vi, struct page *page, unsigned int len) { @@ -358,7 +359,7 @@ static int add_recvbuf_small(struct virtnet_info *vi, gfp_t gfp) struct skb_vnet_hdr *hdr; int err; - skb = netdev_alloc_skb_ip_align(vi->dev, MAX_PACKET_LEN); + skb = __netdev_alloc_skb_ip_align(vi->dev, MAX_PACKET_LEN, gfp); if (unlikely(!skb)) return -ENOMEM; |