[dpdk-dev] net/i40e: fix issues for RSS flow API

Message ID 20180123064302.118082-1-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 Jan. 23, 2018, 6:43 a.m. UTC
  This patch fix issues check from DPDK coverity issues.

Fixes: ecad87d22383e ("net/i40e: move RSS to flow API")
Coverity issues: 257020 257024 257037

Signed-off-by: Wei Zhao <wei.zhao1@intel.com>
---
 drivers/net/i40e/i40e_ethdev.c | 2 +-
 drivers/net/i40e/i40e_flow.c   | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)
  

Comments

Qi Zhang Jan. 25, 2018, 3:59 a.m. UTC | #1
> -----Original Message-----
> From: Zhao1, Wei
> Sent: Tuesday, January 23, 2018 2:43 PM
> To: dev@dpdk.org
> Cc: Zhang, Qi Z <qi.z.zhang@intel.com>; Zhao1, Wei <wei.zhao1@intel.com>
> Subject: [PATCH] net/i40e: fix issues for RSS flow API
> 
> This patch fix issues check from DPDK coverity issues.
> 
> Fixes: ecad87d22383e ("net/i40e: move RSS to flow API") Coverity issues:
> 257020 257024 257037
> 
> Signed-off-by: Wei Zhao <wei.zhao1@intel.com>

Acked-by Qi Zhang <qi.z.zhang@intel.com>
  
Qi Zhang Jan. 25, 2018, 5:40 a.m. UTC | #2
Hi Wei:
	

