[dpdk-stable] [PATCH 19.11] net/mlx5: fix IPIP multi-tunnel validation

[dpdk-stable] [PATCH 19.11] net/mlx5: fix IPIP multi-tunnel validation

[Lior Margalit]

[ upstream commit fa06906a48 ]

A flow rule must not include multiple tunnel layers.
An attempt to create such a rule, for example:
testpmd> flow create .../ vxlan / eth / ipv4 proto is 4 / end <actions>
results in an unclear error.

In the current implementation there is a check for
multiple IPIP tunnels, but not for combination of IPIP
and a different kind of tunnel, such as VXLAN. The fix
is to enhance the above check to use MLX5_FLOW_LAYER_TUNNEL
that consists of all the tunnel masks. The error message
will be "multiple tunnel not supported".

Fixes: 5e33bebdd8d3 ("net/mlx5: support IP-in-IP tunnel")

Signed-off-by: Lior Margalit <lmargalit@nvidia.com>
Acked-by: Ori Kam <orika@nvidia.com>
Acked-by: Matan Azrad <matan@nvidia.com>
---
 drivers/net/mlx5/mlx5_flow.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/drivers/net/mlx5/mlx5_flow.c b/drivers/net/mlx5/mlx5_flow.c
index 65064ffb0..005171d09 100644
--- a/drivers/net/mlx5/mlx5_flow.c
+++ b/drivers/net/mlx5/mlx5_flow.c
@@ -1589,7 +1589,7 @@ mlx5_flow_validate_item_ipv4(const struct rte_flow_item *item,
 					  RTE_FLOW_ERROR_TYPE_ITEM, item,
 					  "IPv4 cannot follow L2/VLAN layer "
 					  "which ether type is not IPv4");
-	if (item_flags & MLX5_FLOW_LAYER_IPIP) {
+	if (item_flags & MLX5_FLOW_LAYER_TUNNEL) {
 		if (mask && spec)
 			next_proto = mask->hdr.next_proto_id &
 				     spec->hdr.next_proto_id;
@@ -1691,7 +1691,7 @@ mlx5_flow_validate_item_ipv6(const struct rte_flow_item *item,
 					  RTE_FLOW_ERROR_TYPE_ITEM, item,
 					  "IPv6 cannot follow L2/VLAN layer "
 					  "which ether type is not IPv6");
-	if (item_flags & MLX5_FLOW_LAYER_IPV6_ENCAP) {
+	if (item_flags & MLX5_FLOW_LAYER_TUNNEL) {
 		if (mask && spec)
 			next_proto = mask->hdr.proto & spec->hdr.proto;
 		if (next_proto == IPPROTO_IPIP || next_proto == IPPROTO_IPV6)
-- 
2.25.1

Re: [dpdk-stable] [PATCH 19.11] net/mlx5: fix IPIP multi-tunnel validation

[Christian Ehrhardt]

On Wed, Aug 11, 2021 at 12:20 PM Lior Margalit <lmargalit@nvidia.com> wrote:
>
> [ upstream commit fa06906a48 ]

Thank you, applied

> A flow rule must not include multiple tunnel layers.
> An attempt to create such a rule, for example:
> testpmd> flow create .../ vxlan / eth / ipv4 proto is 4 / end <actions>
> results in an unclear error.
>
> In the current implementation there is a check for
> multiple IPIP tunnels, but not for combination of IPIP
> and a different kind of tunnel, such as VXLAN. The fix
> is to enhance the above check to use MLX5_FLOW_LAYER_TUNNEL
> that consists of all the tunnel masks. The error message
> will be "multiple tunnel not supported".
>
> Fixes: 5e33bebdd8d3 ("net/mlx5: support IP-in-IP tunnel")
>
> Signed-off-by: Lior Margalit <lmargalit@nvidia.com>
> Acked-by: Ori Kam <orika@nvidia.com>
> Acked-by: Matan Azrad <matan@nvidia.com>
> ---
>  drivers/net/mlx5/mlx5_flow.c | 4 ++--
>  1 file changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/drivers/net/mlx5/mlx5_flow.c b/drivers/net/mlx5/mlx5_flow.c
> index 65064ffb0..005171d09 100644
> --- a/drivers/net/mlx5/mlx5_flow.c
> +++ b/drivers/net/mlx5/mlx5_flow.c
> @@ -1589,7 +1589,7 @@ mlx5_flow_validate_item_ipv4(const struct rte_flow_item *item,
>                                           RTE_FLOW_ERROR_TYPE_ITEM, item,
>                                           "IPv4 cannot follow L2/VLAN layer "
>                                           "which ether type is not IPv4");
> -       if (item_flags & MLX5_FLOW_LAYER_IPIP) {
> +       if (item_flags & MLX5_FLOW_LAYER_TUNNEL) {
>                 if (mask && spec)
>                         next_proto = mask->hdr.next_proto_id &
>                                      spec->hdr.next_proto_id;
> @@ -1691,7 +1691,7 @@ mlx5_flow_validate_item_ipv6(const struct rte_flow_item *item,
>                                           RTE_FLOW_ERROR_TYPE_ITEM, item,
>                                           "IPv6 cannot follow L2/VLAN layer "
>                                           "which ether type is not IPv6");
> -       if (item_flags & MLX5_FLOW_LAYER_IPV6_ENCAP) {
> +       if (item_flags & MLX5_FLOW_LAYER_TUNNEL) {
>                 if (mask && spec)
>                         next_proto = mask->hdr.proto & spec->hdr.proto;
>                 if (next_proto == IPPROTO_IPIP || next_proto == IPPROTO_IPV6)
> --
> 2.25.1
>


-- 
Christian Ehrhardt
Staff Engineer, Ubuntu Server
Canonical Ltd