Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 0803e040 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'for_linus' of git://git.kernel.org/pub/scm/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
parents 80fac0f5 b226acab

MAINTAINERS

+13 −0
Original line number Diff line number Diff line
@@ -12419,6 +12419,19 @@ S: Maintained 
F:	drivers/media/v4l2-core/videobuf2-*

F:	include/media/videobuf2-*



VIRTIO AND VHOST VSOCK DRIVER

M:	Stefan Hajnoczi <stefanha@redhat.com>

L:	kvm@vger.kernel.org

L:	virtualization@lists.linux-foundation.org

L:	netdev@vger.kernel.org

S:	Maintained

F:	include/linux/virtio_vsock.h

F:	include/uapi/linux/virtio_vsock.h

F:	net/vmw_vsock/virtio_transport_common.c

F:	net/vmw_vsock/virtio_transport.c

F:	drivers/vhost/vsock.c

F:	drivers/vhost/vsock.h



VIRTUAL SERIO DEVICE DRIVER

M:	Stephen Chandler Paul <thatslyude@gmail.com>

S:	Maintained

drivers/Makefile

+1 −0
Original line number Diff line number Diff line
@@ -138,6 +138,7 @@ obj-$(CONFIG_OF) += of/ 
obj-$(CONFIG_SSB)		+= ssb/

obj-$(CONFIG_BCMA)		+= bcma/

obj-$(CONFIG_VHOST_RING)	+= vhost/

obj-$(CONFIG_VHOST)		+= vhost/

obj-$(CONFIG_VLYNQ)		+= vlynq/

obj-$(CONFIG_STAGING)		+= staging/

obj-y				+= platform/

drivers/misc/mic/Kconfig

+4 −0
Original line number Diff line number Diff line
@@ -146,3 +146,7 @@ config VOP 
	  More information about the Intel MIC family as well as the Linux

	  OS and tools for MIC to use with this driver are available from

	  <http://software.intel.com/en-us/mic-developer>.



if VOP

source "drivers/vhost/Kconfig.vringh"

endif

drivers/net/caif/Kconfig

+1 −1
Original line number Diff line number Diff line
@@ -52,5 +52,5 @@ config CAIF_VIRTIO 
	The caif driver for CAIF over Virtio.



if CAIF_VIRTIO

source "drivers/vhost/Kconfig"

source "drivers/vhost/Kconfig.vringh"

endif

drivers/vhost/Kconfig

+12 −6
Original line number Diff line number Diff line
@@ -2,7 +2,6 @@ config VHOST_NET 
	tristate "Host kernel accelerator for virtio net"

	depends on NET && EVENTFD && (TUN || !TUN) && (MACVTAP || !MACVTAP)

	select VHOST

	select VHOST_RING

	---help---

	  This kernel module can be loaded in host kernel to accelerate

	  guest networking with virtio_net. Not to be confused with virtio_net
@@ -15,17 +14,24 @@ config VHOST_SCSI 
	tristate "VHOST_SCSI TCM fabric driver"

	depends on TARGET_CORE && EVENTFD && m

	select VHOST

	select VHOST_RING

	default n

	---help---

	Say M here to enable the vhost_scsi TCM fabric module

	for use with virtio-scsi guests



config VHOST_RING

	tristate

config VHOST_VSOCK

	tristate "vhost virtio-vsock driver"

	depends on VSOCKETS && EVENTFD

	select VIRTIO_VSOCKETS_COMMON

	select VHOST

	default n

	---help---

	  This option is selected by any driver which needs to access

	  the host side of a virtio ring.

	This kernel module can be loaded in the host kernel to provide AF_VSOCK

	sockets for communicating with guests.  The guests must have the

	virtio_transport.ko driver loaded to use the virtio-vsock device.



	To compile this driver as a module, choose M here: the module will be called

	vhost_vsock.



config VHOST

	tristate