From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from dpdk.org (dpdk.org [92.243.14.124]) by inbox.dpdk.org (Postfix) with ESMTP id 4310BA052B; Wed, 29 Jul 2020 15:37:13 +0200 (CEST) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 129551C036; Wed, 29 Jul 2020 15:36:56 +0200 (CEST) Received: from us-smtp-1.mimecast.com (us-smtp-delivery-1.mimecast.com [205.139.110.120]) by dpdk.org (Postfix) with ESMTP id 800E71BFFA for ; Wed, 29 Jul 2020 15:36:51 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1596029811; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=LvJH+IHwf08tG8tY7iGdf0WKR9EU3XNTS+8hoRtMMts=; b=Xf25pV6MP5NDq9i6EwkNIFEbblV65JPxokFeJcRINw3/jw6X1Q3UZsysI0Mq7pYDVvF7fh gxGdGOISBRUYpuBuJqsEtH48YC81krZT+LMYDMKXUPqpNgDR0OQiINYdHvKWe647Orim8n ddYsBwKbRsjyIJUt+u2Ntizoh2qtsgA= Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-356-Hv8G5yZXNZiKw0Miki5FEA-1; Wed, 29 Jul 2020 09:36:46 -0400 X-MC-Unique: Hv8G5yZXNZiKw0Miki5FEA-1 Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id C6DD718C63C0; Wed, 29 Jul 2020 13:36:44 +0000 (UTC) Received: from localhost.localdomain (unknown [10.36.110.21]) by smtp.corp.redhat.com (Postfix) with ESMTP id 5B46B61176; Wed, 29 Jul 2020 13:36:42 +0000 (UTC) From: Maxime Coquelin To: dev@dpdk.org, matan@mellanox.com, chenbo.xia@intel.com, yong.liu@intel.com, yinan.wang@intel.com Cc: thomas@monjalon.net, ferruh.yigit@intel.com, david.marchand@redhat.com, Maxime Coquelin Date: Wed, 29 Jul 2020 15:36:25 +0200 Message-Id: <20200729133626.237098-3-maxime.coquelin@redhat.com> In-Reply-To: <20200729133626.237098-1-maxime.coquelin@redhat.com> References: <20200729133626.237098-1-maxime.coquelin@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.12 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 8bit Subject: [dpdk-dev] [PATCH v4 2/3] net/vhost: fix queue update X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: DPDK patches and discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dev-bounces@dpdk.org Sender: "dev" Now that the vhost library saves the guest notifications enablement value in its virtqueues metadata, it is not necessary to do it in the vring_state_changed callback. One effect of the patch is also to prevent possible deadlock happening in vhost library. Fixes: 604052ae5395 ("net/vhost: support queue update") Reported-by: Yinan Wang Tested-by: Yinan Wang Reviewed-by: Chenbo Xia Signed-off-by: Maxime Coquelin --- drivers/net/vhost/rte_eth_vhost.c | 28 +++++++++------------------- 1 file changed, 9 insertions(+), 19 deletions(-) diff --git a/drivers/net/vhost/rte_eth_vhost.c b/drivers/net/vhost/rte_eth_vhost.c index bbf79b2c0e..951929c663 100644 --- a/drivers/net/vhost/rte_eth_vhost.c +++ b/drivers/net/vhost/rte_eth_vhost.c @@ -94,7 +94,6 @@ struct vhost_queue { struct rte_mempool *mb_pool; uint16_t port; uint16_t virtqueue_id; - bool intr_en; struct vhost_stats stats; }; @@ -547,8 +546,6 @@ eth_rxq_intr_enable(struct rte_eth_dev *dev, uint16_t qid) rte_vhost_enable_guest_notification(vq->vid, (qid << 1) + 1, 1); rte_wmb(); - vq->intr_en = true; - return ret; } @@ -574,8 +571,6 @@ eth_rxq_intr_disable(struct rte_eth_dev *dev, uint16_t qid) rte_vhost_enable_guest_notification(vq->vid, (qid << 1) + 1, 0); rte_wmb(); - vq->intr_en = false; - return 0; } @@ -841,7 +836,6 @@ vring_conf_update(int vid, struct rte_eth_dev *eth_dev, uint16_t vring_id) struct rte_eth_conf *dev_conf = ð_dev->data->dev_conf; struct pmd_internal *internal = eth_dev->data->dev_private; struct rte_vhost_vring vring; - struct vhost_queue *vq; int rx_idx = vring_id % 2 ? (vring_id - 1) >> 1 : -1; int ret = 0; @@ -853,21 +847,17 @@ vring_conf_update(int vid, struct rte_eth_dev *eth_dev, uint16_t vring_id) rte_atomic32_read(&internal->dev_attached) && rte_atomic32_read(&internal->started) && dev_conf->intr_conf.rxq) { - vq = eth_dev->data->rx_queues[rx_idx]; ret = rte_vhost_get_vhost_vring(vid, vring_id, &vring); - if (!ret) { - if (vring.kickfd != - eth_dev->intr_handle->efds[rx_idx]) { - VHOST_LOG(INFO, - "kickfd for rxq-%d was changed.\n", - rx_idx); - eth_dev->intr_handle->efds[rx_idx] = - vring.kickfd; - } + if (ret) { + VHOST_LOG(ERR, "Failed to get vring %d information.\n", + vring_id); + return ret; + } - rte_vhost_enable_guest_notification(vid, vring_id, - vq->intr_en); - rte_wmb(); + if (vring.kickfd != eth_dev->intr_handle->efds[rx_idx]) { + VHOST_LOG(INFO, "kickfd for rxq-%d was changed.\n", + rx_idx); + eth_dev->intr_handle->efds[rx_idx] = vring.kickfd; } } -- 2.26.2