net/iavf: add enable/disable queues for large VF

The current virtchnl structure for enable/disable queues only supports
max 32 queue pairs. Use a new opcode and structure to indicate up to 256
queue pairs, in order to enable/disable queues in large VF case.

Signed-off-by: Ting Xu <ting.xu@intel.com>
Acked-by: Beilei Xing <beilei.xing@intel.com>

diff --git a/drivers/net/iavf/iavf.h b/drivers/net/iavf/iavf.h
index 5e330b2..3d3b0da 100644 (file)
--- a/drivers/net/iavf/iavf.h
+++ b/drivers/net/iavf/iavf.h
@@ -23,6 +23,7 @@
 #define IAVF_MAX_NUM_QUEUES_LV          256
 #define IAVF_CFG_Q_NUM_PER_BUF          32
 #define IAVF_IRQ_MAP_NUM_PER_BUF        128
+#define IAVF_RXTX_QUEUE_CHUNKS_NUM      2
 
 #define IAVF_NUM_MACADDR_MAX      64
 
@@ -268,8 +269,12 @@ int iavf_enable_vlan_strip(struct iavf_adapter *adapter);
 int iavf_disable_vlan_strip(struct iavf_adapter *adapter);
 int iavf_switch_queue(struct iavf_adapter *adapter, uint16_t qid,
                     bool rx, bool on);
+int iavf_switch_queue_lv(struct iavf_adapter *adapter, uint16_t qid,
+                    bool rx, bool on);
 int iavf_enable_queues(struct iavf_adapter *adapter);
+int iavf_enable_queues_lv(struct iavf_adapter *adapter);
 int iavf_disable_queues(struct iavf_adapter *adapter);
