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

Pull virtio fixes from Michael S Tsirkin:
 "virtio 1.0 related fixes

  Most importantly, this fixes using virtio_pci as a module.

  Further, the big virtio 1.0 conversion missed a couple of places.
  This fixes them up.

  This isn't 100% sparse-clean yet because on many architectures
  get_user triggers sparse warnings when used with __bitwise tag (when
  same tag is on both pointer and value read).

  I posted a patchset to fix it up by adding __force on all arches that
  don't already have it (many do), when that's merged these warnings
  will go away"

* tag 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mst/vhost:
  virtio_pci: restore module attributes
  mic/host: fix up virtio 1.0 APIs
  vringh: update for virtio 1.0 APIs
  vringh: 64 bit features
  tools/virtio: add virtio 1.0 in vringh_test
  tools/virtio: add virtio 1.0 in virtio_test
  tools/virtio: enable -Werror
  tools/virtio: 64 bit features
  tools/virtio: fix vringh test
  tools/virtio: more stubs
  virtio: core support for config generation
  virtio_pci: add VIRTIO_PCI_NO_LEGACY
  virtio_pci: move probe to common file
  virtio_pci_common.h: drop VIRTIO_PCI_NO_LEGACY
  virtio_config: fix virtio_cread_bytes
  virtio: set VIRTIO_CONFIG_S_FEATURES_OK on restore

16 files changed, 324 insertions, 109 deletions

diff --git a/drivers/misc/mic/host/mic_debugfs.c b/drivers/misc/mic/host/mic_debugfs.c
index 028ba5d6fd1c..687e9aacf3bb 100644
--- a/drivers/misc/mic/host/mic_debugfs.c
+++ b/drivers/misc/mic/host/mic_debugfs.c
@@ -326,21 +326,27 @@ static int mic_vdev_info_show(struct seq_file *s, void *unused)
                         }
                         avail = vrh->vring.avail;
                         seq_printf(s, "avail flags 0x%x idx %d\n",
-                                   avail->flags, avail->idx & (num - 1));
+                                   vringh16_to_cpu(vrh, avail->flags),
+                                   vringh16_to_cpu(vrh, avail->idx) & (num - 1));
                         seq_printf(s, "avail flags 0x%x idx %d\n",
-                                   avail->flags, avail->idx);
+                                   vringh16_to_cpu(vrh, avail->flags),
+                                   vringh16_to_cpu(vrh, avail->idx));
                         for (j = 0; j < num; j++)
                                 seq_printf(s, "avail ring[%d] %d\n",
                                            j, avail->ring[j]);
                         used = vrh->vring.used;
                         seq_printf(s, "used flags 0x%x idx %d\n",
-                                   used->flags, used->idx & (num - 1));
+                                   vringh16_to_cpu(vrh, used->flags),
+                                   vringh16_to_cpu(vrh, used->idx) & (num - 1));
                         seq_printf(s, "used flags 0x%x idx %d\n",
-                                   used->flags, used->idx);
+                                   vringh16_to_cpu(vrh, used->flags),
+                                   vringh16_to_cpu(vrh, used->idx));
                         for (j = 0; j < num; j++)
                                 seq_printf(s, "used ring[%d] id %d len %d\n",
-                                           j, used->ring[j].id,
-                                           used->ring[j].len);
+                                           j, vringh32_to_cpu(vrh,
+                                                              used->ring[j].id),
+                                           vringh32_to_cpu(vrh,
+                                                           used->ring[j].len));
                 }
         }
         mutex_unlock(&mdev->mic_mutex);
diff --git a/drivers/vhost/vringh.c b/drivers/vhost/vringh.c
index 5174ebac288d..3bb02c60a2f5 100644
--- a/drivers/vhost/vringh.c
+++ b/drivers/vhost/vringh.c
@@ -11,6 +11,7 @@
 #include <linux/uaccess.h>
 #include <linux/slab.h>
 #include <linux/export.h>
