From: Michael S. Tsirkin Date: Fri, 2 Jul 2010 16:32:55 +0000 (+0000) Subject: virtio_net: do not reschedule rx refill forever X-Git-Tag: v2.6.34.2~203 X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=5b5b5f08f32661973c8880c3aaeb916c735a2e8c;p=karo-tx-linux.git virtio_net: do not reschedule rx refill forever commit 1788f49548860fa1c861ee3454d47b466c877e43 upstream. We currently fill all of RX ring, then add_buf returns ENOSPC, which gets mis-detected as an out of memory condition and causes us to reschedule the work, and so on forever. Fix this by oom = err == -ENOMEM; Signed-off-by: Michael S. Tsirkin Signed-off-by: Rusty Russell Signed-off-by: David S. Miller Signed-off-by: Greg Kroah-Hartman --- diff --git a/drivers/net/virtio_net.c b/drivers/net/virtio_net.c index b0577dd1a42d..6ec3096d2361 100644 --- a/drivers/net/virtio_net.c +++ b/drivers/net/virtio_net.c @@ -417,7 +417,7 @@ static int add_recvbuf_mergeable(struct virtnet_info *vi, gfp_t gfp) static bool try_fill_recv(struct virtnet_info *vi, gfp_t gfp) { int err; - bool oom = false; + bool oom; do { if (vi->mergeable_rx_bufs) @@ -427,10 +427,9 @@ static bool try_fill_recv(struct virtnet_info *vi, gfp_t gfp) else err = add_recvbuf_small(vi, gfp); - if (err < 0) { - oom = true; + oom = err == -ENOMEM; + if (err < 0) break; - } ++vi->num; } while (err > 0); if (unlikely(vi->num > vi->max))