Merge tag 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mst/vhost

Pull virtio fixes from Michael Tsirkin:
 "Several fixes, add more reviewers to the list"

* tag 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mst/vhost:
  virtio: Honour 'may_reduce_num' in vring_create_virtqueue
  MAiNTAINERS: add Paolo, Stefan for virtio blk/scsi
  virtio_pci: fix a NULL pointer reference in vp_del_vqs

4 files changed, 22 insertions, 5 deletions

diff --git a/MAINTAINERS b/MAINTAINERS
index 27b0de13506c..3671fdea5010 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -16509,7 +16509,7 @@ F:	drivers/char/virtio_console.c
 F:      include/linux/virtio_console.h
 F:      include/uapi/linux/virtio_console.h
 
-VIRTIO CORE, NET AND BLOCK DRIVERS
+VIRTIO CORE AND NET DRIVERS
 M:      "Michael S. Tsirkin" <mst@redhat.com>
 M:      Jason Wang <jasowang@redhat.com>
 L:      virtualization@lists.linux-foundation.org
@@ -16524,6 +16524,19 @@ F:	include/uapi/linux/virtio_*.h
 F:      drivers/crypto/virtio/
 F:      mm/balloon_compaction.c
 
+VIRTIO BLOCK AND SCSI DRIVERS
+M:      "Michael S. Tsirkin" <mst@redhat.com>
+M:      Jason Wang <jasowang@redhat.com>
+R:      Paolo Bonzini <pbonzini@redhat.com>
+R:      Stefan Hajnoczi <stefanha@redhat.com>
+L:      virtualization@lists.linux-foundation.org
+S:      Maintained
+F:      drivers/block/virtio_blk.c
+F:      drivers/scsi/virtio_scsi.c
+F:      include/uapi/linux/virtio_blk.h
+F:      include/uapi/linux/virtio_scsi.h
+F:      drivers/vhost/scsi.c
+
 VIRTIO CRYPTO DRIVER
 M:      Gonglei <arei.gonglei@huawei.com>
 L:      virtualization@lists.linux-foundation.org
diff --git a/drivers/virtio/virtio_pci_common.c b/drivers/virtio/virtio_pci_common.c
index d0584c040c60..7a0398bb84f7 100644
--- a/drivers/virtio/virtio_pci_common.c
+++ b/drivers/virtio/virtio_pci_common.c
@@ -255,9 +255,11 @@ void vp_del_vqs(struct virtio_device *vdev)
         for (i = 0; i < vp_dev->msix_used_vectors; ++i)
                 free_irq(pci_irq_vector(vp_dev->pci_dev, i), vp_dev);
 
-        for (i = 0; i < vp_dev->msix_vectors; i++)
-                if (vp_dev->msix_affinity_masks[i])
-                        free_cpumask_var(vp_dev->msix_affinity_masks[i]);
+        if (vp_dev->msix_affinity_masks) {
+                for (i = 0; i < vp_dev->msix_vectors; i++)
+                        if (vp_dev->msix_affinity_masks[i])
+                                free_cpumask_var(vp_dev->msix_affinity_masks[i]);
+        }
 
         if (vp_dev->msix_enabled) {
                 /* Disable the vector used for configuration */
diff --git a/drivers/virtio/virtio_ring.c b/drivers/virtio/virtio_ring.c
index 18846afb39da..5df92c308286 100644
--- a/drivers/virtio/virtio_ring.c
+++ b/drivers/virtio/virtio_ring.c
@@ -882,6 +882,8 @@ static struct virtqueue *vring_create_virtqueue_split(
                                           GFP_KERNEL|__GFP_NOWARN|__GFP_ZERO);
                 if (queue)
                         break;
+                if (!may_reduce_num)
+                        return NULL;
         }
 
         if (!num)
diff --git a/include/linux/virtio_ring.h b/include/linux/virtio_ring.h
index fab02133a919..3dc70adfe5f5 100644
--- a/include/linux/virtio_ring.h
+++ b/include/linux/virtio_ring.h
@@ -63,7 +63,7 @@ struct virtqueue;
 /*
  * Creates a virtqueue and allocates the descriptor ring.  If
  * may_reduce_num is set, then this may allocate a smaller ring than
- * expected.  The caller should query virtqueue_get_ring_size to learn
+ * expected.  The caller should query virtqueue_get_vring_size to learn
  * the actual size of the ring.
  */
 struct virtqueue *vring_create_virtqueue(unsigned int index,