Skip to content

Commit 6e9e286

Browse files
Yevgeny KliteynikSaeed Mahameed
Yevgeny Kliteynik
authored and
Saeed Mahameed
committed
net/mlx5: DR, Refactor VXLAN GPE flex parser tunnel code for SW steering
Refactor flex parser tunnel code: - Add definition for flex parser tunneling header for VXLAN-GPE - Use macros for VXLAN-GPE SW steering when building STE - Refactor the code to reflect that this is a VXLAN GPE only code and not a general flex parser code. This also significantly simplifies addition of more flex parser protocols, such as Geneve. Signed-off-by: Yevgeny Kliteynik <[email protected]> Reviewed-by: Alex Vesker <[email protected]> Signed-off-by: Saeed Mahameed <[email protected]>
1 parent ab118da commit 6e9e286

File tree

4 files changed

+66
-57
lines changed

4 files changed

+66
-57
lines changed

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

Lines changed: 21 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -102,13 +102,29 @@ static bool dr_mask_is_gre_set(struct mlx5dr_match_misc *misc)
102102
DR_MASK_IS_OUTER_MPLS_OVER_GRE_UDP_SET((_misc2), gre) || \
103103
DR_MASK_IS_OUTER_MPLS_OVER_GRE_UDP_SET((_misc2), udp))
104104

105-
static bool dr_mask_is_flex_parser_tnl_set(struct mlx5dr_match_misc3 *misc3)
105+
static bool
106+
dr_mask_is_misc3_vxlan_gpe_set(struct mlx5dr_match_misc3 *misc3)
106107
{
107108
return (misc3->outer_vxlan_gpe_vni ||
108109
misc3->outer_vxlan_gpe_next_protocol ||
109110
misc3->outer_vxlan_gpe_flags);
110111
}
111112

