From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Thu, 2 Mar 2017 21:53:13 +0000 (-0800)
Subject: Merge tag 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mst/vhost
X-Git-Tag: v5.15~11753
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=54d7989f476ca57fc3c5cc71524c480ccb74c481;p=platform%2Fkernel%2Flinux-starfive.git

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

Pull vhost updates from Michael Tsirkin:
 "virtio, vhost: optimizations, fixes

  Looks like a quiet cycle for vhost/virtio, just a couple of minor
  tweaks. Most notable is automatic interrupt affinity for blk and scsi.
  Hopefully other devices are not far behind"

* tag 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mst/vhost:
  virtio-console: avoid DMA from stack
  vhost: introduce O(1) vq metadata cache
  virtio_scsi: use virtio IRQ affinity
  virtio_blk: use virtio IRQ affinity
  blk-mq: provide a default queue mapping for virtio device
  virtio: provide a method to get the IRQ affinity mask for a virtqueue
  virtio: allow drivers to request IRQ affinity when creating VQs
  virtio_pci: simplify MSI-X setup
  virtio_pci: don't duplicate the msix_enable flag in struct pci_dev
  virtio_pci: use shared interrupts for virtqueues
  virtio_pci: remove struct virtio_pci_vq_info
  vhost: try avoiding avail index access when getting descriptor
  virtio_mmio: expose header to userspace
---

54d7989f476ca57fc3c5cc71524c480ccb74c481
diff --cc block/Makefile
index 2ad7c30,6069194..081bb68
--- a/block/Makefile
+++ b/block/Makefile
@@@ -25,7 -23,6 +25,8 @@@ obj-$(CONFIG_BLOCK_COMPAT)	+= compat_io
  obj-$(CONFIG_BLK_CMDLINE_PARSER)	+= cmdline-parser.o
  obj-$(CONFIG_BLK_DEV_INTEGRITY) += bio-integrity.o blk-integrity.o t10-pi.o
  obj-$(CONFIG_BLK_MQ_PCI)	+= blk-mq-pci.o
+ obj-$(CONFIG_BLK_MQ_VIRTIO)	+= blk-mq-virtio.o
  obj-$(CONFIG_BLK_DEV_ZONED)	+= blk-zoned.o
  obj-$(CONFIG_BLK_WBT)		+= blk-wbt.o
 +obj-$(CONFIG_BLK_DEBUG_FS)	+= blk-mq-debugfs.o
 +obj-$(CONFIG_BLK_SED_OPAL)	+= sed-opal.o
diff --cc drivers/gpu/drm/virtio/virtgpu_kms.c
index 30f989a,e975fa5..4918668
--- a/drivers/gpu/drm/virtio/virtgpu_kms.c
+++ b/drivers/gpu/drm/virtio/virtgpu_kms.c
@@@ -170,13 -169,10 +170,13 @@@ int virtio_gpu_driver_load(struct drm_d
  	if (virtio_has_feature(vgdev->vdev, VIRTIO_GPU_F_VIRGL))
  		vgdev->has_virgl_3d = true;
  	DRM_INFO("virgl 3d acceleration %s\n",
 -		 vgdev->has_virgl_3d ? "enabled" : "not available");
 +		 vgdev->has_virgl_3d ? "enabled" : "not supported by host");
 +#else
 +	DRM_INFO("virgl 3d acceleration not supported by guest\n");
 +#endif
  
  	ret = vgdev->vdev->config->find_vqs(vgdev->vdev, 2, vqs,
- 					    callbacks, names);
+ 					    callbacks, names, NULL);
  	if (ret) {
  		DRM_ERROR("failed to find virt queues\n");
  		goto err_vqs;
diff --cc drivers/vhost/vhost.c
index 4269e62,998bed5..9469364
--- a/drivers/vhost/vhost.c
+++ b/drivers/vhost/vhost.c
@@@ -2239,15 -2330,11 +2330,15 @@@ bool vhost_vq_avail_empty(struct vhost_
  	__virtio16 avail_idx;
  	int r;
  
 +	if (vq->avail_idx != vq->last_avail_idx)
 +		return false;
 +
- 	r = vhost_get_user(vq, avail_idx, &vq->avail->idx);
+ 	r = vhost_get_avail(vq, avail_idx, &vq->avail->idx);
 -	if (r)
 +	if (unlikely(r))
  		return false;
 +	vq->avail_idx = vhost16_to_cpu(vq, avail_idx);
  
 -	return vhost16_to_cpu(vq, avail_idx) == vq->avail_idx;
 +	return vq->avail_idx == vq->last_avail_idx;
  }
  EXPORT_SYMBOL_GPL(vhost_vq_avail_empty);