[dpdk-dev,v1] net/ixgbe: add more check in n-tuple filter

Message ID 1485142340-49032-1-git-send-email-wei.zhao1@intel.com
State Superseded, archived
Headers show

Checks

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

Commit Message

Wei Zhao Jan. 23, 2017, 3:32 a.m.
Add more check on the mask of src_addr, dst_addr and next_proto_id
in n-tuple filter rule pattern parser.If do not add such check,
it maybe cause error in pattern parser.

Signed-off-by: zhao wei <wei.zhao1@gmail.com>
---
 drivers/net/ixgbe/ixgbe_flow.c | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

Comments

Ferruh Yigit Jan. 23, 2017, 12:22 p.m. | #1
On 1/23/2017 3:32 AM, Wei Zhao wrote:
> Add more check on the mask of src_addr, dst_addr and next_proto_id
> in n-tuple filter rule pattern parser.If do not add such check,
> it maybe cause error in pattern parser.
> 
> Signed-off-by: zhao wei <wei.zhao1@gmail.com>
> ---
>  drivers/net/ixgbe/ixgbe_flow.c | 5 ++++-
>  1 file changed, 4 insertions(+), 1 deletion(-)
> 
> diff --git a/drivers/net/ixgbe/ixgbe_flow.c b/drivers/net/ixgbe/ixgbe_flow.c
> index 82aceed..8f78eee 100644
> --- a/drivers/net/ixgbe/ixgbe_flow.c
> +++ b/drivers/net/ixgbe/ixgbe_flow.c
> @@ -331,7 +331,10 @@ cons_parse_ntuple_filter(const struct rte_flow_attr *attr,
>  	    ipv4_mask->hdr.packet_id ||
>  	    ipv4_mask->hdr.fragment_offset ||
>  	    ipv4_mask->hdr.time_to_live ||
> -	    ipv4_mask->hdr.hdr_checksum) {
> +	    ipv4_mask->hdr.hdr_checksum ||
> +	    !ipv4_mask->hdr.next_proto_id ||
> +	    !ipv4_mask->hdr.dst_addr ||
> +	    !ipv4_mask->hdr.src_addr ||) {

The '||' at the end seems extra.

Also can you please confirm your sign off?

>  			rte_flow_error_set(error,
>  			EINVAL, RTE_FLOW_ERROR_TYPE_ITEM,
>  			item, "Not supported by ntuple filter");
>
Wei Zhao Feb. 3, 2017, 1:21 a.m. | #2
Hi,  Ferruh

> -----Original Message-----
> From: Yigit, Ferruh
> Sent: Monday, January 23, 2017 8:23 PM
> To: Zhao1, Wei <wei.zhao1@intel.com>; dev@dpdk.org
> Cc: zhao wei <wei.zhao1@gmail.com>
> Subject: Re: [dpdk-dev] [PATCH v1] net/ixgbe: add more check in n-tuple
> filter
> 
> On 1/23/2017 3:32 AM, Wei Zhao wrote:
> > Add more check on the mask of src_addr, dst_addr and next_proto_id in
> > n-tuple filter rule pattern parser.If do not add such check, it maybe
> > cause error in pattern parser.
> >
> > Signed-off-by: zhao wei <wei.zhao1@gmail.com>
> > ---
> >  drivers/net/ixgbe/ixgbe_flow.c | 5 ++++-
> >  1 file changed, 4 insertions(+), 1 deletion(-)
> >
> > diff --git a/drivers/net/ixgbe/ixgbe_flow.c
> > b/drivers/net/ixgbe/ixgbe_flow.c index 82aceed..8f78eee 100644
> > --- a/drivers/net/ixgbe/ixgbe_flow.c
> > +++ b/drivers/net/ixgbe/ixgbe_flow.c
> > @@ -331,7 +331,10 @@ cons_parse_ntuple_filter(const struct
> rte_flow_attr *attr,
> >  	    ipv4_mask->hdr.packet_id ||
> >  	    ipv4_mask->hdr.fragment_offset ||
> >  	    ipv4_mask->hdr.time_to_live ||
> > -	    ipv4_mask->hdr.hdr_checksum) {
> > +	    ipv4_mask->hdr.hdr_checksum ||
> > +	    !ipv4_mask->hdr.next_proto_id ||
> > +	    !ipv4_mask->hdr.dst_addr ||
> > +	    !ipv4_mask->hdr.src_addr ||) {
> 
> The '||' at the end seems extra.
> 
> Also can you please confirm your sign off?
> 
> >  			rte_flow_error_set(error,
> >  			EINVAL, RTE_FLOW_ERROR_TYPE_ITEM,
> >  			item, "Not supported by ntuple filter");
> >

This patch has been change to suspended on patchwork net.
Thank you.

Patch

diff --git a/drivers/net/ixgbe/ixgbe_flow.c b/drivers/net/ixgbe/ixgbe_flow.c
index 82aceed..8f78eee 100644
--- a/drivers/net/ixgbe/ixgbe_flow.c
+++ b/drivers/net/ixgbe/ixgbe_flow.c
@@ -331,7 +331,10 @@  cons_parse_ntuple_filter(const struct rte_flow_attr *attr,
 	    ipv4_mask->hdr.packet_id ||
 	    ipv4_mask->hdr.fragment_offset ||
 	    ipv4_mask->hdr.time_to_live ||
-	    ipv4_mask->hdr.hdr_checksum) {
+	    ipv4_mask->hdr.hdr_checksum ||
+	    !ipv4_mask->hdr.next_proto_id ||
+	    !ipv4_mask->hdr.dst_addr ||
+	    !ipv4_mask->hdr.src_addr ||) {
 			rte_flow_error_set(error,
 			EINVAL, RTE_FLOW_ERROR_TYPE_ITEM,
 			item, "Not supported by ntuple filter");