[V2] net/i40e: fix fdir cannot receive rx writeback issue
diff mbox series

Message ID 20200715230358.32562-1-chenmin.sun@intel.com
State Superseded
Delegated to: Qi Zhang
Headers show
Series
  • [V2] net/i40e: fix fdir cannot receive rx writeback issue
Related show

Checks

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

Commit Message

Sun, Chenmin July 15, 2020, 11:03 p.m. UTC
From: Chenmin Sun <chenmin.sun@intel.com>

This patch fixes the fdir cannot receive rx writeback packet issue,
by setting the fdir_vsi->nb_used_qps to 1.
Besides this, to make sure fdir programming works fine when the port
is stopped, move the fdir interrupt configure from start/stop to
setup/teardown.

Fixes: cfd662d22e ("net/i40e: fix interrupt throttling setting in PF")

Signed-off-by: Chenmin Sun <chenmin.sun@intel.com>
---

v2:
* Fix commit message typo
---
 drivers/net/i40e/i40e_ethdev.c | 15 ++-------------
 drivers/net/i40e/i40e_ethdev.h |  2 ++
 drivers/net/i40e/i40e_fdir.c   | 11 +++++++++++
 3 files changed, 15 insertions(+), 13 deletions(-)

Comments

Xing, Beilei July 16, 2020, 8:25 a.m. UTC | #1
> -----Original Message-----
> From: Sun, Chenmin <chenmin.sun@intel.com>
> Sent: Thursday, July 16, 2020 7:04 AM
> To: Zhang, Qi Z <qi.z.zhang@intel.com>; Xing, Beilei <beilei.xing@intel.com>
> Cc: dev@dpdk.org; Sun, Chenmin <chenmin.sun@intel.com>
> Subject: [PATCH V2] net/i40e: fix fdir cannot receive rx writeback issue
> 
> From: Chenmin Sun <chenmin.sun@intel.com>
> 
> This patch fixes the fdir cannot receive rx writeback packet issue, by setting the
> fdir_vsi->nb_used_qps to 1.

Better to describe what's the root cause but not how to set the detailed value.
The root cause should be FDIR interrupt is not enabled successfully.

