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

Pull virtio updates from Rusty Russell:
 "Nothing really exciting: some groundwork for changing virtio endian,
  and some robustness fixes for broken virtio devices, plus minor
  tweaks"

* tag 'virtio-next-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/rusty/linux:
  virtio_scsi: verify if queue is broken after virtqueue_get_buf()
  x86, asmlinkage, lguest: Pass in globals into assembler statement
  virtio: mmio: fix signature checking for BE guests
  virtio_ring: adapt to notify() returning bool
  virtio_net: verify if queue is broken after virtqueue_get_buf()
  virtio_console: verify if queue is broken after virtqueue_get_buf()
  virtio_blk: verify if queue is broken after virtqueue_get_buf()
  virtio_ring: add new function virtqueue_is_broken()
  virtio_test: verify if virtqueue_kick() succeeded
  virtio_net: verify if virtqueue_kick() succeeded
  virtio_ring: let virtqueue_{kick()/notify()} return a bool
  virtio_ring: change host notification API
  virtio_config: remove virtio_config_val
  virtio: use size-based config accessors.
  virtio_config: introduce size-based accessors.
  virtio_ring: plug kmemleak false positive.
  virtio: pm: use CONFIG_PM_SLEEP instead of CONFIG_PM

1 files changed, 9 insertions, 10 deletions

diff --git a/drivers/scsi/virtio_scsi.c b/drivers/scsi/virtio_scsi.c
index 74b88efde6ad..c3173dced870 100644
--- a/drivers/scsi/virtio_scsi.c
+++ b/drivers/scsi/virtio_scsi.c
@@ -224,6 +224,9 @@ static void virtscsi_vq_done(struct virtio_scsi *vscsi,
                 virtqueue_disable_cb(vq);
                 while ((buf = virtqueue_get_buf(vq, &len)) != NULL)
                         fn(vscsi, buf);
+
+                if (unlikely(virtqueue_is_broken(vq)))
+                        break;
         } while (!virtqueue_enable_cb(vq));
         spin_unlock_irqrestore(&virtscsi_vq->vq_lock, flags);
 }
@@ -710,19 +713,15 @@ static struct scsi_host_template virtscsi_host_template_multi = {
 #define virtscsi_config_get(vdev, fld) \
         ({ \
                 typeof(((struct virtio_scsi_config *)0)->fld) __val; \
-                vdev->config->get(vdev, \
-                                  offsetof(struct virtio_scsi_config, fld), \
-                                  &__val, sizeof(__val)); \
+                virtio_cread(vdev, struct virtio_scsi_config, fld, &__val); \
                 __val; \
         })
 
 #define virtscsi_config_set(vdev, fld, val) \
-        (void)({ \
+        do { \
                 typeof(((struct virtio_scsi_config *)0)->fld) __val = (val); \
-                vdev->config->set(vdev, \
-                                  offsetof(struct virtio_scsi_config, fld), \
-                                  &__val, sizeof(__val)); \
-        })
+                virtio_cwrite(vdev, struct virtio_scsi_config, fld, &__val); \
+        } while(0)
 
 static void __virtscsi_set_affinity(struct virtio_scsi *vscsi, bool affinity)
 {
@@ -954,7 +953,7 @@ static void virtscsi_remove(struct virtio_device *vdev)
         scsi_host_put(shost);
 }
 
-#ifdef CONFIG_PM
+#ifdef CONFIG_PM_SLEEP
 static int virtscsi_freeze(struct virtio_device *vdev)
 {
         virtscsi_remove_vqs(vdev);
@@ -988,7 +987,7 @@ static struct virtio_driver virtio_scsi_driver = {
         .id_table = id_table,
         .probe = virtscsi_probe,
         .scan = virtscsi_scan,
-#ifdef CONFIG_PM
+#ifdef CONFIG_PM_SLEEP
         .freeze = virtscsi_freeze,
         .restore = virtscsi_restore,
 #endif