Commit de1facaf authored by Yevgeny Kliteynik's avatar Yevgeny Kliteynik Committed by Saeed Mahameed
Browse files

net/mlx5: DR, Rename builders HW specific names 



We will support multiple STE versions.
The existing naming is not suitable for newer versions.
Removed the HW specific details and renamed with a more
general names.

Signed-off-by: default avatarAlex Vesker <valex@nvidia.com>
Signed-off-by: default avatarYevgeny Kliteynik <kliteyn@nvidia.com>
Signed-off-by: default avatarSaeed Mahameed <saeedm@nvidia.com>
parent 77662e75

drivers/net/ethernet/mellanox/mlx5/core/steering/dr_matcher.c

+34 −29
Original line number Diff line number Diff line
@@ -85,7 +85,7 @@ static bool dr_mask_is_ttl_set(struct mlx5dr_match_spec *spec) 
	(_misc2)._inner_outer##_first_mpls_s_bos || \

	(_misc2)._inner_outer##_first_mpls_ttl)



static bool dr_mask_is_gre_set(struct mlx5dr_match_misc *misc)

static bool dr_mask_is_tnl_gre_set(struct mlx5dr_match_misc *misc)

{

	return (misc->gre_key_h || misc->gre_key_l ||

		misc->gre_protocol || misc->gre_c_present ||
@@ -98,7 +98,7 @@ static bool dr_mask_is_gre_set(struct mlx5dr_match_misc *misc) 
	(_misc2).outer_first_mpls_over_##gre_udp##_s_bos || \

	(_misc2).outer_first_mpls_over_##gre_udp##_ttl)



#define DR_MASK_IS_FLEX_PARSER_0_SET(_misc2) ( \

#define DR_MASK_IS_TNL_MPLS_SET(_misc2) ( \

	DR_MASK_IS_OUTER_MPLS_OVER_GRE_UDP_SET((_misc2), gre) || \

	DR_MASK_IS_OUTER_MPLS_OVER_GRE_UDP_SET((_misc2), udp))
@@ -148,12 +148,23 @@ dr_mask_is_flex_parser_tnl_geneve_set(struct mlx5dr_match_param *mask, 
	       dr_matcher_supp_flex_parser_geneve(&dmn->info.caps);

}



static bool dr_mask_is_flex_parser_icmpv6_set(struct mlx5dr_match_misc3 *misc3)

static bool dr_mask_is_icmpv6_set(struct mlx5dr_match_misc3 *misc3)

{

	return (misc3->icmpv6_type || misc3->icmpv6_code ||

		misc3->icmpv6_header_data);

}



static bool dr_mask_is_flex_parser_icmp_set(struct mlx5dr_match_param *mask,

					    struct mlx5dr_domain *dmn)

{

	if (DR_MASK_IS_ICMPV4_SET(&mask->misc3))

		return mlx5dr_matcher_supp_flex_parser_icmp_v4(&dmn->info.caps);

	else if (dr_mask_is_icmpv6_set(&mask->misc3))

		return mlx5dr_matcher_supp_flex_parser_icmp_v6(&dmn->info.caps);



	return false;

}



static bool dr_mask_is_wqe_metadata_set(struct mlx5dr_match_misc2 *misc2)

{

	return misc2->metadata_reg_a;
@@ -257,7 +268,7 @@ static int dr_matcher_set_ste_builders(struct mlx5dr_matcher *matcher, 


		if (dr_mask_is_smac_set(&mask.outer) &&

		    dr_mask_is_dmac_set(&mask.outer)) {

			mlx5dr_ste_build_eth_l2_src_des(&sb[idx++], &mask,

			mlx5dr_ste_build_eth_l2_src_dst(&sb[idx++], &mask,

							inner, rx);

		}
@@ -277,7 +288,7 @@ static int dr_matcher_set_ste_builders(struct mlx5dr_matcher *matcher, 
								 inner, rx);



			if (DR_MASK_IS_ETH_L4_SET(mask.outer, mask.misc, outer))

				mlx5dr_ste_build_ipv6_l3_l4(&sb[idx++], &mask,

				mlx5dr_ste_build_eth_ipv6_l3_l4(&sb[idx++], &mask,

								inner, rx);

		} else {

			if (dr_mask_is_ipv4_5_tuple_set(&mask.outer))
@@ -290,12 +301,10 @@ static int dr_matcher_set_ste_builders(struct mlx5dr_matcher *matcher, 
		}



		if (dr_mask_is_flex_parser_tnl_vxlan_gpe_set(&mask, dmn))

			mlx5dr_ste_build_flex_parser_tnl_vxlan_gpe(&sb[idx++],

								   &mask,

			mlx5dr_ste_build_tnl_vxlan_gpe(&sb[idx++], &mask,

						       inner, rx);

		else if (dr_mask_is_flex_parser_tnl_geneve_set(&mask, dmn))

			mlx5dr_ste_build_flex_parser_tnl_geneve(&sb[idx++],

								&mask,

			mlx5dr_ste_build_tnl_geneve(&sb[idx++], &mask,

						    inner, rx);



		if (DR_MASK_IS_ETH_L4_MISC_SET(mask.misc3, outer))
@@ -304,22 +313,18 @@ static int dr_matcher_set_ste_builders(struct mlx5dr_matcher *matcher, 
		if (DR_MASK_IS_FIRST_MPLS_SET(mask.misc2, outer))

			mlx5dr_ste_build_mpls(&sb[idx++], &mask, inner, rx);



		if (DR_MASK_IS_FLEX_PARSER_0_SET(mask.misc2))

			mlx5dr_ste_build_flex_parser_0(&sb[idx++], &mask,

						       inner, rx);

		if (DR_MASK_IS_TNL_MPLS_SET(mask.misc2))

			mlx5dr_ste_build_tnl_mpls(&sb[idx++], &mask, inner, rx);



		if ((DR_MASK_IS_FLEX_PARSER_ICMPV4_SET(&mask.misc3) &&

		     mlx5dr_matcher_supp_flex_parser_icmp_v4(&dmn->info.caps)) ||

		    (dr_mask_is_flex_parser_icmpv6_set(&mask.misc3) &&

		     mlx5dr_matcher_supp_flex_parser_icmp_v6(&dmn->info.caps))) {

			ret = mlx5dr_ste_build_flex_parser_1(&sb[idx++],

		if (dr_mask_is_flex_parser_icmp_set(&mask, dmn)) {

			ret = mlx5dr_ste_build_icmp(&sb[idx++],

						    &mask, &dmn->info.caps,

						    inner, rx);

			if (ret)

				return ret;

		}

		if (dr_mask_is_gre_set(&mask.misc))

			mlx5dr_ste_build_gre(&sb[idx++], &mask, inner, rx);

		if (dr_mask_is_tnl_gre_set(&mask.misc))

			mlx5dr_ste_build_tnl_gre(&sb[idx++], &mask, inner, rx);

	}



	/* Inner */
@@ -334,7 +339,7 @@ static int dr_matcher_set_ste_builders(struct mlx5dr_matcher *matcher, 


		if (dr_mask_is_smac_set(&mask.inner) &&

		    dr_mask_is_dmac_set(&mask.inner)) {

			mlx5dr_ste_build_eth_l2_src_des(&sb[idx++],

			mlx5dr_ste_build_eth_l2_src_dst(&sb[idx++],

							&mask, inner, rx);

		}
@@ -354,7 +359,7 @@ static int dr_matcher_set_ste_builders(struct mlx5dr_matcher *matcher, 
								 inner, rx);



			if (DR_MASK_IS_ETH_L4_SET(mask.inner, mask.misc, inner))

				mlx5dr_ste_build_ipv6_l3_l4(&sb[idx++], &mask,

				mlx5dr_ste_build_eth_ipv6_l3_l4(&sb[idx++], &mask,

								inner, rx);

		} else {

			if (dr_mask_is_ipv4_5_tuple_set(&mask.inner))
@@ -372,8 +377,8 @@ static int dr_matcher_set_ste_builders(struct mlx5dr_matcher *matcher, 
		if (DR_MASK_IS_FIRST_MPLS_SET(mask.misc2, inner))

			mlx5dr_ste_build_mpls(&sb[idx++], &mask, inner, rx);



		if (DR_MASK_IS_FLEX_PARSER_0_SET(mask.misc2))

			mlx5dr_ste_build_flex_parser_0(&sb[idx++], &mask, inner, rx);

		if (DR_MASK_IS_TNL_MPLS_SET(mask.misc2))

			mlx5dr_ste_build_tnl_mpls(&sb[idx++], &mask, inner, rx);

	}

	/* Empty matcher, takes all */

	if (matcher->match_criteria == DR_MATCHER_CRITERIA_EMPTY)

drivers/net/ethernet/mellanox/mlx5/core/steering/dr_ste.c

+21 −21
Original line number Diff line number Diff line
@@ -1090,7 +1090,7 @@ static int dr_ste_build_eth_l2_src_des_tag(struct mlx5dr_match_param *value, 
	return 0;

}



void mlx5dr_ste_build_eth_l2_src_des(struct mlx5dr_ste_build *sb,

void mlx5dr_ste_build_eth_l2_src_dst(struct mlx5dr_ste_build *sb,

				     struct mlx5dr_match_param *mask,

				     bool inner, bool rx)

{
@@ -1594,7 +1594,7 @@ static int dr_ste_build_ipv6_l3_l4_tag(struct mlx5dr_match_param *value, 
	return 0;

}



void mlx5dr_ste_build_ipv6_l3_l4(struct mlx5dr_ste_build *sb,

void mlx5dr_ste_build_eth_ipv6_l3_l4(struct mlx5dr_ste_build *sb,

				     struct mlx5dr_match_param *mask,

				     bool inner, bool rx)

{
@@ -1693,7 +1693,7 @@ static int dr_ste_build_gre_tag(struct mlx5dr_match_param *value, 
	return 0;

}



void mlx5dr_ste_build_gre(struct mlx5dr_ste_build *sb,

void mlx5dr_ste_build_tnl_gre(struct mlx5dr_ste_build *sb,

			      struct mlx5dr_match_param *mask, bool inner, bool rx)

{

	dr_ste_build_gre_bit_mask(mask, inner, sb->bit_mask);
@@ -1771,7 +1771,7 @@ static int dr_ste_build_flex_parser_0_tag(struct mlx5dr_match_param *value, 
	return 0;

}



void mlx5dr_ste_build_flex_parser_0(struct mlx5dr_ste_build *sb,

void mlx5dr_ste_build_tnl_mpls(struct mlx5dr_ste_build *sb,

			       struct mlx5dr_match_param *mask,

			       bool inner, bool rx)

{
@@ -1792,8 +1792,8 @@ static int dr_ste_build_flex_parser_1_bit_mask(struct mlx5dr_match_param *mask, 
					       struct mlx5dr_cmd_caps *caps,

					       u8 *bit_mask)

{

	bool is_ipv4_mask = DR_MASK_IS_ICMPV4_SET(&mask->misc3);

	struct mlx5dr_match_misc3 *misc_3_mask = &mask->misc3;

	bool is_ipv4_mask = DR_MASK_IS_FLEX_PARSER_ICMPV4_SET(misc_3_mask);

	u32 icmp_header_data_mask;

	u32 icmp_type_mask;

	u32 icmp_code_mask;
@@ -1869,7 +1869,7 @@ static int dr_ste_build_flex_parser_1_tag(struct mlx5dr_match_param *value, 
	u32 icmp_code;

	bool is_ipv4;



	is_ipv4 = DR_MASK_IS_FLEX_PARSER_ICMPV4_SET(misc_3);

	is_ipv4 = DR_MASK_IS_ICMPV4_SET(misc_3);

	if (is_ipv4) {

		icmp_header_data	= misc_3->icmpv4_header_data;

		icmp_type		= misc_3->icmpv4_type;
@@ -1928,7 +1928,7 @@ static int dr_ste_build_flex_parser_1_tag(struct mlx5dr_match_param *value, 
	return 0;

}



int mlx5dr_ste_build_flex_parser_1(struct mlx5dr_ste_build *sb,

int mlx5dr_ste_build_icmp(struct mlx5dr_ste_build *sb,

			  struct mlx5dr_match_param *mask,

			  struct mlx5dr_cmd_caps *caps,

			  bool inner, bool rx)
@@ -2069,7 +2069,7 @@ dr_ste_build_flex_parser_tnl_vxlan_gpe_tag(struct mlx5dr_match_param *value, 
	return 0;

}



void mlx5dr_ste_build_flex_parser_tnl_vxlan_gpe(struct mlx5dr_ste_build *sb,

void mlx5dr_ste_build_tnl_vxlan_gpe(struct mlx5dr_ste_build *sb,

				    struct mlx5dr_match_param *mask,

				    bool inner, bool rx)

{
@@ -2122,7 +2122,7 @@ dr_ste_build_flex_parser_tnl_geneve_tag(struct mlx5dr_match_param *value, 
	return 0;

}



void mlx5dr_ste_build_flex_parser_tnl_geneve(struct mlx5dr_ste_build *sb,

void mlx5dr_ste_build_tnl_geneve(struct mlx5dr_ste_build *sb,

				 struct mlx5dr_match_param *mask,

				 bool inner, bool rx)

{

drivers/net/ethernet/mellanox/mlx5/core/steering/dr_types.h

+21 −21
Original line number Diff line number Diff line
@@ -288,7 +288,7 @@ int mlx5dr_ste_build_ste_arr(struct mlx5dr_matcher *matcher, 
			     struct mlx5dr_matcher_rx_tx *nic_matcher,

			     struct mlx5dr_match_param *value,

			     u8 *ste_arr);

void mlx5dr_ste_build_eth_l2_src_des(struct mlx5dr_ste_build *builder,

void mlx5dr_ste_build_eth_l2_src_dst(struct mlx5dr_ste_build *builder,

				     struct mlx5dr_match_param *mask,

				     bool inner, bool rx);

void mlx5dr_ste_build_eth_l3_ipv4_5_tuple(struct mlx5dr_ste_build *sb,
@@ -312,29 +312,29 @@ void mlx5dr_ste_build_eth_l2_dst(struct mlx5dr_ste_build *sb, 
void mlx5dr_ste_build_eth_l2_tnl(struct mlx5dr_ste_build *sb,

				 struct mlx5dr_match_param *mask,

				 bool inner, bool rx);

void mlx5dr_ste_build_ipv6_l3_l4(struct mlx5dr_ste_build *sb,

void mlx5dr_ste_build_eth_ipv6_l3_l4(struct mlx5dr_ste_build *sb,

				     struct mlx5dr_match_param *mask,

				     bool inner, bool rx);

void mlx5dr_ste_build_eth_l4_misc(struct mlx5dr_ste_build *sb,

				  struct mlx5dr_match_param *mask,

				  bool inner, bool rx);

void mlx5dr_ste_build_gre(struct mlx5dr_ste_build *sb,

void mlx5dr_ste_build_tnl_gre(struct mlx5dr_ste_build *sb,

			      struct mlx5dr_match_param *mask,

			      bool inner, bool rx);

void mlx5dr_ste_build_mpls(struct mlx5dr_ste_build *sb,

			   struct mlx5dr_match_param *mask,

			   bool inner, bool rx);

void mlx5dr_ste_build_flex_parser_0(struct mlx5dr_ste_build *sb,

void mlx5dr_ste_build_tnl_mpls(struct mlx5dr_ste_build *sb,

			       struct mlx5dr_match_param *mask,

			       bool inner, bool rx);

int mlx5dr_ste_build_flex_parser_1(struct mlx5dr_ste_build *sb,

int mlx5dr_ste_build_icmp(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_vxlan_gpe(struct mlx5dr_ste_build *sb,

void mlx5dr_ste_build_tnl_vxlan_gpe(struct mlx5dr_ste_build *sb,

				    struct mlx5dr_match_param *mask,

				    bool inner, bool rx);

void mlx5dr_ste_build_flex_parser_tnl_geneve(struct mlx5dr_ste_build *sb,

void mlx5dr_ste_build_tnl_geneve(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,
@@ -588,7 +588,7 @@ struct mlx5dr_match_param { 
	struct mlx5dr_match_misc3 misc3;

};



#define DR_MASK_IS_FLEX_PARSER_ICMPV4_SET(_misc3) ((_misc3)->icmpv4_type || \

#define DR_MASK_IS_ICMPV4_SET(_misc3) ((_misc3)->icmpv4_type || \

				       (_misc3)->icmpv4_code || \

				       (_misc3)->icmpv4_header_data)