From mboxrd@z Thu Jan 1 00:00:00 1970
Return-Path: <dev-bounces@dpdk.org>
Received: from mails.dpdk.org (mails.dpdk.org [217.70.189.124])
by inbox.dpdk.org (Postfix) with ESMTP id 1F465A0548;
Fri, 2 Apr 2021 08:34:38 +0200 (CEST)
Received: from [217.70.189.124] (localhost [127.0.0.1])
by mails.dpdk.org (Postfix) with ESMTP id C3A27140FE3;
Fri, 2 Apr 2021 08:34:19 +0200 (CEST)
Received: from mga11.intel.com (mga11.intel.com [192.55.52.93])
by mails.dpdk.org (Postfix) with ESMTP id 75016140FBB
for <dev@dpdk.org>; Fri, 2 Apr 2021 08:34:18 +0200 (CEST)
IronPort-SDR: E7+NrIa5THk+7MJBYCnCYm6n3Qn/Ra3L6zXNLYYzgqthdBIxgJG0t3SQg/W2efwWntR1WvEVVI
q4/sKMQeqp5A==
X-IronPort-AV: E=McAfee;i="6000,8403,9941"; a="189144954"
X-IronPort-AV: E=Sophos;i="5.81,299,1610438400"; d="scan'208";a="189144954"
Received: from fmsmga008.fm.intel.com ([10.253.24.58])
by fmsmga102.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384;
01 Apr 2021 23:34:18 -0700
IronPort-SDR: wBP9nTLHdgLdrQWCZB2jIRLaBSh3gOnQIugj0xf+YFzvFqkksUke3Bc1y/z1dmyRtApz5i1Ll0
n3W+1O6V7C4A==
X-ExtLoop1: 1
X-IronPort-AV: E=Sophos;i="5.81,299,1610438400"; d="scan'208";a="413042784"
Received: from npg_dpdk_virtio_jiayuhu_07.sh.intel.com ([10.67.118.193])
by fmsmga008.fm.intel.com with ESMTP; 01 Apr 2021 23:34:16 -0700
From: Jiayu Hu <jiayu.hu@intel.com>
To: dev@dpdk.org
Cc: maxime.coquelin@redhat.com, chenbo.xia@intel.com, yinan.wang@intel.com,
sunil.pai.g@intel.com, cheng1.jiang@intel.com,
Jiayu Hu <jiayu.hu@intel.com>
Date: Fri, 2 Apr 2021 09:04:01 -0400
Message-Id: <1617368642-131298-4-git-send-email-jiayu.hu@intel.com>
X-Mailer: git-send-email 2.7.4
In-Reply-To: <1617368642-131298-1-git-send-email-jiayu.hu@intel.com>
References: <1615985773-406787-1-git-send-email-jiayu.hu@intel.com>
<1617368642-131298-1-git-send-email-jiayu.hu@intel.com>
Subject: [dpdk-dev] [PATCH v2 3/4] vhost: avoid deadlock on async register
X-BeenThere: dev@dpdk.org
X-Mailman-Version: 2.1.29
Precedence: list
List-Id: DPDK patches and discussions <dev.dpdk.org>
List-Unsubscribe: <https://mails.dpdk.org/options/dev>,
<mailto:dev-request@dpdk.org?subject=unsubscribe>
List-Archive: <http://mails.dpdk.org/archives/dev/>
List-Post: <mailto:dev@dpdk.org>
List-Help: <mailto:dev-request@dpdk.org?subject=help>
List-Subscribe: <https://mails.dpdk.org/listinfo/dev>,
<mailto:dev-request@dpdk.org?subject=subscribe>
Errors-To: dev-bounces@dpdk.org
Sender: "dev" <dev-bounces@dpdk.org>
Users can register async copy device in vring_state_changed(),
when vhost queue is enabled. However, a deadlock occurs inside
rte_vhost_async_channel_register(), if VHOST_USER_F_PROTOCOL_FEATURES
is not supported, as vhost_user_msg_handler() takes vq->access_lock
before calling vhost_user_set_vring_kick().
This patch avoids async register deadlock by removing calling
vring_state_changed() in vhost_user_set_vring_kick(). It's safe
as vhost_user_msg_handler() will call vring_state_changed() anyway.
Signed-off-by: Jiayu Hu <jiayu.hu@intel.com>
---
lib/librte_vhost/vhost_user.c | 3 ---
1 file changed, 3 deletions(-)
diff --git a/lib/librte_vhost/vhost_user.c b/lib/librte_vhost/vhost_user.c
index 44c0452..8f0eba6 100644
--- a/lib/librte_vhost/vhost_user.c
+++ b/lib/librte_vhost/vhost_user.c
@@ -1918,9 +1918,6 @@ vhost_user_set_vring_kick(struct virtio_net **pdev, struct VhostUserMsg *msg,
*/
if (!(dev->features & (1ULL << VHOST_USER_F_PROTOCOL_FEATURES))) {
vq->enabled = true;
- if (dev->notify_ops->vring_state_changed)
- dev->notify_ops->vring_state_changed(
- dev->vid, file.index, 1);
}
if (vq->ready) {
--
2.7.4