Commit 6b8350a4 authored by David S. Miller's avatar David S. Miller
Browse files

Merge branch 'vsock-add-local-transport-support' 

Stefano Garzarella says:

====================
vsock: add local transport support

v2:
 - style fixes [Dave]
 - removed RCU sync and changed 'the_vsock_loopback' in a global
   static variable [Stefan]
 - use G2H transport when local transport is not loaded and remote cid
   is VMADDR_CID_LOCAL [Stefan]
 - rebased on net-next

v1: https://patchwork.kernel.org/cover/11251735/



This series introduces a new transport (vsock_loopback) to handle
local communication.
This could be useful to test vsock core itself and to allow developers
to test their applications without launching a VM.

Before this series, vmci and virtio transports allowed this behavior,
but only in the guest.
We are moving the loopback handling in a new transport, because it
might be useful to provide this feature also in the host or when
no H2G/G2H transports (hyperv, virtio, vmci) are loaded.

The user can use the loopback with the new VMADDR_CID_LOCAL (that
replaces VMADDR_CID_RESERVED) in any condition.
Otherwise, if the G2H transport is loaded, it can also use the guest
local CID as previously supported by vmci and virtio transports.
If G2H transport is not loaded, the user can also use VMADDR_CID_HOST
for local communication.

Patch 1 is a cleanup to build virtio_transport_common without virtio
Patch 2 adds the new VMADDR_CID_LOCAL, replacing VMADDR_CID_RESERVED
Patch 3 adds a new feature flag to register a loopback transport
Patch 4 adds the new vsock_loopback transport based on the loopback
        implementation of virtio_transport
Patch 5 implements the logic to use the local transport for loopback
        communication
Patch 6 removes the loopback from virtio_transport
====================

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents bea0f4a5 bf5432b1

MAINTAINERS

+1 −0
Original line number Diff line number Diff line
@@ -17480,6 +17480,7 @@ F: net/vmw_vsock/diag.c 
F:	net/vmw_vsock/af_vsock_tap.c

F:	net/vmw_vsock/virtio_transport_common.c

F:	net/vmw_vsock/virtio_transport.c

F:	net/vmw_vsock/vsock_loopback.c

F:	drivers/net/vsockmon.c

F:	drivers/vhost/vsock.c

F:	tools/testing/vsock/

include/net/af_vsock.h

+2 −0
Original line number Diff line number Diff line
@@ -98,6 +98,8 @@ struct vsock_transport_send_notify_data { 
#define VSOCK_TRANSPORT_F_G2H		0x00000002

/* Transport provides DGRAM communication */

#define VSOCK_TRANSPORT_F_DGRAM		0x00000004

/* Transport provides local (loopback) communication */

#define VSOCK_TRANSPORT_F_LOCAL		0x00000008



struct vsock_transport {

	struct module *module;

include/uapi/linux/vm_sockets.h

+5 −3
Original line number Diff line number Diff line
@@ -99,11 +99,13 @@ 


#define VMADDR_CID_HYPERVISOR 0



/* This CID is specific to VMCI and can be considered reserved (even VMCI

 * doesn't use it anymore, it's a legacy value from an older release).

/* Use this as the destination CID in an address when referring to the

 * local communication (loopback).

 * (This was VMADDR_CID_RESERVED, but even VMCI doesn't use it anymore,

 * it was a legacy value from an older release).

 */



#define VMADDR_CID_RESERVED 1

#define VMADDR_CID_LOCAL 1



/* Use this as the destination CID in an address when referring to the host

 * (any process other than the hypervisor).  VMCI relies on it being 2, but

net/vmw_vsock/Kconfig

+12 −0
Original line number Diff line number Diff line
@@ -26,6 +26,18 @@ config VSOCKETS_DIAG 


	  Enable this module so userspace applications can query open sockets.



config VSOCKETS_LOOPBACK

	tristate "Virtual Sockets loopback transport"

	depends on VSOCKETS

	default y

	select VIRTIO_VSOCKETS_COMMON

	help

	  This module implements a loopback transport for Virtual Sockets,

	  using vmw_vsock_virtio_transport_common.



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

	  will be called vsock_loopback. If unsure, say N.



config VMWARE_VMCI_VSOCKETS

	tristate "VMware VMCI transport for Virtual Sockets"

	depends on VSOCKETS && VMWARE_VMCI

net/vmw_vsock/Makefile

+1 −0
Original line number Diff line number Diff line
@@ -5,6 +5,7 @@ obj-$(CONFIG_VMWARE_VMCI_VSOCKETS) += vmw_vsock_vmci_transport.o 
obj-$(CONFIG_VIRTIO_VSOCKETS) += vmw_vsock_virtio_transport.o

obj-$(CONFIG_VIRTIO_VSOCKETS_COMMON) += vmw_vsock_virtio_transport_common.o

obj-$(CONFIG_HYPERV_VSOCKETS) += hv_sock.o

obj-$(CONFIG_VSOCKETS_LOOPBACK) += vsock_loopback.o



vsock-y += af_vsock.o af_vsock_tap.o vsock_addr.o

CRA Git | Maintained and supported by SUSTech CRA and CCSE