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

net/mlx5: DR, Use the new HW specific STE infrastructure 



Split the STE builders functionality into the common part and
device-specific part. All the device-specific part (with 'v0' in
the function names) is accessed through the STE context structure.

Subsequent patches will have the device-specific logic moved to a
separate file.

Signed-off-by: default avatarYevgeny Kliteynik <kliteyn@nvidia.com>
Reviewed-by: default avatarSaeed Mahameed <saeedm@nvidia.com>
Signed-off-by: default avatarSaeed Mahameed <saeedm@nvidia.com>
parent 75699246

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

+6 −0
Original line number Diff line number Diff line
@@ -57,6 +57,12 @@ static int dr_domain_init_resources(struct mlx5dr_domain *dmn) 
{

	int ret;



	dmn->ste_ctx = mlx5dr_ste_get_ctx(dmn->info.caps.sw_format_ver);

	if (!dmn->ste_ctx) {

		mlx5dr_err(dmn, "SW Steering on this device is unsupported\n");

		return -EOPNOTSUPP;

	}



	ret = mlx5_core_alloc_pd(dmn->mdev, &dmn->pdn);

	if (ret) {

		mlx5dr_err(dmn, "Couldn't allocate PD, ret: %d", ret);

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

+61 −45
Original line number Diff line number Diff line
@@ -221,6 +221,7 @@ static int dr_matcher_set_ste_builders(struct mlx5dr_matcher *matcher, 
{

	struct mlx5dr_domain_rx_tx *nic_dmn = nic_matcher->nic_tbl->nic_dmn;

	struct mlx5dr_domain *dmn = matcher->tbl->dmn;

	struct mlx5dr_ste_ctx *ste_ctx = dmn->ste_ctx;

	struct mlx5dr_match_param mask = {};

	struct mlx5dr_ste_build *sb;

	bool inner, rx;
@@ -259,80 +260,89 @@ static int dr_matcher_set_ste_builders(struct mlx5dr_matcher *matcher, 
		inner = false;



		if (dr_mask_is_wqe_metadata_set(&mask.misc2))

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

			mlx5dr_ste_build_general_purpose(ste_ctx, &sb[idx++],

							 &mask, inner, rx);



		if (dr_mask_is_reg_c_0_3_set(&mask.misc2))

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

			mlx5dr_ste_build_register_0(ste_ctx, &sb[idx++],

						    &mask, inner, rx);



		if (dr_mask_is_reg_c_4_7_set(&mask.misc2))

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

			mlx5dr_ste_build_register_1(ste_ctx, &sb[idx++],

						    &mask, inner, rx);



		if (dr_mask_is_gvmi_or_qpn_set(&mask.misc) &&

		    (dmn->type == MLX5DR_DOMAIN_TYPE_FDB ||

		     dmn->type == MLX5DR_DOMAIN_TYPE_NIC_RX)) {

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

						      dmn, inner, rx);

			mlx5dr_ste_build_src_gvmi_qpn(ste_ctx, &sb[idx++],

						      &mask, dmn, inner, rx);

		}



		if (dr_mask_is_smac_set(&mask.outer) &&

		    dr_mask_is_dmac_set(&mask.outer)) {

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

							inner, rx);

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

							&mask, inner, rx);

		}



		if (dr_mask_is_smac_set(&mask.outer))

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

			mlx5dr_ste_build_eth_l2_src(ste_ctx, &sb[idx++],

						    &mask, inner, rx);



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

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

			mlx5dr_ste_build_eth_l2_dst(ste_ctx, &sb[idx++],

						    &mask, inner, rx);



		if (outer_ipv == DR_RULE_IPV6) {

			if (dr_mask_is_dst_addr_set(&mask.outer))

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

								 inner, rx);

				mlx5dr_ste_build_eth_l3_ipv6_dst(ste_ctx, &sb[idx++],

								 &mask, inner, rx);



			if (dr_mask_is_src_addr_set(&mask.outer))

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

								 inner, rx);

				mlx5dr_ste_build_eth_l3_ipv6_src(ste_ctx, &sb[idx++],

								 &mask, inner, rx);



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

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

								inner, rx);

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

								&mask, inner, rx);

		} else {

			if (dr_mask_is_ipv4_5_tuple_set(&mask.outer))

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

								     inner, rx);

				mlx5dr_ste_build_eth_l3_ipv4_5_tuple(ste_ctx, &sb[idx++],

								     &mask, inner, rx);



			if (dr_mask_is_ttl_set(&mask.outer))

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

								  inner, rx);

				mlx5dr_ste_build_eth_l3_ipv4_misc(ste_ctx, &sb[idx++],

								  &mask, inner, rx);

		}



		if (dr_mask_is_tnl_vxlan_gpe(&mask, dmn))

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

						       inner, rx);

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

						       &mask, inner, rx);

		else if (dr_mask_is_tnl_geneve(&mask, dmn))

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

						    inner, rx);

			mlx5dr_ste_build_tnl_geneve(ste_ctx, &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);

			mlx5dr_ste_build_eth_l4_misc(ste_ctx, &sb[idx++],

						     &mask, inner, rx);



		if (DR_MASK_IS_FIRST_MPLS_SET(mask.misc2, outer))

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

			mlx5dr_ste_build_mpls(ste_ctx, &sb[idx++],

					      &mask, inner, rx);



		if (DR_MASK_IS_TNL_MPLS_SET(mask.misc2))

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

			mlx5dr_ste_build_tnl_mpls(ste_ctx, &sb[idx++],

						  &mask, inner, rx);



		if (dr_mask_is_icmp(&mask, dmn)) {

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

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

						    &mask, &dmn->info.caps,

						    inner, rx);

			if (ret)

				return ret;

		}

		if (dr_mask_is_tnl_gre_set(&mask.misc))

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

			mlx5dr_ste_build_tnl_gre(ste_ctx, &sb[idx++],

						 &mask, inner, rx);

	}



	/* Inner */
