net/mlx5: DR, Refactor VXLAN GPE flex parser tunnel code for SW steering

Refactor flex parser tunnel code:
 - Add definition for flex parser tunneling header for VXLAN-GPE
 - Use macros for VXLAN-GPE SW steering when building STE
 - Refactor the code to reflect that this is a VXLAN GPE
   only code and not a general flex parser code.
   This also significantly simplifies addition of more
   flex parser protocols, such as Geneve.

Signed-off-by: Yevgeny Kliteynik <kliteyn@mellanox.com>
Reviewed-by: Alex Vesker <valex@mellanox.com>
Signed-off-by: Saeed Mahameed <saeedm@mellanox.com>

diff --git a/drivers/net/ethernet/mellanox/mlx5/core/steering/dr_matcher.c b/drivers/net/ethernet/mellanox/mlx5/core/steering/dr_matcher.c
index c6548980daf01d335cbb276eb885d84003231a1c..f177c468b7409d575c616cab8337219598a8342e 100644 (file)
--- a/drivers/net/ethernet/mellanox/mlx5/core/steering/dr_matcher.c
+++ b/drivers/net/ethernet/mellanox/mlx5/core/steering/dr_matcher.c
@@ -102,13 +102,29 @@ static bool dr_mask_is_gre_set(struct mlx5dr_match_misc *misc)
        DR_MASK_IS_OUTER_MPLS_OVER_GRE_UDP_SET((_misc2), gre) || \
        DR_MASK_IS_OUTER_MPLS_OVER_GRE_UDP_SET((_misc2), udp))
 
-static bool dr_mask_is_flex_parser_tnl_set(struct mlx5dr_match_misc3 *misc3)
+static bool
+dr_mask_is_misc3_vxlan_gpe_set(struct mlx5dr_match_misc3 *misc3)
 {
        return (misc3->outer_vxlan_gpe_vni ||
                misc3->outer_vxlan_gpe_next_protocol ||
                misc3->outer_vxlan_gpe_flags);
 }
 
