From 3d8dbc69c147bc75bfaefa33789e48dc6b5f6a0f Mon Sep 17 00:00:00 2001 From: Dariusz Stojaczyk Date: Mon, 28 Aug 2017 13:37:20 +0200 Subject: [PATCH] Revert "vhost: wrap vhost_user_read_cb with vhost_user mutex" This reverts commit 697389816422e61f9295e60d48be0bd39f0dec14. This solution was incomplete, see the next patch which properly fixes the deadlock issue. Change-Id: Ib3cc609814276f1c48b05280379b8c2849ad831f Signed-off-by: Dariusz Stojaczyk Reviewed-on: https://review.gerrithub.io/375909 Tested-by: SPDK Automated Test System Reviewed-by: Pawel Wodkowski Reviewed-by: Daniel Verkamp Reviewed-by: Jim Harris --- lib/vhost/rte_vhost/socket.c | 4 ---- 1 file changed, 4 deletions(-) diff --git a/lib/vhost/rte_vhost/socket.c b/lib/vhost/rte_vhost/socket.c index 4f89329ea..4eea67893 100644 --- a/lib/vhost/rte_vhost/socket.c +++ b/lib/vhost/rte_vhost/socket.c @@ -277,8 +277,6 @@ vhost_user_read_cb(int connfd, void *dat, int *remove) ret = vhost_user_msg_handler(conn->vid, connfd); if (ret < 0) { - pthread_mutex_lock(&vhost_user.mutex); - close(connfd); *remove = 1; vhost_destroy_device(conn->vid); @@ -293,8 +291,6 @@ vhost_user_read_cb(int connfd, void *dat, int *remove) create_unix_socket(vsocket); vhost_user_start_client(vsocket); } - - pthread_mutex_unlock(&vhost_user.mutex); } }