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 7375FA04F5; Fri, 19 Jun 2020 10:05:38 +0200 (CEST) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id AC1AB54AE; Fri, 19 Jun 2020 10:05:37 +0200 (CEST) Received: from mga05.intel.com (mga05.intel.com [192.55.52.43]) by dpdk.org (Postfix) with ESMTP id 6907A4C7B; Fri, 19 Jun 2020 10:05:35 +0200 (CEST) IronPort-SDR: 3Yk1BWM/LAjnDn4octApH3M7R6023cqKyrIEoPXvkayyQdPpOeLBifPaPqKTRb9XiWnCpHmNAO 7dhxw4rI6jjA== X-IronPort-AV: E=McAfee;i="6000,8403,9656"; a="227571964" X-IronPort-AV: E=Sophos;i="5.75,254,1589266800"; d="scan'208";a="227571964" X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from orsmga002.jf.intel.com ([10.7.209.21]) by fmsmga105.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 19 Jun 2020 01:05:32 -0700 IronPort-SDR: cCCd/2GoxbMSIHCcPciqyGKlJmDxvy9IkFRNFQgZQQD2qOWuFXLZiRpppbS2ol/aH719cw86XU dN69DBL3U9mA== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.75,254,1589266800"; d="scan'208";a="292048675" Received: from intel.sh.intel.com ([10.239.255.48]) by orsmga002.jf.intel.com with ESMTP; 19 Jun 2020 01:05:31 -0700 From: Junyu Jiang To: dev@dpdk.org Cc: Jingjing Wu , Beilei Xing , Qiming Yang , Junyu Jiang , stable@dpdk.org Date: Fri, 19 Jun 2020 07:44:02 +0000 Message-Id: <20200619074402.5663-1-junyux.jiang@intel.com> X-Mailer: git-send-email 2.17.1 Subject: [dpdk-dev] [PATCH] net/iavf: fix RSS RETA settings invalid X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: DPDK patches and discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dev-bounces@dpdk.org Sender: "dev" This patch moved the RSS initialization from dev start to dev configure, to fix the issue that RSS redirection table can not be kept after restarting port. Fixes: 69dd4c3d0898 ("net/avf: enable queue and device") Cc: stable@dpdk.org Signed-off-by: Junyu Jiang --- drivers/net/iavf/iavf_ethdev.c | 71 +++++++++++++++++----------------- 1 file changed, 35 insertions(+), 36 deletions(-) diff --git a/drivers/net/iavf/iavf_ethdev.c b/drivers/net/iavf/iavf_ethdev.c index 2b1066b0a..5e79a2d03 100644 --- a/drivers/net/iavf/iavf_ethdev.c +++ b/drivers/net/iavf/iavf_ethdev.c @@ -136,34 +136,6 @@ static const struct eth_dev_ops iavf_eth_dev_ops = { .filter_ctrl = iavf_dev_filter_ctrl, }; -static int -iavf_dev_configure(struct rte_eth_dev *dev) -{ - struct iavf_adapter *ad = - IAVF_DEV_PRIVATE_TO_ADAPTER(dev->data->dev_private); - struct iavf_info *vf = IAVF_DEV_PRIVATE_TO_VF(ad); - struct rte_eth_conf *dev_conf = &dev->data->dev_conf; - - ad->rx_bulk_alloc_allowed = true; - /* Initialize to TRUE. If any of Rx queues doesn't meet the - * vector Rx/Tx preconditions, it will be reset. - */ - ad->rx_vec_allowed = true; - ad->tx_vec_allowed = true; - - if (dev->data->dev_conf.rxmode.mq_mode & ETH_MQ_RX_RSS_FLAG) - dev->data->dev_conf.rxmode.offloads |= DEV_RX_OFFLOAD_RSS_HASH; - - /* Vlan stripping setting */ - if (vf->vf_res->vf_cap_flags & VIRTCHNL_VF_OFFLOAD_VLAN) { - if (dev_conf->rxmode.offloads & DEV_RX_OFFLOAD_VLAN_STRIP) - iavf_enable_vlan_strip(ad); - else - iavf_disable_vlan_strip(ad); - } - return 0; -} - static int iavf_init_rss(struct iavf_adapter *adapter) { @@ -220,6 +192,41 @@ iavf_init_rss(struct iavf_adapter *adapter) return 0; } +static int +iavf_dev_configure(struct rte_eth_dev *dev) +{ + struct iavf_adapter *ad = + IAVF_DEV_PRIVATE_TO_ADAPTER(dev->data->dev_private); + struct iavf_info *vf = IAVF_DEV_PRIVATE_TO_VF(ad); + struct rte_eth_conf *dev_conf = &dev->data->dev_conf; + + ad->rx_bulk_alloc_allowed = true; + /* Initialize to TRUE. If any of Rx queues doesn't meet the + * vector Rx/Tx preconditions, it will be reset. + */ + ad->rx_vec_allowed = true; + ad->tx_vec_allowed = true; + + if (dev->data->dev_conf.rxmode.mq_mode & ETH_MQ_RX_RSS_FLAG) + dev->data->dev_conf.rxmode.offloads |= DEV_RX_OFFLOAD_RSS_HASH; + + /* Vlan stripping setting */ + if (vf->vf_res->vf_cap_flags & VIRTCHNL_VF_OFFLOAD_VLAN) { + if (dev_conf->rxmode.offloads & DEV_RX_OFFLOAD_VLAN_STRIP) + iavf_enable_vlan_strip(ad); + else + iavf_disable_vlan_strip(ad); + } + + if (vf->vf_res->vf_cap_flags & VIRTCHNL_VF_OFFLOAD_RSS_PF) { + if (iavf_init_rss(ad) != 0) { + PMD_DRV_LOG(ERR, "configure rss failed"); + return -1; + } + } + return 0; +} + static int iavf_init_rxq(struct rte_eth_dev *dev, struct iavf_rx_queue *rxq) { @@ -440,13 +447,6 @@ iavf_dev_start(struct rte_eth_dev *dev) return -1; } - if (vf->vf_res->vf_cap_flags & VIRTCHNL_VF_OFFLOAD_RSS_PF) { - if (iavf_init_rss(adapter) != 0) { - PMD_DRV_LOG(ERR, "configure rss failed"); - goto err_rss; - } - } - if (iavf_configure_queues(adapter) != 0) { PMD_DRV_LOG(ERR, "configure queues failed"); goto err_queue; @@ -475,7 +475,6 @@ iavf_dev_start(struct rte_eth_dev *dev) err_mac: iavf_add_del_all_mac_addr(adapter, false); err_queue: -err_rss: return -1; } -- 2.17.1