[v4] net/i40e: fix vf runtime queues rss config

Message ID 1565631812-3136-1-git-send-email-xiao.zhang@intel.com
State Superseded
Headers show
Series
  • [v4] net/i40e: fix vf runtime queues rss config
Related show

Checks

Context Check Description
ci/Performance-Testing fail build patch failure
ci/Intel-compilation fail Compilation issues
ci/checkpatch success coding style OK

Commit Message

Xiao Zhang Aug. 12, 2019, 5:43 p.m.
I40evf queue can not work properly with kernel pf driver. Eg. when
configure 8 queues pair, only 4 queues can receive packets, and half
packets will be lost if using 2 queues pair.
This issue is caused by misconfiguration of look up table, use aq command
to setup the lut to make it work properly.

Fixes: cea7a51c1750 ("i40evf: support RSS")
Cc: stable@dpdk.org

Signed-off-by: Xiao Zhang <xiao.zhang@intel.com>
---
v4 move local variable definition to the begin of the function
v3 move LUT configuration in to i40evf_configure_rss
v2 change for loop format to avoid build patch issue
---
 drivers/net/i40e/i40e_ethdev_vf.c | 32 ++++++++++++++++++++++++++------
 1 file changed, 26 insertions(+), 6 deletions(-)

Comments

Aaron Conole Aug. 12, 2019, 12:07 p.m. | #1
Xiao Zhang <xiao.zhang@intel.com> writes:

> I40evf queue can not work properly with kernel pf driver. Eg. when
> configure 8 queues pair, only 4 queues can receive packets, and half
> packets will be lost if using 2 queues pair.
> This issue is caused by misconfiguration of look up table, use aq command
> to setup the lut to make it work properly.
>
> Fixes: cea7a51c1750 ("i40evf: support RSS")
> Cc: stable@dpdk.org
>
> Signed-off-by: Xiao Zhang <xiao.zhang@intel.com>
> ---

I see a large number of failures:

https://travis-ci.com/ovsrobot/dpdk/builds/122763118

Can you check this?
Xing, Beilei Aug. 13, 2019, 1:43 a.m. | #2
Hi,

> -----Original Message-----
> From: Zhang, Xiao
> Sent: Tuesday, August 13, 2019 1:44 AM
> To: dev@dpdk.org
> Cc: Xing, Beilei <beilei.xing@intel.com>; Zhang, Xiao <xiao.zhang@intel.com>;
> stable@dpdk.org
> Subject: [v4] net/i40e: fix vf runtime queues rss config
> 
> I40evf queue can not work properly with kernel pf driver. Eg. when configure
> 8 queues pair, only 4 queues can receive packets, and half packets will be lost
> if using 2 queues pair.
> This issue is caused by misconfiguration of look up table, use aq command to
> setup the lut to make it work properly.
> 
> Fixes: cea7a51c1750 ("i40evf: support RSS")
> Cc: stable@dpdk.org
> 
> Signed-off-by: Xiao Zhang <xiao.zhang@intel.com>
> ---
> v4 move local variable definition to the begin of the function
> v3 move LUT configuration in to i40evf_configure_rss
> v2 change for loop format to avoid build patch issue
> ---
>  drivers/net/i40e/i40e_ethdev_vf.c | 32 ++++++++++++++++++++++++++------
>  1 file changed, 26 insertions(+), 6 deletions(-)
> 
> diff --git a/drivers/net/i40e/i40e_ethdev_vf.c
> b/drivers/net/i40e/i40e_ethdev_vf.c
> index 308fb98..8c34afb 100644
> --- a/drivers/net/i40e/i40e_ethdev_vf.c
> +++ b/drivers/net/i40e/i40e_ethdev_vf.c
> @@ -2598,7 +2598,10 @@ 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;
> +	uint32_t rss_lut_size = (I40E_VFQF_HLUT1_MAX_INDEX + 1) * 4;
>  	uint16_t num;
> +	uint8_t *lut;

The pointer *lut is conflict with above 'uint32_t lut = 0'.

