Re: [dpdk-dev] [PATCH v6] net/i40e: fix incorrect hash look up table

[Jeff Guo <jia.guo@intel.com>]

Acked-by: Jeff Guo <jia.guo@intel.com>

On 7/24/2020 5:38 PM, Shougang Wang wrote:
> The hash look up table (LUT) is managed by global register but it is not
> initialized when RSS is disabled. Once user wants to enable RSS during
> runtime, the LUT will not be initialized.
> This patch fixes the issue by initializing the LUT whatever RSS enabled
> or not.
>
> Fixes: feaae285b342 ("net/i40e: support hash configuration in RSS flow")
> Cc: stable@dpdk.org
>
> Signed-off-by: Shougang Wang <shougangx.wang@intel.com>
> Tested-by: Zhang, XiX <xix.zhang@intel.com>
> ---
> v6:
> -Remove useless comment.
>   drivers/net/i40e/i40e_ethdev.c | 25 +++++--------------------
>   1 file changed, 5 insertions(+), 20 deletions(-)
>
> diff --git a/drivers/net/i40e/i40e_ethdev.c b/drivers/net/i40e/i40e_ethdev.c
> index 05d5f2861..890f05d90 100644
> --- a/drivers/net/i40e/i40e_ethdev.c
> +++ b/drivers/net/i40e/i40e_ethdev.c
> @@ -302,7 +302,6 @@ static int i40e_dev_init_vlan(struct rte_eth_dev *dev);
>   static int i40e_veb_release(struct i40e_veb *veb);
>   static struct i40e_veb *i40e_veb_setup(struct i40e_pf *pf,
>   						struct i40e_vsi *vsi);
> -static int i40e_pf_config_mq_rx(struct i40e_pf *pf);
>   static int i40e_vsi_config_double_vlan(struct i40e_vsi *vsi, int on);
>   static inline int i40e_find_all_mac_for_vlan(struct i40e_vsi *vsi,
>   					     struct i40e_macvlan_filter *mv_f,
> @@ -398,6 +397,7 @@ static void i40e_ethertype_filter_restore(struct i40e_pf *pf);
>   static void i40e_tunnel_filter_restore(struct i40e_pf *pf);
>   static void i40e_filter_restore(struct i40e_pf *pf);
>   static void i40e_notify_all_vfs_link_status(struct rte_eth_dev *dev);
> +static int i40e_pf_config_rss(struct i40e_pf *pf);
>   
>   static const char *const valid_keys[] = {
>   	ETH_I40E_FLOATING_VEB_ARG,
> @@ -1954,8 +1954,6 @@ i40e_dev_configure(struct rte_eth_dev *dev)
>   		goto err;
>   
>   	/* VMDQ setup.
> -	 *  Needs to move VMDQ setting out of i40e_pf_config_mq_rx() as VMDQ and
> -	 *  RSS setting have different requirements.
>   	 *  General PMD driver call sequence are NIC init, configure,
>   	 *  rx/tx_queue_setup and dev_start. In rx/tx_queue_setup() function, it
>   	 *  will try to lookup the VSI that specific queue belongs to if VMDQ
> @@ -6478,7 +6476,7 @@ i40e_dev_rx_init(struct i40e_pf *pf)
>   	uint16_t i;
>   	struct i40e_rx_queue *rxq;
>   
> -	i40e_pf_config_mq_rx(pf);
> +	i40e_pf_config_rss(pf);
>   	for (i = 0; i < data->nb_rx_queues; i++) {
>   		rxq = data->rx_queues[i];
>   		if (!rxq || !rxq->q_set)
> @@ -8984,6 +8982,7 @@ i40e_pf_calc_configured_queues_num(struct i40e_pf *pf)
>   static int
>   i40e_pf_config_rss(struct i40e_pf *pf)
>   {
> +	enum rte_eth_rx_mq_mode mq_mode = pf->dev_data->dev_conf.rxmode.mq_mode;
>   	struct i40e_hw *hw = I40E_PF_TO_HW(pf);
>   	struct rte_eth_rss_conf rss_conf;
>   	uint32_t i, lut = 0;
> @@ -9022,7 +9021,8 @@ i40e_pf_config_rss(struct i40e_pf *pf)
>   	}
>   
>   	rss_conf = pf->dev_data->dev_conf.rx_adv_conf.rss_conf;
> -	if ((rss_conf.rss_hf & pf->adapter->flow_types_mask) == 0) {
> +	if ((rss_conf.rss_hf & pf->adapter->flow_types_mask) == 0 ||
> +	    !(mq_mode & ETH_MQ_RX_RSS_FLAG)) {
>   		i40e_pf_disable_rss(pf);
>   		return 0;
>   	}
> @@ -9195,21 +9195,6 @@ i40e_tunnel_filter_handle(struct rte_eth_dev *dev,
>   	return ret;
>   }
>   
> -static int
> -i40e_pf_config_mq_rx(struct i40e_pf *pf)
> -{
> -	int ret = 0;
> -	enum rte_eth_rx_mq_mode mq_mode = pf->dev_data->dev_conf.rxmode.mq_mode;
> -
> -	/* RSS setup */
> -	if (mq_mode & ETH_MQ_RX_RSS_FLAG)
> -		ret = i40e_pf_config_rss(pf);
> -	else
> -		i40e_pf_disable_rss(pf);
> -
> -	return ret;
> -}
> -
>   /* Get the symmetric hash enable configurations per port */
>   static void
>   i40e_get_symmetric_hash_enable_per_port(struct i40e_hw *hw, uint8_t *enable)