[PATCH] net/ixgbe: fix reconfiguration of rx queues

[Chas Williams <3chas3@gmail.com>]

From: "Charles (Chas) Williams" <chas3@att.com>

.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 <chas3@att.com>
---
 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