From: Stefan Hajnoczi <stefa...@redhat.com>
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 <stefa...@redhat.com>
---
lib/librte_vhost/socket.c | 5 +----
lib/librte_vhost/trans_af_unix.c | 16 ++++++++++++++--
lib/librte_vhost/vhost.h | 16 +++++++++++++---
3 files changed, 28 insertions(+), 9 deletions(-)
diff --git a/lib/librte_vhost/socket.c b/lib/librte_vhost/socket.c
index 3b5608c..df6d707 100644
--- a/lib/librte_vhost/socket.c
+++ b/lib/librte_vhost/socket.c
@@ -564,8 +564,5 @@ rte_vhost_driver_start(const char *path)
}
}
- 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 f23bb9c..93d11f7 100644
--- a/lib/librte_vhost/trans_af_unix.c
+++ b/lib/librte_vhost/trans_af_unix.c
@@ -22,6 +22,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);
/*
@@ -280,7 +282,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 *af_vsocket =
@@ -438,7 +440,7 @@ vhost_user_reconnect_init(void)
return ret;
}
-int
+static int
vhost_user_start_client(struct vhost_user_socket *vsocket)
{
struct af_unix_socket *af_vsocket =
@@ -529,6 +531,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)
{
@@ -541,5 +552,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,
};
diff --git a/lib/librte_vhost/vhost.h b/lib/librte_vhost/vhost.h
index 40b5c25..c74753b 100644
--- a/lib/librte_vhost/vhost.h
+++ b/lib/librte_vhost/vhost.h
@@ -324,6 +324,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 and event idx have already been
checked
* so this function just needs to perform the notification.
@@ -458,9 +471,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);
--
2.7.4