> Besides this, to make sure fdir programming works fine when the port is
> stopped, move the fdir interrupt configure from start/stop to setup/teardown.
> 
> Fixes: cfd662d22e ("net/i40e: fix interrupt throttling setting in PF")
> 
> Signed-off-by: Chenmin Sun <chenmin.sun@intel.com>
> ---
> 
> v2:
> * Fix commit message typo
> ---
>  drivers/net/i40e/i40e_ethdev.c | 15 ++-------------
> drivers/net/i40e/i40e_ethdev.h |  2 ++
>  drivers/net/i40e/i40e_fdir.c   | 11 +++++++++++
>  3 files changed, 15 insertions(+), 13 deletions(-)
> 
> diff --git a/drivers/net/i40e/i40e_ethdev.c b/drivers/net/i40e/i40e_ethdev.c
> index 393b5320f..8933a39f2 100644
> --- a/drivers/net/i40e/i40e_ethdev.c
> +++ b/drivers/net/i40e/i40e_ethdev.c
> @@ -2068,7 +2068,7 @@ i40e_vsi_queues_bind_intr(struct i40e_vsi *vsi,
> uint16_t itr_idx)
>  	}
>  }
> 
> -static void
> +void
>  i40e_vsi_enable_queues_intr(struct i40e_vsi *vsi)  {
>  	struct rte_eth_dev *dev = vsi->adapter->eth_dev; @@ -2095,7 +2095,7
> @@ i40e_vsi_enable_queues_intr(struct i40e_vsi *vsi)
>  	I40E_WRITE_FLUSH(hw);
>  }
> 
> -static void
> +void
>  i40e_vsi_disable_queues_intr(struct i40e_vsi *vsi)  {
>  	struct rte_eth_dev *dev = vsi->adapter->eth_dev; @@ -2317,13
> +2317,6 @@ i40e_dev_start(struct rte_eth_dev *dev)
>  		i40e_vsi_enable_queues_intr(pf->vmdq[i].vsi);
>  	}
> 
> -	/* enable FDIR MSIX interrupt */
> -	if (pf->fdir.fdir_vsi) {
> -		i40e_vsi_queues_bind_intr(pf->fdir.fdir_vsi,
> -					  I40E_ITR_INDEX_NONE);
> -		i40e_vsi_enable_queues_intr(pf->fdir.fdir_vsi);
> -	}
> -
>  	/* Enable all queues which have been configured */
>  	for (nb_rxq = 0; nb_rxq < dev->data->nb_rx_queues; nb_rxq++) {
>  		ret = i40e_dev_rx_queue_start(dev, nb_rxq); @@ -2459,10
> +2452,6 @@ i40e_dev_stop(struct rte_eth_dev *dev)
>  		i40e_vsi_queues_unbind_intr(pf->vmdq[i].vsi);
>  	}
> 
> -	if (pf->fdir.fdir_vsi) {
> -		i40e_vsi_queues_unbind_intr(pf->fdir.fdir_vsi);
> -		i40e_vsi_disable_queues_intr(pf->fdir.fdir_vsi);
> -	}
>  	/* Clear all queues and release memory */
>  	i40e_dev_clear_queues(dev);
> 
> diff --git a/drivers/net/i40e/i40e_ethdev.h b/drivers/net/i40e/i40e_ethdev.h
> index 31ca05de9..886c98b15 100644
> --- a/drivers/net/i40e/i40e_ethdev.h
> +++ b/drivers/net/i40e/i40e_ethdev.h
> @@ -1268,6 +1268,7 @@ void i40e_pf_enable_irq0(struct i40e_hw *hw);  int
> i40e_dev_link_update(struct rte_eth_dev *dev, int wait_to_complete);  void
> i40e_vsi_queues_bind_intr(struct i40e_vsi *vsi, uint16_t itr_idx);  void
> i40e_vsi_queues_unbind_intr(struct i40e_vsi *vsi);
> +void i40e_vsi_disable_queues_intr(struct i40e_vsi *vsi);
>  int i40e_vsi_vlan_pvid_set(struct i40e_vsi *vsi,
>  			   struct i40e_vsi_vlan_pvid_info *info);  int
> i40e_vsi_config_vlan_stripping(struct i40e_vsi *vsi, bool on); @@ -1277,6
> +1278,7 @@ uint64_t i40e_parse_hena(const struct i40e_adapter *adapter,
> uint64_t flags);  enum i40e_status_code i40e_fdir_setup_tx_resources(struct
> i40e_pf *pf);  enum i40e_status_code i40e_fdir_setup_rx_resources(struct
> i40e_pf *pf);  int i40e_fdir_setup(struct i40e_pf *pf);
> +void i40e_vsi_enable_queues_intr(struct i40e_vsi *vsi);
>  const struct rte_memzone *i40e_memzone_reserve(const char *name,
>  					uint32_t len,
>  					int socket_id);
> diff --git a/drivers/net/i40e/i40e_fdir.c b/drivers/net/i40e/i40e_fdir.c index
> 71eb31fb8..60eeccc1a 100644
> --- a/drivers/net/i40e/i40e_fdir.c
> +++ b/drivers/net/i40e/i40e_fdir.c
> @@ -228,6 +228,11 @@ i40e_fdir_setup(struct i40e_pf *pf)
>  		goto fail_mem;
>  	}
> 
> +	/* enable FDIR MSIX interrupt */
> +	vsi->nb_used_qps = 1;
> +	i40e_vsi_queues_bind_intr(vsi, I40E_ITR_INDEX_NONE);
> +	i40e_vsi_enable_queues_intr(vsi);
> +
>  	/* reserve memory for the fdir programming packet */
>  	snprintf(z_name, sizeof(z_name), "%s_%s_%d",
>  			eth_dev->device->driver->name,
> @@ -274,12 +279,18 @@ i40e_fdir_teardown(struct i40e_pf *pf)
>  	vsi = pf->fdir.fdir_vsi;
>  	if (!vsi)
>  		return;
> +
> +	/* disable FDIR MSIX interrupt */
> +	i40e_vsi_queues_unbind_intr(vsi);
> +	i40e_vsi_disable_queues_intr(vsi);
> +
>  	int err = i40e_switch_tx_queue(hw, vsi->base_queue, FALSE);
>  	if (err)
>  		PMD_DRV_LOG(DEBUG, "Failed to do FDIR TX switch off");
>  	err = i40e_switch_rx_queue(hw, vsi->base_queue, FALSE);
>  	if (err)
>  		PMD_DRV_LOG(DEBUG, "Failed to do FDIR RX switch off");
> +
>  	i40e_dev_rx_queue_release(pf->fdir.rxq);
>  	rte_eth_dma_zone_free(dev, "fdir_rx_ring", pf->fdir.rxq->queue_id);
>  	pf->fdir.rxq = NULL;
> --
> 2.17.1

Patch
diff mbox series

diff --git a/drivers/net/i40e/i40e_ethdev.c b/drivers/net/i40e/i40e_ethdev.c
index 393b5320f..8933a39f2 100644
--- a/drivers/net/i40e/i40e_ethdev.c
+++ b/drivers/net/i40e/i40e_ethdev.c
@@ -2068,7 +2068,7 @@  i40e_vsi_queues_bind_intr(struct i40e_vsi *vsi, uint16_t itr_idx)
 	}
 }
 
-static void
+void
 i40e_vsi_enable_queues_intr(struct i40e_vsi *vsi)
 {
 	struct rte_eth_dev *dev = vsi->adapter->eth_dev;
@@ -2095,7 +2095,7 @@  i40e_vsi_enable_queues_intr(struct i40e_vsi *vsi)
 	I40E_WRITE_FLUSH(hw);
 }
 
