net/i40e: fix unexpected skip fdir setup

Message ID 20190703063449.23848-1-qi.z.zhang@intel.com (mailing list archive)
State Accepted, archived
Delegated to: Qi Zhang
Headers
Series net/i40e: fix unexpected skip fdir setup |

Checks

Context Check Description
ci/checkpatch success coding style OK
ci/intel-Performance-Testing success Performance Testing PASS
ci/mellanox-Performance-Testing success Performance Testing PASS
ci/Intel-compilation fail Compilation issues

Commit Message

Qi Zhang July 3, 2019, 6:34 a.m. UTC
  In i40e_flow_flush_fdir_filter, i40e_fdir_teardown is called, so
i40e_fdir_setup is required to be called before create a new fdir flow.

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

Signed-off-by: Qi Zhang <qi.z.zhang@intel.com>
---
 drivers/net/i40e/i40e_flow.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
  

Comments

Xing, Beilei July 4, 2019, 2:17 a.m. UTC | #1
> -----Original Message-----
> From: Zhang, Qi Z
> Sent: Wednesday, July 3, 2019 2:35 PM
> To: Xing, Beilei <beilei.xing@intel.com>
> Cc: dev@dpdk.org; Zhang, Qi Z <qi.z.zhang@intel.com>; stable@dpdk.org
> Subject: [PATCH] net/i40e: fix unexpected skip fdir setup
> 
> In i40e_flow_flush_fdir_filter, i40e_fdir_teardown is called, so
> i40e_fdir_setup is required to be called before create a new fdir flow.
> 
> Fixes: 2e67a7fbf3ff ("net/i40e: config flow director automatically")
> Cc: stable@dpdk.org
> 
> Signed-off-by: Qi Zhang <qi.z.zhang@intel.com>
> ---
>  drivers/net/i40e/i40e_flow.c | 4 ++--
>  1 file changed, 2 insertions(+), 2 deletions(-)
> 
> diff --git a/drivers/net/i40e/i40e_flow.c b/drivers/net/i40e/i40e_flow.c index
> d62b32f17..48a6782a8 100644
> --- a/drivers/net/i40e/i40e_flow.c
> +++ b/drivers/net/i40e/i40e_flow.c
> @@ -3175,8 +3175,8 @@ i40e_flow_parse_fdir_filter(struct rte_eth_dev
> *dev,
> 
>  	cons_filter_type = RTE_ETH_FILTER_FDIR;
> 
> -	if (dev->data->dev_conf.fdir_conf.mode !=
> -	    RTE_FDIR_MODE_PERFECT) {
> +	if (dev->data->dev_conf.fdir_conf.mode !=
> RTE_FDIR_MODE_PERFECT ||
> +		pf->fdir.fdir_vsi == NULL) {
>  		/* Enable fdir when fdir flow is added at first time. */
>  		ret = i40e_fdir_setup(pf);
>  		if (ret != I40E_SUCCESS) {
> --
> 2.13.6

Acked-by: Beilei Xing <beilei.xing@intel.com>
  
Qi Zhang July 5, 2019, 1:14 a.m. UTC | #2
> -----Original Message-----
> From: Xing, Beilei
> Sent: Thursday, July 4, 2019 10:18 AM
> To: Zhang, Qi Z <qi.z.zhang@intel.com>
> Cc: dev@dpdk.org; stable@dpdk.org
> Subject: RE: [PATCH] net/i40e: fix unexpected skip fdir setup
> 
> 
> 
> > -----Original Message-----
> > From: Zhang, Qi Z
> > Sent: Wednesday, July 3, 2019 2:35 PM
> > To: Xing, Beilei <beilei.xing@intel.com>
> > Cc: dev@dpdk.org; Zhang, Qi Z <qi.z.zhang@intel.com>; stable@dpdk.org
> > Subject: [PATCH] net/i40e: fix unexpected skip fdir setup
> >
> > In i40e_flow_flush_fdir_filter, i40e_fdir_teardown is called, so
> > i40e_fdir_setup is required to be called before create a new fdir flow.
> >
> > Fixes: 2e67a7fbf3ff ("net/i40e: config flow director automatically")
> > Cc: stable@dpdk.org

Added Bugzilla ID: 265
> >
> > Signed-off-by: Qi Zhang <qi.z.zhang@intel.com>
> > ---
> >  drivers/net/i40e/i40e_flow.c | 4 ++--
> >  1 file changed, 2 insertions(+), 2 deletions(-)
> >
> > diff --git a/drivers/net/i40e/i40e_flow.c
> > b/drivers/net/i40e/i40e_flow.c index
> > d62b32f17..48a6782a8 100644
> > --- a/drivers/net/i40e/i40e_flow.c
> > +++ b/drivers/net/i40e/i40e_flow.c
> > @@ -3175,8 +3175,8 @@ i40e_flow_parse_fdir_filter(struct rte_eth_dev
> > *dev,
> >
> >  	cons_filter_type = RTE_ETH_FILTER_FDIR;
> >
> > -	if (dev->data->dev_conf.fdir_conf.mode !=
> > -	    RTE_FDIR_MODE_PERFECT) {
> > +	if (dev->data->dev_conf.fdir_conf.mode !=
> > RTE_FDIR_MODE_PERFECT ||
> > +		pf->fdir.fdir_vsi == NULL) {
> >  		/* Enable fdir when fdir flow is added at first time. */
> >  		ret = i40e_fdir_setup(pf);
> >  		if (ret != I40E_SUCCESS) {
> > --
> > 2.13.6
> 
> Acked-by: Beilei Xing <beilei.xing@intel.com>

Applied to dpdk-next-net-intel.

Thanks
Qi
  

Patch

diff --git a/drivers/net/i40e/i40e_flow.c b/drivers/net/i40e/i40e_flow.c
index d62b32f17..48a6782a8 100644
--- a/drivers/net/i40e/i40e_flow.c
+++ b/drivers/net/i40e/i40e_flow.c
@@ -3175,8 +3175,8 @@  i40e_flow_parse_fdir_filter(struct rte_eth_dev *dev,
 
 	cons_filter_type = RTE_ETH_FILTER_FDIR;
 
-	if (dev->data->dev_conf.fdir_conf.mode !=
-	    RTE_FDIR_MODE_PERFECT) {
+	if (dev->data->dev_conf.fdir_conf.mode != RTE_FDIR_MODE_PERFECT ||
+		pf->fdir.fdir_vsi == NULL) {
 		/* Enable fdir when fdir flow is added at first time. */
 		ret = i40e_fdir_setup(pf);
 		if (ret != I40E_SUCCESS) {