Commit 35ed159b authored Oct 15, 2013 by Jason Wang Committed by David S. Miller Oct 17, 2013

virtio-net: refill only when device is up during setting queues



We used to schedule the refill work unconditionally after changing the
number of queues. This may lead an issue if the device is not
up. Since we only try to cancel the work in ndo_stop(), this may cause
the refill work still work after removing the device. Fix this by only
schedule the work when device is up.

The bug were introduce by commit 9b9cd802.
(virtio-net: fix the race between channels setting and refill)

Cc: Rusty Russell <rusty@rustcorp.com.au>
Cc: Michael S. Tsirkin <mst@redhat.com>
Signed-off-by: Jason Wang <jasowang@redhat.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

parent 3ab098df

drivers/net/virtio_net.c

+5 −1

Original line number	Diff line number	Diff line
		@@ -938,6 +938,8 @@ static int virtnet_set_queues(struct virtnet_info *vi, u16 queue_pairs)
		return -EINVAL;
		} else {
		vi->curr_queue_pairs = queue_pairs;
		/* virtnet_open() will refill when device is going to up. */
		if (dev->flags & IFF_UP)
		schedule_delayed_work(&vi->refill, 0);
		}

		@@ -1741,7 +1743,9 @@ static int virtnet_restore(struct virtio_device *vdev)
		vi->config_enable = true;
		mutex_unlock(&vi->config_lock);

		rtnl_lock();
		virtnet_set_queues(vi, vi->curr_queue_pairs);
		rtnl_unlock();

		return 0;
		}

Admin message