+int iavf_disable_queues_lv(struct iavf_adapter *adapter);
 int iavf_configure_rss_lut(struct iavf_adapter *adapter);
 int iavf_configure_rss_key(struct iavf_adapter *adapter);
 int iavf_configure_queues(struct iavf_adapter *adapter,

diff --git a/drivers/net/iavf/iavf_rxtx.c b/drivers/net/iavf/iavf_rxtx.c
index 7d4f4ed..6635f7f 100644 (file)
--- a/drivers/net/iavf/iavf_rxtx.c
+++ b/drivers/net/iavf/iavf_rxtx.c
@@ -532,6 +532,7 @@ iavf_dev_rx_queue_start(struct rte_eth_dev *dev, uint16_t rx_queue_id)
 {
        struct iavf_adapter *adapter =
                IAVF_DEV_PRIVATE_TO_ADAPTER(dev->data->dev_private);
+       struct iavf_info *vf = IAVF_DEV_PRIVATE_TO_VF(dev->data->dev_private);
        struct iavf_hw *hw = IAVF_DEV_PRIVATE_TO_HW(dev->data->dev_private);
        struct iavf_rx_queue *rxq;
        int err = 0;
@@ -556,7 +557,11 @@ iavf_dev_rx_queue_start(struct rte_eth_dev *dev, uint16_t rx_queue_id)
        IAVF_WRITE_FLUSH(hw);
 
        /* Ready to switch the queue on */
-       err = iavf_switch_queue(adapter, rx_queue_id, true, true);
+       if (!vf->lv_enabled)
+               err = iavf_switch_queue(adapter, rx_queue_id, true, true);
+       else
+               err = iavf_switch_queue_lv(adapter, rx_queue_id, true, true);
+
        if (err)
                PMD_DRV_LOG(ERR, "Failed to switch RX queue %u on",
                            rx_queue_id);
@@ -572,6 +577,7 @@ iavf_dev_tx_queue_start(struct rte_eth_dev *dev, uint16_t tx_queue_id)
 {
        struct iavf_adapter *adapter =
                IAVF_DEV_PRIVATE_TO_ADAPTER(dev->data->dev_private);
+       struct iavf_info *vf = IAVF_DEV_PRIVATE_TO_VF(dev->data->dev_private);
        struct iavf_hw *hw = IAVF_DEV_PRIVATE_TO_HW(dev->data->dev_private);
        struct iavf_tx_queue *txq;
        int err = 0;
@@ -588,7 +594,10 @@ iavf_dev_tx_queue_start(struct rte_eth_dev *dev, uint16_t tx_queue_id)
        IAVF_WRITE_FLUSH(hw);
 
        /* Ready to switch the queue on */
-       err = iavf_switch_queue(adapter, tx_queue_id, false, true);
+       if (!vf->lv_enabled)
+               err = iavf_switch_queue(adapter, tx_queue_id, false, true);
+       else
+               err = iavf_switch_queue_lv(adapter, tx_queue_id, false, true);
 
        if (err)
                PMD_DRV_LOG(ERR, "Failed to switch TX queue %u on",
@@ -689,12 +698,22 @@ iavf_stop_queues(struct rte_eth_dev *dev)
 {
        struct iavf_adapter *adapter =
                IAVF_DEV_PRIVATE_TO_ADAPTER(dev->data->dev_private);
+       struct iavf_info *vf = IAVF_DEV_PRIVATE_TO_VF(dev->data->dev_private);
        struct iavf_rx_queue *rxq;
        struct iavf_tx_queue *txq;
        int ret, i;
 
        /* Stop All queues */
-       ret = iavf_disable_queues(adapter);
+       if (!vf->lv_enabled) {
+               ret = iavf_disable_queues(adapter);
+               if (ret)
+                       PMD_DRV_LOG(WARNING, "Fail to stop queues");
+       } else {
+               ret = iavf_disable_queues_lv(adapter);
+               if (ret)
+                       PMD_DRV_LOG(WARNING, "Fail to stop queues for large VF");
+       }
+
        if (ret)
                PMD_DRV_LOG(WARNING, "Fail to stop queues");
 

diff --git a/drivers/net/iavf/iavf_vchnl.c b/drivers/net/iavf/iavf_vchnl.c
index 145a4ff..54d9917 100644 (file)
--- a/drivers/net/iavf/iavf_vchnl.c
+++ b/drivers/net/iavf/iavf_vchnl.c
@@ -608,6 +608,138 @@ iavf_switch_queue(struct iavf_adapter *adapter, uint16_t qid,
        return err;
 }
 
+int
+iavf_enable_queues_lv(struct iavf_adapter *adapter)
+{
+       struct iavf_info *vf = IAVF_DEV_PRIVATE_TO_VF(adapter);
+       struct virtchnl_del_ena_dis_queues *queue_select;
+       struct virtchnl_queue_chunk *queue_chunk;
+       struct iavf_cmd_info args;
+       int err, len;
+
+       len = sizeof(struct virtchnl_del_ena_dis_queues) +
+                 sizeof(struct virtchnl_queue_chunk) *
+                 (IAVF_RXTX_QUEUE_CHUNKS_NUM - 1);
+       queue_select = rte_zmalloc("queue_select", len, 0);
+       if (!queue_select)
+               return -ENOMEM;
+
+       queue_chunk = queue_select->chunks.chunks;
+       queue_select->chunks.num_chunks = IAVF_RXTX_QUEUE_CHUNKS_NUM;
+       queue_select->vport_id = vf->vsi_res->vsi_id;
+
+       queue_chunk[VIRTCHNL_QUEUE_TYPE_TX].type = VIRTCHNL_QUEUE_TYPE_TX;
+       queue_chunk[VIRTCHNL_QUEUE_TYPE_TX].start_queue_id = 0;
+       queue_chunk[VIRTCHNL_QUEUE_TYPE_TX].num_queues =
+               adapter->eth_dev->data->nb_tx_queues;
+
+       queue_chunk[VIRTCHNL_QUEUE_TYPE_RX].type = VIRTCHNL_QUEUE_TYPE_RX;
+       queue_chunk[VIRTCHNL_QUEUE_TYPE_RX].start_queue_id = 0;
+       queue_chunk[VIRTCHNL_QUEUE_TYPE_RX].num_queues =
+               adapter->eth_dev->data->nb_rx_queues;
+
+       args.ops = VIRTCHNL_OP_ENABLE_QUEUES_V2;
+       args.in_args = (u8 *)queue_select;
+       args.in_args_size = len;
+       args.out_buffer = vf->aq_resp;
+       args.out_size = IAVF_AQ_BUF_SZ;
+       err = iavf_execute_vf_cmd(adapter, &args);
+       if (err) {
+               PMD_DRV_LOG(ERR,
+                           "Failed to execute command of OP_ENABLE_QUEUES_V2");
+               return err;
+       }
+       return 0;
+}
+
+int
+iavf_disable_queues_lv(struct iavf_adapter *adapter)
+{
+       struct iavf_info *vf = IAVF_DEV_PRIVATE_TO_VF(adapter);
+       struct virtchnl_del_ena_dis_queues *queue_select;
+       struct virtchnl_queue_chunk *queue_chunk;
+       struct iavf_cmd_info args;
+       int err, len;
+
+       len = sizeof(struct virtchnl_del_ena_dis_queues) +
+                 sizeof(struct virtchnl_queue_chunk) *
+                 (IAVF_RXTX_QUEUE_CHUNKS_NUM - 1);
+       queue_select = rte_zmalloc("queue_select", len, 0);
+       if (!queue_select)
+               return -ENOMEM;
+
+       queue_chunk = queue_select->chunks.chunks;
+       queue_select->chunks.num_chunks = IAVF_RXTX_QUEUE_CHUNKS_NUM;
+       queue_select->vport_id = vf->vsi_res->vsi_id;
+
+       queue_chunk[VIRTCHNL_QUEUE_TYPE_TX].type = VIRTCHNL_QUEUE_TYPE_TX;
+       queue_chunk[VIRTCHNL_QUEUE_TYPE_TX].start_queue_id = 0;
+       queue_chunk[VIRTCHNL_QUEUE_TYPE_TX].num_queues =
+               adapter->eth_dev->data->nb_tx_queues;
+
+       queue_chunk[VIRTCHNL_QUEUE_TYPE_RX].type = VIRTCHNL_QUEUE_TYPE_RX;
+       queue_chunk[VIRTCHNL_QUEUE_TYPE_RX].start_queue_id = 0;
+       queue_chunk[VIRTCHNL_QUEUE_TYPE_RX].num_queues =
+               adapter->eth_dev->data->nb_rx_queues;
+
+       args.ops = VIRTCHNL_OP_DISABLE_QUEUES_V2;
+       args.in_args = (u8 *)queue_select;
+       args.in_args_size = len;
+       args.out_buffer = vf->aq_resp;
+       args.out_size = IAVF_AQ_BUF_SZ;
+       err = iavf_execute_vf_cmd(adapter, &args);
+       if (err) {
+               PMD_DRV_LOG(ERR,
+                           "Failed to execute command of OP_DISABLE_QUEUES_V2");
+               return err;
+       }
+       return 0;
+}
+
+int
+iavf_switch_queue_lv(struct iavf_adapter *adapter, uint16_t qid,
+                bool rx, bool on)
+{
+       struct iavf_info *vf = IAVF_DEV_PRIVATE_TO_VF(adapter);
+       struct virtchnl_del_ena_dis_queues *queue_select;
+       struct virtchnl_queue_chunk *queue_chunk;
+       struct iavf_cmd_info args;
+       int err, len;
+
+       len = sizeof(struct virtchnl_del_ena_dis_queues);
+       queue_select = rte_zmalloc("queue_select", len, 0);
+       if (!queue_select)
+               return -ENOMEM;
+
+       queue_chunk = queue_select->chunks.chunks;
+       queue_select->chunks.num_chunks = 1;
+       queue_select->vport_id = vf->vsi_res->vsi_id;
+
+       if (rx) {
+               queue_chunk->type = VIRTCHNL_QUEUE_TYPE_RX;
+               queue_chunk->start_queue_id = qid;
+               queue_chunk->num_queues = 1;
+       } else {
+               queue_chunk->type = VIRTCHNL_QUEUE_TYPE_TX;
+               queue_chunk->start_queue_id = qid;
+               queue_chunk->num_queues = 1;
+       }
+
+       if (on)
+               args.ops = VIRTCHNL_OP_ENABLE_QUEUES_V2;
+       else
+               args.ops = VIRTCHNL_OP_DISABLE_QUEUES_V2;
+       args.in_args = (u8 *)queue_select;
+       args.in_args_size = len;
+       args.out_buffer = vf->aq_resp;
+       args.out_size = IAVF_AQ_BUF_SZ;
+       err = iavf_execute_vf_cmd(adapter, &args);
+       if (err)
+               PMD_DRV_LOG(ERR, "Failed to execute command of %s",
+                           on ? "OP_ENABLE_QUEUES_V2" : "OP_DISABLE_QUEUES_V2");
+       return err;
+}
+
 int
 iavf_configure_rss_lut(struct iavf_adapter *adapter)
 {