Merge tag 'virtio-next-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/rusty/linux

Pull virtio updates from Rusty Russell:
 "One cc: stable commit, the rest are a series of minor cleanups which
  have been sitting in MST's tree during my vacation.  I changed a
  function name and made one trivial change, then they spent two days in
  linux-next"

* tag 'virtio-next-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/rusty/linux: (25 commits)
  virtio-rng: refactor probe error handling
  virtio_scsi: drop scan callback
  virtio_balloon: enable VQs early on restore
  virtio_scsi: fix race on device removal
  virito_scsi: use freezable WQ for events
  virtio_net: enable VQs early on restore
  virtio_console: enable VQs early on restore
  virtio_scsi: enable VQs early on restore
  virtio_blk: enable VQs early on restore
  virtio_scsi: move kick event out from virtscsi_init
  virtio_net: fix use after free on allocation failure
  9p/trans_virtio: enable VQs early
  virtio_console: enable VQs early
  virtio_blk: enable VQs early
  virtio_net: enable VQs early
  virtio: add API to enable VQs early
  virtio_net: minor cleanup
  virtio-net: drop config_mutex
  virtio_net: drop config_enable
  virtio-blk: drop config_mutex
  ...

1 files changed, 11 insertions, 29 deletions

diff --git a/drivers/block/virtio_blk.c b/drivers/block/virtio_blk.c
index 0a581400de0f..930fee886917 100644
--- a/drivers/block/virtio_blk.c
+++ b/drivers/block/virtio_blk.c
@@ -41,12 +41,6 @@ struct virtio_blk
         /* Process context for config space updates */
         struct work_struct config_work;
 
-        /* Lock for config space updates */
-        struct mutex config_lock;
-
-        /* enable config space updates */
-        bool config_enable;
-
         /* What host tells us, plus 2 for header & tailer. */
         unsigned int sg_elems;
 
@@ -347,10 +341,6 @@ static void virtblk_config_changed_work(struct work_struct *work)
         char *envp[] = { "RESIZE=1", NULL };
         u64 capacity, size;
 
-        mutex_lock(&vblk->config_lock);
-        if (!vblk->config_enable)
-                goto done;
-
         /* Host must always specify the capacity. */
         virtio_cread(vdev, struct virtio_blk_config, capacity, &capacity);
 
@@ -374,8 +364,6 @@ static void virtblk_config_changed_work(struct work_struct *work)
         set_capacity(vblk->disk, capacity);
         revalidate_disk(vblk->disk);
         kobject_uevent_env(&disk_to_dev(vblk->disk)->kobj, KOBJ_CHANGE, envp);
-done:
-        mutex_unlock(&vblk->config_lock);
 }
 
 static void virtblk_config_changed(struct virtio_device *vdev)
@@ -606,10 +594,8 @@ static int virtblk_probe(struct virtio_device *vdev)
 
         vblk->vdev = vdev;
         vblk->sg_elems = sg_elems;
-        mutex_init(&vblk->config_lock);
 
         INIT_WORK(&vblk->config_work, virtblk_config_changed_work);
-        vblk->config_enable = true;
 
         err = init_vq(vblk);
         if (err)
@@ -733,6 +719,8 @@ static int virtblk_probe(struct virtio_device *vdev)
         if (!err && opt_io_size)
                 blk_queue_io_opt(q, blk_size * opt_io_size);
 
+        virtio_device_ready(vdev);
+
         add_disk(vblk->disk);
         err = device_create_file(disk_to_dev(vblk->disk), &dev_attr_serial);
         if (err)
@@ -771,10 +759,8 @@ static void virtblk_remove(struct virtio_device *vdev)
         int index = vblk->index;
         int refc;
 
-        /* Prevent config work handler from accessing the device. */
-        mutex_lock(&vblk->config_lock);
-        vblk->config_enable = false;
-        mutex_unlock(&vblk->config_lock);
+        /* Make sure no work handler is accessing the device. */
+        flush_work(&vblk->config_work);
 
         del_gendisk(vblk->disk);
         blk_cleanup_queue(vblk->disk->queue);
@@ -784,8 +770,6 @@ static void virtblk_remove(struct virtio_device *vdev)
         /* Stop all the virtqueues. */
         vdev->config->reset(vdev);
 
-        flush_work(&vblk->config_work);
-
         refc = atomic_read(&disk_to_dev(vblk->disk)->kobj.kref.refcount);
         put_disk(vblk->disk);
         vdev->config->del_vqs(vdev);
@@ -805,11 +789,7 @@ static int virtblk_freeze(struct virtio_device *vdev)
         /* Ensure we don't receive any more interrupts */
         vdev->config->reset(vdev);
 
-        /* Prevent config work handler from accessing the device. */
-        mutex_lock(&vblk->config_lock);
-        vblk->config_enable = false;
-        mutex_unlock(&vblk->config_lock);
-
+        /* Make sure no work handler is accessing the device. */
         flush_work(&vblk->config_work);
 
         blk_mq_stop_hw_queues(vblk->disk->queue);
@@ -823,12 +803,14 @@ static int virtblk_restore(struct virtio_device *vdev)
         struct virtio_blk *vblk = vdev->priv;
         int ret;
 
-        vblk->config_enable = true;
         ret = init_vq(vdev->priv);
-        if (!ret)
-                blk_mq_start_stopped_hw_queues(vblk->disk->queue, true);
+        if (ret)
+                return ret;
 
-        return ret;
+        virtio_device_ready(vdev);
+
+        blk_mq_start_stopped_hw_queues(vblk->disk->queue, true);
+        return 0;
 }
 #endif