113+
static bool
114+
dr_matcher_supp_flex_parser_vxlan_gpe(struct mlx5dr_cmd_caps *caps)
115+
{
116+
return caps->flex_protocols &
117+
MLX5_FLEX_PARSER_VXLAN_GPE_ENABLED;
118+
}
119+
120+
static bool
121+
dr_mask_is_flex_parser_tnl_vxlan_gpe_set(struct mlx5dr_match_param *mask,
122+
struct mlx5dr_domain *dmn)
123+
{
124+
return dr_mask_is_misc3_vxlan_gpe_set(&mask->misc3) &&
125+
dr_matcher_supp_flex_parser_vxlan_gpe(&dmn->info.caps);
126+
}
127+
112128
static bool dr_mask_is_flex_parser_icmpv6_set(struct mlx5dr_match_misc3 *misc3)
113129
{
114130
return (misc3->icmpv6_type || misc3->icmpv6_code ||
@@ -137,13 +153,6 @@ static bool dr_mask_is_gvmi_or_qpn_set(struct mlx5dr_match_misc *misc)
137153
return (misc->source_sqn || misc->source_port);
138154
}
139155

140-
static bool
141-
dr_matcher_supp_flex_parser_vxlan_gpe(struct mlx5dr_domain *dmn)
142-
{
143-
return dmn->info.caps.flex_protocols &
144-
MLX5_FLEX_PARSER_VXLAN_GPE_ENABLED;
145-
}
146-
147156
int mlx5dr_matcher_select_builders(struct mlx5dr_matcher *matcher,
148157
struct mlx5dr_matcher_rx_tx *nic_matcher,
149158
enum mlx5dr_ipv outer_ipv,
@@ -262,10 +271,10 @@ static int dr_matcher_set_ste_builders(struct mlx5dr_matcher *matcher,
262271
inner, rx);
263272
}
264273

265-
if (dr_mask_is_flex_parser_tnl_set(&mask.misc3) &&
266-
dr_matcher_supp_flex_parser_vxlan_gpe(dmn))
267-
mlx5dr_ste_build_flex_parser_tnl(&sb[idx++], &mask,
268-
inner, rx);
274+
if (dr_mask_is_flex_parser_tnl_vxlan_gpe_set(&mask, dmn))
275+
mlx5dr_ste_build_flex_parser_tnl_vxlan_gpe(&sb[idx++],
276+
&mask,
277+
inner, rx);
269278

270279
if (DR_MASK_IS_ETH_L4_MISC_SET(mask.misc3, outer))
271280
mlx5dr_ste_build_eth_l4_misc(&sb[idx++], &mask, inner, rx);

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

Lines changed: 31 additions & 42 deletions
Original file line numberDiff line numberDiff line change
@@ -2103,68 +2103,57 @@ void mlx5dr_ste_build_eth_l4_misc(struct mlx5dr_ste_build *sb,
21032103
sb->ste_build_tag_func = &dr_ste_build_eth_l4_misc_tag;
21042104
}
21052105

2106-
static void dr_ste_build_flex_parser_tnl_bit_mask(struct mlx5dr_match_param *value,
2107-
bool inner, u8 *bit_mask)
2106+
static void
2107+
dr_ste_build_flex_parser_tnl_vxlan_gpe_bit_mask(struct mlx5dr_match_param *value,
2108+
bool inner, u8 *bit_mask)
21082109
{
21092110
struct mlx5dr_match_misc3 *misc_3_mask = &value->misc3;
21102111

2111-
if (misc_3_mask->outer_vxlan_gpe_flags ||
2112-
misc_3_mask->outer_vxlan_gpe_next_protocol) {
2113-
MLX5_SET(ste_flex_parser_tnl, bit_mask,
2114-
flex_parser_tunneling_header_63_32,
2115-
(misc_3_mask->outer_vxlan_gpe_flags << 24) |
2116-
(misc_3_mask->outer_vxlan_gpe_next_protocol));
2117-
misc_3_mask->outer_vxlan_gpe_flags = 0;
2118-
misc_3_mask->outer_vxlan_gpe_next_protocol = 0;
2119-
}
2120-
2121-
if (misc_3_mask->outer_vxlan_gpe_vni) {
2122-
MLX5_SET(ste_flex_parser_tnl, bit_mask,
2123-
flex_parser_tunneling_header_31_0,
2124-
misc_3_mask->outer_vxlan_gpe_vni << 8);
2125-
misc_3_mask->outer_vxlan_gpe_vni = 0;
2126-
}
2112+
DR_STE_SET_MASK_V(flex_parser_tnl_vxlan_gpe, bit_mask,
2113+
outer_vxlan_gpe_flags,
2114+
misc_3_mask, outer_vxlan_gpe_flags);
2115+
DR_STE_SET_MASK_V(flex_parser_tnl_vxlan_gpe, bit_mask,
2116+
outer_vxlan_gpe_next_protocol,
2117+
misc_3_mask, outer_vxlan_gpe_next_protocol);
2118+
DR_STE_SET_MASK_V(flex_parser_tnl_vxlan_gpe, bit_mask,
2119+
outer_vxlan_gpe_vni,
2120+
misc_3_mask, outer_vxlan_gpe_vni);
21272121
}
21282122

2129-
static int dr_ste_build_flex_parser_tnl_tag(struct mlx5dr_match_param *value,
2130-
struct mlx5dr_ste_build *sb,
2131-
u8 *hw_ste_p)
2123+
static int
2124+
dr_ste_build_flex_parser_tnl_vxlan_gpe_tag(struct mlx5dr_match_param *value,
2125+
struct mlx5dr_ste_build *sb,
2126+
u8 *hw_ste_p)
21322127
{
21332128
struct dr_hw_ste_format *hw_ste = (struct dr_hw_ste_format *)hw_ste_p;
21342129
struct mlx5dr_match_misc3 *misc3 = &value->misc3;
21352130
u8 *tag = hw_ste->tag;
21362131

2137-
if (misc3->outer_vxlan_gpe_flags ||
2138-
misc3->outer_vxlan_gpe_next_protocol) {
2139-
MLX5_SET(ste_flex_parser_tnl, tag,
2140-
flex_parser_tunneling_header_63_32,
2141-
(misc3->outer_vxlan_gpe_flags << 24) |
2142-
(misc3->outer_vxlan_gpe_next_protocol));
2143-
misc3->outer_vxlan_gpe_flags = 0;
2144-
misc3->outer_vxlan_gpe_next_protocol = 0;
2145-
}
2146-
2147-
if (misc3->outer_vxlan_gpe_vni) {
2148-
MLX5_SET(ste_flex_parser_tnl, tag,
2149-
flex_parser_tunneling_header_31_0,
2150-
misc3->outer_vxlan_gpe_vni << 8);
2151-
misc3->outer_vxlan_gpe_vni = 0;
2152-
}
2132+
DR_STE_SET_TAG(flex_parser_tnl_vxlan_gpe, tag,
2133+
outer_vxlan_gpe_flags, misc3,
2134+
outer_vxlan_gpe_flags);
2135+
DR_STE_SET_TAG(flex_parser_tnl_vxlan_gpe, tag,
2136+
outer_vxlan_gpe_next_protocol, misc3,
2137+
outer_vxlan_gpe_next_protocol);
2138+
DR_STE_SET_TAG(flex_parser_tnl_vxlan_gpe, tag,
2139+
outer_vxlan_gpe_vni, misc3,
2140+
outer_vxlan_gpe_vni);
21532141

21542142
return 0;
21552143
}
21562144

2157-
void mlx5dr_ste_build_flex_parser_tnl(struct mlx5dr_ste_build *sb,
2158-
struct mlx5dr_match_param *mask,
2159-
bool inner, bool rx)
2145+
void mlx5dr_ste_build_flex_parser_tnl_vxlan_gpe(struct mlx5dr_ste_build *sb,
2146+
struct mlx5dr_match_param *mask,
2147+
bool inner, bool rx)
21602148
{
2161-
dr_ste_build_flex_parser_tnl_bit_mask(mask, inner, sb->bit_mask);
2149+
dr_ste_build_flex_parser_tnl_vxlan_gpe_bit_mask(mask, inner,
2150+
sb->bit_mask);
21622151

21632152
sb->rx = rx;
21642153
sb->inner = inner;
21652154
sb->lu_type = MLX5DR_STE_LU_TYPE_FLEX_PARSER_TNL_HEADER;
21662155
sb->byte_mask = dr_ste_conv_bit_to_byte_mask(sb->bit_mask);
2167-
sb->ste_build_tag_func = &dr_ste_build_flex_parser_tnl_tag;
2156+
sb->ste_build_tag_func = &dr_ste_build_flex_parser_tnl_vxlan_gpe_tag;
21682157
}
21692158

21702159
static void dr_ste_build_register_0_bit_mask(struct mlx5dr_match_param *value,

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -325,9 +325,9 @@ int mlx5dr_ste_build_flex_parser_1(struct mlx5dr_ste_build *sb,
325325
struct mlx5dr_match_param *mask,
326326
struct mlx5dr_cmd_caps *caps,
327327
bool inner, bool rx);
328-
void mlx5dr_ste_build_flex_parser_tnl(struct mlx5dr_ste_build *sb,
329-
struct mlx5dr_match_param *mask,
330-
bool inner, bool rx);
328+
void mlx5dr_ste_build_flex_parser_tnl_vxlan_gpe(struct mlx5dr_ste_build *sb,
329+
struct mlx5dr_match_param *mask,
330+
bool inner, bool rx);
331331
void mlx5dr_ste_build_general_purpose(struct mlx5dr_ste_build *sb,
332332
struct mlx5dr_match_param *mask,
333333
bool inner, bool rx);

‎drivers/net/ethernet/mellanox/mlx5/core/steering/mlx5_ifc_dr.h

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -548,6 +548,17 @@ struct mlx5_ifc_ste_flex_parser_tnl_bits {
548548
u8 reserved_at_40[0x40];
549549
};
550550

551+
struct mlx5_ifc_ste_flex_parser_tnl_vxlan_gpe_bits {
552+
u8 outer_vxlan_gpe_flags[0x8];
553+
u8 reserved_at_8[0x10];
554+
u8 outer_vxlan_gpe_next_protocol[0x8];
555+
556+
u8 outer_vxlan_gpe_vni[0x18];
557+
u8 reserved_at_38[0x8];
558+
559+
u8 reserved_at_40[0x40];
560+
};
561+
551562
struct mlx5_ifc_ste_general_purpose_bits {
552563
u8 general_purpose_lookup_field[0x20];
553564

0 commit comments

Comments
 (0)