Skip to contentSkip to conversation

virtio-net: remove useless disable on freeze

PATCH In review Michael S. Tsirkin 2 participants 2 messages May 30, 2012

Subsystems (4)
lore
Share & tools
lore

Michael S. Tsirkin

author maintainer
#0 lore raw

PATCH 1/1 virtio-net: remove useless disable on freeze

disable_cb is just an optimization: it
can not guarantee that there are no callbacks.
In particular it doesn't have any effect when
event index is on.

Instead, detach, napi disable and reset on freeze ensure we don't run concurrently with a callback.

Remove the useless calls so we get same behaviour
with and without event index.

---

Reposting a patch that seems to have fallen through cracks.

 drivers/net/virtio_net.c |    5 -----
 1 files changed, 0 insertions(+), 5 deletions(-)
drivers/net/virtio_net.c +0 -5
index 9ce6995..5214b1e 100644
@@ -1231,11 +1231,6 @@ static int virtnet_freeze(struct virtio_device *vdev)
 	vi->config_enable = false;
 	mutex_unlock(&vi->config_lock);
 
-	virtqueue_disable_cb(vi->rvq);
-	virtqueue_disable_cb(vi->svq);
-	if (virtio_has_feature(vi->vdev, VIRTIO_NET_F_CTRL_VQ))
-		virtqueue_disable_cb(vi->cvq);
-
 	netif_device_detach(vi->dev);
 	cancel_delayed_work_sync(&vi->refill);
 
Signature · 1 line
MST
maintainer
#1 lore raw

From: "Michael S. Tsirkin" <[email protected]>
Date: Wed, 30 May 2012 17:21:29 +0300

Quoted 8 lines

disable_cb is just an optimization: it
can not guarantee that there are no callbacks.
In particular it doesn't have any effect when
event index is on.

Instead, detach, napi disable and reset on freeze ensure we don't run concurrently with a callback.

Quoted 7 lines

Remove the useless calls so we get same behaviour
with and without event index.

---

Reposting a patch that seems to have fallen through cracks.

It seems to not make it to the lists and get properly picked up by patchwork.

In any event, I've applied this, thanks.