-static void
+void
 i40e_vsi_disable_queues_intr(struct i40e_vsi *vsi)
 {
 	struct rte_eth_dev *dev = vsi->adapter->eth_dev;
@@ -2317,13 +2317,6 @@  i40e_dev_start(struct rte_eth_dev *dev)
 		i40e_vsi_enable_queues_intr(pf->vmdq[i].vsi);
 	}
 
-	/* enable FDIR MSIX interrupt */
-	if (pf->fdir.fdir_vsi) {
-		i40e_vsi_queues_bind_intr(pf->fdir.fdir_vsi,
-					  I40E_ITR_INDEX_NONE);
-		i40e_vsi_enable_queues_intr(pf->fdir.fdir_vsi);
-	}
-
 	/* Enable all queues which have been configured */
 	for (nb_rxq = 0; nb_rxq < dev->data->nb_rx_queues; nb_rxq++) {
 		ret = i40e_dev_rx_queue_start(dev, nb_rxq);
@@ -2459,10 +2452,6 @@  i40e_dev_stop(struct rte_eth_dev *dev)
 		i40e_vsi_queues_unbind_intr(pf->vmdq[i].vsi);
 	}
 
-	if (pf->fdir.fdir_vsi) {
-		i40e_vsi_queues_unbind_intr(pf->fdir.fdir_vsi);
-		i40e_vsi_disable_queues_intr(pf->fdir.fdir_vsi);
-	}
 	/* Clear all queues and release memory */
 	i40e_dev_clear_queues(dev);
 
diff --git a/drivers/net/i40e/i40e_ethdev.h b/drivers/net/i40e/i40e_ethdev.h
index 31ca05de9..886c98b15 100644
--- a/drivers/net/i40e/i40e_ethdev.h
+++ b/drivers/net/i40e/i40e_ethdev.h
@@ -1268,6 +1268,7 @@  void i40e_pf_enable_irq0(struct i40e_hw *hw);
 int i40e_dev_link_update(struct rte_eth_dev *dev, int wait_to_complete);
 void i40e_vsi_queues_bind_intr(struct i40e_vsi *vsi, uint16_t itr_idx);
 void i40e_vsi_queues_unbind_intr(struct i40e_vsi *vsi);
+void i40e_vsi_disable_queues_intr(struct i40e_vsi *vsi);
 int i40e_vsi_vlan_pvid_set(struct i40e_vsi *vsi,
 			   struct i40e_vsi_vlan_pvid_info *info);
 int i40e_vsi_config_vlan_stripping(struct i40e_vsi *vsi, bool on);
@@ -1277,6 +1278,7 @@  uint64_t i40e_parse_hena(const struct i40e_adapter *adapter, uint64_t flags);
 enum i40e_status_code i40e_fdir_setup_tx_resources(struct i40e_pf *pf);
 enum i40e_status_code i40e_fdir_setup_rx_resources(struct i40e_pf *pf);
 int i40e_fdir_setup(struct i40e_pf *pf);
+void i40e_vsi_enable_queues_intr(struct i40e_vsi *vsi);
 const struct rte_memzone *i40e_memzone_reserve(const char *name,
 					uint32_t len,
 					int socket_id);
diff --git a/drivers/net/i40e/i40e_fdir.c b/drivers/net/i40e/i40e_fdir.c
index 71eb31fb8..60eeccc1a 100644
--- a/drivers/net/i40e/i40e_fdir.c
+++ b/drivers/net/i40e/i40e_fdir.c
@@ -228,6 +228,11 @@  i40e_fdir_setup(struct i40e_pf *pf)
 		goto fail_mem;
 	}
 
+	/* enable FDIR MSIX interrupt */
+	vsi->nb_used_qps = 1;
+	i40e_vsi_queues_bind_intr(vsi, I40E_ITR_INDEX_NONE);
+	i40e_vsi_enable_queues_intr(vsi);
+
 	/* reserve memory for the fdir programming packet */
 	snprintf(z_name, sizeof(z_name), "%s_%s_%d",
 			eth_dev->device->driver->name,
@@ -274,12 +279,18 @@  i40e_fdir_teardown(struct i40e_pf *pf)
 	vsi = pf->fdir.fdir_vsi;
 	if (!vsi)
 		return;
+
+	/* disable FDIR MSIX interrupt */
+	i40e_vsi_queues_unbind_intr(vsi);
+	i40e_vsi_disable_queues_intr(vsi);
+
 	int err = i40e_switch_tx_queue(hw, vsi->base_queue, FALSE);
 	if (err)
 		PMD_DRV_LOG(DEBUG, "Failed to do FDIR TX switch off");
 	err = i40e_switch_rx_queue(hw, vsi->base_queue, FALSE);
 	if (err)
 		PMD_DRV_LOG(DEBUG, "Failed to do FDIR RX switch off");
+
 	i40e_dev_rx_queue_release(pf->fdir.rxq);
 	rte_eth_dma_zone_free(dev, "fdir_rx_ring", pf->fdir.rxq->queue_id);
 	pf->fdir.rxq = NULL;