Commit 3464645a authored Jan 04, 2012 by Mike Waychison Committed by David S. Miller Jan 05, 2012

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>

parent ea81875a

drivers/net/virtio_net.c

+2 −1

Original line number	Diff line number	Diff line
		@@ -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;

Admin message