diff mbox

[dpdk-dev] net/ixgbe: add queue index check in filter

Message ID 1500272004-35941-1-git-send-email-wei.zhao1@intel.com (mailing list archive)
State Superseded, archived
Delegated to: Ferruh Yigit
Headers

Checks

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

Commit Message

Zhao1, Wei July 17, 2017, 6:13 a.m. UTC 
  Add queue index check when create filter rule, or
filter with invalid queue id can be created successfully.

Signed-off-by: Wei Zhao <wei.zhao1@intel.com>
---
 drivers/net/ixgbe/ixgbe_flow.c | 16 ++++++++++++----
 1 file changed, 12 insertions(+), 4 deletions(-)

Comments

Ferruh Yigit July 18, 2017, 10:43 a.m. UTC | #1 
On 7/17/2017 7:13 AM, Wei Zhao wrote:
> Add queue index check when create filter rule, or
> filter with invalid queue id can be created successfully.
> 
> Signed-off-by: Wei Zhao <wei.zhao1@intel.com>

<...>

> @@ -1177,6 +1178,9 @@ ixgbe_parse_l2_tn_filter(struct rte_eth_dev *dev,
>  		return -rte_errno;
>  	}
>  
> +	if (filter->queue >= dev->data->nb_rx_queues)
> +		return -rte_errno;
> +

This is giving following build error [1].

[1]
.../drivers/net/ixgbe/ixgbe_flow.c:1180:6:
error: use of undeclared identifier 'filter'
        if (filter->queue >= dev->data->nb_rx_queues)
            ^
Zhao1, Wei July 19, 2017, 3:50 a.m. UTC | #2 
Hi,  Ferruh

> -----Original Message-----

> From: Yigit, Ferruh

> Sent: Tuesday, July 18, 2017 6:44 PM

> To: Zhao1, Wei <wei.zhao1@intel.com>; dev@dpdk.org

> Cc: Lu, Wenzhuo <wenzhuo.lu@intel.com>

> Subject: Re: [dpdk-dev] [PATCH] net/ixgbe: add queue index check in filter

> 

> On 7/17/2017 7:13 AM, Wei Zhao wrote:

> > Add queue index check when create filter rule, or filter with invalid

> > queue id can be created successfully.

> >

> > Signed-off-by: Wei Zhao <wei.zhao1@intel.com>

> 

> <...>

> 

> > @@ -1177,6 +1178,9 @@ ixgbe_parse_l2_tn_filter(struct rte_eth_dev

> *dev,

> >  		return -rte_errno;

> >  	}

> >

> > +	if (filter->queue >= dev->data->nb_rx_queues)

> > +		return -rte_errno;

> > +

> 

> This is giving following build error [1].

> 

> [1]

> .../drivers/net/ixgbe/ixgbe_flow.c:1180:6:

> error: use of undeclared identifier 'filter'

>         if (filter->queue >= dev->data->nb_rx_queues)

>             ^


Thank you, a new  v2 patch has been commit to DPDK.org
diff mbox

Patch

diff --git a/drivers/net/ixgbe/ixgbe_flow.c b/drivers/net/ixgbe/ixgbe_flow.c
index 6885abd..6d4a0be 100644
--- a/drivers/net/ixgbe/ixgbe_flow.c
+++ b/drivers/net/ixgbe/ixgbe_flow.c
@@ -488,9 +488,7 @@  ixgbe_parse_ntuple_filter(struct rte_eth_dev *dev,
 		return -rte_errno;
 	}
 
-	if (filter->queue >= IXGBE_MAX_RX_QUEUE_NUM ||
-		filter->priority > IXGBE_5TUPLE_MAX_PRI ||
-		filter->priority < IXGBE_5TUPLE_MIN_PRI)
+	if (filter->queue >= dev->data->nb_rx_queues)
 		return -rte_errno;
 
 	/* fixed value for ixgbe */
@@ -707,7 +705,7 @@  ixgbe_parse_ethertype_filter(struct rte_eth_dev *dev,
 		return -rte_errno;
 	}
 
-	if (filter->queue >= IXGBE_MAX_RX_QUEUE_NUM) {
+	if (filter->queue >= dev->data->nb_rx_queues) {
 		memset(filter, 0, sizeof(struct rte_eth_ethertype_filter));
 		rte_flow_error_set(error, EINVAL,
 			RTE_FLOW_ERROR_TYPE_ITEM,
@@ -984,6 +982,9 @@  ixgbe_parse_syn_filter(struct rte_eth_dev *dev,
 	ret = cons_parse_syn_filter(attr, pattern,
 					actions, filter, error);
 
+	if (filter->queue >= dev->data->nb_rx_queues)
+		return -rte_errno;
+
 	if (ret)
 		return ret;
 
@@ -1177,6 +1178,9 @@  ixgbe_parse_l2_tn_filter(struct rte_eth_dev *dev,
 		return -rte_errno;
 	}
 
+	if (filter->queue >= dev->data->nb_rx_queues)
+		return -rte_errno;
+
 	return ret;
 }
 
@@ -2542,6 +2546,10 @@  ixgbe_parse_fdir_filter(struct rte_eth_dev *dev,
 	if (fdir_mode == RTE_FDIR_MODE_NONE ||
 	    fdir_mode != rule->mode)
 		return -ENOTSUP;
+
+	if (rule->queue >= dev->data->nb_rx_queues)
+		return -ENOTSUP;
+
 	return ret;
 }