From: sunwenjie <findtheonlyway@gmail.com>
To: dev@dpdk.org
Cc: sunwenjie <findtheonlyway@gmail.com>,
sunwenjie <sunwenjie@didichuxing.com>
Subject: [dpdk-dev] [PATCH] vhostuser: fix deadlock when vhost unregister
Date: Thu, 10 Jan 2019 13:02:18 +0800 [thread overview]
Message-ID: <20190110050218.3081-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.mutex
if fdset_try_del fail and relock it when retry.
Signed-off-by: findtheonlway <findtheonlyway@gmail.com>
Signed-off-by: sunwenjie <sunwenjie@didichuxing.com>
---
lib/librte_vhost/socket.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/lib/librte_vhost/socket.c b/lib/librte_vhost/socket.c
index 9cf34ad17..a9effa115 100644
--- a/lib/librte_vhost/socket.c
+++ b/lib/librte_vhost/socket.c
@@ -961,13 +961,12 @@ 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;
@@ -981,6 +980,7 @@ rte_vhost_driver_unregister(const char *path)
*/
if (fdset_try_del(&vhost_user.fdset,
conn->connfd) == -1) {
+ pthread_mutex_unlock(&vhost_user.mutex);
pthread_mutex_unlock(
&vsocket->conn_mutex);
goto again;
--
2.20.1
next reply other threads:[~2019-01-10 5:02 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-01-10 5:02 sunwenjie [this message]
-- strict thread matches above, loose matches on Subject: below --
2019-01-08 11:45 sunwenjie
2019-01-10 14:48 ` Maxime Coquelin
2019-01-11 3:12 ` 孙文杰
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=20190110050218.3081-1-findtheonlyway@gmail.com \
--to=findtheonlyway@gmail.com \
--cc=dev@dpdk.org \
--cc=sunwenjie@didichuxing.com \
/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
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
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).