diff mbox series

[09/28] vhost: propagate vhost transport operations

Message ID	1560957293-17294-10-git-send-email-ndragazis@arrikto.com (mailing list archive)
State	RFC, archived
Delegated to:	Maxime Coquelin
Headers	From: Nikos Dragazis <ndragazis@arrikto.com> To: dev@dpdk.org Cc: Maxime Coquelin <maxime.coquelin@redhat.com>, Tiwei Bie <tiwei.bie@intel.com>, Zhihong Wang <zhihong.wang@intel.com>, Stefan Hajnoczi <stefanha@redhat.com>, Wei Wang <wei.w.wang@intel.com>, Stojaczyk Dariusz <dariusz.stojaczyk@intel.com>, Vangelis Koukis <vkoukis@arrikto.com> Date: Wed, 19 Jun 2019 18:14:34 +0300 Message-Id: <1560957293-17294-10-git-send-email-ndragazis@arrikto.com> In-Reply-To: <1560957293-17294-1-git-send-email-ndragazis@arrikto.com> References: <1560957293-17294-1-git-send-email-ndragazis@arrikto.com> Subject: [dpdk-dev] [PATCH 09/28] vhost: propagate vhost transport operations Precedence: list Errors-To: dev-bounces@dpdk.org Sender: "dev" <dev-bounces@dpdk.org>
Series	vhost: add virtio-vhost-user transport \| [00/28] vhost: add virtio-vhost-user transport [01/28] vhost: introduce vhost transport operations structure [02/28] vhost: move socket management code [03/28] vhost: allocate per-socket transport state [04/28] vhost: move socket fd and un sockaddr [05/28] vhost: move start server/client calls [06/28] vhost: move vhost-user connection [07/28] vhost: move vhost-user reconnection [08/28] vhost: move vhost-user fdset [09/28] vhost: propagate vhost transport operations [10/28] vhost: use a single structure for the device state [11/28] vhost: extract socket I/O into transport [12/28] vhost: move slave request fd and lock [13/28] vhost: move mmap/munmap [14/28] vhost: move setup of the log memory region [15/28] vhost: remove main fd parameter from msg handlers [16/28] vhost: move postcopy live migration code [17/28] vhost: support registering additional vhost-user transports [18/28] drivers/virtio_vhost_user: add virtio PCI framework [19/28] vhost: add index field in vhost virtqueues [20/28] drivers: add virtio-vhost-user transport [21/28] drivers/virtio_vhost_user: use additional device resources [22/28] vhost: add flag for choosing vhost-user transport [23/28] net/vhost: add virtio-vhost-user support [24/28] examples/vhost_scsi: add --socket-file argument [25/28] examples/vhost_scsi: add virtio-vhost-user support [26/28] mk: link apps with virtio-vhost-user driver [27/28] config: add option for the virtio-vhost-user transport [28/28] usertools: add virtio-vhost-user devices to dpdk-devbind.py

Checks

Context	Check	Description
ci/checkpatch	success	coding style OK
ci/Intel-compilation	fail	Compilation issues

Commit Message

Nikos Dragazis June 19, 2019, 3:14 p.m. UTC

  This patch propagates struct vhost_user_socket's vhost_transport_ops
into the newly created vhost device.

This patch completes the initial refactoring of socket.c, with the
AF_UNIX-specific code now in trans_af_unix.c and the librte_vhost API
entrypoints in socket.c.

Now it is time to turn towards vhost_user.c and its mixture of
vhost-user protocol processing and socket I/O.  The socket I/O will be
moved into trans_af_unix.c so that other transports can be added that
don't use file descriptors.

Signed-off-by: Nikos Dragazis <ndragazis@arrikto.com>
Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
---
 lib/librte_vhost/trans_af_unix.c | 2 +-
 lib/librte_vhost/vhost.c         | 4 ++--
 lib/librte_vhost/vhost.h         | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff mbox series

Patch

diff --git a/lib/librte_vhost/trans_af_unix.c b/lib/librte_vhost/trans_af_unix.c
index e8a4ef2..865d862 100644
--- a/lib/librte_vhost/trans_af_unix.c
+++ b/lib/librte_vhost/trans_af_unix.c
@@ -167,7 +167,7 @@  vhost_user_add_connection(int fd, struct vhost_user_socket *vsocket)
 		return;
 	}
 
-	vid = vhost_new_device();
+	vid = vhost_new_device(vsocket->trans_ops);
 	if (vid == -1) {
 		goto err;
 	}
diff --git a/lib/librte_vhost/vhost.c b/lib/librte_vhost/vhost.c
index a36bc01..a72edf3 100644
--- a/lib/librte_vhost/vhost.c
+++ b/lib/librte_vhost/vhost.c
@@ -480,7 +480,7 @@  reset_device(struct virtio_net *dev)
  * there is a new virtio device being attached).
  */
 int
-vhost_new_device(void)
+vhost_new_device(const struct vhost_transport_ops *trans_ops)
 {
 	struct virtio_net *dev;
 	int i;
@@ -507,7 +507,7 @@  vhost_new_device(void)
 	dev->vid = i;
 	dev->flags = VIRTIO_DEV_BUILTIN_VIRTIO_NET;
 	dev->slave_req_fd = -1;
-	dev->trans_ops = &af_unix_trans_ops;
+	dev->trans_ops = trans_ops;
 	dev->vdpa_dev_id = -1;
 	dev->postcopy_ufd = -1;
 	rte_spinlock_init(&dev->slave_req_lock);
diff --git a/lib/librte_vhost/vhost.h b/lib/librte_vhost/vhost.h
index 64b7f77..0831b27 100644
--- a/lib/librte_vhost/vhost.h
+++ b/lib/librte_vhost/vhost.h
@@ -568,7 +568,7 @@  get_device(int vid)
 	return dev;
 }
 
-int vhost_new_device(void);
+int vhost_new_device(const struct vhost_transport_ops *trans_ops);
 void cleanup_device(struct virtio_net *dev, int destroy);
 void reset_device(struct virtio_net *dev);
 void vhost_destroy_device(int);