> -----Original Message-----
> From: Zhao1, Wei
> Sent: Tuesday, January 23, 2018 2:43 PM
> To: dev@dpdk.org
> Cc: Zhang, Qi Z <qi.z.zhang@intel.com>; Zhao1, Wei <wei.zhao1@intel.com>
> Subject: [PATCH] net/i40e: fix issues for RSS flow API
> 
> This patch fix issues check from DPDK coverity issues.
> 
> Fixes: ecad87d22383e ("net/i40e: move RSS to flow API") Coverity issues:
> 257020 257024 257037
> 
> Signed-off-by: Wei Zhao <wei.zhao1@intel.com>
> ---
>  drivers/net/i40e/i40e_ethdev.c | 2 +-
>  drivers/net/i40e/i40e_flow.c   | 4 ++--
>  2 files changed, 3 insertions(+), 3 deletions(-)
> 
> diff --git a/drivers/net/i40e/i40e_ethdev.c b/drivers/net/i40e/i40e_ethdev.c
> index 5ea9f99..b0db458 100644
> --- a/drivers/net/i40e/i40e_ethdev.c
> +++ b/drivers/net/i40e/i40e_ethdev.c
> @@ -11681,7 +11681,7 @@ i40e_config_rss_filter(struct i40e_pf *pf,
>  							sizeof(uint32_t);
>  	}
> 
> -	return i40e_hw_rss_hash_set(pf, &rss_conf);
> +	i40e_hw_rss_hash_set(pf, &rss_conf);
> 
>  	rte_memcpy(rss_info,
>  		conf, sizeof(struct i40e_rte_flow_rss_conf)); diff --git
> a/drivers/net/i40e/i40e_flow.c b/drivers/net/i40e/i40e_flow.c index
> cd9a9b6..a23f485 100644
> --- a/drivers/net/i40e/i40e_flow.c
> +++ b/drivers/net/i40e/i40e_flow.c
> @@ -4201,6 +4201,7 @@ i40e_flow_parse_rss_action(struct rte_eth_dev
> *dev,
>  	struct i40e_rte_flow_rss_conf *rss_info = &pf->rss_info;
>  	uint16_t i, j, n, tmp;
>  	uint32_t index = 0;
> +	uint64_t hf_bit = 1;
> 
>  	NEXT_ITEM_OF_ACTION(act, actions, index);
>  	rss = (const struct rte_flow_action_rss *)act->conf; @@ -4219,7
> +4220,7 @@ i40e_flow_parse_rss_action(struct rte_eth_dev *dev,
> 
>  	if (action_flag) {
>  		for (n = 0; n < 64; n++) {
> -			if (rss->rss_conf->rss_hf & (1 << n)) {
> +			if (rss->rss_conf->rss_hf & (hf_bit << n)) {
>  				conf_info->region[0].hw_flowtype[0] = n;
>  				conf_info->region[0].flowtype_num = 1;
>  				conf_info->queue_region_number = 1; @@ -4313,7
> +4314,6 @@ i40e_flow_parse_rss_action(struct rte_eth_dev *dev,
>  		}
> 
>  		rss_config->queue_region_conf = TRUE;
> -		return 0;
>  	}

Seems if you remove return 0, rss_config->queue_region_conf will be overwrite by FALSE at end, right?
> 
>  	if (!rss || !rss->num) {
> --
> 2.9.3
  
Qi Zhang Jan. 25, 2018, 6:12 a.m. UTC | #3
> -----Original Message-----
> From: Zhang, Qi Z
> Sent: Thursday, January 25, 2018 12:00 PM
> To: Zhao1, Wei <wei.zhao1@intel.com>; dev@dpdk.org
> Subject: RE: [PATCH] net/i40e: fix issues for RSS flow API
> 
> > -----Original Message-----
> > From: Zhao1, Wei
> > Sent: Tuesday, January 23, 2018 2:43 PM
> > To: dev@dpdk.org
> > Cc: Zhang, Qi Z <qi.z.zhang@intel.com>; Zhao1, Wei
> <wei.zhao1@intel.com>
> > Subject: [PATCH] net/i40e: fix issues for RSS flow API
> >
> > This patch fix issues check from DPDK coverity issues.
> >
> > Fixes: ecad87d22383e ("net/i40e: move RSS to flow API") Coverity issues:
> > 257020 257024 257037
> >
> > Signed-off-by: Wei Zhao <wei.zhao1@intel.com>
> 
> Acked-by Qi Zhang <qi.z.zhang@intel.com>

Nacked-by Qi Zhang <qi.z.zhang@intel.com> since new issue is found, v2 is required.
  
Zhao1, Wei Jan. 25, 2018, 6:22 a.m. UTC | #4
Ok, v2 will commit later.

> -----Original Message-----
> From: Zhang, Qi Z
> Sent: Thursday, January 25, 2018 2:12 PM
> To: Zhao1, Wei <wei.zhao1@intel.com>; dev@dpdk.org
> Subject: RE: [PATCH] net/i40e: fix issues for RSS flow API
> 
> 
> 
> > -----Original Message-----
> > From: Zhang, Qi Z
> > Sent: Thursday, January 25, 2018 12:00 PM
> > To: Zhao1, Wei <wei.zhao1@intel.com>; dev@dpdk.org
> > Subject: RE: [PATCH] net/i40e: fix issues for RSS flow API
> >
> > > -----Original Message-----
> > > From: Zhao1, Wei
> > > Sent: Tuesday, January 23, 2018 2:43 PM
> > > To: dev@dpdk.org
> > > Cc: Zhang, Qi Z <qi.z.zhang@intel.com>; Zhao1, Wei
> > <wei.zhao1@intel.com>
> > > Subject: [PATCH] net/i40e: fix issues for RSS flow API
> > >
> > > This patch fix issues check from DPDK coverity issues.
> > >
> > > Fixes: ecad87d22383e ("net/i40e: move RSS to flow API") Coverity issues:
> > > 257020 257024 257037
> > >
> > > Signed-off-by: Wei Zhao <wei.zhao1@intel.com>
> >
> > Acked-by Qi Zhang <qi.z.zhang@intel.com>
> 
> Nacked-by Qi Zhang <qi.z.zhang@intel.com> since new issue is found, v2 is
> required.
  
Zhao1, Wei Jan. 26, 2018, 3:17 a.m. UTC | #5
Hi, zhang qi

   V2 for this patch.
Thanks.
https://dpdk.org/dev/patchwork/patch/34533/

> -----Original Message-----
> From: Zhang, Qi Z
> Sent: Thursday, January 25, 2018 1:40 PM
> To: Zhao1, Wei <wei.zhao1@intel.com>; dev@dpdk.org
> Subject: RE: [PATCH] net/i40e: fix issues for RSS flow API
> 
> Hi Wei:
> 
> 
> > -----Original Message-----
> > From: Zhao1, Wei
> > Sent: Tuesday, January 23, 2018 2:43 PM
> > To: dev@dpdk.org
> > Cc: Zhang, Qi Z <qi.z.zhang@intel.com>; Zhao1, Wei
> > <wei.zhao1@intel.com>
> > Subject: [PATCH] net/i40e: fix issues for RSS flow API
> >
> > This patch fix issues check from DPDK coverity issues.
> >
> > Fixes: ecad87d22383e ("net/i40e: move RSS to flow API") Coverity issues:
> > 257020 257024 257037
> >
> > Signed-off-by: Wei Zhao <wei.zhao1@intel.com>
> > ---
> >  drivers/net/i40e/i40e_ethdev.c | 2 +-
> >  drivers/net/i40e/i40e_flow.c   | 4 ++--
> >  2 files changed, 3 insertions(+), 3 deletions(-)
> >
> > diff --git a/drivers/net/i40e/i40e_ethdev.c
> > b/drivers/net/i40e/i40e_ethdev.c index 5ea9f99..b0db458 100644
> > --- a/drivers/net/i40e/i40e_ethdev.c
> > +++ b/drivers/net/i40e/i40e_ethdev.c
> > @@ -11681,7 +11681,7 @@ i40e_config_rss_filter(struct i40e_pf *pf,
> >  							sizeof(uint32_t);
> >  	}
> >
> > -	return i40e_hw_rss_hash_set(pf, &rss_conf);
> > +	i40e_hw_rss_hash_set(pf, &rss_conf);
> >
> >  	rte_memcpy(rss_info,
> >  		conf, sizeof(struct i40e_rte_flow_rss_conf)); diff --git
> > a/drivers/net/i40e/i40e_flow.c b/drivers/net/i40e/i40e_flow.c index
> > cd9a9b6..a23f485 100644
> > --- a/drivers/net/i40e/i40e_flow.c
> > +++ b/drivers/net/i40e/i40e_flow.c
> > @@ -4201,6 +4201,7 @@ i40e_flow_parse_rss_action(struct rte_eth_dev
> > *dev,
> >  	struct i40e_rte_flow_rss_conf *rss_info = &pf->rss_info;
> >  	uint16_t i, j, n, tmp;
> >  	uint32_t index = 0;
> > +	uint64_t hf_bit = 1;
> >
> >  	NEXT_ITEM_OF_ACTION(act, actions, index);
> >  	rss = (const struct rte_flow_action_rss *)act->conf; @@ -4219,7
> > +4220,7 @@ i40e_flow_parse_rss_action(struct rte_eth_dev *dev,
> >
> >  	if (action_flag) {
> >  		for (n = 0; n < 64; n++) {
> > -			if (rss->rss_conf->rss_hf & (1 << n)) {
> > +			if (rss->rss_conf->rss_hf & (hf_bit << n)) {
> >  				conf_info->region[0].hw_flowtype[0] = n;
> >  				conf_info->region[0].flowtype_num = 1;
> >  				conf_info->queue_region_number = 1; @@ -
> 4313,7
> > +4314,6 @@ i40e_flow_parse_rss_action(struct rte_eth_dev *dev,
> >  		}
> >
> >  		rss_config->queue_region_conf = TRUE;
> > -		return 0;
> >  	}
> 
> Seems if you remove return 0, rss_config->queue_region_conf will be
> overwrite by FALSE at end, right?
> >
> >  	if (!rss || !rss->num) {
> > --
> > 2.9.3
  
Zhang, Helin Jan. 26, 2018, 8:32 a.m. UTC | #6
Hi Wei

I need your helps to rework the patch to follow the commit log styles
other commits use. Please find some good examples via git log. Thanks!

/Helin

> -----Original Message-----
> From: dev [mailto:dev-bounces@dpdk.org] On Behalf Of Zhao1, Wei
> Sent: Friday, January 26, 2018 11:18 AM
> To: Zhang, Qi Z; dev@dpdk.org
> Subject: Re: [dpdk-dev] [PATCH] net/i40e: fix issues for RSS flow API
> 
> Hi, zhang qi
> 
>    V2 for this patch.
> Thanks.
> https://dpdk.org/dev/patchwork/patch/34533/
> 
> > -----Original Message-----
> > From: Zhang, Qi Z
> > Sent: Thursday, January 25, 2018 1:40 PM
> > To: Zhao1, Wei <wei.zhao1@intel.com>; dev@dpdk.org
> > Subject: RE: [PATCH] net/i40e: fix issues for RSS flow API
> >
> > Hi Wei:
> >
> >
> > > -----Original Message-----
> > > From: Zhao1, Wei
> > > Sent: Tuesday, January 23, 2018 2:43 PM
> > > To: dev@dpdk.org
> > > Cc: Zhang, Qi Z <qi.z.zhang@intel.com>; Zhao1, Wei
> > > <wei.zhao1@intel.com>
> > > Subject: [PATCH] net/i40e: fix issues for RSS flow API
> > >
> > > This patch fix issues check from DPDK coverity issues.
> > >
> > > Fixes: ecad87d22383e ("net/i40e: move RSS to flow API") Coverity issues:
> > > 257020 257024 257037
> > >
> > > Signed-off-by: Wei Zhao <wei.zhao1@intel.com>
> > > ---
> > >  drivers/net/i40e/i40e_ethdev.c | 2 +-
> > >  drivers/net/i40e/i40e_flow.c   | 4 ++--
> > >  2 files changed, 3 insertions(+), 3 deletions(-)
> > >
> > > diff --git a/drivers/net/i40e/i40e_ethdev.c
> > > b/drivers/net/i40e/i40e_ethdev.c index 5ea9f99..b0db458 100644
> > > --- a/drivers/net/i40e/i40e_ethdev.c
> > > +++ b/drivers/net/i40e/i40e_ethdev.c
> > > @@ -11681,7 +11681,7 @@ i40e_config_rss_filter(struct i40e_pf *pf,
> > >  							sizeof(uint32_t);
> > >  	}
> > >
> > > -	return i40e_hw_rss_hash_set(pf, &rss_conf);
> > > +	i40e_hw_rss_hash_set(pf, &rss_conf);
> > >
> > >  	rte_memcpy(rss_info,
> > >  		conf, sizeof(struct i40e_rte_flow_rss_conf)); diff --git
> > > a/drivers/net/i40e/i40e_flow.c b/drivers/net/i40e/i40e_flow.c index
> > > cd9a9b6..a23f485 100644
> > > --- a/drivers/net/i40e/i40e_flow.c
> > > +++ b/drivers/net/i40e/i40e_flow.c
> > > @@ -4201,6 +4201,7 @@ i40e_flow_parse_rss_action(struct rte_eth_dev
> > > *dev,
> > >  	struct i40e_rte_flow_rss_conf *rss_info = &pf->rss_info;
> > >  	uint16_t i, j, n, tmp;
> > >  	uint32_t index = 0;
> > > +	uint64_t hf_bit = 1;
> > >
> > >  	NEXT_ITEM_OF_ACTION(act, actions, index);
> > >  	rss = (const struct rte_flow_action_rss *)act->conf; @@ -4219,7
> > > +4220,7 @@ i40e_flow_parse_rss_action(struct rte_eth_dev *dev,
> > >
> > >  	if (action_flag) {
> > >  		for (n = 0; n < 64; n++) {
> > > -			if (rss->rss_conf->rss_hf & (1 << n)) {
> > > +			if (rss->rss_conf->rss_hf & (hf_bit << n)) {
> > >  				conf_info->region[0].hw_flowtype[0] = n;
> > >  				conf_info->region[0].flowtype_num = 1;
> > >  				conf_info->queue_region_number = 1; @@ -
> > 4313,7
> > > +4314,6 @@ i40e_flow_parse_rss_action(struct rte_eth_dev *dev,
> > >  		}
> > >
> > >  		rss_config->queue_region_conf = TRUE;
> > > -		return 0;
> > >  	}
> >
> > Seems if you remove return 0, rss_config->queue_region_conf will be
> > overwrite by FALSE at end, right?
> > >
> > >  	if (!rss || !rss->num) {
> > > --
> > > 2.9.3
  
Zhao1, Wei Jan. 26, 2018, 8:56 a.m. UTC | #7
Hi, helin

    A new v3 has been commit, https://dpdk.org/dev/patchwork/patch/34546/

Thanks.

> -----Original Message-----
> From: Zhang, Helin
> Sent: Friday, January 26, 2018 4:32 PM
> To: Zhao1, Wei <wei.zhao1@intel.com>; Zhang, Qi Z <qi.z.zhang@intel.com>;
> dev@dpdk.org
> Subject: RE: [PATCH] net/i40e: fix issues for RSS flow API
> 
> Hi Wei
> 
> I need your helps to rework the patch to follow the commit log styles other
> commits use. Please find some good examples via git log. Thanks!
> 
> /Helin
> 
> > -----Original Message-----
> > From: dev [mailto:dev-bounces@dpdk.org] On Behalf Of Zhao1, Wei
> > Sent: Friday, January 26, 2018 11:18 AM
> > To: Zhang, Qi Z; dev@dpdk.org
> > Subject: Re: [dpdk-dev] [PATCH] net/i40e: fix issues for RSS flow API
> >
> > Hi, zhang qi
> >
> >    V2 for this patch.
> > Thanks.
> > https://dpdk.org/dev/patchwork/patch/34533/
> >
> > > -----Original Message-----
> > > From: Zhang, Qi Z
> > > Sent: Thursday, January 25, 2018 1:40 PM
> > > To: Zhao1, Wei <wei.zhao1@intel.com>; dev@dpdk.org
> > > Subject: RE: [PATCH] net/i40e: fix issues for RSS flow API
> > >
> > > Hi Wei:
> > >
> > >
> > > > -----Original Message-----
> > > > From: Zhao1, Wei
> > > > Sent: Tuesday, January 23, 2018 2:43 PM
> > > > To: dev@dpdk.org
> > > > Cc: Zhang, Qi Z <qi.z.zhang@intel.com>; Zhao1, Wei
> > > > <wei.zhao1@intel.com>
> > > > Subject: [PATCH] net/i40e: fix issues for RSS flow API
> > > >
> > > > This patch fix issues check from DPDK coverity issues.
> > > >
> > > > Fixes: ecad87d22383e ("net/i40e: move RSS to flow API") Coverity
> issues:
> > > > 257020 257024 257037
> > > >
> > > > Signed-off-by: Wei Zhao <wei.zhao1@intel.com>
> > > > ---
> > > >  drivers/net/i40e/i40e_ethdev.c | 2 +-
> > > >  drivers/net/i40e/i40e_flow.c   | 4 ++--
> > > >  2 files changed, 3 insertions(+), 3 deletions(-)
> > > >
> > > > diff --git a/drivers/net/i40e/i40e_ethdev.c
> > > > b/drivers/net/i40e/i40e_ethdev.c index 5ea9f99..b0db458 100644
> > > > --- a/drivers/net/i40e/i40e_ethdev.c
> > > > +++ b/drivers/net/i40e/i40e_ethdev.c
> > > > @@ -11681,7 +11681,7 @@ i40e_config_rss_filter(struct i40e_pf *pf,
> > > >  							sizeof(uint32_t);
> > > >  	}
> > > >
> > > > -	return i40e_hw_rss_hash_set(pf, &rss_conf);
> > > > +	i40e_hw_rss_hash_set(pf, &rss_conf);
> > > >
> > > >  	rte_memcpy(rss_info,
> > > >  		conf, sizeof(struct i40e_rte_flow_rss_conf)); diff --git
> > > > a/drivers/net/i40e/i40e_flow.c b/drivers/net/i40e/i40e_flow.c
> > > > index
> > > > cd9a9b6..a23f485 100644
> > > > --- a/drivers/net/i40e/i40e_flow.c
> > > > +++ b/drivers/net/i40e/i40e_flow.c
> > > > @@ -4201,6 +4201,7 @@ i40e_flow_parse_rss_action(struct
> > > > rte_eth_dev *dev,
> > > >  	struct i40e_rte_flow_rss_conf *rss_info = &pf->rss_info;
> > > >  	uint16_t i, j, n, tmp;
> > > >  	uint32_t index = 0;
> > > > +	uint64_t hf_bit = 1;
> > > >
> > > >  	NEXT_ITEM_OF_ACTION(act, actions, index);
> > > >  	rss = (const struct rte_flow_action_rss *)act->conf; @@ -4219,7
> > > > +4220,7 @@ i40e_flow_parse_rss_action(struct rte_eth_dev *dev,
> > > >
> > > >  	if (action_flag) {
> > > >  		for (n = 0; n < 64; n++) {
> > > > -			if (rss->rss_conf->rss_hf & (1 << n)) {
> > > > +			if (rss->rss_conf->rss_hf & (hf_bit << n)) {
> > > >  				conf_info->region[0].hw_flowtype[0] = n;
> > > >  				conf_info->region[0].flowtype_num = 1;
> > > >  				conf_info->queue_region_number = 1; @@ -
> > > 4313,7
> > > > +4314,6 @@ i40e_flow_parse_rss_action(struct rte_eth_dev *dev,
> > > >  		}
> > > >
> > > >  		rss_config->queue_region_conf = TRUE;
> > > > -		return 0;
> > > >  	}
> > >
> > > Seems if you remove return 0, rss_config->queue_region_conf will be
> > > overwrite by FALSE at end, right?
> > > >
> > > >  	if (!rss || !rss->num) {
> > > > --
> > > > 2.9.3
  

Patch

diff --git a/drivers/net/i40e/i40e_ethdev.c b/drivers/net/i40e/i40e_ethdev.c
index 5ea9f99..b0db458 100644
--- a/drivers/net/i40e/i40e_ethdev.c
+++ b/drivers/net/i40e/i40e_ethdev.c
@@ -11681,7 +11681,7 @@  i40e_config_rss_filter(struct i40e_pf *pf,
 							sizeof(uint32_t);
 	}
 
-	return i40e_hw_rss_hash_set(pf, &rss_conf);
+	i40e_hw_rss_hash_set(pf, &rss_conf);
 
 	rte_memcpy(rss_info,
 		conf, sizeof(struct i40e_rte_flow_rss_conf));
diff --git a/drivers/net/i40e/i40e_flow.c b/drivers/net/i40e/i40e_flow.c
index cd9a9b6..a23f485 100644
--- a/drivers/net/i40e/i40e_flow.c
+++ b/drivers/net/i40e/i40e_flow.c
@@ -4201,6 +4201,7 @@  i40e_flow_parse_rss_action(struct rte_eth_dev *dev,
 	struct i40e_rte_flow_rss_conf *rss_info = &pf->rss_info;
 	uint16_t i, j, n, tmp;
 	uint32_t index = 0;
+	uint64_t hf_bit = 1;
 
 	NEXT_ITEM_OF_ACTION(act, actions, index);
 	rss = (const struct rte_flow_action_rss *)act->conf;
@@ -4219,7 +4220,7 @@  i40e_flow_parse_rss_action(struct rte_eth_dev *dev,
 
 	if (action_flag) {
 		for (n = 0; n < 64; n++) {
-			if (rss->rss_conf->rss_hf & (1 << n)) {
+			if (rss->rss_conf->rss_hf & (hf_bit << n)) {
 				conf_info->region[0].hw_flowtype[0] = n;
 				conf_info->region[0].flowtype_num = 1;
 				conf_info->queue_region_number = 1;
@@ -4313,7 +4314,6 @@  i40e_flow_parse_rss_action(struct rte_eth_dev *dev,
 		}
 
 		rss_config->queue_region_conf = TRUE;
-		return 0;
 	}
 
 	if (!rss || !rss->num) {