diff mbox

[dpdk-dev,v2] net/i40e: fix flow RSS configuration error

Message ID 1521617103-4776-1-git-send-email-wei.zhao1@intel.com (mailing list archive)
State Superseded, archived
Delegated to: Helin Zhang
Headers

Checks

Context Check Description
ci/checkpatch success coding style OK
ci/Intel-compilation fail Compilation issues

Commit Message

Zhao1, Wei March 21, 2018, 7:25 a.m. UTC 
  I40e need a protection for rss rule flow configuration
after one rule is set for a port.

Fixes: ecad87d22383 ("net/i40e: move RSS to flow API")
Signed-off-by: Wei Zhao <wei.zhao1@intel.com>
Tested-by: Peng Yuan <yuan.peng@intel.com>
---
Changes in v2:

 change fixes version number.
---
 drivers/net/i40e/i40e_flow.c | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

Comments

Qi Zhang March 22, 2018, 12:39 p.m. UTC | #1 
> -----Original Message-----
> From: Zhao1, Wei
> Sent: Wednesday, March 21, 2018 3:25 PM
> To: dev@dpdk.org
> Cc: Zhang, Qi Z <qi.z.zhang@intel.com>; Zhao1, Wei <wei.zhao1@intel.com>
> Subject: [PATCH v2] net/i40e: fix flow RSS configuration error
> 
> I40e need a protection for rss rule flow configuration after one rule is set for a
> port.
> 
> Fixes: ecad87d22383 ("net/i40e: move RSS to flow API")
> Signed-off-by: Wei Zhao <wei.zhao1@intel.com>
> Tested-by: Peng Yuan <yuan.peng@intel.com>
> ---
> Changes in v2:
> 
>  change fixes version number.
> ---
>  drivers/net/i40e/i40e_flow.c | 9 ++++++---
>  1 file changed, 6 insertions(+), 3 deletions(-)
> 
> diff --git a/drivers/net/i40e/i40e_flow.c b/drivers/net/i40e/i40e_flow.c index
> 16c47cf..7268426 100644
> --- a/drivers/net/i40e/i40e_flow.c
> +++ b/drivers/net/i40e/i40e_flow.c
> @@ -4385,14 +4385,15 @@ i40e_config_rss_filter_set(struct rte_eth_dev
> *dev,  {
>  	struct i40e_pf *pf = I40E_DEV_PRIVATE_TO_PF(dev->data->dev_private);
>  	struct i40e_hw *hw =
> I40E_DEV_PRIVATE_TO_HW(dev->data->dev_private);
> +	int ret = -ENOTSUP;

Why ret be initialized to -ENOTSUP?, there is no default behavior needed here.
> 
>  	if (conf->queue_region_conf) {
> -		i40e_flush_queue_region_all_conf(dev, hw, pf, 1);
> +		ret = i40e_flush_queue_region_all_conf(dev, hw, pf, 1);
>  		conf->queue_region_conf = 0;
>  	} else {
> -		i40e_config_rss_filter(pf, conf, 1);
> +		ret = i40e_config_rss_filter(pf, conf, 1);
>  	}
> -	return 0;
> +	return ret;
>  }
> 
>  static int
> @@ -4545,6 +4546,8 @@ i40e_flow_create(struct rte_eth_dev *dev,
>  	case RTE_ETH_FILTER_HASH:
>  		ret = i40e_config_rss_filter_set(dev,
>  			    &cons_filter.rss_conf);
> +		if (ret)
> +			goto free_flow;
>  		flow->rule = &pf->rss_info;
>  		break;
>  	default:
> --
> 2.7.5
Zhao1, Wei March 23, 2018, 1:33 a.m. UTC | #2 
> -----Original Message-----
> From: Zhang, Qi Z
> Sent: Thursday, March 22, 2018 8:39 PM
> To: Zhao1, Wei <wei.zhao1@intel.com>; dev@dpdk.org
> Subject: RE: [PATCH v2] net/i40e: fix flow RSS configuration error
> 
> 
> 
> > -----Original Message-----
> > From: Zhao1, Wei
> > Sent: Wednesday, March 21, 2018 3:25 PM
> > To: dev@dpdk.org
> > Cc: Zhang, Qi Z <qi.z.zhang@intel.com>; Zhao1, Wei
> > <wei.zhao1@intel.com>
> > Subject: [PATCH v2] net/i40e: fix flow RSS configuration error
> >
> > I40e need a protection for rss rule flow configuration after one rule
> > is set for a port.
> >
> > Fixes: ecad87d22383 ("net/i40e: move RSS to flow API")
> > Signed-off-by: Wei Zhao <wei.zhao1@intel.com>
> > Tested-by: Peng Yuan <yuan.peng@intel.com>
> > ---
> > Changes in v2:
> >
> >  change fixes version number.
> > ---
> >  drivers/net/i40e/i40e_flow.c | 9 ++++++---
> >  1 file changed, 6 insertions(+), 3 deletions(-)
> >
> > diff --git a/drivers/net/i40e/i40e_flow.c
> > b/drivers/net/i40e/i40e_flow.c index
> > 16c47cf..7268426 100644
> > --- a/drivers/net/i40e/i40e_flow.c
> > +++ b/drivers/net/i40e/i40e_flow.c
> > @@ -4385,14 +4385,15 @@ i40e_config_rss_filter_set(struct rte_eth_dev
> > *dev,  {
> >  	struct i40e_pf *pf = I40E_DEV_PRIVATE_TO_PF(dev->data-
> >dev_private);
> >  	struct i40e_hw *hw =
> > I40E_DEV_PRIVATE_TO_HW(dev->data->dev_private);
> > +	int ret = -ENOTSUP;
> 
> Why ret be initialized to -ENOTSUP?, there is no default behavior needed
> here.

Yes, I will commit a new v3 later.

> >
> >  	if (conf->queue_region_conf) {
> > -		i40e_flush_queue_region_all_conf(dev, hw, pf, 1);
> > +		ret = i40e_flush_queue_region_all_conf(dev, hw, pf, 1);
> >  		conf->queue_region_conf = 0;
> >  	} else {
> > -		i40e_config_rss_filter(pf, conf, 1);
> > +		ret = i40e_config_rss_filter(pf, conf, 1);
> >  	}
> > -	return 0;
> > +	return ret;
> >  }
> >
> >  static int
> > @@ -4545,6 +4546,8 @@ i40e_flow_create(struct rte_eth_dev *dev,
> >  	case RTE_ETH_FILTER_HASH:
> >  		ret = i40e_config_rss_filter_set(dev,
> >  			    &cons_filter.rss_conf);
> > +		if (ret)
> > +			goto free_flow;
> >  		flow->rule = &pf->rss_info;
> >  		break;
> >  	default:
> > --
> > 2.7.5
diff mbox

Patch

diff --git a/drivers/net/i40e/i40e_flow.c b/drivers/net/i40e/i40e_flow.c
index 16c47cf..7268426 100644
--- a/drivers/net/i40e/i40e_flow.c
+++ b/drivers/net/i40e/i40e_flow.c
@@ -4385,14 +4385,15 @@  i40e_config_rss_filter_set(struct rte_eth_dev *dev,
 {
 	struct i40e_pf *pf = I40E_DEV_PRIVATE_TO_PF(dev->data->dev_private);
 	struct i40e_hw *hw = I40E_DEV_PRIVATE_TO_HW(dev->data->dev_private);
+	int ret = -ENOTSUP;
 
 	if (conf->queue_region_conf) {
-		i40e_flush_queue_region_all_conf(dev, hw, pf, 1);
+		ret = i40e_flush_queue_region_all_conf(dev, hw, pf, 1);
 		conf->queue_region_conf = 0;
 	} else {
-		i40e_config_rss_filter(pf, conf, 1);
+		ret = i40e_config_rss_filter(pf, conf, 1);
 	}
-	return 0;
+	return ret;
 }
 
 static int
@@ -4545,6 +4546,8 @@  i40e_flow_create(struct rte_eth_dev *dev,
 	case RTE_ETH_FILTER_HASH:
 		ret = i40e_config_rss_filter_set(dev,
 			    &cons_filter.rss_conf);
+		if (ret)
+			goto free_flow;
 		flow->rule = &pf->rss_info;
 		break;
 	default: