diff options
| author |   Michael S. Tsirkin <mst@redhat.com> | 2010-07-02 16:32:55 +0000 |
|---|---|---|
| committer |   David S. Miller <davem@davemloft.net> | 2010-07-02 22:27:25 -0700 |
| commit | 1788f49548860fa1c861ee3454d47b466c877e43 (patch) | |
| tree | fa1b0633814188f942441eaa5a89dd504faae819 /drivers/net | |
| parent | s2io: resolve statistics issues (diff) | |
| download | linux-dev-1788f49548860fa1c861ee3454d47b466c877e43.tar.xz linux-dev-1788f49548860fa1c861ee3454d47b466c877e43.zip | |
virtio_net: do not reschedule rx refill forever
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 <mst@redhat.com>
Signed-off-by: Rusty Russell <rusty@rustcorp.com.au>
Cc: stable@kernel.org # .34.x
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net')
| -rw-r--r-- | drivers/net/virtio_net.c | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/drivers/net/virtio_net.c b/drivers/net/virtio_net.c index 1edb7a61983c..ee7571195b10 100644 --- a/drivers/net/virtio_net.c +++ b/drivers/net/virtio_net.c @@ -415,7 +415,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) @@ -425,10 +425,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)) |