[PATCH v4 17/23] net/ice: enable multiple queues configurations for large VF

[Kevin Liu <kevinx.liu@intel.com>]

From: Steve Yang <stevex.yang@intel.com>

Since the adminq buffer size has a 4K limitation, the current virtchnl
command VIRTCHNL_OP_CONFIG_VSI_QUEUES cannot send the message only once to
configure up to 256 queues. In this patch, we send the messages multiple
times to make sure that the buffer size is less than 4K each time.

Signed-off-by: Steve Yang <stevex.yang@intel.com>
Signed-off-by: Kevin Liu <kevinx.liu@intel.com>
---
 drivers/net/ice/ice_dcf.c        | 11 ++++++-----
 drivers/net/ice/ice_dcf.h        |  3 ++-
 drivers/net/ice/ice_dcf_ethdev.c | 20 ++++++++++++++++++--
 drivers/net/ice/ice_dcf_ethdev.h |  1 +
 4 files changed, 27 insertions(+), 8 deletions(-)

diff --git a/drivers/net/ice/ice_dcf.c b/drivers/net/ice/ice_dcf.c
index 7091658841..7004c00f1c 100644
--- a/drivers/net/ice/ice_dcf.c
+++ b/drivers/net/ice/ice_dcf.c
@@ -949,7 +949,8 @@ ice_dcf_init_rss(struct ice_dcf_hw *hw)
 #define IAVF_RXDID_COMMS_OVS_1 22
 
 int
-ice_dcf_configure_queues(struct ice_dcf_hw *hw)
+ice_dcf_configure_queues(struct ice_dcf_hw *hw,
+			 uint16_t num_queue_pairs, uint16_t index)
 {
 	struct ice_rx_queue **rxq =
 		(struct ice_rx_queue **)hw->eth_dev->data->rx_queues;
@@ -962,16 +963,16 @@ ice_dcf_configure_queues(struct ice_dcf_hw *hw)
 	int err;
 
 	size = sizeof(*vc_config) +
-	       sizeof(vc_config->qpair[0]) * hw->num_queue_pairs;
+	       sizeof(vc_config->qpair[0]) * num_queue_pairs;
 	vc_config = rte_zmalloc("cfg_queue", size, 0);
 	if (!vc_config)
 		return -ENOMEM;
 
 	vc_config->vsi_id = hw->vsi_res->vsi_id;
-	vc_config->num_queue_pairs = hw->num_queue_pairs;
+	vc_config->num_queue_pairs = num_queue_pairs;
 
-	for (i = 0, vc_qp = vc_config->qpair;
-	     i < hw->num_queue_pairs;
+	for (i = index, vc_qp = vc_config->qpair;
+	     i < index + num_queue_pairs;
 	     i++, vc_qp++) {
 		vc_qp->txq.vsi_id = hw->vsi_res->vsi_id;
 		vc_qp->txq.queue_id = i;
diff --git a/drivers/net/ice/ice_dcf.h b/drivers/net/ice/ice_dcf.h
index 05ea91d2a5..e36428a92a 100644
--- a/drivers/net/ice/ice_dcf.h
+++ b/drivers/net/ice/ice_dcf.h
@@ -129,7 +129,8 @@ void ice_dcf_uninit_hw(struct rte_eth_dev *eth_dev, struct ice_dcf_hw *hw);
 int ice_dcf_configure_rss_key(struct ice_dcf_hw *hw);
 int ice_dcf_configure_rss_lut(struct ice_dcf_hw *hw);
 int ice_dcf_init_rss(struct ice_dcf_hw *hw);
-int ice_dcf_configure_queues(struct ice_dcf_hw *hw);
+int ice_dcf_configure_queues(struct ice_dcf_hw *hw,
+			     uint16_t num_queue_pairs, uint16_t index);
 int ice_dcf_request_queues(struct ice_dcf_hw *hw, uint16_t num);
 int ice_dcf_get_max_rss_queue_region(struct ice_dcf_hw *hw);
 int ice_dcf_config_irq_map(struct ice_dcf_hw *hw);
diff --git a/drivers/net/ice/ice_dcf_ethdev.c b/drivers/net/ice/ice_dcf_ethdev.c
index a43c5a320d..78df82d5b5 100644
--- a/drivers/net/ice/ice_dcf_ethdev.c
+++ b/drivers/net/ice/ice_dcf_ethdev.c
@@ -513,6 +513,8 @@ ice_dcf_dev_start(struct rte_eth_dev *dev)
 	struct rte_intr_handle *intr_handle = dev->intr_handle;
 	struct ice_adapter *ad = &dcf_ad->parent;
 	struct ice_dcf_hw *hw = &dcf_ad->real_hw;
+	uint16_t num_queue_pairs;
+	uint16_t index = 0;
 	int ret;
 
 	if (hw->resetting) {
@@ -531,6 +533,7 @@ ice_dcf_dev_start(struct rte_eth_dev *dev)
 
 	hw->num_queue_pairs = RTE_MAX(dev->data->nb_rx_queues,
 				      dev->data->nb_tx_queues);
+	num_queue_pairs = hw->num_queue_pairs;
 
 	ret = ice_dcf_init_rx_queues(dev);
 	if (ret) {
@@ -546,7 +549,20 @@ ice_dcf_dev_start(struct rte_eth_dev *dev)
 		}
 	}
 
-	ret = ice_dcf_configure_queues(hw);
+	/* If needed, send configure queues msg multiple times to make the
+	 * adminq buffer length smaller than the 4K limitation.
+	 */
+	while (num_queue_pairs > ICE_DCF_CFG_Q_NUM_PER_BUF) {
+		if (ice_dcf_configure_queues(hw,
+				ICE_DCF_CFG_Q_NUM_PER_BUF, index) != 0) {
+			PMD_DRV_LOG(ERR, "configure queues failed");
+			goto err_queue;
+		}
+		num_queue_pairs -= ICE_DCF_CFG_Q_NUM_PER_BUF;
+		index += ICE_DCF_CFG_Q_NUM_PER_BUF;
+	}
+
+	ret = ice_dcf_configure_queues(hw, num_queue_pairs, index);
 	if (ret) {
 		PMD_DRV_LOG(ERR, "Fail to config queues");
 		return ret;
@@ -586,7 +602,7 @@ ice_dcf_dev_start(struct rte_eth_dev *dev)
 
 
 	dev->data->dev_link.link_status = RTE_ETH_LINK_UP;
-
+err_queue:
 	return 0;
 }
 
diff --git a/drivers/net/ice/ice_dcf_ethdev.h b/drivers/net/ice/ice_dcf_ethdev.h
index 4a08d32e0c..2fac1e5b21 100644
--- a/drivers/net/ice/ice_dcf_ethdev.h
+++ b/drivers/net/ice/ice_dcf_ethdev.h
@@ -22,6 +22,7 @@
 #define ICE_DCF_ETH_MAX_LEN (RTE_ETHER_MTU + ICE_DCF_ETH_OVERHEAD)
 #define ICE_DCF_MAX_NUM_QUEUES_DFLT 16
 #define ICE_DCF_MAX_NUM_QUEUES_LV   256
+#define ICE_DCF_CFG_Q_NUM_PER_BUF   32
 
 struct ice_dcf_queue {
 	uint64_t dummy;
-- 
2.33.1