From: Ye Xiaolong <xiaolong.ye@intel.com>
To: sunwenjie <findtheonlyway@gmail.com>
Cc: dev@dpdk.org
Subject: Re: [dpdk-dev] [PATCH] vhost: fix deadlock when vhost unregister.
Date: Tue, 15 Jan 2019 10:48:42 +0800 [thread overview]
Message-ID: <20190115024842.GA20985@intel.com> (raw)
In-Reply-To: <20190111134931.28402-1-findtheonlyway@gmail.com>
Hi,
On 01/11, sunwenjie wrote:
> 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.
>
> Signed-off-by: findtheonlway <findtheonlyway@gmail.com>
> Signed-off-by: sunwenjie <sunwenjie@didichuxing.com>
The commit log and Signed-off-by tage should not be indented, and you should
get you commit log checked by `./devtools/check-git-log.sh -1`, and fix all the
errors it shows.
Btw, I think this is your v2 patch, and you should add the v2 tag in the
subject.
Thanks,
Xiaolong
>---
> 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..7959c5ece 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;
>@@ -981,6 +981,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 prev parent reply other threads:[~2019-01-15 2:48 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-01-11 13:49 sunwenjie
2019-01-15 2:48 ` Ye Xiaolong [this message]
2019-01-28 6:55 sunwenjie
2019-02-08 14:12 ` 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=20190115024842.GA20985@intel.com \
--to=xiaolong.ye@intel.com \
--cc=dev@dpdk.org \
--cc=findtheonlyway@gmail.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).