From mboxrd@z Thu Jan 1 00:00:00 1970 From: Chas Williams <3chas3@gmail.com> Subject: [PATCH] net/ixgbe: fix reconfiguration of rx queues Date: Mon, 29 Jan 2018 10:21:15 -0500 Message-ID: <20180129152115.26359-1-3chas3@gmail.com> Cc: wenzhuo.lu@intel.com, konstantin.ananyev@intel.com, "Charles (Chas) Williams" To: dev@dpdk.org Return-path: Received: from mail-qt0-f193.google.com (mail-qt0-f193.google.com [209.85.216.193]) by dpdk.org (Postfix) with ESMTP id 423231B7AD for ; Mon, 29 Jan 2018 16:21:22 +0100 (CET) Received: by mail-qt0-f193.google.com with SMTP id o35so13057489qtj.13 for ; Mon, 29 Jan 2018 07:21:22 -0800 (PST) List-Id: DPDK patches and discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dev-bounces@dpdk.org Sender: "dev" From: "Charles (Chas) Williams" .dev_configure() may be called again after RX queues have been setup. This has the effect of clearing whatever setting the RX queues made for rx_bulk_alloc_allowed or rx_vec_allowed. Only reset this configuration is there aren't any currently allocated queues. Fixes: 01fa1d6215fa ("ixgbe: unify Rx setup") Signed-off-by: Chas Williams --- drivers/net/ixgbe/ixgbe_ethdev.c | 18 ++++++++++++++++-- 1 file changed, 16 insertions(+), 2 deletions(-) diff --git a/drivers/net/ixgbe/ixgbe_ethdev.c b/drivers/net/ixgbe/ixgbe_ethdev.c index 37eb668..b39249a 100644 --- a/drivers/net/ixgbe/ixgbe_ethdev.c +++ b/drivers/net/ixgbe/ixgbe_ethdev.c @@ -2348,6 +2348,7 @@ ixgbe_dev_configure(struct rte_eth_dev *dev) struct ixgbe_adapter *adapter = (struct ixgbe_adapter *)dev->data->dev_private; int ret; + uint16_t i; PMD_INIT_FUNC_TRACE(); /* multipe queue mode checking */ @@ -2363,11 +2364,17 @@ ixgbe_dev_configure(struct rte_eth_dev *dev) /* * Initialize to TRUE. If any of Rx queues doesn't meet the bulk - * allocation or vector Rx preconditions we will reset it. + * allocation or vector Rx preconditions we will reset it. We + * can only do this is there aren't any existing RX queues. */ + for (i = 0; i < dev->data->nb_rx_queues; i++) { + if (dev->data->rx_queues[i]) + goto out; + } adapter->rx_bulk_alloc_allowed = true; adapter->rx_vec_allowed = true; +out: return 0; } @@ -4959,6 +4966,7 @@ ixgbevf_dev_configure(struct rte_eth_dev *dev) struct rte_eth_conf *conf = &dev->data->dev_conf; struct ixgbe_adapter *adapter = (struct ixgbe_adapter *)dev->data->dev_private; + uint16_t i; PMD_INIT_LOG(DEBUG, "Configured Virtual Function port id: %d", dev->data->port_id); @@ -4981,11 +4989,17 @@ ixgbevf_dev_configure(struct rte_eth_dev *dev) /* * Initialize to TRUE. If any of Rx queues doesn't meet the bulk - * allocation or vector Rx preconditions we will reset it. + * allocation or vector Rx preconditions we will reset it. We + * can only do this is there aren't any existing RX queues. */ + for (i = 0; i < dev->data->nb_rx_queues; i++) { + if (dev->data->rx_queues[i]) + goto out; + } adapter->rx_bulk_alloc_allowed = true; adapter->rx_vec_allowed = true; +out: return 0; } -- 2.9.5