diff mbox series

net/iavf: fix RSS RETA settings invalid

Message ID 20200619074402.5663-1-junyux.jiang@intel.com (mailing list archive)
State Accepted, archived
Delegated to: Qi Zhang
Headers
Series net/iavf: fix RSS RETA settings invalid |

Checks

Context Check Description
ci/checkpatch success coding style OK
ci/iol-broadcom-Performance success Performance Testing PASS
ci/iol-intel-Performance success Performance Testing PASS
ci/iol-nxp-Performance success Performance Testing PASS
ci/Intel-compilation success Compilation OK
ci/iol-mellanox-Performance success Performance Testing PASS
ci/travis-robot success Travis build: passed
ci/iol-testing success Testing PASS

Commit Message

Junyu Jiang June 19, 2020, 7:44 a.m. UTC 
  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 <junyux.jiang@intel.com>
---
 drivers/net/iavf/iavf_ethdev.c | 71 +++++++++++++++++-----------------
 1 file changed, 35 insertions(+), 36 deletions(-)

Comments

Qiming Yang July 1, 2020, 2:10 a.m. UTC | #1 
> -----Original Message-----
> From: Jiang, JunyuX <junyux.jiang@intel.com>
> Sent: Friday, June 19, 2020 15:44
> To: dev@dpdk.org
> Cc: Wu, Jingjing <jingjing.wu@intel.com>; Xing, Beilei
> <beilei.xing@intel.com>; Yang, Qiming <qiming.yang@intel.com>; Jiang,
> JunyuX <junyux.jiang@intel.com>; stable@dpdk.org
> Subject: [PATCH] net/iavf: fix RSS RETA settings invalid
> 
> 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 <junyux.jiang@intel.com>
> ---
>  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

Acked-by: Qiming Yang <qiming.yang@intel.com>
Qi Zhang July 1, 2020, 12:15 p.m. UTC | #2 
> -----Original Message-----
> From: dev <dev-bounces@dpdk.org> On Behalf Of Yang, Qiming
> Sent: Wednesday, July 1, 2020 10:10 AM
> To: Jiang, JunyuX <junyux.jiang@intel.com>; dev@dpdk.org
> Cc: Wu, Jingjing <jingjing.wu@intel.com>; Xing, Beilei
> <beilei.xing@intel.com>; stable@dpdk.org
> Subject: Re: [dpdk-dev] [PATCH] net/iavf: fix RSS RETA settings invalid
> 
> > -----Original Message-----
> > From: Jiang, JunyuX <junyux.jiang@intel.com>
> > Sent: Friday, June 19, 2020 15:44
> > To: dev@dpdk.org
> > Cc: Wu, Jingjing <jingjing.wu@intel.com>; Xing, Beilei
> > <beilei.xing@intel.com>; Yang, Qiming <qiming.yang@intel.com>; Jiang,
> > JunyuX <junyux.jiang@intel.com>; stable@dpdk.org
> > Subject: [PATCH] net/iavf: fix RSS RETA settings invalid
> >
> > 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 <junyux.jiang@intel.com>
> > ---
> >  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
> 
> Acked-by: Qiming Yang <qiming.yang@intel.com>

Applied dpdk-next-net-intel.

Thanks
Qi
diff mbox series

Patch

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;
 }