[dpdk-dev,v4] net/i40e: add flow RSS queue index check

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

Checks

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

Commit Message

Zhao1, Wei April 4, 2018, 8:06 a.m. UTC
  There need a queue index check for RSS queue region
in order to aviod error from configuration.

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:

 move check code out from the big loop.

change in v3:

 delete unnecessary dash in comment.

change in v4:

 add more parameters check code.
---
 drivers/net/i40e/i40e_flow.c | 26 ++++++++++++++++++++++++++
 1 file changed, 26 insertions(+)
  

Comments

Qi Zhang April 4, 2018, 1:25 p.m. UTC | #1
> -----Original Message-----
> From: Zhao1, Wei
> Sent: Wednesday, April 4, 2018 4:06 PM
> To: dev@dpdk.org; stable@dpdk.org
> Cc: Zhang, Qi Z <qi.z.zhang@intel.com>; Zhao1, Wei <wei.zhao1@intel.com>
> Subject: [PATCH v4] net/i40e: add flow RSS queue index check

tile start with fix.

> 
> There need a queue index check for RSS queue region in order to aviod error
> from configuration.
> 
> 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>

Should be Tested-by: Yuan Peng <yuan.peng@intel.com>

Acked-by: Qi Zhang <qi.z.zhang@intel.com>

> 
> ---
> 
> Changes in v2:
> 
>  move check code out from the big loop.
> 
> change in v3:
> 
>  delete unnecessary dash in comment.
> 
> change in v4:
> 
>  add more parameters check code.
> ---
>  drivers/net/i40e/i40e_flow.c | 26 ++++++++++++++++++++++++++
>  1 file changed, 26 insertions(+)
> 
> diff --git a/drivers/net/i40e/i40e_flow.c b/drivers/net/i40e/i40e_flow.c index
> f3e8c5f..f4d08bb 100644
> --- a/drivers/net/i40e/i40e_flow.c
> +++ b/drivers/net/i40e/i40e_flow.c
> @@ -4216,6 +4216,32 @@ i40e_flow_parse_rss_action(struct rte_eth_dev
> *dev,
>  		}
>  	}
> 
> +	if (conf_info->queue_region_number) {
> +		for (i = 0; i < rss->num; i++) {
> +			for (j = 0; j < rss_info->num; j++) {
> +				if (rss->queue[i] == rss_info->queue[j])
> +					break;
> +			}
> +			if (j == rss_info->num) {
> +				rte_flow_error_set(error, EINVAL,
> +					RTE_FLOW_ERROR_TYPE_ACTION,
> +					act,
> +					"no valid queues");
> +				return -rte_errno;
> +			}
> +		}
> +
> +		for (i = 0; i < rss->num - 1; i++) {
> +			if (rss->queue[i + 1] != rss->queue[i] + 1) {
> +				rte_flow_error_set(error, EINVAL,
> +					RTE_FLOW_ERROR_TYPE_ACTION,
> +					act,
> +					"no valid queues");
> +				return -rte_errno;
> +			}
> +		}
> +	}
> +
>  	for (n = 0; n < conf_info->queue_region_number; n++) {
>  		if (conf_info->region[n].user_priority_num ||
>  				conf_info->region[n].flowtype_num) {
> --
> 2.7.5
  
Zhang, Helin April 6, 2018, 8:30 a.m. UTC | #2
> -----Original Message-----
> From: dev [mailto:dev-bounces@dpdk.org] On Behalf Of Zhang, Qi Z
> Sent: Wednesday, April 4, 2018 9:26 PM
> To: Zhao1, Wei; dev@dpdk.org; stable@dpdk.org
> Subject: Re: [dpdk-dev] [PATCH v4] net/i40e: add flow RSS queue index check
> 
> 
> 
> > -----Original Message-----
> > From: Zhao1, Wei
> > Sent: Wednesday, April 4, 2018 4:06 PM
> > To: dev@dpdk.org; stable@dpdk.org
> > Cc: Zhang, Qi Z <qi.z.zhang@intel.com>; Zhao1, Wei
> > <wei.zhao1@intel.com>
> > Subject: [PATCH v4] net/i40e: add flow RSS queue index check
> 
> tile start with fix.
> 
> >
> > There need a queue index check for RSS queue region in order to aviod
> > error from configuration.
> >
> > 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>
> 
> Should be Tested-by: Yuan Peng <yuan.peng@intel.com>
> 
> Acked-by: Qi Zhang <qi.z.zhang@intel.com>
Applied to dpdk-next-net-intel, thanks!

/Helin
  

Patch

diff --git a/drivers/net/i40e/i40e_flow.c b/drivers/net/i40e/i40e_flow.c
index f3e8c5f..f4d08bb 100644
--- a/drivers/net/i40e/i40e_flow.c
+++ b/drivers/net/i40e/i40e_flow.c
@@ -4216,6 +4216,32 @@  i40e_flow_parse_rss_action(struct rte_eth_dev *dev,
 		}
 	}
 
+	if (conf_info->queue_region_number) {
+		for (i = 0; i < rss->num; i++) {
+			for (j = 0; j < rss_info->num; j++) {
+				if (rss->queue[i] == rss_info->queue[j])
+					break;
+			}
+			if (j == rss_info->num) {
+				rte_flow_error_set(error, EINVAL,
+					RTE_FLOW_ERROR_TYPE_ACTION,
+					act,
+					"no valid queues");
+				return -rte_errno;
+			}
+		}
+
+		for (i = 0; i < rss->num - 1; i++) {
+			if (rss->queue[i + 1] != rss->queue[i] + 1) {
+				rte_flow_error_set(error, EINVAL,
+					RTE_FLOW_ERROR_TYPE_ACTION,
+					act,
+					"no valid queues");
+				return -rte_errno;
+			}
+		}
+	}
+
 	for (n = 0; n < conf_info->queue_region_number; n++) {
 		if (conf_info->region[n].user_priority_num ||
 				conf_info->region[n].flowtype_num) {