From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from dpdk.org (dpdk.org [92.243.14.124]) by inbox.dpdk.org (Postfix) with ESMTP id 4ABEBA0518 for ; Fri, 24 Jul 2020 11:54:53 +0200 (CEST) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id D0BF01C027; Fri, 24 Jul 2020 11:54:52 +0200 (CEST) Received: from mga09.intel.com (mga09.intel.com [134.134.136.24]) by dpdk.org (Postfix) with ESMTP id 1B9761BFE3; Fri, 24 Jul 2020 11:54:48 +0200 (CEST) IronPort-SDR: hxSskfFOrDNii1tA7VpKHdhcs1DFEQa/mkniFzMaqnU0WBbObOy5VPsbK794+mY6fl+Y2GYxXI KtM7VFTD+ffA== X-IronPort-AV: E=McAfee;i="6000,8403,9691"; a="151973904" X-IronPort-AV: E=Sophos;i="5.75,390,1589266800"; d="scan'208";a="151973904" X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from orsmga002.jf.intel.com ([10.7.209.21]) by orsmga102.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 24 Jul 2020 02:54:48 -0700 IronPort-SDR: l5Mkjy6rHupGgG2wppjQyvBFsvx0CJkzlZm5WDBDwgYkWbhsnva2BeQilM9NTiYvjS0vSBGh/7 89b6O5UoAPqA== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.75,390,1589266800"; d="scan'208";a="302623060" Received: from jguo15x-mobl.ccr.corp.intel.com (HELO [10.67.68.150]) ([10.67.68.150]) by orsmga002.jf.intel.com with ESMTP; 24 Jul 2020 02:54:46 -0700 To: Shougang Wang , dev@dpdk.org Cc: beilei.xing@intel.com, Yang Qiming , stable@dpdk.org References: <20200715063515.9262-1-shougangx.wang@intel.com> <20200724093834.28221-1-shougangx.wang@intel.com> From: Jeff Guo Message-ID: <7d2a4c66-5469-58fc-9563-7c195d8059c3@intel.com> Date: Fri, 24 Jul 2020 17:54:45 +0800 User-Agent: Mozilla/5.0 (Windows NT 10.0; WOW64; rv:68.0) Gecko/20100101 Thunderbird/68.10.0 MIME-Version: 1.0 In-Reply-To: <20200724093834.28221-1-shougangx.wang@intel.com> Content-Type: text/plain; charset=utf-8; format=flowed Content-Transfer-Encoding: 7bit Content-Language: en-US Subject: Re: [dpdk-stable] [PATCH v6] net/i40e: fix incorrect hash look up table X-BeenThere: stable@dpdk.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: patches for DPDK stable branches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: stable-bounces@dpdk.org Sender: "stable" Acked-by: Jeff Guo 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 > Tested-by: Zhang, XiX > --- > 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)