@@ -343,50 +353,56 @@ static int dr_matcher_set_ste_builders(struct mlx5dr_matcher *matcher, 
		inner = true;



		if (dr_mask_is_eth_l2_tnl_set(&mask.misc))

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

			mlx5dr_ste_build_eth_l2_tnl(ste_ctx, &sb[idx++],

						    &mask, inner, rx);



		if (dr_mask_is_smac_set(&mask.inner) &&

		    dr_mask_is_dmac_set(&mask.inner)) {

			mlx5dr_ste_build_eth_l2_src_dst(&sb[idx++],

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

							&mask, inner, rx);

		}



		if (dr_mask_is_smac_set(&mask.inner))

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

			mlx5dr_ste_build_eth_l2_src(ste_ctx, &sb[idx++],

						    &mask, inner, rx);



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

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

			mlx5dr_ste_build_eth_l2_dst(ste_ctx, &sb[idx++],

						    &mask, inner, rx);



		if (inner_ipv == DR_RULE_IPV6) {

			if (dr_mask_is_dst_addr_set(&mask.inner))

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

								 inner, rx);

				mlx5dr_ste_build_eth_l3_ipv6_dst(ste_ctx, &sb[idx++],

								 &mask, inner, rx);



			if (dr_mask_is_src_addr_set(&mask.inner))

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

								 inner, rx);

				mlx5dr_ste_build_eth_l3_ipv6_src(ste_ctx, &sb[idx++],

								 &mask, inner, rx);



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

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

								inner, rx);

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

								&mask, inner, rx);

		} else {

			if (dr_mask_is_ipv4_5_tuple_set(&mask.inner))

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

								     inner, rx);

				mlx5dr_ste_build_eth_l3_ipv4_5_tuple(ste_ctx, &sb[idx++],

								     &mask, inner, rx);



			if (dr_mask_is_ttl_set(&mask.inner))

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

								  inner, rx);

				mlx5dr_ste_build_eth_l3_ipv4_misc(ste_ctx, &sb[idx++],

								  &mask, inner, rx);

		}



		if (DR_MASK_IS_ETH_L4_MISC_SET(mask.misc3, inner))

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

			mlx5dr_ste_build_eth_l4_misc(ste_ctx, &sb[idx++],

						     &mask, inner, rx);



		if (DR_MASK_IS_FIRST_MPLS_SET(mask.misc2, inner))

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

			mlx5dr_ste_build_mpls(ste_ctx, &sb[idx++],

					      &mask, inner, rx);



		if (DR_MASK_IS_TNL_MPLS_SET(mask.misc2))

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

			mlx5dr_ste_build_tnl_mpls(ste_ctx, &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

+501 −265

File changed.

Preview size limit exceeded, changes collapsed.

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

+2 −0
Original line number Diff line number Diff line
@@ -82,6 +82,8 @@ 
	(_misc)->outer_first_mpls_over_udp_s_bos || \

	(_misc)->outer_first_mpls_over_udp_ttl)



