From 40163f9e1756fa62562c3f463706fb3f1b264f7b Mon Sep 17 00:00:00 2001 From: Lunyuan Cui Date: Fri, 17 Jan 2020 08:22:58 +0000 Subject: [PATCH] net/i40e: fix multi-queue Rx interrupt for VF MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit The interrupt vector which bind to queues should not be larger than the max available vector. It will cause port start failed. This patch changed the judgement condition of the limited vector id. It can effectively avoid vector id out of range. Fixes: 6a6cf5f88b4a ("net/i40e: enable multi-queue Rx interrupt for VF") Signed-off-by: Lunyuan Cui Reviewed-by: Qiming Yang --- drivers/net/i40e/i40e_ethdev_vf.c | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/drivers/net/i40e/i40e_ethdev_vf.c b/drivers/net/i40e/i40e_ethdev_vf.c index fa2c7deeac..b846373092 100644 --- a/drivers/net/i40e/i40e_ethdev_vf.c +++ b/drivers/net/i40e/i40e_ethdev_vf.c @@ -658,7 +658,6 @@ i40evf_config_irq_map(struct rte_eth_dev *dev) struct rte_intr_handle *intr_handle = &pci_dev->intr_handle; uint32_t vector_id; int i, err; - uint16_t nb_msix; if (dev->data->dev_conf.intr_conf.rxq != 0 && rte_intr_allow_others(intr_handle)) @@ -666,9 +665,6 @@ i40evf_config_irq_map(struct rte_eth_dev *dev) else vector_id = I40E_MISC_VEC_ID; - nb_msix = RTE_MIN(vf->vf_res->max_vectors, - intr_handle->nb_efd); - map_info = (struct virtchnl_irq_map_info *)cmd_buffer; map_info->num_vectors = dev->data->nb_rx_queues; for (i = 0; i < dev->data->nb_rx_queues; i++) { @@ -683,7 +679,7 @@ i40evf_config_irq_map(struct rte_eth_dev *dev) intr_handle->intr_vec[i] = vector_id; if (vector_id > I40E_MISC_VEC_ID) vector_id++; - if (vector_id > nb_msix) + if (vector_id >= vf->vf_res->max_vectors) vector_id = I40E_RX_VEC_START; } -- 2.20.1