From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mga09.intel.com (mga09.intel.com [134.134.136.24]) by dpdk.org (Postfix) with ESMTP id 5C1D42BD0 for ; Mon, 7 Nov 2016 10:24:26 +0100 (CET) Received: from fmsmga002.fm.intel.com ([10.253.24.26]) by orsmga102.jf.intel.com with ESMTP; 07 Nov 2016 01:24:17 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.31,605,1473145200"; d="scan'208";a="1081630680" Received: from yliu-dev.sh.intel.com (HELO yliu-dev) ([10.239.67.162]) by fmsmga002.fm.intel.com with ESMTP; 07 Nov 2016 01:24:16 -0800 Date: Mon, 7 Nov 2016 17:25:06 +0800 From: Yuanhan Liu To: dev@dpdk.org Cc: Thomas Monjalon , Tan Jianfeng , Kevin Traynor , Ilya Maximets , Kyle Larose , Maxime Coquelin Message-ID: <20161107092506.GI12283@yliu-dev.sh.intel.com> References: <1478338865-26126-1-git-send-email-yuanhan.liu@linux.intel.com> <1478338865-26126-11-git-send-email-yuanhan.liu@linux.intel.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <1478338865-26126-11-git-send-email-yuanhan.liu@linux.intel.com> User-Agent: Mutt/1.5.23 (2014-03-12) Subject: Re: [dpdk-dev] [PATCH v2 10/10] net/virtio: fix multiple queue enabling X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: patches and discussions about DPDK List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 07 Nov 2016 09:24:26 -0000 On Sat, Nov 05, 2016 at 05:41:05PM +0800, Yuanhan Liu wrote: > When queue number shrinks to 1 from X, the following code stops us > sending the multiple queue ctrl message: > > if (nb_queues > 1) { > if (virtio_set_multiple_queues(dev, nb_queues) != 0) > return -EINVAL; > } > > This ends up with still X queues being enabled, which is obviously > wrong. Fix it by removing the check. > > Fixes: 823ad647950a ("virtio: support multiple queues") > > Signed-off-by: Yuanhan Liu This breaks the virtio-user case, where ctrl-queue is not enabled by defeault. Here is an update patch would fix this. --yliu --- >>From 22502943764a99b1398d40f0110f8ce28323323a Mon Sep 17 00:00:00 2001 From: Yuanhan Liu Date: Sat, 5 Nov 2016 16:53:27 +0800 Subject: [PATCH v3 10/10] net/virtio: fix multiple queue enabling When queue number shrinks to 1 from X, the following code stops us sending the multiple queue ctrl message: if (nb_queues > 1) { if (virtio_set_multiple_queues(dev, nb_queues) != 0) return -EINVAL; } This ends up with still X queues being enabled, which is obviously wrong. Fix it by replacing the check with a multiple queue enabled or not check. Fixes: 823ad647950a ("virtio: support multiple queues") Signed-off-by: Yuanhan Liu --- v3: - fix the virtio-user case, which is default with ctrl-queue being disabled. Thus virtio_set_multiple_queues fails. --- drivers/net/virtio/virtio_ethdev.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/drivers/net/virtio/virtio_ethdev.c b/drivers/net/virtio/virtio_ethdev.c index d70bd00..18da98f 100644 --- a/drivers/net/virtio/virtio_ethdev.c +++ b/drivers/net/virtio/virtio_ethdev.c @@ -1472,6 +1472,7 @@ virtio_dev_start(struct rte_eth_dev *dev) uint16_t nb_queues, i; struct virtnet_rx *rxvq; struct virtnet_tx *txvq __rte_unused; + struct virtio_hw *hw = dev->data->dev_private; /* check if lsc interrupt feature is enabled */ if (dev->data->dev_conf.intr_conf.lsc) { @@ -1494,7 +1495,7 @@ virtio_dev_start(struct rte_eth_dev *dev) *vhost backend will have no chance to be waked up */ nb_queues = RTE_MAX(dev->data->nb_rx_queues, dev->data->nb_tx_queues); - if (nb_queues > 1) { + if (hw->max_queue_pairs > 1) { if (virtio_set_multiple_queues(dev, nb_queues) != 0) return -EINVAL; } -- 1.9.0