OSDN Git Service

net/mlx5: DR, Remove protocol-specific flex_parser_3 definitions
authorMuhammad Sammar <muhammads@nvidia.com>
Wed, 21 Oct 2020 05:29:49 +0000 (08:29 +0300)
committerSaeed Mahameed <saeedm@nvidia.com>
Tue, 20 Apr 2021 03:17:24 +0000 (20:17 -0700)
Remove MPLS specific fields from flex parser 3 layout.
Flex parser can be used for multiple protocols and should
not be hardcoded to a specific type.

Signed-off-by: Muhammad Sammar <muhammads@nvidia.com>
Signed-off-by: Yevgeny Kliteynik <kliteyn@nvidia.com>
Signed-off-by: Saeed Mahameed <saeedm@nvidia.com>
drivers/net/ethernet/mellanox/mlx5/core/steering/dr_ste.h
drivers/net/ethernet/mellanox/mlx5/core/steering/dr_ste_v0.c
drivers/net/ethernet/mellanox/mlx5/core/steering/mlx5_ifc_dr.h

index 06bcb0e..eb03841 100644 (file)
@@ -86,6 +86,13 @@ enum dr_ste_action_modify_type_l4 {
        DR_STE_ACTION_MDFY_TYPE_L4_UDP  = 0x2,
 };
 
+enum {
+       HDR_MPLS_OFFSET_LABEL   = 12,
+       HDR_MPLS_OFFSET_EXP     = 9,
+       HDR_MPLS_OFFSET_S_BOS   = 8,
+       HDR_MPLS_OFFSET_TTL     = 0,
+};
+
 u16 mlx5dr_ste_conv_bit_to_byte_mask(u8 *bit_mask);
 
 #define DR_STE_CTX_BUILDER(fname) \
index c5f62d2..d9ac57d 100644 (file)
@@ -1248,32 +1248,29 @@ dr_ste_v0_build_tnl_mpls_tag(struct mlx5dr_match_param *value,
                             u8 *tag)
 {
        struct mlx5dr_match_misc2 *misc_2 = &value->misc2;
+       u32 mpls_hdr;
 
        if (DR_STE_IS_OUTER_MPLS_OVER_GRE_SET(misc_2)) {
-               DR_STE_SET_TAG(flex_parser_0, tag, parser_3_label,
-                              misc_2, outer_first_mpls_over_gre_label);
-
-               DR_STE_SET_TAG(flex_parser_0, tag, parser_3_exp,
-                              misc_2, outer_first_mpls_over_gre_exp);
-
-               DR_STE_SET_TAG(flex_parser_0, tag, parser_3_s_bos,
-                              misc_2, outer_first_mpls_over_gre_s_bos);
-
-               DR_STE_SET_TAG(flex_parser_0, tag, parser_3_ttl,
-                              misc_2, outer_first_mpls_over_gre_ttl);
+               mpls_hdr = misc_2->outer_first_mpls_over_gre_label << HDR_MPLS_OFFSET_LABEL;
+               misc_2->outer_first_mpls_over_gre_label = 0;
+               mpls_hdr |= misc_2->outer_first_mpls_over_gre_exp << HDR_MPLS_OFFSET_EXP;
+               misc_2->outer_first_mpls_over_gre_exp = 0;
+               mpls_hdr |= misc_2->outer_first_mpls_over_gre_s_bos << HDR_MPLS_OFFSET_S_BOS;
+               misc_2->outer_first_mpls_over_gre_s_bos = 0;
+               mpls_hdr |= misc_2->outer_first_mpls_over_gre_ttl << HDR_MPLS_OFFSET_TTL;
+               misc_2->outer_first_mpls_over_gre_ttl = 0;
        } else {
-               DR_STE_SET_TAG(flex_parser_0, tag, parser_3_label,
-                              misc_2, outer_first_mpls_over_udp_label);
-
-               DR_STE_SET_TAG(flex_parser_0, tag, parser_3_exp,
-                              misc_2, outer_first_mpls_over_udp_exp);
-
-               DR_STE_SET_TAG(flex_parser_0, tag, parser_3_s_bos,
-                              misc_2, outer_first_mpls_over_udp_s_bos);
-
-               DR_STE_SET_TAG(flex_parser_0, tag, parser_3_ttl,
-                              misc_2, outer_first_mpls_over_udp_ttl);
+               mpls_hdr = misc_2->outer_first_mpls_over_udp_label << HDR_MPLS_OFFSET_LABEL;
+               misc_2->outer_first_mpls_over_udp_label = 0;
+               mpls_hdr |= misc_2->outer_first_mpls_over_udp_exp << HDR_MPLS_OFFSET_EXP;
+               misc_2->outer_first_mpls_over_udp_exp = 0;
+               mpls_hdr |= misc_2->outer_first_mpls_over_udp_s_bos << HDR_MPLS_OFFSET_S_BOS;
+               misc_2->outer_first_mpls_over_udp_s_bos = 0;
+               mpls_hdr |= misc_2->outer_first_mpls_over_udp_ttl << HDR_MPLS_OFFSET_TTL;
+               misc_2->outer_first_mpls_over_udp_ttl = 0;
        }
+
+       MLX5_SET(ste_flex_parser_0, tag, flex_parser_3, mpls_hdr);
        return 0;
 }
 
index 83df6df..601bbb3 100644 (file)
@@ -434,10 +434,7 @@ struct mlx5_ifc_ste_gre_bits {
 };
 
 struct mlx5_ifc_ste_flex_parser_0_bits {
-       u8         parser_3_label[0x14];
-       u8         parser_3_exp[0x3];
-       u8         parser_3_s_bos[0x1];
-       u8         parser_3_ttl[0x8];
+       u8         flex_parser_3[0x20];
 
        u8         flex_parser_2[0x20];