From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Sat, 6 Aug 2016 13:20:13 +0000 (-0400)
Subject: Merge tag 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mst/vhost
X-Git-Tag: v4.8-rc1~10
X-Git-Url: http://git.cascardo.info/?p=cascardo%2Flinux.git;a=commitdiff_plain;h=0803e04011c2e107b9611660301edde94d7010cc

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

Pull virtio/vhost updates from Michael Tsirkin:

 - new vsock device support in host and guest

 - platform IOMMU support in host and guest, including compatibility
   quirks for legacy systems.

 - misc fixes and cleanups.

* tag 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mst/vhost:
  VSOCK: Use kvfree()
  vhost: split out vringh Kconfig
  vhost: detect 32 bit integer wrap around
  vhost: new device IOTLB API
  vhost: drop vringh dependency
  vhost: convert pre sorted vhost memory array to interval tree
  vhost: introduce vhost memory accessors
  VSOCK: Add Makefile and Kconfig
  VSOCK: Introduce vhost_vsock.ko
  VSOCK: Introduce virtio_transport.ko
  VSOCK: Introduce virtio_vsock_common.ko
  VSOCK: defer sock removal to transports
  VSOCK: transport-specific vsock_transport functions
  vhost: drop vringh dependency
  vop: pull in vhost Kconfig
  virtio: new feature to detect IOMMU device quirk
  balloon: check the number of available pages in leak balloon
  vhost: lockless enqueuing
  vhost: simplify work flushing
---

0803e04011c2e107b9611660301edde94d7010cc
diff --cc drivers/vhost/net.c
index e032ca397371,0965f869dc57..5dc128a8da83
--- a/drivers/vhost/net.c
+++ b/drivers/vhost/net.c
@@@ -652,8 -616,11 +656,12 @@@ static void handle_rx(struct vhost_net 
  	sock = vq->private_data;
  	if (!sock)
  		goto out;
+ 
+ 	if (!vq_iotlb_prefetch(vq))
+ 		goto out;
+ 
  	vhost_disable_notify(&net->dev, vq);
 +	vhost_net_disable_vq(net, vq);
  
  	vhost_hlen = nvq->vhost_hlen;
  	sock_hlen = nvq->sock_hlen;
diff --cc include/uapi/linux/Kbuild
index c44747c0796a,3cf0116d9c2b..185f8ea2702f
--- a/include/uapi/linux/Kbuild
+++ b/include/uapi/linux/Kbuild
@@@ -454,9 -453,9 +454,10 @@@ header-y += virtio_ring.
  header-y += virtio_rng.h
  header-y += virtio_scsi.h
  header-y += virtio_types.h
+ header-y += virtio_vsock.h
  header-y += vm_sockets.h
  header-y += vt.h
 +header-y += vtpm_proxy.h
  header-y += wait.h
  header-y += wanrouter.h
  header-y += watchdog.h