New upstream version 17.11.3

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

diff --git a/lib/librte_vhost/socket.c b/lib/librte_vhost/socket.c
index c7f99b0..f816601 100644 (file)
--- a/lib/librte_vhost/socket.c
+++ b/lib/librte_vhost/socket.c
@@ -68,6 +68,7 @@ struct vhost_user_socket {
        bool is_server;
        bool reconnect;
        bool dequeue_zero_copy;
+       bool iommu_support;
 
        /*
         * The "supported_features" indicates the feature bits the
@@ -180,6 +181,11 @@ send_fd_message(int sockfd, char *buf, int buflen, int *fds, int fd_num)
                msgh.msg_control = control;
                msgh.msg_controllen = sizeof(control);
                cmsg = CMSG_FIRSTHDR(&msgh);
+               if (cmsg == NULL) {
+                       RTE_LOG(ERR, VHOST_CONFIG, "cmsg == NULL\n");
+                       errno = EINVAL;
+                       return -1;
+               }
                cmsg->cmsg_len = CMSG_LEN(fdsize);
                cmsg->cmsg_level = SOL_SOCKET;
                cmsg->cmsg_type = SCM_RIGHTS;
@@ -217,9 +223,7 @@ vhost_user_add_connection(int fd, struct vhost_user_socket *vsocket)
 
        vid = vhost_new_device();
        if (vid == -1) {
-               close(fd);
-               free(conn);
-               return;
+               goto err;
        }
 
        size = strnlen(vsocket->path, PATH_MAX);
@@ -230,24 +234,40 @@ vhost_user_add_connection(int fd, struct vhost_user_socket *vsocket)
 
        RTE_LOG(INFO, VHOST_CONFIG, "new device, handle is %d\n", vid);
 
+       if (vsocket->notify_ops->new_connection) {
+               ret = vsocket->notify_ops->new_connection(vid);
+               if (ret < 0) {
+                       RTE_LOG(ERR, VHOST_CONFIG,
+                               "failed to add vhost user connection with fd %d\n",
+                               fd);
+                       goto err;
+               }
+       }
+
        conn->connfd = fd;
        conn->vsocket = vsocket;
        conn->vid = vid;
        ret = fdset_add(&vhost_user.fdset, fd, vhost_user_read_cb,
                        NULL, conn);
        if (ret < 0) {
-               conn->connfd = -1;
-               free(conn);
-               close(fd);
                RTE_LOG(ERR, VHOST_CONFIG,
                        "failed to add fd %d into vhost server fdset\n",
                        fd);
-               return;
+
+               if (vsocket->notify_ops->destroy_connection)
+                       vsocket->notify_ops->destroy_connection(conn->vid);
+
+               goto err;
        }
 
        pthread_mutex_lock(&vsocket->conn_mutex);
        TAILQ_INSERT_TAIL(&vsocket->conn_list, conn, next);
        pthread_mutex_unlock(&vsocket->conn_mutex);
+       return;
+
+err:
+       free(conn);
+       close(fd);
 }
 
 /* call back when there is new vhost-user connection from client  */
@@ -277,6 +297,9 @@ vhost_user_read_cb(int connfd, void *dat, int *remove)
                *remove = 1;
                vhost_destroy_device(conn->vid);
 
+               if (vsocket->notify_ops->destroy_connection)
+                       vsocket->notify_ops->destroy_connection(conn->vid);
+
                pthread_mutex_lock(&vsocket->conn_mutex);
                TAILQ_REMOVE(&vsocket->conn_list, conn, next);
                pthread_mutex_unlock(&vsocket->conn_mutex);
@@ -445,13 +468,22 @@ vhost_user_reconnect_init(void)
 {
        int ret;
 
-       pthread_mutex_init(&reconn_list.mutex, NULL);
+       ret = pthread_mutex_init(&reconn_list.mutex, NULL);
+       if (ret < 0) {
+               RTE_LOG(ERR, VHOST_CONFIG, "failed to initialize mutex");
+               return ret;
+       }
        TAILQ_INIT(&reconn_list.head);
 
        ret = pthread_create(&reconn_tid, NULL,
                             vhost_user_client_reconnect, NULL);
-       if (ret < 0)
+       if (ret != 0) {
                RTE_LOG(ERR, VHOST_CONFIG, "failed to create reconnect thread");
+               if (pthread_mutex_destroy(&reconn_list.mutex)) {
+                       RTE_LOG(ERR, VHOST_CONFIG,
+                               "failed to destroy reconnect mutex");
+               }
+       }
 
        return ret;
 }
@@ -613,8 +645,19 @@ rte_vhost_driver_register(const char *path, uint64_t flags)
                goto out;
        memset(vsocket, 0, sizeof(struct vhost_user_socket));
        vsocket->path = strdup(path);
+       if (vsocket->path == NULL) {
+               RTE_LOG(ERR, VHOST_CONFIG,
+                       "error: failed to copy socket path string\n");
+               free(vsocket);
+               goto out;
+       }
        TAILQ_INIT(&vsocket->conn_list);
-       pthread_mutex_init(&vsocket->conn_mutex, NULL);
+       ret = pthread_mutex_init(&vsocket->conn_mutex, NULL);
+       if (ret) {
+               RTE_LOG(ERR, VHOST_CONFIG,
+                       "error: failed to init connection mutex\n");
+               goto out_free;
+       }
        vsocket->dequeue_zero_copy = flags & RTE_VHOST_USER_DEQUEUE_ZERO_COPY;
 
        /*
@@ -632,27 +675,38 @@ rte_vhost_driver_register(const char *path, uint64_t flags)
        vsocket->supported_features = VIRTIO_NET_SUPPORTED_FEATURES;
        vsocket->features           = VIRTIO_NET_SUPPORTED_FEATURES;
 
+       if (!(flags & RTE_VHOST_USER_IOMMU_SUPPORT)) {
+               vsocket->supported_features &= ~(1ULL << VIRTIO_F_IOMMU_PLATFORM);
+               vsocket->features &= ~(1ULL << VIRTIO_F_IOMMU_PLATFORM);
+       }
+
        if ((flags & RTE_VHOST_USER_CLIENT) != 0) {
                vsocket->reconnect = !(flags & RTE_VHOST_USER_NO_RECONNECT);
                if (vsocket->reconnect && reconn_tid == 0) {
-                       if (vhost_user_reconnect_init() < 0) {
-                               free(vsocket->path);
-                               free(vsocket);
-                               goto out;
-                       }
+                       if (vhost_user_reconnect_init() != 0)
+                               goto out_mutex;
                }
        } else {
                vsocket->is_server = true;
        }
        ret = create_unix_socket(vsocket);
        if (ret < 0) {
-               free(vsocket->path);
-               free(vsocket);
-               goto out;
+               goto out_mutex;
        }
 
        vhost_user.vsockets[vhost_user.vsocket_cnt++] = vsocket;
 
+       pthread_mutex_unlock(&vhost_user.mutex);
+       return ret;
+
+out_mutex:
+       if (pthread_mutex_destroy(&vsocket->conn_mutex)) {
+               RTE_LOG(ERR, VHOST_CONFIG,
+                       "error: failed to destroy connection mutex\n");
+       }
+out_free:
+       free(vsocket->path);
+       free(vsocket);
 out:
        pthread_mutex_unlock(&vhost_user.mutex);
 
@@ -707,13 +761,25 @@ rte_vhost_driver_unregister(const char *path)
                                vhost_user_remove_reconnect(vsocket);
                        }
 
+again:
                        pthread_mutex_lock(&vsocket->conn_mutex);
                        for (conn = TAILQ_FIRST(&vsocket->conn_list);
                             conn != NULL;
                             conn = next) {
                                next = TAILQ_NEXT(conn, next);
 
-                               fdset_del(&vhost_user.fdset, conn->connfd);
+                               /*
+                                * If r/wcb is executing, release the
+                                * conn_mutex lock, and try again since
+                                * the r/wcb may use the conn_mutex lock.
+                                */
+                               if (fdset_try_del(&vhost_user.fdset,
+                                                 conn->connfd) == -1) {
+                                       pthread_mutex_unlock(
+                                                       &vsocket->conn_mutex);
+                                       goto again;
+                               }
+
                                RTE_LOG(INFO, VHOST_CONFIG,
                                        "free connfd = %d for device '%s'\n",
                                        conn->connfd, path);
@@ -724,6 +790,7 @@ rte_vhost_driver_unregister(const char *path)
                        }
                        pthread_mutex_unlock(&vsocket->conn_mutex);
 
+                       pthread_mutex_destroy(&vsocket->conn_mutex);
                        free(vsocket->path);
                        free(vsocket);
 
@@ -786,7 +853,7 @@ rte_vhost_driver_start(const char *path)
        if (fdset_tid == 0) {
                int ret = pthread_create(&fdset_tid, NULL, fdset_event_dispatch,
                                     &vhost_user.fdset);
-               if (ret < 0)
+               if (ret != 0)
                        RTE_LOG(ERR, VHOST_CONFIG,
                                "failed to create fdset handling thread");
        }