[dpdk-dev] [RFC 05/24] vhost: move start_server/client() calls to trans_af_unix.c
Stefan Hajnoczi
stefanha at redhat.com
Fri Jan 19 14:44:25 CET 2018
Introduce a vhost_transport_ops->socket_start() interface so the
transport can begin establishing vhost-user connections. This is part
of the AF_UNIX transport refactoring and removes AF_UNIX code from
vhost.h and socket.c.
Signed-off-by: Stefan Hajnoczi <stefanha at redhat.com>
---
lib/librte_vhost/vhost.h | 16 +++++++++++++---
lib/librte_vhost/socket.c | 5 +----
lib/librte_vhost/trans_af_unix.c | 16 ++++++++++++++--
3 files changed, 28 insertions(+), 9 deletions(-)
diff --git a/lib/librte_vhost/vhost.h b/lib/librte_vhost/vhost.h
index 3aefe6597..7cbef04ab 100644
--- a/lib/librte_vhost/vhost.h
+++ b/lib/librte_vhost/vhost.h
@@ -236,6 +236,19 @@ struct vhost_transport_ops {
*/
void (*socket_cleanup)(struct vhost_user_socket *vsocket);
+ /**
+ * Start establishing vhost-user connections. This function is
+ * asynchronous and connections may be established after it has
+ * returned. Call vhost_user_add_connection() to register new
+ * connections.
+ *
+ * @param vsocket
+ * vhost socket
+ * @return
+ * 0 on success, -1 on failure
+ */
+ int (*socket_start)(struct vhost_user_socket *vsocket);
+
/**
* Notify the guest that used descriptors have been added to the vring.
* The VRING_AVAIL_F_NO_INTERRUPT flag has already been checked so this
@@ -346,9 +359,6 @@ struct vhost_user {
extern struct vhost_user vhost_user;
-int vhost_user_start_server(struct vhost_user_socket *vsocket);
-int vhost_user_start_client(struct vhost_user_socket *vsocket);
-
extern pthread_t reconn_tid;
int vhost_user_reconnect_init(void);
diff --git a/lib/librte_vhost/socket.c b/lib/librte_vhost/socket.c
index 78f847ccc..f8a96ab5f 100644
--- a/lib/librte_vhost/socket.c
+++ b/lib/librte_vhost/socket.c
@@ -318,8 +318,5 @@ rte_vhost_driver_start(const char *path)
"failed to create fdset handling thread");
}
- if (vsocket->is_server)
- return vhost_user_start_server(vsocket);
- else
- return vhost_user_start_client(vsocket);
+ return vsocket->trans_ops->socket_start(vsocket);
}
diff --git a/lib/librte_vhost/trans_af_unix.c b/lib/librte_vhost/trans_af_unix.c
index cc8d7ccdc..6c22093a4 100644
--- a/lib/librte_vhost/trans_af_unix.c
+++ b/lib/librte_vhost/trans_af_unix.c
@@ -51,6 +51,8 @@ struct af_unix_socket {
};
static int create_unix_socket(struct vhost_user_socket *vsocket);
+static int vhost_user_start_server(struct vhost_user_socket *vsocket);
+static int vhost_user_start_client(struct vhost_user_socket *vsocket);
static void vhost_user_read_cb(int connfd, void *dat, int *remove);
/* return bytes# of read on success or negative val on failure. */
@@ -276,7 +278,7 @@ create_unix_socket(struct vhost_user_socket *vsocket)
return 0;
}
-int
+static int
vhost_user_start_server(struct vhost_user_socket *vsocket)
{
struct af_unix_socket *s =
@@ -433,7 +435,7 @@ vhost_user_reconnect_init(void)
return ret;
}
-int
+static int
vhost_user_start_client(struct vhost_user_socket *vsocket)
{
struct af_unix_socket *s =
@@ -523,6 +525,15 @@ af_unix_socket_cleanup(struct vhost_user_socket *vsocket)
}
}
+static int
+af_unix_socket_start(struct vhost_user_socket *vsocket)
+{
+ if (vsocket->is_server)
+ return vhost_user_start_server(vsocket);
+ else
+ return vhost_user_start_client(vsocket);
+}
+
static int
af_unix_vring_call(struct virtio_net *dev __rte_unused,
struct vhost_virtqueue *vq)
@@ -536,5 +547,6 @@ const struct vhost_transport_ops af_unix_trans_ops = {
.socket_size = sizeof(struct af_unix_socket),
.socket_init = af_unix_socket_init,
.socket_cleanup = af_unix_socket_cleanup,
+ .socket_start = af_unix_socket_start,
.vring_call = af_unix_vring_call,
};
--
2.14.3
More information about the dev
mailing list