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

net/mlx5: DR, Add support for matching on geneve TLV option 



Enable matching on tunnel geneve TLV option using the flex parser.

Signed-off-by: default avatarMuhammad Sammar <muhammads@nvidia.com>
Signed-off-by: default avatarYevgeny Kliteynik <kliteyn@nvidia.com>
Signed-off-by: default avatarSaeed Mahameed <saeedm@nvidia.com>
parent 4923938d

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

+4 −0
Original line number Diff line number Diff line
@@ -106,6 +106,10 @@ int mlx5dr_cmd_query_device(struct mlx5_core_dev *mdev, 
			MLX5_CAP_GEN(mdev, flex_parser_id_icmpv6_dw1);

	}



	if (caps->flex_protocols & MLX5_FLEX_PARSER_GENEVE_TLV_OPTION_0_ENABLED)

		caps->flex_parser_id_geneve_tlv_option_0 =

			MLX5_CAP_GEN(mdev, flex_parser_id_geneve_tlv_option_0);



	caps->nic_rx_drop_address =

		MLX5_CAP64_FLOWTABLE(mdev, sw_steering_nic_rx_action_drop_icm_address);

	caps->nic_tx_drop_address =

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

+11 −2
Original line number Diff line number Diff line
@@ -133,6 +133,11 @@ static bool dr_mask_is_tnl_geneve_set(struct mlx5dr_match_misc *misc) 
	       misc->geneve_opt_len;

}



static bool dr_mask_is_tnl_geneve_tlv_opt(struct mlx5dr_match_misc3 *misc3)

{

	return misc3->geneve_tlv_option_0_data;

}



static bool

dr_matcher_supp_tnl_geneve(struct mlx5dr_cmd_caps *caps)

{
@@ -360,10 +365,14 @@ static int dr_matcher_set_ste_builders(struct mlx5dr_matcher *matcher, 
		if (dr_mask_is_tnl_vxlan_gpe(&mask, dmn))

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

						       &mask, inner, rx);

		else if (dr_mask_is_tnl_geneve(&mask, dmn))

		else if (dr_mask_is_tnl_geneve(&mask, dmn)) {

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

						    &mask, inner, rx);



			if (dr_mask_is_tnl_geneve_tlv_opt(&mask.misc3))

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

								    &mask, &dmn->info.caps,

								    inner, rx);

		}

		if (DR_MASK_IS_ETH_L4_MISC_SET(mask.misc3, outer))

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

						     &mask, inner, rx);

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

+14 −0
Original line number Diff line number Diff line
@@ -852,6 +852,8 @@ static void dr_ste_copy_mask_misc3(char *mask, struct mlx5dr_match_misc3 *spec) 
	spec->icmpv4_code = MLX5_GET(fte_match_set_misc3, mask, icmp_code);

	spec->icmpv6_type = MLX5_GET(fte_match_set_misc3, mask, icmpv6_type);

	spec->icmpv6_code = MLX5_GET(fte_match_set_misc3, mask, icmpv6_code);

	spec->geneve_tlv_option_0_data =

		MLX5_GET(fte_match_set_misc3, mask, geneve_tlv_option_0_data);

}



static void dr_ste_copy_mask_misc4(char *mask, struct mlx5dr_match_misc4 *spec)
@@ -1147,6 +1149,18 @@ void mlx5dr_ste_build_tnl_geneve(struct mlx5dr_ste_ctx *ste_ctx, 
	ste_ctx->build_tnl_geneve_init(sb, mask);

}



void mlx5dr_ste_build_tnl_geneve_tlv_opt(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)

{

	sb->rx = rx;

	sb->caps = caps;

	sb->inner = inner;

	ste_ctx->build_tnl_geneve_tlv_opt_init(sb, mask);

}



void mlx5dr_ste_build_register_0(struct mlx5dr_ste_ctx *ste_ctx,

				 struct mlx5dr_ste_build *sb,

				 struct mlx5dr_match_param *mask,

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

+1 −0
Original line number Diff line number Diff line
@@ -125,6 +125,7 @@ struct mlx5dr_ste_ctx { 
	void DR_STE_CTX_BUILDER(eth_l4_misc);

	void DR_STE_CTX_BUILDER(tnl_vxlan_gpe);

	void DR_STE_CTX_BUILDER(tnl_geneve);

	void DR_STE_CTX_BUILDER(tnl_geneve_tlv_opt);

	void DR_STE_CTX_BUILDER(register_0);

	void DR_STE_CTX_BUILDER(register_1);

	void DR_STE_CTX_BUILDER(src_gvmi_qpn);

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

+34 −0
Original line number Diff line number Diff line
@@ -1650,6 +1650,39 @@ static void dr_ste_v0_build_flex_parser_1_init(struct mlx5dr_ste_build *sb, 
	sb->ste_build_tag_func = &dr_ste_v0_build_flex_parser_tag;

}



static int

dr_ste_v0_build_flex_parser_tnl_geneve_tlv_opt_tag(struct mlx5dr_match_param *value,

						   struct mlx5dr_ste_build *sb,

						   u8 *tag)

{

	struct mlx5dr_match_misc3 *misc3 = &value->misc3;

	u8 parser_id = sb->caps->flex_parser_id_geneve_tlv_option_0;

	u8 *parser_ptr = dr_ste_calc_flex_parser_offset(tag, parser_id);



	MLX5_SET(ste_flex_parser_0, parser_ptr, flex_parser_3,

		 misc3->geneve_tlv_option_0_data);

	misc3->geneve_tlv_option_0_data = 0;



	return 0;

}



static void

dr_ste_v0_build_flex_parser_tnl_geneve_tlv_opt_init(struct mlx5dr_ste_build *sb,

						    struct mlx5dr_match_param *mask)

{

	dr_ste_v0_build_flex_parser_tnl_geneve_tlv_opt_tag(mask, sb, sb->bit_mask);



	/* STEs with lookup type FLEX_PARSER_{0/1} includes

	 * flex parsers_{0-3}/{4-7} respectively.

	 */

	sb->lu_type = sb->caps->flex_parser_id_geneve_tlv_option_0 > 3 ?

		DR_STE_V0_LU_TYPE_FLEX_PARSER_1 :

		DR_STE_V0_LU_TYPE_FLEX_PARSER_0;



	sb->byte_mask = mlx5dr_ste_conv_bit_to_byte_mask(sb->bit_mask);

	sb->ste_build_tag_func = &dr_ste_v0_build_flex_parser_tnl_geneve_tlv_opt_tag;

}



struct mlx5dr_ste_ctx ste_ctx_v0 = {

	/* Builders */

	.build_eth_l2_src_dst_init	= &dr_ste_v0_build_eth_l2_src_dst_init,
@@ -1669,6 +1702,7 @@ struct mlx5dr_ste_ctx ste_ctx_v0 = { 
	.build_eth_l4_misc_init		= &dr_ste_v0_build_eth_l4_misc_init,

	.build_tnl_vxlan_gpe_init	= &dr_ste_v0_build_flex_parser_tnl_vxlan_gpe_init,

	.build_tnl_geneve_init		= &dr_ste_v0_build_flex_parser_tnl_geneve_init,

	.build_tnl_geneve_tlv_opt_init	= &dr_ste_v0_build_flex_parser_tnl_geneve_tlv_opt_init,

	.build_register_0_init		= &dr_ste_v0_build_register_0_init,

	.build_register_1_init		= &dr_ste_v0_build_register_1_init,

	.build_src_gvmi_qpn_init	= &dr_ste_v0_build_src_gvmi_qpn_init,