> +	int ret;
> 
>  	if (vf->dev_data->dev_conf.rxmode.mq_mode != ETH_MQ_RX_RSS) {
>  		i40evf_disable_rss(vf);
> @@ -2608,12 +2611,29 @@ i40evf_config_rss(struct i40e_vf *vf)
> 
>  	num = RTE_MIN(vf->dev_data->nb_rx_queues,
> I40E_MAX_QP_NUM_PER_VF);
>  	/* Fill out the look up table */
> -	for (i = 0, j = 0; i < nb_q; i++, j++) {
> -		if (j >= num)
> -			j = 0;
> -		lut = (lut << 8) | j;
> -		if ((i & 3) == 3)
> -			I40E_WRITE_REG(hw, I40E_VFQF_HLUT(i >> 2), lut);
> +	if (!(vf->flags & I40E_FLAG_RSS_AQ_CAPABLE)) {
> +		for (i = 0, j = 0; i < nb_q; i++, j++) {
> +			if (j >= num)
> +				j = 0;
> +			lut = (lut << 8) | j;
> +			if ((i & 3) == 3)
> +				I40E_WRITE_REG(hw, I40E_VFQF_HLUT(i >>
> 2), lut);
> +		}
> +	} else {
> +		lut = rte_zmalloc("i40e_rss_lut", rss_lut_size, 0);
> +		if (!lut) {
> +			PMD_DRV_LOG(ERR, "No memory can be allocated");
> +			return -ENOMEM;
> +		}
> +
> +		for (i = 0; i < rss_lut_size; i++)
> +			lut[i] = i % vf->num_queue_pairs;
> +
> +		ret = i40evf_set_rss_lut(&vf->vsi, lut,
> +					 rss_lut_size);
> +		rte_free(lut);
> +		if (ret)
> +			return ret;
>  	}
> 
>  	rss_conf = vf->dev_data->dev_conf.rx_adv_conf.rss_conf;
> --
> 2.7.4

Patch

diff --git a/drivers/net/i40e/i40e_ethdev_vf.c b/drivers/net/i40e/i40e_ethdev_vf.c
index 308fb98..8c34afb 100644
--- a/drivers/net/i40e/i40e_ethdev_vf.c
+++ b/drivers/net/i40e/i40e_ethdev_vf.c
@@ -2598,7 +2598,10 @@  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;
+	uint32_t rss_lut_size = (I40E_VFQF_HLUT1_MAX_INDEX + 1) * 4;
 	uint16_t num;
+	uint8_t *lut;
+	int ret;
 
 	if (vf->dev_data->dev_conf.rxmode.mq_mode != ETH_MQ_RX_RSS) {
 		i40evf_disable_rss(vf);
@@ -2608,12 +2611,29 @@  i40evf_config_rss(struct i40e_vf *vf)
 
 	num = RTE_MIN(vf->dev_data->nb_rx_queues, I40E_MAX_QP_NUM_PER_VF);
 	/* Fill out the look up table */
-	for (i = 0, j = 0; i < nb_q; i++, j++) {
-		if (j >= num)
-			j = 0;
-		lut = (lut << 8) | j;
-		if ((i & 3) == 3)
-			I40E_WRITE_REG(hw, I40E_VFQF_HLUT(i >> 2), lut);
+	if (!(vf->flags & I40E_FLAG_RSS_AQ_CAPABLE)) {
+		for (i = 0, j = 0; i < nb_q; i++, j++) {
+			if (j >= num)
+				j = 0;
+			lut = (lut << 8) | j;
+			if ((i & 3) == 3)
+				I40E_WRITE_REG(hw, I40E_VFQF_HLUT(i >> 2), lut);
+		}
+	} else {
+		lut = rte_zmalloc("i40e_rss_lut", rss_lut_size, 0);
+		if (!lut) {
+			PMD_DRV_LOG(ERR, "No memory can be allocated");
+			return -ENOMEM;
+		}
+
+		for (i = 0; i < rss_lut_size; i++)
+			lut[i] = i % vf->num_queue_pairs;
+
+		ret = i40evf_set_rss_lut(&vf->vsi, lut,
+					 rss_lut_size);
+		rte_free(lut);
+		if (ret)
+			return ret;
 	}
 
 	rss_conf = vf->dev_data->dev_conf.rx_adv_conf.rss_conf;