net/mlx5: match on TCP flags via DV/DR engine

Message ID 20190509061053.181091-1-jackmin@mellanox.com
State Accepted, archived
Delegated to: Shahaf Shuler
Headers show
Series
  • net/mlx5: match on TCP flags via DV/DR engine
Related show

Checks

Context Check Description
ci/Intel-compilation success Compilation OK
ci/intel-Performance-Testing success Performance Testing PASS
ci/mellanox-Performance-Testing success Performance Testing PASS
ci/checkpatch warning coding style issues

Commit Message

Xiaoyu Min May 9, 2019, 6:11 a.m.
Add support to match all TCP control bits (flags)
except "NS (ECN-nonce)" via Direct Verbs (DV) or Direct Rule (DR)
engine.

Signed-off-by: Xiaoyu Min <jackmin@mellanox.com>
---
 drivers/net/mlx5/mlx5_flow_dv.c | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

Comments

Ori Kam May 12, 2019, 6:27 a.m. | #1
> -----Original Message-----
> From: dev <dev-bounces@dpdk.org> On Behalf Of Jack Min
> Sent: Thursday, May 9, 2019 9:11 AM
> To: Shahaf Shuler <shahafs@mellanox.com>; Yongseok Koh
> <yskoh@mellanox.com>
> Cc: dev@dpdk.org
> Subject: [dpdk-dev] [PATCH] net/mlx5: match on TCP flags via DV/DR engine
> 
> Add support to match all TCP control bits (flags)
> except "NS (ECN-nonce)" via Direct Verbs (DV) or Direct Rule (DR)
> engine.
> 
> Signed-off-by: Xiaoyu Min <jackmin@mellanox.com>
> ---
>  drivers/net/mlx5/mlx5_flow_dv.c | 12 +++++++++++-
>  1 file changed, 11 insertions(+), 1 deletion(-)
> 
> diff --git a/drivers/net/mlx5/mlx5_flow_dv.c
> b/drivers/net/mlx5/mlx5_flow_dv.c
> index cf255ca95c..44b4f40404 100644
> --- a/drivers/net/mlx5/mlx5_flow_dv.c
> +++ b/drivers/net/mlx5/mlx5_flow_dv.c
> @@ -2066,6 +2066,12 @@ flow_dv_validate(struct rte_eth_dev *dev, const
> struct rte_flow_attr *attr,
>  	uint64_t last_item = 0;
>  	uint8_t next_protocol = 0xff;
>  	int actions_n = 0;
> +	struct rte_flow_item_tcp nic_tcp_mask = {
> +		.hdr = { .tcp_flags = 0xFF,
> +			 .src_port = RTE_BE16(UINT16_MAX),
> +			 .dst_port = RTE_BE16(UINT16_MAX),
> +		}
> +	};
> 
>  	if (items == NULL)
>  		return -1;
> @@ -2146,7 +2152,7 @@ flow_dv_validate(struct rte_eth_dev *dev, const
> struct rte_flow_attr *attr,
>  			ret = mlx5_flow_validate_item_tcp
>  						(items, item_flags,
>  						 next_protocol,
> -						 &rte_flow_item_tcp_mask,
> +						 &nic_tcp_mask,
>  						 error);
>  			if (ret < 0)
>  				return ret;
> @@ -2862,6 +2868,10 @@ flow_dv_translate_item_tcp(void *matcher, void
> *key,
>  		 rte_be_to_cpu_16(tcp_m->hdr.dst_port));
>  	MLX5_SET(fte_match_set_lyr_2_4, headers_v, tcp_dport,
>  		 rte_be_to_cpu_16(tcp_v->hdr.dst_port & tcp_m-
> >hdr.dst_port));
> +	MLX5_SET(fte_match_set_lyr_2_4, headers_m, tcp_flags,
> +		 tcp_m->hdr.tcp_flags);
> +	MLX5_SET(fte_match_set_lyr_2_4, headers_v, tcp_flags,
> +		 (tcp_v->hdr.tcp_flags & tcp_m->hdr.tcp_flags));
>  }
> 
>  /**
> --
> 2.20.1

Acked-by: Ori Kam <orika@mellanox.com>
Thanks,
Xiaoyu Min May 27, 2019, 2:35 a.m. | #2
On Mon, 19-05-27, 03:20, Shahaf Shuler wrote:
> From: Jack Min <jackmin@mellanox.com>
> 
> >Add support to match all TCP control bits (flags)
> >except "NS (ECN-nonce)" via Direct Verbs (DV) or Direct Rule (DR)
> >engine.
> >
> >Signed-off-by: Xiaoyu Min <jackmin@mellanox.com>
> >Acked-by: Ori Kam <orika@mellanox.com>
> 
> Applied to next-net-mlx, with few points to address:
Thank you, shahaf.

> 1. Your author name is not the same as your signed-of name. please take
> care.
It seems the MS exchange mangled my email name...

> 2. fixed some identation issues
> 3. modifed the title. please have a look.
Ok. 

> thanks. 
> 
> 
> >---
> > drivers/net/mlx5/mlx5_flow_dv.c | 12 +++++++++++-
> > 1 file changed, 11 insertions(+), 1 deletion(-)
> >
> >diff --git a/drivers/net/mlx5/mlx5_flow_dv.c b/drivers/net/mlx5/mlx5_flow_dv.c
> >index cf255ca95c..44b4f40404 100644
> >--- a/drivers/net/mlx5/mlx5_flow_dv.c
> >+++ b/drivers/net/mlx5/mlx5_flow_dv.c
> >@@ -2066,6 +2066,12 @@ flow_dv_validate(struct rte_eth_dev *dev, const struct rte_flow_attr *attr,
> > 	uint64_t last_item = 0;
> > 	uint8_t next_protocol = 0xff;
> > 	int actions_n = 0;
> >+	struct rte_flow_item_tcp nic_tcp_mask = {
> >+		.hdr = { .tcp_flags = 0xFF,
> >+			 .src_port = RTE_BE16(UINT16_MAX),
> >+			 .dst_port = RTE_BE16(UINT16_MAX),
> >+		}
> >+	};
> > 
> > 	if (items == NULL)
> > 		return -1;
> >@@ -2146,7 +2152,7 @@ flow_dv_validate(struct rte_eth_dev *dev, const struct rte_flow_attr *attr,
> > 			ret = mlx5_flow_validate_item_tcp
> > 						(items, item_flags,
> > 						 next_protocol,
> >-						 &rte_flow_item_tcp_mask,
> >+						 &nic_tcp_mask,
> > 						 error);
> > 			if (ret < 0)
> > 				return ret;
> >@@ -2862,6 +2868,10 @@ flow_dv_translate_item_tcp(void *matcher, void *key,
> > 		 rte_be_to_cpu_16(tcp_m->hdr.dst_port));
> > 	MLX5_SET(fte_match_set_lyr_2_4, headers_v, tcp_dport,
> > 		 rte_be_to_cpu_16(tcp_v->hdr.dst_port & tcp_m->hdr.dst_port));
> >+	MLX5_SET(fte_match_set_lyr_2_4, headers_m, tcp_flags,
> >+		 tcp_m->hdr.tcp_flags);
> >+	MLX5_SET(fte_match_set_lyr_2_4, headers_v, tcp_flags,
> >+		 (tcp_v->hdr.tcp_flags & tcp_m->hdr.tcp_flags));
> > }
> > 
> > /**

Patch

diff --git a/drivers/net/mlx5/mlx5_flow_dv.c b/drivers/net/mlx5/mlx5_flow_dv.c
index cf255ca95c..44b4f40404 100644
--- a/drivers/net/mlx5/mlx5_flow_dv.c
+++ b/drivers/net/mlx5/mlx5_flow_dv.c
@@ -2066,6 +2066,12 @@  flow_dv_validate(struct rte_eth_dev *dev, const struct rte_flow_attr *attr,
 	uint64_t last_item = 0;
 	uint8_t next_protocol = 0xff;
 	int actions_n = 0;
+	struct rte_flow_item_tcp nic_tcp_mask = {
+		.hdr = { .tcp_flags = 0xFF,
+			 .src_port = RTE_BE16(UINT16_MAX),
+			 .dst_port = RTE_BE16(UINT16_MAX),
+		}
+	};
 
 	if (items == NULL)
 		return -1;
@@ -2146,7 +2152,7 @@  flow_dv_validate(struct rte_eth_dev *dev, const struct rte_flow_attr *attr,
 			ret = mlx5_flow_validate_item_tcp
 						(items, item_flags,
 						 next_protocol,
-						 &rte_flow_item_tcp_mask,
+						 &nic_tcp_mask,
 						 error);
 			if (ret < 0)
 				return ret;
@@ -2862,6 +2868,10 @@  flow_dv_translate_item_tcp(void *matcher, void *key,
 		 rte_be_to_cpu_16(tcp_m->hdr.dst_port));
 	MLX5_SET(fte_match_set_lyr_2_4, headers_v, tcp_dport,
 		 rte_be_to_cpu_16(tcp_v->hdr.dst_port & tcp_m->hdr.dst_port));
+	MLX5_SET(fte_match_set_lyr_2_4, headers_m, tcp_flags,
+		 tcp_m->hdr.tcp_flags);
+	MLX5_SET(fte_match_set_lyr_2_4, headers_v, tcp_flags,
+		 (tcp_v->hdr.tcp_flags & tcp_m->hdr.tcp_flags));
 }
 
 /**