net/mlx5: fix incorrect L3 layer chosen in TTL action

  For IPINIP flow, there are two L3 layer match pattern items, the inner
layer follows the outer layer as the latter L3 layer item, the TTL action
handles the outer layer.

Current the outer and inner L3 layers are both regared as the outer L3
layer, it caueses TTL action uses the incorrect latter inner protocal in
flow_dv_convert_action_modify_ttl() for header modifier.

Check former L3 outer layer existence avoid set the incorrect inner layer
to the flow attr.

Fixes: 4bb14c83df95 ("net/mlx5: support modify header using Direct Verbs")
Cc: dekelp@mellanox.com
Cc: stable@dpdk.org

Signed-off-by: Suanming Mou <suanmingm@mellanox.com>
---
 drivers/net/mlx5/mlx5_flow_dv.c | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)
  

Hi Mou

From: Suanming Mou
> For IPINIP flow, there are two L3 layer match pattern items, the inner layer
> follows the outer layer as the latter L3 layer item, the TTL action handles the
> outer layer.
> 
> Current the outer and inner L3 layers are both regared as the outer L3 layer,
> it caueses TTL action uses the incorrect latter inner protocal in
> flow_dv_convert_action_modify_ttl() for header modifier.
> 
> Check former L3 outer layer existence avoid set the incorrect inner layer to
> the flow attr.
> 
> Fixes: 4bb14c83df95 ("net/mlx5: support modify header using Direct Verbs")
> Cc: dekelp@mellanox.com
> Cc: stable@dpdk.org
> 
> Signed-off-by: Suanming Mou <suanmingm@mellanox.com>
> ---
>  drivers/net/mlx5/mlx5_flow_dv.c | 12 ++++++++++--
>  1 file changed, 10 insertions(+), 2 deletions(-)
> 
> diff --git a/drivers/net/mlx5/mlx5_flow_dv.c
> b/drivers/net/mlx5/mlx5_flow_dv.c index c402a8d..7cef5d3 100644
> --- a/drivers/net/mlx5/mlx5_flow_dv.c
> +++ b/drivers/net/mlx5/mlx5_flow_dv.c
> @@ -84,10 +84,18 @@
>  	for (; item->type != RTE_FLOW_ITEM_TYPE_END; item++) {
>  		switch (item->type) {
>  		case RTE_FLOW_ITEM_TYPE_IPV4:
> -			attr->ipv4 = 1;
> +			/*
> +			 * flow_dv_validate() avoids multiple L3 layers case
> +			 * other than IPINIP. If attr->ipv6 set, ipv4 should
> +			 * be the IPINIP inner layer.
> +			 */
> +			if (!attr->ipv6)
> +				attr->ipv4 = 1;
>  			break;
>  		case RTE_FLOW_ITEM_TYPE_IPV6:
> -			attr->ipv6 = 1;
> +			/* If ipv4 set, ipv6 is the IPINIP inner layer. */
> +			if (!attr->ipv4)
> +				attr->ipv6 = 1;
>  			break;
>  		case RTE_FLOW_ITEM_TYPE_UDP:
>  			attr->udp = 1;

What are about udp\tcp?

They both can be in outer and inner.....
  

> -----Original Message-----
> From: Matan Azrad <matan@mellanox.com>
> Sent: Thursday, November 21, 2019 3:40 PM
> To: Suanming Mou <suanmingm@mellanox.com>; Slava Ovsiienko
> <viacheslavo@mellanox.com>
> Cc: dev@dpdk.org; stable@dpdk.org; Dekel Peled <dekelp@mellanox.com>
> Subject: RE: [PATCH] net/mlx5: fix incorrect L3 layer chosen in TTL action
> 
> 
> Hi Mou
> 
> From: Suanming Mou
> > For IPINIP flow, there are two L3 layer match pattern items, the inner
> > layer follows the outer layer as the latter L3 layer item, the TTL
> > action handles the outer layer.
> >
> > Current the outer and inner L3 layers are both regared as the outer L3
> > layer, it caueses TTL action uses the incorrect latter inner protocal
> > in
> > flow_dv_convert_action_modify_ttl() for header modifier.
> >
> > Check former L3 outer layer existence avoid set the incorrect inner
> > layer to the flow attr.
> >
> > Fixes: 4bb14c83df95 ("net/mlx5: support modify header using Direct
> > Verbs")
> > Cc: dekelp@mellanox.com
> > Cc: stable@dpdk.org
> >
> > Signed-off-by: Suanming Mou <suanmingm@mellanox.com>
> > ---
> >  drivers/net/mlx5/mlx5_flow_dv.c | 12 ++++++++++--
> >  1 file changed, 10 insertions(+), 2 deletions(-)
> >
> > diff --git a/drivers/net/mlx5/mlx5_flow_dv.c
> > b/drivers/net/mlx5/mlx5_flow_dv.c index c402a8d..7cef5d3 100644
> > --- a/drivers/net/mlx5/mlx5_flow_dv.c
> > +++ b/drivers/net/mlx5/mlx5_flow_dv.c
> > @@ -84,10 +84,18 @@
> >  	for (; item->type != RTE_FLOW_ITEM_TYPE_END; item++) {
> >  		switch (item->type) {
> >  		case RTE_FLOW_ITEM_TYPE_IPV4:
> > -			attr->ipv4 = 1;
> > +			/*
> > +			 * flow_dv_validate() avoids multiple L3 layers case
> > +			 * other than IPINIP. If attr->ipv6 set, ipv4 should
> > +			 * be the IPINIP inner layer.
> > +			 */
> > +			if (!attr->ipv6)
> > +				attr->ipv4 = 1;
> >  			break;
> >  		case RTE_FLOW_ITEM_TYPE_IPV6:
> > -			attr->ipv6 = 1;
> > +			/* If ipv4 set, ipv6 is the IPINIP inner layer. */
> > +			if (!attr->ipv4)
> > +				attr->ipv6 = 1;
> >  			break;
> >  		case RTE_FLOW_ITEM_TYPE_UDP:
> >  			attr->udp = 1;
> 
> What are about udp\tcp?
> 
> They both can be in outer and inner.....

Good catch. Per the command below, the udp tcp should also need to be taken care in vxlan mode.
flow create 0 group 2 ingress pattern ipv4 src is 192.168.1.1 /  udp src is 250 / vxlan vni is 125 / ipv4 src is 192.168.1.2 /  tcp src is 135 / end actions set_tp_src port 125 / jump group 3 / end

Maybe we need a new patch named "net/mlx5: fix incorrect L3/L4 layer chosen in tunnel mode".

>