[dpdk-dev,v2,10/15] net/mlx5: allow flow tunnel ID 0 with outer pattern

Message ID 20180410133415.189905-11-xuemingl@mellanox.com (mailing list archive)
State Superseded, archived
Delegated to: Shahaf Shuler
Headers

Checks

Context Check Description
ci/checkpatch success coding style OK
ci/Intel-compilation fail apply patch file failure

Commit Message

Xueming Li April 10, 2018, 1:34 p.m. UTC
  Tunnel w/o tunnel id pattern could match any non-tunneled packet,
this patch allowed tunnel w/o tunnel id pattern after proper outer spec.

Signed-off-by: Xueming Li <xuemingl@mellanox.com>
---
 drivers/net/mlx5/mlx5_flow.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)
  

Comments

Nélio Laranjeiro April 11, 2018, 12:25 p.m. UTC | #1
On Tue, Apr 10, 2018 at 09:34:10PM +0800, Xueming Li wrote:
> Tunnel w/o tunnel id pattern could match any non-tunneled packet,
> this patch allowed tunnel w/o tunnel id pattern after proper outer spec.
> 
> Signed-off-by: Xueming Li <xuemingl@mellanox.com>

Acked-by: Nelio Laranjeiro <nelio.laranjeiro@6wind.com>

> ---
>  drivers/net/mlx5/mlx5_flow.c | 3 ++-
>  1 file changed, 2 insertions(+), 1 deletion(-)
> 
> diff --git a/drivers/net/mlx5/mlx5_flow.c b/drivers/net/mlx5/mlx5_flow.c
> index 857b8b716..58d437308 100644
> --- a/drivers/net/mlx5/mlx5_flow.c
> +++ b/drivers/net/mlx5/mlx5_flow.c
> @@ -1803,7 +1803,8 @@ mlx5_flow_create_vxlan(const struct rte_flow_item *item,
>  	 * before will also match this rule.
>  	 * To avoid such situation, VNI 0 is currently refused.
>  	 */
> -	if (!vxlan.val.tunnel_id)
> +	/* Only allow tunnel w/o tunnel id pattern after proper outer spec. */
> +	if (parser->out_layer == HASH_RXQ_ETH && !vxlan.val.tunnel_id)
>  		return rte_flow_error_set(data->error, EINVAL,
>  					  RTE_FLOW_ERROR_TYPE_ITEM,
>  					  item,
> -- 
> 2.13.3
>
  

Patch

diff --git a/drivers/net/mlx5/mlx5_flow.c b/drivers/net/mlx5/mlx5_flow.c
index 857b8b716..58d437308 100644
--- a/drivers/net/mlx5/mlx5_flow.c
+++ b/drivers/net/mlx5/mlx5_flow.c
@@ -1803,7 +1803,8 @@  mlx5_flow_create_vxlan(const struct rte_flow_item *item,
 	 * before will also match this rule.
 	 * To avoid such situation, VNI 0 is currently refused.
 	 */
-	if (!vxlan.val.tunnel_id)
+	/* Only allow tunnel w/o tunnel id pattern after proper outer spec. */
+	if (parser->out_layer == HASH_RXQ_ETH && !vxlan.val.tunnel_id)
 		return rte_flow_error_set(data->error, EINVAL,
 					  RTE_FLOW_ERROR_TYPE_ITEM,
 					  item,