[3/3] net/i40e: remove teardown when flush FDIR filter

Message ID 20200427071500.14767-4-wei.zhao1@intel.com (mailing list archive)
State Superseded, archived
Delegated to: xiaolong ye
Headers
Series fix i40e bug for flow filter |

Checks

Context Check Description
ci/checkpatch success coding style OK
ci/travis-robot success Travis build: passed
ci/Intel-compilation fail Compilation issues

Commit Message

Zhao1, Wei April 27, 2020, 7:15 a.m. UTC
  When we flush FDIR filter, we can not call i40e_fdir_teardown()
function as it will free vsi used for FDIR, then the vsi->base_queue
will be freed from pf->qp_pool, but vsi->base_queue can only get
once when do dev init in i40e_pf_setup(). If we free it, it will
never be alloc again.

Bugzilla ID: 404
Fixes: 2e67a7fbf3ff ("net/i40e: config flow director automatically")
Cc: stable@dpdk.org

Signed-off-by: Wei Zhao <wei.zhao1@intel.com>
---
 drivers/net/i40e/i40e_flow.c | 3 ---
 1 file changed, 3 deletions(-)
  

Comments

Xing, Beilei April 28, 2020, 1:13 a.m. UTC | #1
> -----Original Message-----
> From: Zhao1, Wei <wei.zhao1@intel.com>
> Sent: Monday, April 27, 2020 3:15 PM
> To: dev@dpdk.org
> Cc: Xing, Beilei <beilei.xing@intel.com>; maxime.leroy@6wind.com;
> stable@dpdk.org; Zhao1, Wei <wei.zhao1@intel.com>
> Subject: [PATCH 3/3] net/i40e: remove teardown when flush FDIR filter
> 
> When we flush FDIR filter, we can not call i40e_fdir_teardown() function as it
> will free vsi used for FDIR, then the vsi->base_queue will be freed from pf-
> >qp_pool, but vsi->base_queue can only get once when do dev init in
> i40e_pf_setup(). If we free it, it will never be alloc again.

Then we should teardown fdir in dev_uninit, right?

> 
> Bugzilla ID: 404
> Fixes: 2e67a7fbf3ff ("net/i40e: config flow director automatically")
> Cc: stable@dpdk.org
> 
> Signed-off-by: Wei Zhao <wei.zhao1@intel.com>
> ---
>  drivers/net/i40e/i40e_flow.c | 3 ---
>  1 file changed, 3 deletions(-)
> 
> diff --git a/drivers/net/i40e/i40e_flow.c b/drivers/net/i40e/i40e_flow.c index
> 1533d5abb..65f877866 100644
> --- a/drivers/net/i40e/i40e_flow.c
> +++ b/drivers/net/i40e/i40e_flow.c
> @@ -5145,7 +5145,6 @@ i40e_flow_destroy(struct rte_eth_dev *dev,
> 
>  		/* If the last flow is destroyed, disable fdir. */
>  		if (!ret && TAILQ_EMPTY(&pf->fdir.fdir_list)) {
> -			i40e_fdir_teardown(pf);
>  			i40e_fdir_rx_proc_enable(dev, 0);
>  		}
>  		break;
> @@ -5343,8 +5342,6 @@ i40e_flow_flush_fdir_filter(struct i40e_pf *pf)
>  			pf->fdir.inset_flag[pctype] = 0;
>  	}
> 
> -	i40e_fdir_teardown(pf);
> -
>  	return ret;
>  }
> 
> --
> 2.19.1
  
Zhao1, Wei April 28, 2020, 1:18 a.m. UTC | #2
> -----Original Message-----
> From: Xing, Beilei <beilei.xing@intel.com>
> Sent: Tuesday, April 28, 2020 9:13 AM
> To: Zhao1, Wei <wei.zhao1@intel.com>; dev@dpdk.org
> Cc: maxime.leroy@6wind.com; stable@dpdk.org
> Subject: RE: [PATCH 3/3] net/i40e: remove teardown when flush FDIR filter
> 
> 
> 
> > -----Original Message-----
> > From: Zhao1, Wei <wei.zhao1@intel.com>
> > Sent: Monday, April 27, 2020 3:15 PM
> > To: dev@dpdk.org
> > Cc: Xing, Beilei <beilei.xing@intel.com>; maxime.leroy@6wind.com;
> > stable@dpdk.org; Zhao1, Wei <wei.zhao1@intel.com>
> > Subject: [PATCH 3/3] net/i40e: remove teardown when flush FDIR filter
> >
> > When we flush FDIR filter, we can not call i40e_fdir_teardown()
> > function as it will free vsi used for FDIR, then the vsi->base_queue
> > will be freed from pf-
> > >qp_pool, but vsi->base_queue can only get once when do dev init in
> > i40e_pf_setup(). If we free it, it will never be alloc again.
> 
> Then we should teardown fdir in dev_uninit, right?

Yes, dev_close has call teardown function.

> 
> >
> > Bugzilla ID: 404
> > Fixes: 2e67a7fbf3ff ("net/i40e: config flow director automatically")
> > Cc: stable@dpdk.org
> >
> > Signed-off-by: Wei Zhao <wei.zhao1@intel.com>
> > ---
> >  drivers/net/i40e/i40e_flow.c | 3 ---
> >  1 file changed, 3 deletions(-)
> >
> > diff --git a/drivers/net/i40e/i40e_flow.c
> > b/drivers/net/i40e/i40e_flow.c index
> > 1533d5abb..65f877866 100644
> > --- a/drivers/net/i40e/i40e_flow.c
> > +++ b/drivers/net/i40e/i40e_flow.c
> > @@ -5145,7 +5145,6 @@ i40e_flow_destroy(struct rte_eth_dev *dev,
> >
> >  		/* If the last flow is destroyed, disable fdir. */
> >  		if (!ret && TAILQ_EMPTY(&pf->fdir.fdir_list)) {
> > -			i40e_fdir_teardown(pf);
> >  			i40e_fdir_rx_proc_enable(dev, 0);
> >  		}
> >  		break;
> > @@ -5343,8 +5342,6 @@ i40e_flow_flush_fdir_filter(struct i40e_pf *pf)
> >  			pf->fdir.inset_flag[pctype] = 0;
> >  	}
> >
> > -	i40e_fdir_teardown(pf);
> > -
> >  	return ret;
> >  }
> >
> > --
> > 2.19.1
  

Patch

diff --git a/drivers/net/i40e/i40e_flow.c b/drivers/net/i40e/i40e_flow.c
index 1533d5abb..65f877866 100644
--- a/drivers/net/i40e/i40e_flow.c
+++ b/drivers/net/i40e/i40e_flow.c
@@ -5145,7 +5145,6 @@  i40e_flow_destroy(struct rte_eth_dev *dev,
 
 		/* If the last flow is destroyed, disable fdir. */
 		if (!ret && TAILQ_EMPTY(&pf->fdir.fdir_list)) {
-			i40e_fdir_teardown(pf);
 			i40e_fdir_rx_proc_enable(dev, 0);
 		}
 		break;
@@ -5343,8 +5342,6 @@  i40e_flow_flush_fdir_filter(struct i40e_pf *pf)
 			pf->fdir.inset_flag[pctype] = 0;
 	}
 
-	i40e_fdir_teardown(pf);
-
 	return ret;
 }