vhost: fix crash on port deletion

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

diff --git a/lib/vhost/socket.c b/lib/vhost/socket.c
index 5d0d728..d6f9414 100644 (file)
--- a/lib/vhost/socket.c
+++ b/lib/vhost/socket.c
@@ -1023,66 +1023,65 @@ again:
 
        for (i = 0; i < vhost_user.vsocket_cnt; i++) {
                struct vhost_user_socket *vsocket = vhost_user.vsockets[i];
+               if (strcmp(vsocket->path, path))
+                       continue;
 
-               if (!strcmp(vsocket->path, path)) {
-                       pthread_mutex_lock(&vsocket->conn_mutex);
-                       for (conn = TAILQ_FIRST(&vsocket->conn_list);
-                            conn != NULL;
-                            conn = next) {
-                               next = TAILQ_NEXT(conn, next);
-
-                               /*
-                                * If r/wcb is executing, release vsocket's
-                                * conn_mutex and vhost_user's mutex locks, and
-                                * try again since the r/wcb may use the
-                                * conn_mutex and mutex locks.
-                                */
-                               if (fdset_try_del(&vhost_user.fdset,
-                                                 conn->connfd) == -1) {
-                                       pthread_mutex_unlock(
-                                                       &vsocket->conn_mutex);
-                                       pthread_mutex_unlock(&vhost_user.mutex);
-                                       goto again;
-                               }
-
-                               VHOST_LOG_CONFIG(INFO,
-                                       "free connfd = %d for device '%s'\n",
-                                       conn->connfd, path);
-                               close(conn->connfd);
-                               vhost_destroy_device(conn->vid);
-                               TAILQ_REMOVE(&vsocket->conn_list, conn, next);
-                               free(conn);
-                       }
-                       pthread_mutex_unlock(&vsocket->conn_mutex);
-
-                       if (vsocket->is_server) {
-                               /*
-                                * If r/wcb is executing, release vhost_user's
-                                * mutex lock, and try again since the r/wcb
-                                * may use the mutex lock.
-                                */
-                               if (fdset_try_del(&vhost_user.fdset,
-                                               vsocket->socket_fd) == -1) {
-                                       pthread_mutex_unlock(&vhost_user.mutex);
-                                       goto again;
-                               }
-
-                               close(vsocket->socket_fd);
-                               unlink(path);
-                       } else if (vsocket->reconnect) {
-                               vhost_user_remove_reconnect(vsocket);
+               if (vsocket->is_server) {
+                       /*
+                        * If r/wcb is executing, release vhost_user's
+                        * mutex lock, and try again since the r/wcb
+                        * may use the mutex lock.
+                        */
+                       if (fdset_try_del(&vhost_user.fdset, vsocket->socket_fd) == -1) {
+                               pthread_mutex_unlock(&vhost_user.mutex);
+                               goto again;
                        }
+               } else if (vsocket->reconnect) {
+                       vhost_user_remove_reconnect(vsocket);
+               }
 
-                       pthread_mutex_destroy(&vsocket->conn_mutex);
-                       vhost_user_socket_mem_free(vsocket);
+               pthread_mutex_lock(&vsocket->conn_mutex);
+               for (conn = TAILQ_FIRST(&vsocket->conn_list);
+                        conn != NULL;
+                        conn = next) {
+                       next = TAILQ_NEXT(conn, next);
 
-                       count = --vhost_user.vsocket_cnt;
-                       vhost_user.vsockets[i] = vhost_user.vsockets[count];
-                       vhost_user.vsockets[count] = NULL;
-                       pthread_mutex_unlock(&vhost_user.mutex);
+                       /*
+                        * If r/wcb is executing, release vsocket's
+                        * conn_mutex and vhost_user's mutex locks, and
+                        * try again since the r/wcb may use the
+                        * conn_mutex and mutex locks.
+                        */
+                       if (fdset_try_del(&vhost_user.fdset,
+                                         conn->connfd) == -1) {
+                               pthread_mutex_unlock(&vsocket->conn_mutex);
+                               pthread_mutex_unlock(&vhost_user.mutex);
+                               goto again;
+                       }
 
-                       return 0;
+                       VHOST_LOG_CONFIG(INFO,
+                               "free connfd = %d for device '%s'\n",
+                               conn->connfd, path);
+                       close(conn->connfd);
+                       vhost_destroy_device(conn->vid);
+                       TAILQ_REMOVE(&vsocket->conn_list, conn, next);
+                       free(conn);
+               }
+               pthread_mutex_unlock(&vsocket->conn_mutex);
+
+               if (vsocket->is_server) {
+                       close(vsocket->socket_fd);
+                       unlink(path);
                }
+
+               pthread_mutex_destroy(&vsocket->conn_mutex);
+               vhost_user_socket_mem_free(vsocket);
+
+               count = --vhost_user.vsocket_cnt;
+               vhost_user.vsockets[i] = vhost_user.vsockets[count];
+               vhost_user.vsockets[count] = NULL;
+               pthread_mutex_unlock(&vhost_user.mutex);
+               return 0;
        }
        pthread_mutex_unlock(&vhost_user.mutex);