u16 mlx5dr_ste_conv_bit_to_byte_mask(u8 *bit_mask);



#define DR_STE_CTX_BUILDER(fname) \

	((*build_##fname##_init)(struct mlx5dr_ste_build *sb, \

				 struct mlx5dr_match_param *mask))

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

+43 −20
Original line number Diff line number Diff line
@@ -120,6 +120,7 @@ struct mlx5dr_ste_htbl; 
struct mlx5dr_match_param;

struct mlx5dr_cmd_caps;

struct mlx5dr_matcher_rx_tx;

struct mlx5dr_ste_ctx;



struct mlx5dr_ste {

	u8 *hw_ste;
@@ -248,6 +249,7 @@ u64 mlx5dr_ste_get_icm_addr(struct mlx5dr_ste *ste); 
u64 mlx5dr_ste_get_mr_addr(struct mlx5dr_ste *ste);

struct list_head *mlx5dr_ste_get_miss_list(struct mlx5dr_ste *ste);



struct mlx5dr_ste_ctx *mlx5dr_ste_get_ctx(u8 version);

void mlx5dr_ste_free(struct mlx5dr_ste *ste,

		     struct mlx5dr_matcher *matcher,

		     struct mlx5dr_matcher_rx_tx *nic_matcher);
@@ -289,65 +291,85 @@ 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_dst(struct mlx5dr_ste_build *builder,

void mlx5dr_ste_build_eth_l2_src_dst(struct mlx5dr_ste_ctx *ste_ctx,

				     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,

void mlx5dr_ste_build_eth_l3_ipv4_5_tuple(struct mlx5dr_ste_ctx *ste_ctx,

					  struct mlx5dr_ste_build *sb,

					  struct mlx5dr_match_param *mask,

					  bool inner, bool rx);

void mlx5dr_ste_build_eth_l3_ipv4_misc(struct mlx5dr_ste_build *sb,

void mlx5dr_ste_build_eth_l3_ipv4_misc(struct mlx5dr_ste_ctx *ste_ctx,

				       struct mlx5dr_ste_build *sb,

				       struct mlx5dr_match_param *mask,

				       bool inner, bool rx);

void mlx5dr_ste_build_eth_l3_ipv6_dst(struct mlx5dr_ste_build *sb,

void mlx5dr_ste_build_eth_l3_ipv6_dst(struct mlx5dr_ste_ctx *ste_ctx,

				      struct mlx5dr_ste_build *sb,

				      struct mlx5dr_match_param *mask,

				      bool inner, bool rx);

void mlx5dr_ste_build_eth_l3_ipv6_src(struct mlx5dr_ste_build *sb,

void mlx5dr_ste_build_eth_l3_ipv6_src(struct mlx5dr_ste_ctx *ste_ctx,

				      struct mlx5dr_ste_build *sb,

				      struct mlx5dr_match_param *mask,

				      bool inner, bool rx);

void mlx5dr_ste_build_eth_l2_src(struct mlx5dr_ste_build *sb,

void mlx5dr_ste_build_eth_l2_src(struct mlx5dr_ste_ctx *ste_ctx,

				 struct mlx5dr_ste_build *sb,

				 struct mlx5dr_match_param *mask,

				 bool inner, bool rx);

void mlx5dr_ste_build_eth_l2_dst(struct mlx5dr_ste_build *sb,

void mlx5dr_ste_build_eth_l2_dst(struct mlx5dr_ste_ctx *ste_ctx,

				 struct mlx5dr_ste_build *sb,

				 struct mlx5dr_match_param *mask,

				 bool inner, bool rx);

void mlx5dr_ste_build_eth_l2_tnl(struct mlx5dr_ste_build *sb,

void mlx5dr_ste_build_eth_l2_tnl(struct mlx5dr_ste_ctx *ste_ctx,

				 struct mlx5dr_ste_build *sb,

				 struct mlx5dr_match_param *mask,

				 bool inner, bool rx);

void mlx5dr_ste_build_eth_ipv6_l3_l4(struct mlx5dr_ste_build *sb,

void mlx5dr_ste_build_eth_ipv6_l3_l4(struct mlx5dr_ste_ctx *ste_ctx,

				     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,

void mlx5dr_ste_build_eth_l4_misc(struct mlx5dr_ste_ctx *ste_ctx,

				  struct mlx5dr_ste_build *sb,

				  struct mlx5dr_match_param *mask,

				  bool inner, bool rx);

void mlx5dr_ste_build_tnl_gre(struct mlx5dr_ste_build *sb,

void mlx5dr_ste_build_tnl_gre(struct mlx5dr_ste_ctx *ste_ctx,

			      struct mlx5dr_ste_build *sb,

			      struct mlx5dr_match_param *mask,

			      bool inner, bool rx);

void mlx5dr_ste_build_mpls(struct mlx5dr_ste_build *sb,

void mlx5dr_ste_build_mpls(struct mlx5dr_ste_ctx *ste_ctx,

			   struct mlx5dr_ste_build *sb,

			   struct mlx5dr_match_param *mask,

			   bool inner, bool rx);

void mlx5dr_ste_build_tnl_mpls(struct mlx5dr_ste_build *sb,

void mlx5dr_ste_build_tnl_mpls(struct mlx5dr_ste_ctx *ste_ctx,

			       struct mlx5dr_ste_build *sb,

			       struct mlx5dr_match_param *mask,

			       bool inner, bool rx);

int mlx5dr_ste_build_icmp(struct mlx5dr_ste_build *sb,

int mlx5dr_ste_build_icmp(struct mlx5dr_ste_ctx *ste_ctx,

			  struct mlx5dr_ste_build *sb,

			  struct mlx5dr_match_param *mask,

			  struct mlx5dr_cmd_caps *caps,

			  bool inner, bool rx);

void mlx5dr_ste_build_tnl_vxlan_gpe(struct mlx5dr_ste_build *sb,

void mlx5dr_ste_build_tnl_vxlan_gpe(struct mlx5dr_ste_ctx *ste_ctx,

				    struct mlx5dr_ste_build *sb,

				    struct mlx5dr_match_param *mask,

				    bool inner, bool rx);

void mlx5dr_ste_build_tnl_geneve(struct mlx5dr_ste_build *sb,

void mlx5dr_ste_build_tnl_geneve(struct mlx5dr_ste_ctx *ste_ctx,

				 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,

void mlx5dr_ste_build_general_purpose(struct mlx5dr_ste_ctx *ste_ctx,

				      struct mlx5dr_ste_build *sb,

				      struct mlx5dr_match_param *mask,

				      bool inner, bool rx);

void mlx5dr_ste_build_register_0(struct mlx5dr_ste_build *sb,

void mlx5dr_ste_build_register_0(struct mlx5dr_ste_ctx *ste_ctx,

				 struct mlx5dr_ste_build *sb,

				 struct mlx5dr_match_param *mask,

				 bool inner, bool rx);

void mlx5dr_ste_build_register_1(struct mlx5dr_ste_build *sb,

void mlx5dr_ste_build_register_1(struct mlx5dr_ste_ctx *ste_ctx,

				 struct mlx5dr_ste_build *sb,

				 struct mlx5dr_match_param *mask,

				 bool inner, bool rx);

void mlx5dr_ste_build_src_gvmi_qpn(struct mlx5dr_ste_build *sb,

void mlx5dr_ste_build_src_gvmi_qpn(struct mlx5dr_ste_ctx *ste_ctx,

				   struct mlx5dr_ste_build *sb,

				   struct mlx5dr_match_param *mask,

				   struct mlx5dr_domain *dmn,

				   bool inner, bool rx);
@@ -671,6 +693,7 @@ struct mlx5dr_domain { 
	struct mlx5dr_send_ring *send_ring;

	struct mlx5dr_domain_info info;

	struct mlx5dr_domain_cache cache;

	struct mlx5dr_ste_ctx *ste_ctx;

};



struct mlx5dr_table_rx_tx {