+static bool
+dr_matcher_supp_flex_parser_vxlan_gpe(struct mlx5dr_cmd_caps *caps)
+{
+       return caps->flex_protocols &
+              MLX5_FLEX_PARSER_VXLAN_GPE_ENABLED;
+}
+
+static bool
+dr_mask_is_flex_parser_tnl_vxlan_gpe_set(struct mlx5dr_match_param *mask,
+                                        struct mlx5dr_domain *dmn)
+{
+       return dr_mask_is_misc3_vxlan_gpe_set(&mask->misc3) &&
+              dr_matcher_supp_flex_parser_vxlan_gpe(&dmn->info.caps);
+}
+
 static bool dr_mask_is_flex_parser_icmpv6_set(struct mlx5dr_match_misc3 *misc3)
 {
        return (misc3->icmpv6_type || misc3->icmpv6_code ||
@@ -137,13 +153,6 @@ static bool dr_mask_is_gvmi_or_qpn_set(struct mlx5dr_match_misc *misc)
        return (misc->source_sqn || misc->source_port);
 }
 
-static bool
-dr_matcher_supp_flex_parser_vxlan_gpe(struct mlx5dr_domain *dmn)
-{
-       return dmn->info.caps.flex_protocols &
-              MLX5_FLEX_PARSER_VXLAN_GPE_ENABLED;
-}
-
 int mlx5dr_matcher_select_builders(struct mlx5dr_matcher *matcher,
                                   struct mlx5dr_matcher_rx_tx *nic_matcher,
                                   enum mlx5dr_ipv outer_ipv,
@@ -262,10 +271,10 @@ static int dr_matcher_set_ste_builders(struct mlx5dr_matcher *matcher,
                                                                  inner, rx);
                }
 
-               if (dr_mask_is_flex_parser_tnl_set(&mask.misc3) &&
-                   dr_matcher_supp_flex_parser_vxlan_gpe(dmn))
-                       mlx5dr_ste_build_flex_parser_tnl(&sb[idx++], &mask,
-                                                        inner, rx);
+               if (dr_mask_is_flex_parser_tnl_vxlan_gpe_set(&mask, dmn))
+                       mlx5dr_ste_build_flex_parser_tnl_vxlan_gpe(&sb[idx++],
+                                                                  &mask,
+                                                                  inner, rx);
 
                if (DR_MASK_IS_ETH_L4_MISC_SET(mask.misc3, outer))
                        mlx5dr_ste_build_eth_l4_misc(&sb[idx++], &mask, inner, rx);

diff --git a/drivers/net/ethernet/mellanox/mlx5/core/steering/dr_ste.c b/drivers/net/ethernet/mellanox/mlx5/core/steering/dr_ste.c
index 7e9d6cfc356fdfdf35caa801f308072d702db2a8..7a906938ceb9776d706cd6d69f9256c70c1cea58 100644 (file)
--- a/drivers/net/ethernet/mellanox/mlx5/core/steering/dr_ste.c
+++ b/drivers/net/ethernet/mellanox/mlx5/core/steering/dr_ste.c
@@ -2103,68 +2103,57 @@ void mlx5dr_ste_build_eth_l4_misc(struct mlx5dr_ste_build *sb,
        sb->ste_build_tag_func = &dr_ste_build_eth_l4_misc_tag;
 }
 
-static void dr_ste_build_flex_parser_tnl_bit_mask(struct mlx5dr_match_param *value,
-                                                 bool inner, u8 *bit_mask)
+static void
+dr_ste_build_flex_parser_tnl_vxlan_gpe_bit_mask(struct mlx5dr_match_param *value,
+                                               bool inner, u8 *bit_mask)
 {
        struct mlx5dr_match_misc3 *misc_3_mask = &value->misc3;
 
-       if (misc_3_mask->outer_vxlan_gpe_flags ||
-           misc_3_mask->outer_vxlan_gpe_next_protocol) {
-               MLX5_SET(ste_flex_parser_tnl, bit_mask,
-                        flex_parser_tunneling_header_63_32,
-                        (misc_3_mask->outer_vxlan_gpe_flags << 24) |
-                        (misc_3_mask->outer_vxlan_gpe_next_protocol));
-               misc_3_mask->outer_vxlan_gpe_flags = 0;
-               misc_3_mask->outer_vxlan_gpe_next_protocol = 0;
-       }
-
-       if (misc_3_mask->outer_vxlan_gpe_vni) {
-               MLX5_SET(ste_flex_parser_tnl, bit_mask,
-                        flex_parser_tunneling_header_31_0,
-                        misc_3_mask->outer_vxlan_gpe_vni << 8);
-               misc_3_mask->outer_vxlan_gpe_vni = 0;
-       }
+       DR_STE_SET_MASK_V(flex_parser_tnl_vxlan_gpe, bit_mask,
+                         outer_vxlan_gpe_flags,
+                         misc_3_mask, outer_vxlan_gpe_flags);
+       DR_STE_SET_MASK_V(flex_parser_tnl_vxlan_gpe, bit_mask,
+                         outer_vxlan_gpe_next_protocol,
+                         misc_3_mask, outer_vxlan_gpe_next_protocol);
+       DR_STE_SET_MASK_V(flex_parser_tnl_vxlan_gpe, bit_mask,
+                         outer_vxlan_gpe_vni,
+                         misc_3_mask, outer_vxlan_gpe_vni);
 }
 
-static int dr_ste_build_flex_parser_tnl_tag(struct mlx5dr_match_param *value,
-                                           struct mlx5dr_ste_build *sb,
-                                           u8 *hw_ste_p)
+static int
+dr_ste_build_flex_parser_tnl_vxlan_gpe_tag(struct mlx5dr_match_param *value,
+                                          struct mlx5dr_ste_build *sb,
+                                          u8 *hw_ste_p)
 {
        struct dr_hw_ste_format *hw_ste = (struct dr_hw_ste_format *)hw_ste_p;
        struct mlx5dr_match_misc3 *misc3 = &value->misc3;
        u8 *tag = hw_ste->tag;
 
-       if (misc3->outer_vxlan_gpe_flags ||
-           misc3->outer_vxlan_gpe_next_protocol) {
-               MLX5_SET(ste_flex_parser_tnl, tag,
-                        flex_parser_tunneling_header_63_32,
-                        (misc3->outer_vxlan_gpe_flags << 24) |
-                        (misc3->outer_vxlan_gpe_next_protocol));
-               misc3->outer_vxlan_gpe_flags = 0;
-               misc3->outer_vxlan_gpe_next_protocol = 0;
-       }
-
-       if (misc3->outer_vxlan_gpe_vni) {
-               MLX5_SET(ste_flex_parser_tnl, tag,
-                        flex_parser_tunneling_header_31_0,
-                        misc3->outer_vxlan_gpe_vni << 8);
-               misc3->outer_vxlan_gpe_vni = 0;
-       }
+       DR_STE_SET_TAG(flex_parser_tnl_vxlan_gpe, tag,
+                      outer_vxlan_gpe_flags, misc3,
+                      outer_vxlan_gpe_flags);
+       DR_STE_SET_TAG(flex_parser_tnl_vxlan_gpe, tag,
+                      outer_vxlan_gpe_next_protocol, misc3,
+                      outer_vxlan_gpe_next_protocol);
+       DR_STE_SET_TAG(flex_parser_tnl_vxlan_gpe, tag,
+                      outer_vxlan_gpe_vni, misc3,
+                      outer_vxlan_gpe_vni);
 
        return 0;
 }
 
-void mlx5dr_ste_build_flex_parser_tnl(struct mlx5dr_ste_build *sb,
-                                     struct mlx5dr_match_param *mask,
-                                     bool inner, bool rx)
+void mlx5dr_ste_build_flex_parser_tnl_vxlan_gpe(struct mlx5dr_ste_build *sb,
+                                               struct mlx5dr_match_param *mask,
+                                               bool inner, bool rx)
 {
-       dr_ste_build_flex_parser_tnl_bit_mask(mask, inner, sb->bit_mask);
+       dr_ste_build_flex_parser_tnl_vxlan_gpe_bit_mask(mask, inner,
+                                                       sb->bit_mask);
 
        sb->rx = rx;
        sb->inner = inner;
        sb->lu_type = MLX5DR_STE_LU_TYPE_FLEX_PARSER_TNL_HEADER;
        sb->byte_mask = dr_ste_conv_bit_to_byte_mask(sb->bit_mask);
-       sb->ste_build_tag_func = &dr_ste_build_flex_parser_tnl_tag;
+       sb->ste_build_tag_func = &dr_ste_build_flex_parser_tnl_vxlan_gpe_tag;
 }
 
 static void dr_ste_build_register_0_bit_mask(struct mlx5dr_match_param *value,

diff --git a/drivers/net/ethernet/mellanox/mlx5/core/steering/dr_types.h b/drivers/net/ethernet/mellanox/mlx5/core/steering/dr_types.h
index c1f45a60ee6b4089f23d09653a0f16a800f5e287..a64af56b825f5e4674a6b0677daf6695675875c8 100644 (file)
--- a/drivers/net/ethernet/mellanox/mlx5/core/steering/dr_types.h
+++ b/drivers/net/ethernet/mellanox/mlx5/core/steering/dr_types.h
@@ -325,9 +325,9 @@ int mlx5dr_ste_build_flex_parser_1(struct mlx5dr_ste_build *sb,
                                   struct mlx5dr_match_param *mask,
                                   struct mlx5dr_cmd_caps *caps,
                                   bool inner, bool rx);
-void mlx5dr_ste_build_flex_parser_tnl(struct mlx5dr_ste_build *sb,
-                                     struct mlx5dr_match_param *mask,
-                                     bool inner, bool rx);
+void mlx5dr_ste_build_flex_parser_tnl_vxlan_gpe(struct mlx5dr_ste_build *sb,
+                                               struct mlx5dr_match_param *mask,
+                                               bool inner, bool rx);
 void mlx5dr_ste_build_general_purpose(struct mlx5dr_ste_build *sb,
                                      struct mlx5dr_match_param *mask,
                                      bool inner, bool rx);

diff --git a/drivers/net/ethernet/mellanox/mlx5/core/steering/mlx5_ifc_dr.h b/drivers/net/ethernet/mellanox/mlx5/core/steering/mlx5_ifc_dr.h
index 596c927220d9627727396f800f4a7969abcf18dc..6d78b027fe56c27469c4ef624cd6aa27acf038a5 100644 (file)
--- a/drivers/net/ethernet/mellanox/mlx5/core/steering/mlx5_ifc_dr.h
+++ b/drivers/net/ethernet/mellanox/mlx5/core/steering/mlx5_ifc_dr.h
@@ -548,6 +548,17 @@ struct mlx5_ifc_ste_flex_parser_tnl_bits {
        u8         reserved_at_40[0x40];
 };
 
+struct mlx5_ifc_ste_flex_parser_tnl_vxlan_gpe_bits {
+       u8         outer_vxlan_gpe_flags[0x8];
+       u8         reserved_at_8[0x10];
+       u8         outer_vxlan_gpe_next_protocol[0x8];
+
+       u8         outer_vxlan_gpe_vni[0x18];
+       u8         reserved_at_38[0x8];
+
+       u8         reserved_at_40[0x40];
+};
+
 struct mlx5_ifc_ste_general_purpose_bits {
        u8         general_purpose_lookup_field[0x20];