diff mbox series

[v3] net/i40e: fix FDIR issue for common PCTYPEs

Message ID 20210421034403.8894-1-murphyx.yang@intel.com (mailing list archive)
State Accepted, archived
Delegated to: Qi Zhang
Headers
Series [v3] net/i40e: fix FDIR issue for common PCTYPEs |

Checks

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

Commit Message

Murphy Yang April 21, 2021, 3:44 a.m. UTC 
  Currently, FDIR doesn't work for all common PCTYPEs, the root cause is
that input set is not configured.

Fixes: 4a072ad43442 ("net/i40e: fix flow director config after flow validate")
Signed-off-by: Murphy Yang <murphyx.yang@intel.com>
---
 drivers/net/i40e/i40e_fdir.c | 25 +++++++++++++------------
 1 file changed, 13 insertions(+), 12 deletions(-)

Comments

Xing, Beilei April 21, 2021, 5:10 a.m. UTC | #1 
> -----Original Message-----
> From: Yang, MurphyX <murphyx.yang@intel.com>
> Sent: Wednesday, April 21, 2021 11:44 AM
> To: dev@dpdk.org
> Cc: Yang, Qiming <qiming.yang@intel.com>; Guo, Jia <jia.guo@intel.com>;
> Xing, Beilei <beilei.xing@intel.com>; Yang, SteveX <stevex.yang@intel.com>;
> Zhang, RobinX <robinx.zhang@intel.com>; Yang, MurphyX
> <murphyx.yang@intel.com>
> Subject: [PATCH v3] net/i40e: fix FDIR issue for common PCTYPEs
> 
> Currently, FDIR doesn't work for all common PCTYPEs, the root cause is that
> input set is not configured.
> 
> Fixes: 4a072ad43442 ("net/i40e: fix flow director config after flow validate")
> Signed-off-by: Murphy Yang <murphyx.yang@intel.com>
> ---
>  drivers/net/i40e/i40e_fdir.c | 25 +++++++++++++------------
>  1 file changed, 13 insertions(+), 12 deletions(-)
> 
> diff --git a/drivers/net/i40e/i40e_fdir.c b/drivers/net/i40e/i40e_fdir.c index
> da089baa4d..ed1c60af99 100644
> --- a/drivers/net/i40e/i40e_fdir.c
> +++ b/drivers/net/i40e/i40e_fdir.c
> @@ -1607,8 +1607,10 @@ i40e_flow_set_fdir_inset(struct i40e_pf *pf,
> 
>  	/* Check if the configuration is conflicted */
>  	if (pf->fdir.inset_flag[pctype] &&
> -	    memcmp(&pf->fdir.input_set[pctype], &input_set, sizeof(uint64_t)))
> -		return -1;
> +	    memcmp(&pf->fdir.input_set[pctype], &input_set, sizeof(uint64_t)))
> {
> +		PMD_DRV_LOG(ERR, "Conflict with the first rule's input set.");
> +		return -EINVAL;
> +	}
> 
>  	if (pf->fdir.inset_flag[pctype] &&
>  	    !memcmp(&pf->fdir.input_set[pctype], &input_set, sizeof(uint64_t)))
> @@ -1616,8 +1618,10 @@ i40e_flow_set_fdir_inset(struct i40e_pf *pf,
> 
>  	num = i40e_generate_inset_mask_reg(hw, input_set, mask_reg,
> 
> I40E_INSET_MASK_NUM_REG);
> -	if (num < 0)
> +	if (num < 0) {
> +		PMD_DRV_LOG(ERR, "Invalid pattern mask.");
>  		return -EINVAL;
> +	}
> 
>  	if (pf->support_multi_driver) {
>  		for (i = 0; i < num; i++)
> @@ -1762,18 +1766,15 @@ i40e_flow_add_del_fdir_filter(struct rte_eth_dev
> *dev,
>  	i40e_fdir_filter_convert(filter, &check_filter);
> 
>  	if (add) {
> -		if (filter->input.flow_ext.is_flex_flow) {
> +		/* configure the input set for common PCTYPEs*/
> +		if (!filter->input.flow_ext.customized_pctype) {
>  			ret = i40e_flow_set_fdir_inset(pf, pctype,
>  					filter->input.flow_ext.input_set);
> -			if (ret == -1) {
> -				PMD_DRV_LOG(ERR, "Conflict with the"
> -					    " first rule's input set.");
> -				return -EINVAL;
> -			} else if (ret == -EINVAL) {
> -				PMD_DRV_LOG(ERR, "Invalid pattern mask.");
> -				return -EINVAL;
> -			}
> +			if (ret < 0)
> +				return ret;
> +		}
> 
> +		if (filter->input.flow_ext.is_flex_flow) {
>  			for (i = 0; i < filter->input.flow_ext.raw_id; i++) {
>  				layer_idx = filter->input.flow_ext.layer_idx;
>  				field_idx = layer_idx * I40E_MAX_FLXPLD_FIED
> + i;
> --
> 2.17.1

Acked-by: Beilei Xing <beilei.xing@intel.com>
Qi Zhang April 21, 2021, 2:35 p.m. UTC | #2 
> -----Original Message-----
> From: dev <dev-bounces@dpdk.org> On Behalf Of Xing, Beilei
> Sent: Wednesday, April 21, 2021 1:11 PM
> To: Yang, MurphyX <murphyx.yang@intel.com>; dev@dpdk.org
> Cc: Yang, Qiming <qiming.yang@intel.com>; Guo, Jia <jia.guo@intel.com>;
> Yang, SteveX <stevex.yang@intel.com>; Zhang, RobinX
> <robinx.zhang@intel.com>
> Subject: Re: [dpdk-dev] [PATCH v3] net/i40e: fix FDIR issue for common
> PCTYPEs
> 
> 
> 
> > -----Original Message-----
> > From: Yang, MurphyX <murphyx.yang@intel.com>
> > Sent: Wednesday, April 21, 2021 11:44 AM
> > To: dev@dpdk.org
> > Cc: Yang, Qiming <qiming.yang@intel.com>; Guo, Jia
> > <jia.guo@intel.com>; Xing, Beilei <beilei.xing@intel.com>; Yang,
> > SteveX <stevex.yang@intel.com>; Zhang, RobinX
> > <robinx.zhang@intel.com>; Yang, MurphyX <murphyx.yang@intel.com>
> > Subject: [PATCH v3] net/i40e: fix FDIR issue for common PCTYPEs
> >
> > Currently, FDIR doesn't work for all common PCTYPEs, the root cause is
> > that input set is not configured.
> >
> > Fixes: 4a072ad43442 ("net/i40e: fix flow director config after flow
> > validate")
> > Signed-off-by: Murphy Yang <murphyx.yang@intel.com>
> > ---
> >  drivers/net/i40e/i40e_fdir.c | 25 +++++++++++++------------
> >  1 file changed, 13 insertions(+), 12 deletions(-)
> >
> > diff --git a/drivers/net/i40e/i40e_fdir.c
> > b/drivers/net/i40e/i40e_fdir.c index
> > da089baa4d..ed1c60af99 100644
> > --- a/drivers/net/i40e/i40e_fdir.c
> > +++ b/drivers/net/i40e/i40e_fdir.c
> > @@ -1607,8 +1607,10 @@ i40e_flow_set_fdir_inset(struct i40e_pf *pf,
> >
> >  	/* Check if the configuration is conflicted */
> >  	if (pf->fdir.inset_flag[pctype] &&
> > -	    memcmp(&pf->fdir.input_set[pctype], &input_set, sizeof(uint64_t)))
> > -		return -1;
> > +	    memcmp(&pf->fdir.input_set[pctype], &input_set,
> > +sizeof(uint64_t)))
> > {
> > +		PMD_DRV_LOG(ERR, "Conflict with the first rule's input set.");
> > +		return -EINVAL;
> > +	}
> >
> >  	if (pf->fdir.inset_flag[pctype] &&
> >  	    !memcmp(&pf->fdir.input_set[pctype], &input_set,
> > sizeof(uint64_t))) @@ -1616,8 +1618,10 @@
> > i40e_flow_set_fdir_inset(struct i40e_pf *pf,
> >
> >  	num = i40e_generate_inset_mask_reg(hw, input_set, mask_reg,
> >
> > I40E_INSET_MASK_NUM_REG);
> > -	if (num < 0)
> > +	if (num < 0) {
> > +		PMD_DRV_LOG(ERR, "Invalid pattern mask.");
> >  		return -EINVAL;
> > +	}
> >
> >  	if (pf->support_multi_driver) {
> >  		for (i = 0; i < num; i++)
> > @@ -1762,18 +1766,15 @@ i40e_flow_add_del_fdir_filter(struct
> > rte_eth_dev *dev,
> >  	i40e_fdir_filter_convert(filter, &check_filter);
> >
> >  	if (add) {
> > -		if (filter->input.flow_ext.is_flex_flow) {
> > +		/* configure the input set for common PCTYPEs*/
> > +		if (!filter->input.flow_ext.customized_pctype) {
> >  			ret = i40e_flow_set_fdir_inset(pf, pctype,
> >  					filter->input.flow_ext.input_set);
> > -			if (ret == -1) {
> > -				PMD_DRV_LOG(ERR, "Conflict with the"
> > -					    " first rule's input set.");
> > -				return -EINVAL;
> > -			} else if (ret == -EINVAL) {
> > -				PMD_DRV_LOG(ERR, "Invalid pattern mask.");
> > -				return -EINVAL;
> > -			}
> > +			if (ret < 0)
> > +				return ret;
> > +		}
> >
> > +		if (filter->input.flow_ext.is_flex_flow) {
> >  			for (i = 0; i < filter->input.flow_ext.raw_id; i++) {
> >  				layer_idx = filter->input.flow_ext.layer_idx;
> >  				field_idx = layer_idx * I40E_MAX_FLXPLD_FIED
> > + i;
> > --
> > 2.17.1
> 
> Acked-by: Beilei Xing <beilei.xing@intel.com>

Applied to dpdk-next-net-intel.

Thanks
Qi
diff mbox series

Patch

diff --git a/drivers/net/i40e/i40e_fdir.c b/drivers/net/i40e/i40e_fdir.c
index da089baa4d..ed1c60af99 100644
--- a/drivers/net/i40e/i40e_fdir.c
+++ b/drivers/net/i40e/i40e_fdir.c
@@ -1607,8 +1607,10 @@  i40e_flow_set_fdir_inset(struct i40e_pf *pf,
 
 	/* Check if the configuration is conflicted */
 	if (pf->fdir.inset_flag[pctype] &&
-	    memcmp(&pf->fdir.input_set[pctype], &input_set, sizeof(uint64_t)))
-		return -1;
+	    memcmp(&pf->fdir.input_set[pctype], &input_set, sizeof(uint64_t))) {
+		PMD_DRV_LOG(ERR, "Conflict with the first rule's input set.");
+		return -EINVAL;
+	}
 
 	if (pf->fdir.inset_flag[pctype] &&
 	    !memcmp(&pf->fdir.input_set[pctype], &input_set, sizeof(uint64_t)))
@@ -1616,8 +1618,10 @@  i40e_flow_set_fdir_inset(struct i40e_pf *pf,
 
 	num = i40e_generate_inset_mask_reg(hw, input_set, mask_reg,
 						 I40E_INSET_MASK_NUM_REG);
-	if (num < 0)
+	if (num < 0) {
+		PMD_DRV_LOG(ERR, "Invalid pattern mask.");
 		return -EINVAL;
+	}
 
 	if (pf->support_multi_driver) {
 		for (i = 0; i < num; i++)
@@ -1762,18 +1766,15 @@  i40e_flow_add_del_fdir_filter(struct rte_eth_dev *dev,
 	i40e_fdir_filter_convert(filter, &check_filter);
 
 	if (add) {
-		if (filter->input.flow_ext.is_flex_flow) {
+		/* configure the input set for common PCTYPEs*/
+		if (!filter->input.flow_ext.customized_pctype) {
 			ret = i40e_flow_set_fdir_inset(pf, pctype,
 					filter->input.flow_ext.input_set);
-			if (ret == -1) {
-				PMD_DRV_LOG(ERR, "Conflict with the"
-					    " first rule's input set.");
-				return -EINVAL;
-			} else if (ret == -EINVAL) {
-				PMD_DRV_LOG(ERR, "Invalid pattern mask.");
-				return -EINVAL;
-			}
+			if (ret < 0)
+				return ret;
+		}
 
+		if (filter->input.flow_ext.is_flex_flow) {
 			for (i = 0; i < filter->input.flow_ext.raw_id; i++) {
 				layer_idx = filter->input.flow_ext.layer_idx;
 				field_idx = layer_idx * I40E_MAX_FLXPLD_FIED + i;