+#include <uapi/linux/virtio_config.h>
 
 static __printf(1,2) __cold void vringh_bad(const char *fmt, ...)
 {
@@ -28,13 +29,14 @@ static __printf(1,2) __cold void vringh_bad(const char *fmt, ...)
 
 /* Returns vring->num if empty, -ve on error. */
 static inline int __vringh_get_head(const struct vringh *vrh,
-                                    int (*getu16)(u16 *val, const u16 *p),
+                                    int (*getu16)(const struct vringh *vrh,
+                                                  u16 *val, const __virtio16 *p),
                                     u16 *last_avail_idx)
 {
         u16 avail_idx, i, head;
         int err;
 
-        err = getu16(&avail_idx, &vrh->vring.avail->idx);
+        err = getu16(vrh, &avail_idx, &vrh->vring.avail->idx);
         if (err) {
                 vringh_bad("Failed to access avail idx at %p",
                            &vrh->vring.avail->idx);
@@ -49,7 +51,7 @@ static inline int __vringh_get_head(const struct vringh *vrh,
 
         i = *last_avail_idx & (vrh->vring.num - 1);
 
-        err = getu16(&head, &vrh->vring.avail->ring[i]);
+        err = getu16(vrh, &head, &vrh->vring.avail->ring[i]);
         if (err) {
                 vringh_bad("Failed to read head: idx %d address %p",
                            *last_avail_idx, &vrh->vring.avail->ring[i]);
@@ -144,28 +146,32 @@ static inline bool no_range_check(struct vringh *vrh, u64 addr, size_t *len,
 }
 
 /* No reason for this code to be inline. */
-static int move_to_indirect(int *up_next, u16 *i, void *addr,
+static int move_to_indirect(const struct vringh *vrh,
+                            int *up_next, u16 *i, void *addr,
                             const struct vring_desc *desc,
                             struct vring_desc **descs, int *desc_max)
 {
+        u32 len;
+
         /* Indirect tables can't have indirect. */
         if (*up_next != -1) {
                 vringh_bad("Multilevel indirect %u->%u", *up_next, *i);
                 return -EINVAL;
         }
 
-        if (unlikely(desc->len % sizeof(struct vring_desc))) {
+        len = vringh32_to_cpu(vrh, desc->len);
+        if (unlikely(len % sizeof(struct vring_desc))) {
                 vringh_bad("Strange indirect len %u", desc->len);
                 return -EINVAL;
         }
 
         /* We will check this when we follow it! */
-        if (desc->flags & VRING_DESC_F_NEXT)
-                *up_next = desc->next;
+        if (desc->flags & cpu_to_vringh16(vrh, VRING_DESC_F_NEXT))
+                *up_next = vringh16_to_cpu(vrh, desc->next);
         else
                 *up_next = -2;
         *descs = addr;
-        *desc_max = desc->len / sizeof(struct vring_desc);
+        *desc_max = len / sizeof(struct vring_desc);
 
         /* Now, start at the first indirect. */
         *i = 0;
@@ -287,22 +293,25 @@ __vringh_iov(struct vringh *vrh, u16 i,
                 if (unlikely(err))
                         goto fail;
 
-                if (unlikely(desc.flags & VRING_DESC_F_INDIRECT)) {
+                if (unlikely(desc.flags &
+                             cpu_to_vringh16(vrh, VRING_DESC_F_INDIRECT))) {
+                        u64 a = vringh64_to_cpu(vrh, desc.addr);
+
                         /* Make sure it's OK, and get offset. */
-                        len = desc.len;
-                        if (!rcheck(vrh, desc.addr, &len, &range, getrange)) {
+                        len = vringh32_to_cpu(vrh, desc.len);
+                        if (!rcheck(vrh, a, &len, &range, getrange)) {
                                 err = -EINVAL;
                                 goto fail;
                         }
 
-                        if (unlikely(len != desc.len)) {
+                        if (unlikely(len != vringh32_to_cpu(vrh, desc.len))) {
                                 slow = true;