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

net/mlx5: DR, Add support for matching on Internet Header Length (IHL) 



Add support for matching on new field - Internet Header Length (IHL).

Signed-off-by: default avatarMuhammad Sammar <muhammads@nvidia.com>
Signed-off-by: default avatarYevgeny Kliteynik <kliteyn@nvidia.com>
Reviewed-by: default avatarAlex Vesker <valex@nvidia.com>
Signed-off-by: default avatarSaeed Mahameed <saeedm@nvidia.com>
parent aa818fbf

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

+9 −2
Original line number Diff line number Diff line
@@ -47,6 +47,11 @@ static bool dr_mask_is_ttl_set(struct mlx5dr_match_spec *spec) 
	return spec->ttl_hoplimit;

}



static bool dr_mask_is_ipv4_ihl_set(struct mlx5dr_match_spec *spec)

{

	return spec->ipv4_ihl;

}



#define DR_MASK_IS_L2_DST(_spec, _misc, _inner_outer) (_spec.first_vid || \

	(_spec).first_cfi || (_spec).first_prio || (_spec).cvlan_tag || \

	(_spec).svlan_tag || (_spec).dmac_47_16 || (_spec).dmac_15_0 || \
@@ -507,7 +512,8 @@ static int dr_matcher_set_ste_builders(struct mlx5dr_matcher *matcher, 
				mlx5dr_ste_build_eth_l3_ipv4_5_tuple(ste_ctx, &sb[idx++],

								     &mask, inner, rx);



			if (dr_mask_is_ttl_set(&mask.outer))

			if (dr_mask_is_ttl_set(&mask.outer) ||

			    dr_mask_is_ipv4_ihl_set(&mask.outer))

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

								  &mask, inner, rx);

		}
@@ -614,7 +620,8 @@ static int dr_matcher_set_ste_builders(struct mlx5dr_matcher *matcher, 
				mlx5dr_ste_build_eth_l3_ipv4_5_tuple(ste_ctx, &sb[idx++],

								     &mask, inner, rx);



			if (dr_mask_is_ttl_set(&mask.inner))

			if (dr_mask_is_ttl_set(&mask.inner) ||

			    dr_mask_is_ipv4_ihl_set(&mask.inner))

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

								  &mask, inner, rx);

		}

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

+1 −0
Original line number Diff line number Diff line
@@ -793,6 +793,7 @@ static void dr_ste_copy_mask_spec(char *mask, struct mlx5dr_match_spec *spec, bo 
	spec->tcp_sport = IFC_GET_CLR(fte_match_set_lyr_2_4, mask, tcp_sport, clr);

	spec->tcp_dport = IFC_GET_CLR(fte_match_set_lyr_2_4, mask, tcp_dport, clr);



	spec->ipv4_ihl = IFC_GET_CLR(fte_match_set_lyr_2_4, mask, ipv4_ihl, clr);

	spec->ttl_hoplimit = IFC_GET_CLR(fte_match_set_lyr_2_4, mask, ttl_hoplimit, clr);



	spec->udp_sport = IFC_GET_CLR(fte_match_set_lyr_2_4, mask, udp_sport, clr);

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

+1 −0
Original line number Diff line number Diff line
@@ -1152,6 +1152,7 @@ dr_ste_v0_build_eth_l3_ipv4_misc_tag(struct mlx5dr_match_param *value, 
	struct mlx5dr_match_spec *spec = sb->inner ? &value->inner : &value->outer;



	DR_STE_SET_TAG(eth_l3_ipv4_misc, tag, time_to_live, spec, ttl_hoplimit);

	DR_STE_SET_TAG(eth_l3_ipv4_misc, tag, ihl, spec, ipv4_ihl);



	return 0;

}

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

+1 −0
Original line number Diff line number Diff line
@@ -1331,6 +1331,7 @@ static int dr_ste_v1_build_eth_l3_ipv4_misc_tag(struct mlx5dr_match_param *value 
	struct mlx5dr_match_spec *spec = sb->inner ? &value->inner : &value->outer;



	DR_STE_SET_TAG(eth_l3_ipv4_misc_v1, tag, time_to_live, spec, ttl_hoplimit);

	DR_STE_SET_TAG(eth_l3_ipv4_misc_v1, tag, ihl, spec, ipv4_ihl);



	return 0;

}

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

+3 −1
Original line number Diff line number Diff line
@@ -555,7 +555,9 @@ struct mlx5dr_match_spec { 
	 */

	u32 tcp_dport:16;



	u32 reserved_auto1:24;

	u32 reserved_auto1:16;

	u32 ipv4_ihl:4;

	u32 reserved_auto2:4;

	u32 ttl_hoplimit:8;



	/* UDP source port.;tcp and udp sport/dport are mutually exclusive */