From: Wenwu Ma <wenwux.ma@intel.com>
To: maxime.coquelin@redhat.com, chenbo.xia@intel.com, dev@dpdk.org
Cc: jiayu.hu@intel.com, yinan.wang@intel.com, xingguang.he@intel.com,
Wenwu Ma <wenwux.ma@intel.com>
Subject: [PATCH] vhost: fix deadlock when handling user messages
Date: Thu, 5 May 2022 13:40:08 +0000 [thread overview]
Message-ID: <20220505134008.2865-1-wenwux.ma@intel.com> (raw)
In vhost_user_msg_handler(), if vhost message handling
failed, we should check whether the queue is locked and
release the lock before returning. Or, it will cause a
deadlock later.
Signed-off-by: Wenwu Ma <wenwux.ma@intel.com>
---
lib/vhost/vhost_user.c | 2 ++
1 file changed, 2 insertions(+)
diff --git a/lib/vhost/vhost_user.c b/lib/vhost/vhost_user.c
index 1d390677fa..80a5df6e9d 100644
--- a/lib/vhost/vhost_user.c
+++ b/lib/vhost/vhost_user.c
@@ -3113,6 +3113,8 @@ vhost_user_msg_handler(int vid, int fd)
send_vhost_reply(dev, fd, &ctx);
} else if (ret == RTE_VHOST_MSG_RESULT_ERR) {
VHOST_LOG_CONFIG(ERR, "(%s) vhost message handling failed.\n", dev->ifname);
+ if (unlock_required)
+ vhost_user_unlock_all_queue_pairs(dev);
return -1;
}
--
2.25.1
next reply other threads:[~2022-05-05 5:42 UTC|newest]
Thread overview: 13+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-05-05 13:40 Wenwu Ma [this message]
2022-05-05 7:21 ` David Marchand
2022-05-05 16:17 ` [PATCH v2] " Wenwu Ma
2022-05-06 8:19 ` Xia, Chenbo
2022-05-07 13:27 ` [PATCH v3] vhost: fix deadlock when message handling failed Wenwu Ma
2022-05-07 6:02 ` Xia, Chenbo
2022-05-09 3:13 ` Ling, WeiX
2022-05-17 13:15 ` David Marchand
2022-05-17 13:24 ` Maxime Coquelin
2022-07-11 8:42 ` Pei, Andy
2022-07-11 8:54 ` Xia, Chenbo
2022-07-11 9:02 ` Pei, Andy
2022-07-11 9:14 ` Xia, Chenbo
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=20220505134008.2865-1-wenwux.ma@intel.com \
--to=wenwux.ma@intel.com \
--cc=chenbo.xia@intel.com \
--cc=dev@dpdk.org \
--cc=jiayu.hu@intel.com \
--cc=maxime.coquelin@redhat.com \
--cc=xingguang.he@intel.com \
--cc=yinan.wang@intel.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).