patches for DPDK stable branches
 help / color / mirror / Atom feed

From: sunwenjie <findtheonlyway@gmail.com>
To: dev@dpdk.org
Cc: sunwenjie <findtheonlyway@gmail.com>, stable@dpdk.org
Subject: [dpdk-stable] [PATCH] vhost: fix deadlock when vhost unregister
Date: Mon, 28 Jan 2019 14:55:49 +0800	[thread overview]
Message-ID: <20190128065549.98266-1-findtheonlyway@gmail.com> (raw)

When rte_vhost_driver_unregister  delete the connection fd,
fdset_try_del will always try and donot release the
vhostuser.mutex if the fd is busy, but the fdset_event_dispatch
will set the  fd to busy and call vhost_user_msg_handler to get
vhostuser.mutex, which will  cause deadlock. Unlock the
vhost_user.mutexif fdset_try_del fail and relock it when retry.

Fixes: 8b4b949144b8 ("vhost: fix dead lock on closing in server mode")
Cc: stable@dpdk.org

Signed-off-by: sunwenjie <findtheonlyway@gmail.com>
---
 lib/librte_vhost/socket.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/lib/librte_vhost/socket.c b/lib/librte_vhost/socket.c
index 9cf34ad17..9883b0491 100644
--- a/lib/librte_vhost/socket.c
+++ b/lib/librte_vhost/socket.c
@@ -961,13 +961,13 @@ rte_vhost_driver_unregister(const char *path)
 	int count;
 	struct vhost_user_connection *conn, *next;
 
+again:
 	pthread_mutex_lock(&vhost_user.mutex);
 
 	for (i = 0; i < vhost_user.vsocket_cnt; i++) {
 		struct vhost_user_socket *vsocket = vhost_user.vsockets[i];
 
 		if (!strcmp(vsocket->path, path)) {
-again:
 			pthread_mutex_lock(&vsocket->conn_mutex);
 			for (conn = TAILQ_FIRST(&vsocket->conn_list);
 			     conn != NULL;
@@ -983,6 +983,7 @@ rte_vhost_driver_unregister(const char *path)
 						  conn->connfd) == -1) {
 					pthread_mutex_unlock(
 							&vsocket->conn_mutex);
+					pthread_mutex_unlock(&vhost_user.mutex);
 					goto again;
 				}
 
-- 
2.20.1

next             reply	other threads:[~2019-01-28  6:56 UTC|newest]

Thread overview: 4+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2019-01-28  6:55 sunwenjie [this message]
2019-02-08 14:12 ` [dpdk-stable] [dpdk-dev] " Maxime Coquelin
2019-02-14  4:05   ` 孙文杰
2019-02-21 17:46 ` Maxime Coquelin

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20190128065549.98266-1-findtheonlyway@gmail.com \
    --to=findtheonlyway@gmail.com \
    --cc=dev@dpdk.org \
    --cc=stable@dpdk.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).