vhost: introduce API to start a specific driver

[dpdk.git] / lib / librte_vhost / socket.c

diff --git a/lib/librte_vhost/socket.c b/lib/librte_vhost/socket.c
index 3b68fc9..66fd335 100644 (file)
--- a/lib/librte_vhost/socket.c
+++ b/lib/librte_vhost/socket.c
@@ -63,7 +63,8 @@ struct vhost_user_socket {
        struct vhost_user_connection_list conn_list;
        pthread_mutex_t conn_mutex;
        char *path;
-       int listenfd;
+       int socket_fd;
+       struct sockaddr_un un;
        bool is_server;
        bool reconnect;
        bool dequeue_zero_copy;
@@ -101,7 +102,8 @@ struct vhost_user {
 
 static void vhost_user_server_new_connection(int fd, void *data, int *remove);
 static void vhost_user_read_cb(int fd, void *dat, int *remove);
-static int vhost_user_create_client(struct vhost_user_socket *vsocket);
+static int create_unix_socket(struct vhost_user_socket *vsocket);
+static int vhost_user_start_client(struct vhost_user_socket *vsocket);
 
 static struct vhost_user vhost_user = {
        .fdset = {
@@ -280,23 +282,26 @@ vhost_user_read_cb(int connfd, void *dat, int *remove)
 
                free(conn);
 
-               if (vsocket->reconnect)
-                       vhost_user_create_client(vsocket);
+               if (vsocket->reconnect) {
+                       create_unix_socket(vsocket);
+                       vhost_user_start_client(vsocket);
+               }
        }
 }
 
 static int
-create_unix_socket(const char *path, struct sockaddr_un *un, bool is_server)
+create_unix_socket(struct vhost_user_socket *vsocket)
 {
        int fd;
+       struct sockaddr_un *un = &vsocket->un;
 
        fd = socket(AF_UNIX, SOCK_STREAM, 0);
        if (fd < 0)
                return -1;
        RTE_LOG(INFO, VHOST_CONFIG, "vhost-user %s: socket created, fd: %d\n",
-               is_server ? "server" : "client", fd);
+               vsocket->is_server ? "server" : "client", fd);
 
-       if (!is_server && fcntl(fd, F_SETFL, O_NONBLOCK)) {
+       if (!vsocket->is_server && fcntl(fd, F_SETFL, O_NONBLOCK)) {
                RTE_LOG(ERR, VHOST_CONFIG,
                        "vhost-user: can't set nonblocking mode for socket, fd: "
                        "%d (%s)\n", fd, strerror(errno));
@@ -306,25 +311,21 @@ create_unix_socket(const char *path, struct sockaddr_un *un, bool is_server)
 
        memset(un, 0, sizeof(*un));
        un->sun_family = AF_UNIX;
-       strncpy(un->sun_path, path, sizeof(un->sun_path));
+       strncpy(un->sun_path, vsocket->path, sizeof(un->sun_path));
        un->sun_path[sizeof(un->sun_path) - 1] = '\0';
 
-       return fd;
+       vsocket->socket_fd = fd;
+       return 0;
 }
 
 static int
-vhost_user_create_server(struct vhost_user_socket *vsocket)
+vhost_user_start_server(struct vhost_user_socket *vsocket)
 {
-       int fd;
        int ret;
-       struct sockaddr_un un;
+       int fd = vsocket->socket_fd;
        const char *path = vsocket->path;
 
-       fd = create_unix_socket(path, &un, vsocket->is_server);
-       if (fd < 0)
-               return -1;
-
-       ret = bind(fd, (struct sockaddr *)&un, sizeof(un));
+       ret = bind(fd, (struct sockaddr *)&vsocket->un, sizeof(vsocket->un));
        if (ret < 0) {
                RTE_LOG(ERR, VHOST_CONFIG,
                        "failed to bind to %s: %s; remove it and try again\n",
@@ -337,7 +338,6 @@ vhost_user_create_server(struct vhost_user_socket *vsocket)
        if (ret < 0)
                goto err;
 
-       vsocket->listenfd = fd;
        ret = fdset_add(&vhost_user.fdset, fd, vhost_user_server_new_connection,
                  NULL, vsocket);
        if (ret < 0) {
@@ -456,20 +456,15 @@ vhost_user_reconnect_init(void)
 }
 
 static int
-vhost_user_create_client(struct vhost_user_socket *vsocket)
+vhost_user_start_client(struct vhost_user_socket *vsocket)
 {
-       int fd;
        int ret;
-       struct sockaddr_un un;
+       int fd = vsocket->socket_fd;
        const char *path = vsocket->path;
        struct vhost_user_reconnect *reconn;
 
-       fd = create_unix_socket(path, &un, vsocket->is_server);
-       if (fd < 0)
-               return -1;
-
-       ret = vhost_user_connect_nonblock(fd, (struct sockaddr *)&un,
-                                         sizeof(un));
+       ret = vhost_user_connect_nonblock(fd, (struct sockaddr *)&vsocket->un,
+                                         sizeof(vsocket->un));
        if (ret == 0) {
                vhost_user_add_connection(fd, vsocket);
                return 0;
@@ -492,7 +487,7 @@ vhost_user_create_client(struct vhost_user_socket *vsocket)
                close(fd);
                return -1;
        }
-       reconn->un = un;
+       reconn->un = vsocket->un;
        reconn->fd = fd;
        reconn->vsocket = vsocket;
        pthread_mutex_lock(&reconn_list.mutex);
@@ -645,11 +640,10 @@ rte_vhost_driver_register(const char *path, uint64_t flags)
                                goto out;
                        }
                }
-               ret = vhost_user_create_client(vsocket);
        } else {
                vsocket->is_server = true;
-               ret = vhost_user_create_server(vsocket);
        }
+       ret = create_unix_socket(vsocket);
        if (ret < 0) {
                free(vsocket->path);
                free(vsocket);
@@ -705,8 +699,8 @@ rte_vhost_driver_unregister(const char *path)
 
                if (!strcmp(vsocket->path, path)) {
                        if (vsocket->is_server) {
-                               fdset_del(&vhost_user.fdset, vsocket->listenfd);
-                               close(vsocket->listenfd);
+                               fdset_del(&vhost_user.fdset, vsocket->socket_fd);
+                               close(vsocket->socket_fd);
                                unlink(path);
                        } else if (vsocket->reconnect) {
                                vhost_user_remove_reconnect(vsocket);
@@ -776,8 +770,28 @@ vhost_driver_callback_get(const char *path)
 }
 
 int
-rte_vhost_driver_session_start(void)
+rte_vhost_driver_start(const char *path)
 {
-       fdset_event_dispatch(&vhost_user.fdset);
-       return 0;
+       struct vhost_user_socket *vsocket;
+       static pthread_t fdset_tid;
+
+       pthread_mutex_lock(&vhost_user.mutex);
+       vsocket = find_vhost_user_socket(path);
+       pthread_mutex_unlock(&vhost_user.mutex);
+
+       if (!vsocket)
+               return -1;
+
+       if (fdset_tid == 0) {
+               int ret = pthread_create(&fdset_tid, NULL, fdset_event_dispatch,
+                                    &vhost_user.fdset);
+               if (ret < 0)
+                       RTE_LOG(ERR, VHOST_CONFIG,
+                               "failed to create fdset handling thread");
+       }
+
+       if (vsocket->is_server)
+               return vhost_user_start_server(vsocket);
+       else
+               return vhost_user_start_client(vsocket);
 }