net/mlx5: fix GENEVE and VXLAN-GPE flow item matching

GENEVE and VXLAN-GPE item matching is done similarly to GRE matching.
Users can skip the specification of the protocol type and expect that
this type is deducted from the inner header type automatically.
But the inner header type may not be specified in order to match all the
protocol types. In this case, PMD should not specify the protocol type.
Check if we have the inner header type before setting the protocol type.

Fixes: 690391dd0e8b ("net/mlx5: fix GENEVE protocol type translation")
Fixes: 861fa3796f75 ("net/mlx5: fix VXLAN-GPE next protocol translation")
Cc: stable@dpdk.org
Signed-off-by: Alexander Kozyrev <akozyrev@nvidia.com>
Acked-by: Viacheslav Ovsiienko <viacheslavo@nvidia.com>

diff --git a/drivers/net/mlx5/mlx5_flow_dv.c b/drivers/net/mlx5/mlx5_flow_dv.c
index 1a9c040..3da122c 100644 (file)
--- a/drivers/net/mlx5/mlx5_flow_dv.c
+++ b/drivers/net/mlx5/mlx5_flow_dv.c
@@ -9057,7 +9057,6 @@ flow_dv_translate_item_vxlan_gpe(void *matcher, void *key,
        m_protocol = vxlan_m->protocol;
        v_protocol = vxlan_v->protocol;
        if (!m_protocol) {
-               m_protocol = 0xff;
                /* Force next protocol to ensure next headers parsing. */
                if (pattern_flags & MLX5_FLOW_LAYER_INNER_L2)
                        v_protocol = RTE_VXLAN_GPE_TYPE_ETH;
@@ -9065,6 +9064,8 @@ flow_dv_translate_item_vxlan_gpe(void *matcher, void *key,
                        v_protocol = RTE_VXLAN_GPE_TYPE_IPV4;
                else if (pattern_flags & MLX5_FLOW_LAYER_INNER_L3_IPV6)
                        v_protocol = RTE_VXLAN_GPE_TYPE_IPV6;
+               if (v_protocol)
+                       m_protocol = 0xFF;
        }
        MLX5_SET(fte_match_set_misc3, misc_m,
                 outer_vxlan_gpe_next_protocol, m_protocol);
@@ -9135,8 +9136,9 @@ flow_dv_translate_item_geneve(void *matcher, void *key,
        protocol_v = rte_be_to_cpu_16(geneve_v->protocol);
        if (!protocol_m) {
                /* Force next protocol to prevent matchers duplication */
-               protocol_m = 0xFFFF;
                protocol_v = mlx5_translate_tunnel_etypes(pattern_flags);
+               if (protocol_v)
+                       protocol_m = 0xFFFF;
        }
        MLX5_SET(fte_match_set_misc, misc_m, geneve_protocol_type, protocol_m);
        MLX5_SET(fte_match_set_misc, misc_v, geneve_protocol_type,