From 999a867c936aa14f7791592cc8627b622ad71f58 Mon Sep 17 00:00:00 2001 From: Jingjing Wu Date: Mon, 13 Jul 2015 09:21:41 +0800 Subject: [PATCH] i40evf: fix RSS with less Rx queues than Tx queues I40e VF driver uses the num_queue_pairs in vf structure to construct queue index look up table. When the nb_rx_queue is less than nb_tx_queue, num_queue_pairs is equal to nb_tx_queue. It will make the table use invalid queue index, then application cannot poll packets on these queues. This patch also moves the inline function i40e_align_floor from i40e_ethdev.c to i40e_ethdev.h. Test report: http://dpdk.org/ml/archives/dev/2015-July/021838.html Signed-off-by: Jingjing Wu Acked-by: Helin Zhang Tested-by: Qian Xu --- drivers/net/i40e/i40e_ethdev.c | 8 -------- drivers/net/i40e/i40e_ethdev.h | 8 ++++++++ drivers/net/i40e/i40e_ethdev_vf.c | 6 +++++- 3 files changed, 13 insertions(+), 9 deletions(-) diff --git a/drivers/net/i40e/i40e_ethdev.c b/drivers/net/i40e/i40e_ethdev.c index c855af2b1f..40b052603c 100644 --- a/drivers/net/i40e/i40e_ethdev.c +++ b/drivers/net/i40e/i40e_ethdev.c @@ -303,14 +303,6 @@ static struct eth_driver rte_i40e_pmd = { .dev_private_size = sizeof(struct i40e_adapter), }; -static inline int -i40e_align_floor(int n) -{ - if (n == 0) - return 0; - return (1 << (sizeof(n) * CHAR_BIT - 1 - __builtin_clz(n))); -} - static inline int rte_i40e_dev_atomic_read_link_status(struct rte_eth_dev *dev, struct rte_eth_link *link) diff --git a/drivers/net/i40e/i40e_ethdev.h b/drivers/net/i40e/i40e_ethdev.h index 883ee06650..6185657a4f 100644 --- a/drivers/net/i40e/i40e_ethdev.h +++ b/drivers/net/i40e/i40e_ethdev.h @@ -563,6 +563,14 @@ i40e_init_adminq_parameter(struct i40e_hw *hw) hw->aq.asq_buf_size = I40E_AQ_BUF_SZ; } +static inline int +i40e_align_floor(int n) +{ + if (n == 0) + return 0; + return 1 << (sizeof(n) * CHAR_BIT - 1 - __builtin_clz(n)); +} + #define I40E_VALID_FLOW(flow_type) \ ((flow_type) == RTE_ETH_FLOW_FRAG_IPV4 || \ (flow_type) == RTE_ETH_FLOW_NONFRAG_IPV4_TCP || \ diff --git a/drivers/net/i40e/i40e_ethdev_vf.c b/drivers/net/i40e/i40e_ethdev_vf.c index 568a685c54..f3470e6c4e 100644 --- a/drivers/net/i40e/i40e_ethdev_vf.c +++ b/drivers/net/i40e/i40e_ethdev_vf.c @@ -1524,6 +1524,8 @@ i40evf_rx_init(struct rte_eth_dev *dev) i40evf_config_rss(vf); for (i = 0; i < dev->data->nb_rx_queues; i++) { + if (!rxq[i] || !rxq[i]->q_set) + continue; if (i40evf_rxq_init(dev, rxq[i]) < 0) return -EFAULT; } @@ -1905,6 +1907,7 @@ i40evf_config_rss(struct i40e_vf *vf) struct i40e_hw *hw = I40E_VF_TO_HW(vf); struct rte_eth_rss_conf rss_conf; uint32_t i, j, lut = 0, nb_q = (I40E_VFQF_HLUT_MAX_INDEX + 1) * 4; + uint16_t num; if (vf->dev_data->dev_conf.rxmode.mq_mode != ETH_MQ_RX_RSS) { i40evf_disable_rss(vf); @@ -1912,9 +1915,10 @@ i40evf_config_rss(struct i40e_vf *vf) return 0; } + num = i40e_align_floor(vf->dev_data->nb_rx_queues); /* Fill out the look up table */ for (i = 0, j = 0; i < nb_q; i++, j++) { - if (j >= vf->num_queue_pairs) + if (j >= num) j = 0; lut = (lut << 8) | j; if ((i & 3) == 3) -- 2.20.1