net/mlx5: add random compare support
cover net/mlx5: add random compare support
Add support for compare item with "RTE_FLOW_FIELD_RANDOM".
Depends-on: series-30553 ("ethdev: add random item support")
Depends-on: series-30606 ("ethdev: add RTE_FLOW_ITEM_TYPE_COMPARE")
Depends-on: series-30665 ("net/mlx5: add random item support")
Hamdan Igbaria (1):
net/mlx5/hws: add support for compare matcher
Michael Baum (1):
net/mlx5: add support to compare random value
drivers/common/mlx5/mlx5_prm.h | 16 ++ drivers/net/mlx5/hws/mlx5dr_cmd.c | 9 +- drivers/net/mlx5/hws/mlx5dr_cmd.h | 1 + drivers/net/mlx5/hws/mlx5dr_debug.c | 4 +- drivers/net/mlx5/hws/mlx5dr_debug.h | 1 + drivers/net/mlx5/hws/mlx5dr_definer.c | 220 +++++++++++++++++++++++++- drivers/net/mlx5/hws/mlx5dr_definer.h | 33 ++++ drivers/net/mlx5/hws/mlx5dr_matcher.c | 48 ++++++ drivers/net/mlx5/hws/mlx5dr_matcher.h | 12 +- drivers/net/mlx5/mlx5_flow_hw.c | 70 +++++--- 10 files changed, 387 insertions(+), 27 deletions(-)
Signature · 1 line
2.25.1
PATCH 1/2 net/mlx5/hws: add support for compare matcher
From: Hamdan Igbaria <[email protected]>
Add support for compare matcher, this matcher will allow direct comparison between two packet fields, or a packet field and a value, with fully masked DW.
For now this matcher hash table is limited to size 1x1, thus it supports only 1 rule STE.
--- drivers/common/mlx5/mlx5_prm.h | 16 ++ drivers/net/mlx5/hws/mlx5dr_cmd.c | 9 +- drivers/net/mlx5/hws/mlx5dr_cmd.h | 1 + drivers/net/mlx5/hws/mlx5dr_debug.c | 4 +- drivers/net/mlx5/hws/mlx5dr_debug.h | 1 + drivers/net/mlx5/hws/mlx5dr_definer.c | 220 +++++++++++++++++++++++++- drivers/net/mlx5/hws/mlx5dr_definer.h | 33 ++++ drivers/net/mlx5/hws/mlx5dr_matcher.c | 48 ++++++ drivers/net/mlx5/hws/mlx5dr_matcher.h | 12 +- 9 files changed, 335 insertions(+), 9 deletions(-)
drivers/common/mlx5/mlx5_prm.h +16 -0
@@ -3440,6 +3440,7 @@ enum mlx5_ifc_rtc_ste_format {MLX5_IFC_RTC_STE_FORMAT_8DW =0x4 ,MLX5_IFC_RTC_STE_FORMAT_11DW =0x5 ,MLX5_IFC_RTC_STE_FORMAT_RANGE =0x7 , + MLX5_IFC_RTC_STE_FORMAT_4DW_RANGE = 0x8, }; enum mlx5_ifc_rtc_reparse_mode {
@@ -3478,6 +3479,21 @@ struct mlx5_ifc_rtc_bits {u8 reserved_at_1a0[0x260 ]; }; +struct mlx5_ifc_ste_match_4dw_range_ctrl_dw_bits { +u8 match[0x1 ]; +u8 reserved_at_1[0x2 ]; +u8 base1[0x1 ]; +u8 inverse1[0x1 ]; +u8 reserved_at_5[0x1 ]; +u8 operator1[0x2 ]; +u8 reserved_at_8[0x3 ]; +u8 base0[0x1 ]; +u8 inverse0[0x1 ]; +u8 reserved_at_a[0x1 ]; +u8 operator0[0x2 ]; +u8 compare_delta[0x10 ]; +}; +struct mlx5_ifc_alias_context_bits {u8 vhca_id_to_be_accessed[0x10 ];u8 reserved_at_10[0xd ];
drivers/net/mlx5/hws/mlx5dr_cmd.c +6 -3
@@ -370,9 +370,12 @@ mlx5dr_cmd_rtc_create(struct ibv_context *ctx, attr, obj_type, MLX5_GENERAL_OBJ_TYPE_RTC); attr =MLX5_ADDR_OF (create_rtc_in, in, rtc); -MLX5_SET (rtc, attr, ste_format_0, rtc_attr->is_frst_jumbo ? -MLX5_IFC_RTC_STE_FORMAT_11DW : -MLX5_IFC_RTC_STE_FORMAT_8DW ); +if (rtc_attr->is_compare) { +MLX5_SET (rtc, attr, ste_format_0,MLX5_IFC_RTC_STE_FORMAT_4DW_RANGE ); + }else { +MLX5_SET (rtc, attr, ste_format_0, rtc_attr->is_frst_jumbo ? +MLX5_IFC_RTC_STE_FORMAT_11DW :MLX5_IFC_RTC_STE_FORMAT_8DW ); + }if (rtc_attr->is_scnd_range) {MLX5_SET (rtc, attr, ste_format_1,MLX5_IFC_RTC_STE_FORMAT_RANGE );
drivers/net/mlx5/hws/mlx5dr_cmd.h +1 -0
@@ -82,6 +82,7 @@ struct mlx5dr_cmd_rtc_create_attr {uint8_t reparse_mode;bool is_frst_jumbo;bool is_scnd_range; +bool is_compare; };struct mlx5dr_cmd_alias_obj_create_attr {
drivers/net/mlx5/hws/mlx5dr_debug.c +3 -1
@@ -99,6 +99,7 @@ static int mlx5dr_debug_dump_matcher_match_template(FILE *f, struct mlx5dr_matcher *matcher) {bool is_root = matcher->tbl->level ==MLX5DR_ROOT_LEVEL ; +bool is_compare =mlx5dr_matcher_is_compare (matcher);enum mlx5dr_debug_res_type type;int i, ret;
@@ -117,7 +118,8 @@ mlx5dr_debug_dump_matcher_match_template(FILE *f, struct mlx5dr_matcher *matcherreturn rte_errno; } - type =MLX5DR_DEBUG_RES_TYPE_MATCHER_TEMPLATE_MATCH_DEFINER ; + type = is_compare ?MLX5DR_DEBUG_RES_TYPE_MATCHER_TEMPLATE_COMPARE_MATCH_DEFINER : +MLX5DR_DEBUG_RES_TYPE_MATCHER_TEMPLATE_MATCH_DEFINER ; ret =mlx5dr_debug_dump_matcher_template_definer (f, mt, mt->definer, type);if (ret)return ret;
drivers/net/mlx5/hws/mlx5dr_debug.h +1 -0
@@ -24,6 +24,7 @@ enum mlx5dr_debug_res_type {MLX5DR_DEBUG_RES_TYPE_MATCHER_ACTION_TEMPLATE =4204 ,MLX5DR_DEBUG_RES_TYPE_MATCHER_TEMPLATE_HASH_DEFINER =4205 ,MLX5DR_DEBUG_RES_TYPE_MATCHER_TEMPLATE_RANGE_DEFINER =4206 , + MLX5DR_DEBUG_RES_TYPE_MATCHER_TEMPLATE_COMPARE_MATCH_DEFINER = 4207, }; static inline uint64_t
drivers/net/mlx5/hws/mlx5dr_definer.c +216 -4
279 lines not on this page · raw message
drivers/net/mlx5/hws/mlx5dr_definer.h +33 -0
@@ -17,6 +17,37 @@#define DW_SELECTORS_RANGE 2#define BYTE_SELECTORS_RANGE 8 +enum mlx5dr_definer_compare_ste_dw_offset { +/* In compare STE the matching DW's starts after the 3 actions */ +MLX5DR_DEFINER_COMPARE_STE_ARGUMENT_1 =3 , +MLX5DR_DEFINER_COMPARE_STE_ARGUMENT_0 , +MLX5DR_DEFINER_COMPARE_STE_BASE_1 , +MLX5DR_DEFINER_COMPARE_STE_BASE_0 , +MLX5DR_DEFINER_COMPARE_STE_TAG_DW_3 , +MLX5DR_DEFINER_COMPARE_STE_TAG_DW_2 , +MLX5DR_DEFINER_COMPARE_STE_TAG_DW_1 , +MLX5DR_DEFINER_COMPARE_STE_TAG_DW_0 , +}; + +enum mlx5dr_definer_dw_selectors { +MLX5DR_DEFINER_SELECTOR_DW0 , +MLX5DR_DEFINER_SELECTOR_DW1 , +MLX5DR_DEFINER_SELECTOR_DW2 , +MLX5DR_DEFINER_SELECTOR_DW3 , +MLX5DR_DEFINER_SELECTOR_DW4 , +MLX5DR_DEFINER_SELECTOR_DW5 , +MLX5DR_DEFINER_SELECTOR_DW6 , +MLX5DR_DEFINER_SELECTOR_DW7 , +MLX5DR_DEFINER_SELECTOR_DW8 , +}; + +enum mlx5dr_definer_compare_dw_selectors { +MLX5DR_DEFINER_COMPARE_ARGUMENT_0 =MLX5DR_DEFINER_SELECTOR_DW4 , +MLX5DR_DEFINER_COMPARE_ARGUMENT_1 =MLX5DR_DEFINER_SELECTOR_DW5 , +MLX5DR_DEFINER_COMPARE_BASE_0 =MLX5DR_DEFINER_SELECTOR_DW2 , +MLX5DR_DEFINER_COMPARE_BASE_1 =MLX5DR_DEFINER_SELECTOR_DW3 , +}; +enum mlx5dr_definer_fname {MLX5DR_DEFINER_FNAME_ETH_SMAC_48_16_O ,MLX5DR_DEFINER_FNAME_ETH_SMAC_48_16_I ,
@@ -163,6 +194,8 @@ enum mlx5dr_definer_type {struct mlx5dr_definer_fc {uint8_t item_idx;uint8_t is_range; +uint8_t compare_idx; +bool compare_set_base;uint32_t byte_off;int bit_off;uint32_t bit_mask;
drivers/net/mlx5/hws/mlx5dr_matcher.c +48 -0
64 lines not on this page · raw message
drivers/net/mlx5/hws/mlx5dr_matcher.h +11 -1
@@ -26,6 +26,7 @@ enum mlx5dr_matcher_flags {MLX5DR_MATCHER_FLAGS_RANGE_DEFINER =1 <<0 ,MLX5DR_MATCHER_FLAGS_HASH_DEFINER =1 <<1 ,MLX5DR_MATCHER_FLAGS_COLLISION =1 <<2 , + MLX5DR_MATCHER_FLAGS_COMPARE = 1 << 4, }; struct mlx5dr_match_template {
@@ -89,12 +90,19 @@ mlx5dr_matcher_mt_is_range(struct mlx5dr_match_template *mt)return (!!mt->range_definer); } +static inline bool +mlx5dr_matcher_is_compare (struct mlx5dr_matcher *matcher) +{ +return !!(matcher->flags &MLX5DR_MATCHER_FLAGS_COMPARE ); +} +static inline bool mlx5dr_matcher_req_fw_wqe (struct mlx5dr_matcher *matcher) {/* Currently HWS doesn't support hash different from match or range */ return unlikely (matcher->flags & (MLX5DR_MATCHER_FLAGS_HASH_DEFINER | -MLX5DR_MATCHER_FLAGS_RANGE_DEFINER )); +MLX5DR_MATCHER_FLAGS_RANGE_DEFINER | +MLX5DR_MATCHER_FLAGS_COMPARE )); } int mlx5dr_matcher_conv_items_to_prm(uint64_t *match_buf,
@@ -120,4 +128,6 @@ int mlx5dr_matcher_free_rtc_pointing(struct mlx5dr_context *ctx,enum mlx5dr_table_type type, struct mlx5dr_devx_obj *devx_obj); +int mlx5dr_matcher_validate_compare_attr (struct mlx5dr_matcher *matcher); +#endif /* MLX5DR_MATCHER_H_ */
Signature · 1 line
2.25.1
PATCH 2/2 net/mlx5: add support to compare random value
In reply to Michael BaumAdd support to use "RTE_FLOW_ITEM_TYPE_COMPARE" with "RTE_FLOW_FIELD_RAMDOM" as an argument.
The random field is supported only when base is an immediate value, random field cannot be compared with enother field.
--- drivers/net/mlx5/mlx5_flow_hw.c | 70 ++++++++++++++++++++++++--------- 1 file changed, 52 insertions(+), 18 deletions(-)
drivers/net/mlx5/mlx5_flow_hw.c +52 -18
@@ -6643,18 +6643,55 @@ flow_hw_prepend_item(const struct rte_flow_item *items,return copied_items; } -static inline bool -flow_hw_item_compare_field_supported (enum rte_flow_field_id field) +static int +flow_hw_item_compare_field_validate (enum rte_flow_field_id arg_field, +enum rte_flow_field_id base_field, +struct rte_flow_error *error) { -switch (field) { +switch (arg_field) { +case RTE_FLOW_FIELD_TAG : +case RTE_FLOW_FIELD_META : +break ; +case RTE_FLOW_FIELD_RANDOM : +if (base_field ==RTE_FLOW_FIELD_VALUE ) +return 0 ; +return rte_flow_error_set (error,EINVAL , +RTE_FLOW_ERROR_TYPE_UNSPECIFIED , +NULL , +"compare random is supported only with immediate value" ); +default : +return rte_flow_error_set (error,ENOTSUP , +RTE_FLOW_ERROR_TYPE_UNSPECIFIED , +NULL , +"compare item argument field is not supported" ); + } +switch (base_field) {case RTE_FLOW_FIELD_TAG :case RTE_FLOW_FIELD_META :case RTE_FLOW_FIELD_VALUE : -return true; +break ; +default : +return rte_flow_error_set (error,ENOTSUP , +RTE_FLOW_ERROR_TYPE_UNSPECIFIED , +NULL , +"compare item base field is not supported" ); + } +return 0 ; +} + +static inline uint32_t +flow_hw_item_compare_width_supported (enum rte_flow_field_id field) +{ +switch (field) { +case RTE_FLOW_FIELD_TAG : +case RTE_FLOW_FIELD_META : +return 32 ; +case RTE_FLOW_FIELD_RANDOM : +return 16 ;default :break ; } -return false; +return 0 ; } static int
@@ -6663,6 +6700,7 @@ flow_hw_validate_item_compare(const struct rte_flow_item *item, {const struct rte_flow_item_compare *comp_m = item->mask;const struct rte_flow_item_compare *comp_v = item->spec; +int ret;if (unlikely (!comp_m)) return rte_flow_error_set(error, EINVAL,
@@ -6674,19 +6712,13 @@ flow_hw_validate_item_compare(const struct rte_flow_item *item,RTE_FLOW_ERROR_TYPE_UNSPECIFIED ,NULL , "compare item only support full mask"); -if (!flow_hw_item_compare_field_supported (comp_m->a.field) || - !flow_hw_item_compare_field_supported (comp_m->b.field)) -return rte_flow_error_set (error,ENOTSUP , -RTE_FLOW_ERROR_TYPE_UNSPECIFIED , -NULL , -"compare item field not support" ); -if (comp_m->a.field ==RTE_FLOW_FIELD_VALUE && - comp_m->b.field ==RTE_FLOW_FIELD_VALUE ) -return rte_flow_error_set (error,EINVAL , -RTE_FLOW_ERROR_TYPE_UNSPECIFIED , -NULL , -"compare between value is not valid" ); + ret =flow_hw_item_compare_field_validate (comp_m->a.field, + comp_m->b.field, error); +if (ret <0 ) +return ret;if (comp_v) { +uint32_t width; +if (comp_v->operation != comp_m->operation || comp_v->a.field != comp_m->a.field || comp_v->b.field != comp_m->b.field)
@@ -6694,7 +6726,9 @@ flow_hw_validate_item_compare(const struct rte_flow_item *item,RTE_FLOW_ERROR_TYPE_UNSPECIFIED ,NULL , "compare item spec/mask not matching"); -if ((comp_v->width & comp_m->width) !=32 ) + width =flow_hw_item_compare_width_supported (comp_v->a.field); +MLX5_ASSERT (width >0 ); +if ((comp_v->width & comp_m->width) != width) return rte_flow_error_set(error, EINVAL, RTE_FLOW_ERROR_TYPE_UNSPECIFIED, NULL,
Signature · 1 line
2.25.1
v2 cover net/mlx5: add random compare support
In reply to Michael BaumAdd support for compare item with "RTE_FLOW_FIELD_RANDOM".
Depends-on: series-30606 ("ethdev: add RTE_FLOW_ITEM_TYPE_COMPARE")
v2:
- Rebase.
- Add "RTE_FLOW_FIELD_RANDOM" compare support.
- Reduce the "Depends-on" list.
Hamdan Igbaria (1):
net/mlx5/hws: add support for compare matcher
Michael Baum (1):
net/mlx5: add support to compare random value
drivers/common/mlx5/mlx5_prm.h | 16 ++ drivers/net/mlx5/hws/mlx5dr_cmd.c | 9 +- drivers/net/mlx5/hws/mlx5dr_cmd.h | 1 + drivers/net/mlx5/hws/mlx5dr_debug.c | 4 +- drivers/net/mlx5/hws/mlx5dr_debug.h | 1 + drivers/net/mlx5/hws/mlx5dr_definer.c | 243 +++++++++++++++++++++++++- drivers/net/mlx5/hws/mlx5dr_definer.h | 33 ++++ drivers/net/mlx5/hws/mlx5dr_matcher.c | 48 +++++ drivers/net/mlx5/hws/mlx5dr_matcher.h | 12 +- drivers/net/mlx5/mlx5_flow_hw.c | 70 ++++++-- 10 files changed, 410 insertions(+), 27 deletions(-)
Signature · 1 line
2.25.1
PATCH v2 1/2 net/mlx5/hws: add support for compare matcher
From: Hamdan Igbaria <[email protected]>
Add support for compare matcher, this matcher will allow direct comparison between two packet fields, or a packet field and a value, with fully masked DW.
For now this matcher hash table is limited to size 1x1, thus it supports only 1 rule STE.
--- drivers/common/mlx5/mlx5_prm.h | 16 ++ drivers/net/mlx5/hws/mlx5dr_cmd.c | 9 +- drivers/net/mlx5/hws/mlx5dr_cmd.h | 1 + drivers/net/mlx5/hws/mlx5dr_debug.c | 4 +- drivers/net/mlx5/hws/mlx5dr_debug.h | 1 + drivers/net/mlx5/hws/mlx5dr_definer.c | 243 +++++++++++++++++++++++++- drivers/net/mlx5/hws/mlx5dr_definer.h | 33 ++++ drivers/net/mlx5/hws/mlx5dr_matcher.c | 48 +++++ drivers/net/mlx5/hws/mlx5dr_matcher.h | 12 +- 9 files changed, 358 insertions(+), 9 deletions(-)
drivers/common/mlx5/mlx5_prm.h +16 -0
@@ -3448,6 +3448,7 @@ enum mlx5_ifc_rtc_ste_format {MLX5_IFC_RTC_STE_FORMAT_8DW =0x4 ,MLX5_IFC_RTC_STE_FORMAT_11DW =0x5 ,MLX5_IFC_RTC_STE_FORMAT_RANGE =0x7 , + MLX5_IFC_RTC_STE_FORMAT_4DW_RANGE = 0x8, }; enum mlx5_ifc_rtc_reparse_mode {
@@ -3486,6 +3487,21 @@ struct mlx5_ifc_rtc_bits {u8 reserved_at_1a0[0x260 ]; }; +struct mlx5_ifc_ste_match_4dw_range_ctrl_dw_bits { +u8 match[0x1 ]; +u8 reserved_at_1[0x2 ]; +u8 base1[0x1 ]; +u8 inverse1[0x1 ]; +u8 reserved_at_5[0x1 ]; +u8 operator1[0x2 ]; +u8 reserved_at_8[0x3 ]; +u8 base0[0x1 ]; +u8 inverse0[0x1 ]; +u8 reserved_at_a[0x1 ]; +u8 operator0[0x2 ]; +u8 compare_delta[0x10 ]; +}; +struct mlx5_ifc_alias_context_bits {u8 vhca_id_to_be_accessed[0x10 ];u8 reserved_at_10[0xd ];
drivers/net/mlx5/hws/mlx5dr_cmd.c +6 -3
@@ -370,9 +370,12 @@ mlx5dr_cmd_rtc_create(struct ibv_context *ctx, attr, obj_type, MLX5_GENERAL_OBJ_TYPE_RTC); attr =MLX5_ADDR_OF (create_rtc_in, in, rtc); -MLX5_SET (rtc, attr, ste_format_0, rtc_attr->is_frst_jumbo ? -MLX5_IFC_RTC_STE_FORMAT_11DW : -MLX5_IFC_RTC_STE_FORMAT_8DW ); +if (rtc_attr->is_compare) { +MLX5_SET (rtc, attr, ste_format_0,MLX5_IFC_RTC_STE_FORMAT_4DW_RANGE ); + }else { +MLX5_SET (rtc, attr, ste_format_0, rtc_attr->is_frst_jumbo ? +MLX5_IFC_RTC_STE_FORMAT_11DW :MLX5_IFC_RTC_STE_FORMAT_8DW ); + }if (rtc_attr->is_scnd_range) {MLX5_SET (rtc, attr, ste_format_1,MLX5_IFC_RTC_STE_FORMAT_RANGE );
drivers/net/mlx5/hws/mlx5dr_cmd.h +1 -0
@@ -82,6 +82,7 @@ struct mlx5dr_cmd_rtc_create_attr {uint8_t reparse_mode;bool is_frst_jumbo;bool is_scnd_range; +bool is_compare; };struct mlx5dr_cmd_alias_obj_create_attr {
drivers/net/mlx5/hws/mlx5dr_debug.c +3 -1
@@ -99,6 +99,7 @@ static int mlx5dr_debug_dump_matcher_match_template(FILE *f, struct mlx5dr_matcher *matcher) {bool is_root = matcher->tbl->level ==MLX5DR_ROOT_LEVEL ; +bool is_compare =mlx5dr_matcher_is_compare (matcher);enum mlx5dr_debug_res_type type;int i, ret;
@@ -117,7 +118,8 @@ mlx5dr_debug_dump_matcher_match_template(FILE *f, struct mlx5dr_matcher *matcherreturn rte_errno; } - type =MLX5DR_DEBUG_RES_TYPE_MATCHER_TEMPLATE_MATCH_DEFINER ; + type = is_compare ?MLX5DR_DEBUG_RES_TYPE_MATCHER_TEMPLATE_COMPARE_MATCH_DEFINER : +MLX5DR_DEBUG_RES_TYPE_MATCHER_TEMPLATE_MATCH_DEFINER ; ret =mlx5dr_debug_dump_matcher_template_definer (f, mt, mt->definer, type);if (ret)return ret;
drivers/net/mlx5/hws/mlx5dr_debug.h +1 -0
@@ -24,6 +24,7 @@ enum mlx5dr_debug_res_type {MLX5DR_DEBUG_RES_TYPE_MATCHER_ACTION_TEMPLATE =4204 ,MLX5DR_DEBUG_RES_TYPE_MATCHER_TEMPLATE_HASH_DEFINER =4205 ,MLX5DR_DEBUG_RES_TYPE_MATCHER_TEMPLATE_RANGE_DEFINER =4206 , + MLX5DR_DEBUG_RES_TYPE_MATCHER_TEMPLATE_COMPARE_MATCH_DEFINER = 4207, }; static inline uint64_t
drivers/net/mlx5/hws/mlx5dr_definer.c +239 -4
302 lines not on this page · raw message
drivers/net/mlx5/hws/mlx5dr_definer.h +33 -0
@@ -17,6 +17,37 @@#define DW_SELECTORS_RANGE 2#define BYTE_SELECTORS_RANGE 8 +enum mlx5dr_definer_compare_ste_dw_offset { +/* In compare STE the matching DW's starts after the 3 actions */ +MLX5DR_DEFINER_COMPARE_STE_ARGUMENT_1 =3 , +MLX5DR_DEFINER_COMPARE_STE_ARGUMENT_0 , +MLX5DR_DEFINER_COMPARE_STE_BASE_1 , +MLX5DR_DEFINER_COMPARE_STE_BASE_0 , +MLX5DR_DEFINER_COMPARE_STE_TAG_DW_3 , +MLX5DR_DEFINER_COMPARE_STE_TAG_DW_2 , +MLX5DR_DEFINER_COMPARE_STE_TAG_DW_1 , +MLX5DR_DEFINER_COMPARE_STE_TAG_DW_0 , +}; + +enum mlx5dr_definer_dw_selectors { +MLX5DR_DEFINER_SELECTOR_DW0 , +MLX5DR_DEFINER_SELECTOR_DW1 , +MLX5DR_DEFINER_SELECTOR_DW2 , +MLX5DR_DEFINER_SELECTOR_DW3 , +MLX5DR_DEFINER_SELECTOR_DW4 , +MLX5DR_DEFINER_SELECTOR_DW5 , +MLX5DR_DEFINER_SELECTOR_DW6 , +MLX5DR_DEFINER_SELECTOR_DW7 , +MLX5DR_DEFINER_SELECTOR_DW8 , +}; + +enum mlx5dr_definer_compare_dw_selectors { +MLX5DR_DEFINER_COMPARE_ARGUMENT_0 =MLX5DR_DEFINER_SELECTOR_DW4 , +MLX5DR_DEFINER_COMPARE_ARGUMENT_1 =MLX5DR_DEFINER_SELECTOR_DW5 , +MLX5DR_DEFINER_COMPARE_BASE_0 =MLX5DR_DEFINER_SELECTOR_DW2 , +MLX5DR_DEFINER_COMPARE_BASE_1 =MLX5DR_DEFINER_SELECTOR_DW3 , +}; +enum mlx5dr_definer_fname {MLX5DR_DEFINER_FNAME_ETH_SMAC_48_16_O ,MLX5DR_DEFINER_FNAME_ETH_SMAC_48_16_I ,
@@ -168,6 +199,8 @@ enum mlx5dr_definer_type {struct mlx5dr_definer_fc {uint8_t item_idx;uint8_t is_range; +uint8_t compare_idx; +bool compare_set_base;uint32_t byte_off;int bit_off;uint32_t bit_mask;
drivers/net/mlx5/hws/mlx5dr_matcher.c +48 -0
64 lines not on this page · raw message
drivers/net/mlx5/hws/mlx5dr_matcher.h +11 -1
@@ -26,6 +26,7 @@ enum mlx5dr_matcher_flags {MLX5DR_MATCHER_FLAGS_RANGE_DEFINER =1 <<0 ,MLX5DR_MATCHER_FLAGS_HASH_DEFINER =1 <<1 ,MLX5DR_MATCHER_FLAGS_COLLISION =1 <<2 , + MLX5DR_MATCHER_FLAGS_COMPARE = 1 << 4, }; struct mlx5dr_match_template {
@@ -89,12 +90,19 @@ mlx5dr_matcher_mt_is_range(struct mlx5dr_match_template *mt)return (!!mt->range_definer); } +static inline bool +mlx5dr_matcher_is_compare (struct mlx5dr_matcher *matcher) +{ +return !!(matcher->flags &MLX5DR_MATCHER_FLAGS_COMPARE ); +} +static inline bool mlx5dr_matcher_req_fw_wqe (struct mlx5dr_matcher *matcher) {/* Currently HWS doesn't support hash different from match or range */ return unlikely (matcher->flags & (MLX5DR_MATCHER_FLAGS_HASH_DEFINER | -MLX5DR_MATCHER_FLAGS_RANGE_DEFINER )); +MLX5DR_MATCHER_FLAGS_RANGE_DEFINER | +MLX5DR_MATCHER_FLAGS_COMPARE )); } int mlx5dr_matcher_conv_items_to_prm(uint64_t *match_buf,
@@ -120,4 +128,6 @@ int mlx5dr_matcher_free_rtc_pointing(struct mlx5dr_context *ctx,enum mlx5dr_table_type type, struct mlx5dr_devx_obj *devx_obj); +int mlx5dr_matcher_validate_compare_attr (struct mlx5dr_matcher *matcher); +#endif /* MLX5DR_MATCHER_H_ */
Signature · 1 line
2.25.1
PATCH v2 2/2 net/mlx5: add support to compare random value
In reply to Michael BaumAdd support to use "RTE_FLOW_ITEM_TYPE_COMPARE" with "RTE_FLOW_FIELD_RAMDOM" as an argument.
The random field is supported only when base is an immediate value, random field cannot be compared with enother field.
--- drivers/net/mlx5/mlx5_flow_hw.c | 70 ++++++++++++++++++++++++--------- 1 file changed, 52 insertions(+), 18 deletions(-)
drivers/net/mlx5/mlx5_flow_hw.c +52 -18
@@ -6686,18 +6686,55 @@ flow_hw_prepend_item(const struct rte_flow_item *items,return copied_items; } -static inline bool -flow_hw_item_compare_field_supported (enum rte_flow_field_id field) +static int +flow_hw_item_compare_field_validate (enum rte_flow_field_id arg_field, +enum rte_flow_field_id base_field, +struct rte_flow_error *error) { -switch (field) { +switch (arg_field) { +case RTE_FLOW_FIELD_TAG : +case RTE_FLOW_FIELD_META : +break ; +case RTE_FLOW_FIELD_RANDOM : +if (base_field ==RTE_FLOW_FIELD_VALUE ) +return 0 ; +return rte_flow_error_set (error,EINVAL , +RTE_FLOW_ERROR_TYPE_UNSPECIFIED , +NULL , +"compare random is supported only with immediate value" ); +default : +return rte_flow_error_set (error,ENOTSUP , +RTE_FLOW_ERROR_TYPE_UNSPECIFIED , +NULL , +"compare item argument field is not supported" ); + } +switch (base_field) {case RTE_FLOW_FIELD_TAG :case RTE_FLOW_FIELD_META :case RTE_FLOW_FIELD_VALUE : -return true; +break ; +default : +return rte_flow_error_set (error,ENOTSUP , +RTE_FLOW_ERROR_TYPE_UNSPECIFIED , +NULL , +"compare item base field is not supported" ); + } +return 0 ; +} + +static inline uint32_t +flow_hw_item_compare_width_supported (enum rte_flow_field_id field) +{ +switch (field) { +case RTE_FLOW_FIELD_TAG : +case RTE_FLOW_FIELD_META : +return 32 ; +case RTE_FLOW_FIELD_RANDOM : +return 16 ;default :break ; } -return false; +return 0 ; } static int
@@ -6706,6 +6743,7 @@ flow_hw_validate_item_compare(const struct rte_flow_item *item, {const struct rte_flow_item_compare *comp_m = item->mask;const struct rte_flow_item_compare *comp_v = item->spec; +int ret;if (unlikely (!comp_m)) return rte_flow_error_set(error, EINVAL,
@@ -6717,19 +6755,13 @@ flow_hw_validate_item_compare(const struct rte_flow_item *item,RTE_FLOW_ERROR_TYPE_UNSPECIFIED ,NULL , "compare item only support full mask"); -if (!flow_hw_item_compare_field_supported (comp_m->a.field) || - !flow_hw_item_compare_field_supported (comp_m->b.field)) -return rte_flow_error_set (error,ENOTSUP , -RTE_FLOW_ERROR_TYPE_UNSPECIFIED , -NULL , -"compare item field not support" ); -if (comp_m->a.field ==RTE_FLOW_FIELD_VALUE && - comp_m->b.field ==RTE_FLOW_FIELD_VALUE ) -return rte_flow_error_set (error,EINVAL , -RTE_FLOW_ERROR_TYPE_UNSPECIFIED , -NULL , -"compare between value is not valid" ); + ret =flow_hw_item_compare_field_validate (comp_m->a.field, + comp_m->b.field, error); +if (ret <0 ) +return ret;if (comp_v) { +uint32_t width; +if (comp_v->operation != comp_m->operation || comp_v->a.field != comp_m->a.field || comp_v->b.field != comp_m->b.field)
@@ -6737,7 +6769,9 @@ flow_hw_validate_item_compare(const struct rte_flow_item *item,RTE_FLOW_ERROR_TYPE_UNSPECIFIED ,NULL , "compare item spec/mask not matching"); -if ((comp_v->width & comp_m->width) !=32 ) + width =flow_hw_item_compare_width_supported (comp_v->a.field); +MLX5_ASSERT (width >0 ); +if ((comp_v->width & comp_m->width) != width) return rte_flow_error_set(error, EINVAL, RTE_FLOW_ERROR_TYPE_UNSPECIFIED, NULL,
Signature · 1 line
2.25.1
v3 cover net/mlx5: add random compare support
In reply to Michael BaumAdd support for compare item with "RTE_FLOW_FIELD_RANDOM".
Depends-on: series-30606 ("ethdev: add RTE_FLOW_ITEM_TYPE_COMPARE")
v2:
- Rebase.
- Add "RTE_FLOW_FIELD_META" compare support.
- Reduce the "Depends-on" list.
v3:
- Rebase.
- Fix typo in function name, r/tranlate/translate.
- Fix adding a line without newline at end of file.
Hamdan Igbaria (1):
net/mlx5/hws: add support for compare matcher
Michael Baum (1):
net/mlx5: add support to compare random value
drivers/common/mlx5/mlx5_prm.h | 16 ++ drivers/net/mlx5/hws/mlx5dr_cmd.c | 9 +- drivers/net/mlx5/hws/mlx5dr_cmd.h | 1 + drivers/net/mlx5/hws/mlx5dr_debug.c | 4 +- drivers/net/mlx5/hws/mlx5dr_debug.h | 1 + drivers/net/mlx5/hws/mlx5dr_definer.c | 243 +++++++++++++++++++++++++- drivers/net/mlx5/hws/mlx5dr_definer.h | 33 ++++ drivers/net/mlx5/hws/mlx5dr_matcher.c | 48 +++++ drivers/net/mlx5/hws/mlx5dr_matcher.h | 12 +- drivers/net/mlx5/mlx5_flow_hw.c | 70 ++++++-- 10 files changed, 410 insertions(+), 27 deletions(-)
Signature · 1 line
2.25.1
PATCH v3 1/2 net/mlx5/hws: add support for compare matcher
From: Hamdan Igbaria <[email protected]>
Add support for compare matcher, this matcher will allow direct comparison between two packet fields, or a packet field and a value, with fully masked DW.
For now this matcher hash table is limited to size 1x1, thus it supports only 1 rule STE.
--- drivers/common/mlx5/mlx5_prm.h | 16 ++ drivers/net/mlx5/hws/mlx5dr_cmd.c | 9 +- drivers/net/mlx5/hws/mlx5dr_cmd.h | 1 + drivers/net/mlx5/hws/mlx5dr_debug.c | 4 +- drivers/net/mlx5/hws/mlx5dr_debug.h | 1 + drivers/net/mlx5/hws/mlx5dr_definer.c | 243 +++++++++++++++++++++++++- drivers/net/mlx5/hws/mlx5dr_definer.h | 33 ++++ drivers/net/mlx5/hws/mlx5dr_matcher.c | 48 +++++ drivers/net/mlx5/hws/mlx5dr_matcher.h | 12 +- 9 files changed, 358 insertions(+), 9 deletions(-)
drivers/common/mlx5/mlx5_prm.h +16 -0
@@ -3455,6 +3455,7 @@ enum mlx5_ifc_rtc_ste_format {MLX5_IFC_RTC_STE_FORMAT_8DW =0x4 ,MLX5_IFC_RTC_STE_FORMAT_11DW =0x5 ,MLX5_IFC_RTC_STE_FORMAT_RANGE =0x7 , + MLX5_IFC_RTC_STE_FORMAT_4DW_RANGE = 0x8, }; enum mlx5_ifc_rtc_reparse_mode {
@@ -3493,6 +3494,21 @@ struct mlx5_ifc_rtc_bits {u8 reserved_at_1a0[0x260 ]; }; +struct mlx5_ifc_ste_match_4dw_range_ctrl_dw_bits { +u8 match[0x1 ]; +u8 reserved_at_1[0x2 ]; +u8 base1[0x1 ]; +u8 inverse1[0x1 ]; +u8 reserved_at_5[0x1 ]; +u8 operator1[0x2 ]; +u8 reserved_at_8[0x3 ]; +u8 base0[0x1 ]; +u8 inverse0[0x1 ]; +u8 reserved_at_a[0x1 ]; +u8 operator0[0x2 ]; +u8 compare_delta[0x10 ]; +}; +struct mlx5_ifc_alias_context_bits {u8 vhca_id_to_be_accessed[0x10 ];u8 reserved_at_10[0xd ];
drivers/net/mlx5/hws/mlx5dr_cmd.c +6 -3
@@ -370,9 +370,12 @@ mlx5dr_cmd_rtc_create(struct ibv_context *ctx, attr, obj_type, MLX5_GENERAL_OBJ_TYPE_RTC); attr =MLX5_ADDR_OF (create_rtc_in, in, rtc); -MLX5_SET (rtc, attr, ste_format_0, rtc_attr->is_frst_jumbo ? -MLX5_IFC_RTC_STE_FORMAT_11DW : -MLX5_IFC_RTC_STE_FORMAT_8DW ); +if (rtc_attr->is_compare) { +MLX5_SET (rtc, attr, ste_format_0,MLX5_IFC_RTC_STE_FORMAT_4DW_RANGE ); + }else { +MLX5_SET (rtc, attr, ste_format_0, rtc_attr->is_frst_jumbo ? +MLX5_IFC_RTC_STE_FORMAT_11DW :MLX5_IFC_RTC_STE_FORMAT_8DW ); + }if (rtc_attr->is_scnd_range) {MLX5_SET (rtc, attr, ste_format_1,MLX5_IFC_RTC_STE_FORMAT_RANGE );
drivers/net/mlx5/hws/mlx5dr_cmd.h +1 -0
@@ -82,6 +82,7 @@ struct mlx5dr_cmd_rtc_create_attr {uint8_t reparse_mode;bool is_frst_jumbo;bool is_scnd_range; +bool is_compare; };struct mlx5dr_cmd_alias_obj_create_attr {
drivers/net/mlx5/hws/mlx5dr_debug.c +3 -1
@@ -99,6 +99,7 @@ static int mlx5dr_debug_dump_matcher_match_template(FILE *f, struct mlx5dr_matcher *matcher) {bool is_root = matcher->tbl->level ==MLX5DR_ROOT_LEVEL ; +bool is_compare =mlx5dr_matcher_is_compare (matcher);enum mlx5dr_debug_res_type type;int i, ret;
@@ -117,7 +118,8 @@ mlx5dr_debug_dump_matcher_match_template(FILE *f, struct mlx5dr_matcher *matcherreturn rte_errno; } - type =MLX5DR_DEBUG_RES_TYPE_MATCHER_TEMPLATE_MATCH_DEFINER ; + type = is_compare ?MLX5DR_DEBUG_RES_TYPE_MATCHER_TEMPLATE_COMPARE_MATCH_DEFINER : +MLX5DR_DEBUG_RES_TYPE_MATCHER_TEMPLATE_MATCH_DEFINER ; ret =mlx5dr_debug_dump_matcher_template_definer (f, mt, mt->definer, type);if (ret)return ret;
drivers/net/mlx5/hws/mlx5dr_debug.h +1 -0
@@ -24,6 +24,7 @@ enum mlx5dr_debug_res_type {MLX5DR_DEBUG_RES_TYPE_MATCHER_ACTION_TEMPLATE =4204 ,MLX5DR_DEBUG_RES_TYPE_MATCHER_TEMPLATE_HASH_DEFINER =4205 ,MLX5DR_DEBUG_RES_TYPE_MATCHER_TEMPLATE_RANGE_DEFINER =4206 , + MLX5DR_DEBUG_RES_TYPE_MATCHER_TEMPLATE_COMPARE_MATCH_DEFINER = 4207, }; static inline uint64_t
drivers/net/mlx5/hws/mlx5dr_definer.c +239 -4
302 lines not on this page · raw message
drivers/net/mlx5/hws/mlx5dr_definer.h +33 -0
@@ -17,6 +17,37 @@#define DW_SELECTORS_RANGE 2#define BYTE_SELECTORS_RANGE 8 +enum mlx5dr_definer_compare_ste_dw_offset { +/* In compare STE the matching DW's starts after the 3 actions */ +MLX5DR_DEFINER_COMPARE_STE_ARGUMENT_1 =3 , +MLX5DR_DEFINER_COMPARE_STE_ARGUMENT_0 , +MLX5DR_DEFINER_COMPARE_STE_BASE_1 , +MLX5DR_DEFINER_COMPARE_STE_BASE_0 , +MLX5DR_DEFINER_COMPARE_STE_TAG_DW_3 , +MLX5DR_DEFINER_COMPARE_STE_TAG_DW_2 , +MLX5DR_DEFINER_COMPARE_STE_TAG_DW_1 , +MLX5DR_DEFINER_COMPARE_STE_TAG_DW_0 , +}; + +enum mlx5dr_definer_dw_selectors { +MLX5DR_DEFINER_SELECTOR_DW0 , +MLX5DR_DEFINER_SELECTOR_DW1 , +MLX5DR_DEFINER_SELECTOR_DW2 , +MLX5DR_DEFINER_SELECTOR_DW3 , +MLX5DR_DEFINER_SELECTOR_DW4 , +MLX5DR_DEFINER_SELECTOR_DW5 , +MLX5DR_DEFINER_SELECTOR_DW6 , +MLX5DR_DEFINER_SELECTOR_DW7 , +MLX5DR_DEFINER_SELECTOR_DW8 , +}; + +enum mlx5dr_definer_compare_dw_selectors { +MLX5DR_DEFINER_COMPARE_ARGUMENT_0 =MLX5DR_DEFINER_SELECTOR_DW4 , +MLX5DR_DEFINER_COMPARE_ARGUMENT_1 =MLX5DR_DEFINER_SELECTOR_DW5 , +MLX5DR_DEFINER_COMPARE_BASE_0 =MLX5DR_DEFINER_SELECTOR_DW2 , +MLX5DR_DEFINER_COMPARE_BASE_1 =MLX5DR_DEFINER_SELECTOR_DW3 , +}; +enum mlx5dr_definer_fname {MLX5DR_DEFINER_FNAME_ETH_SMAC_48_16_O ,MLX5DR_DEFINER_FNAME_ETH_SMAC_48_16_I ,
@@ -188,6 +219,8 @@ struct mlx5dr_definer_fc {uint8_t item_idx;uint8_t is_range;uint16_t extra_data; +uint8_t compare_idx; +bool compare_set_base;uint32_t byte_off;int bit_off;uint32_t bit_mask;
drivers/net/mlx5/hws/mlx5dr_matcher.c +48 -0
63 lines not on this page · raw message
drivers/net/mlx5/hws/mlx5dr_matcher.h +11 -1
@@ -26,6 +26,7 @@ enum mlx5dr_matcher_flags {MLX5DR_MATCHER_FLAGS_RANGE_DEFINER =1 <<0 ,MLX5DR_MATCHER_FLAGS_HASH_DEFINER =1 <<1 ,MLX5DR_MATCHER_FLAGS_COLLISION =1 <<2 , + MLX5DR_MATCHER_FLAGS_COMPARE = 1 << 4, }; struct mlx5dr_match_template {
@@ -89,12 +90,19 @@ mlx5dr_matcher_mt_is_range(struct mlx5dr_match_template *mt)return (!!mt->range_definer); } +static inline bool +mlx5dr_matcher_is_compare (struct mlx5dr_matcher *matcher) +{ +return !!(matcher->flags &MLX5DR_MATCHER_FLAGS_COMPARE ); +} +static inline bool mlx5dr_matcher_req_fw_wqe (struct mlx5dr_matcher *matcher) {/* Currently HWS doesn't support hash different from match or range */ return unlikely (matcher->flags & (MLX5DR_MATCHER_FLAGS_HASH_DEFINER | -MLX5DR_MATCHER_FLAGS_RANGE_DEFINER )); +MLX5DR_MATCHER_FLAGS_RANGE_DEFINER | +MLX5DR_MATCHER_FLAGS_COMPARE )); } int mlx5dr_matcher_conv_items_to_prm(uint64_t *match_buf,
@@ -120,4 +128,6 @@ int mlx5dr_matcher_free_rtc_pointing(struct mlx5dr_context *ctx,enum mlx5dr_table_type type, struct mlx5dr_devx_obj *devx_obj); +int mlx5dr_matcher_validate_compare_attr (struct mlx5dr_matcher *matcher); +#endif /* MLX5DR_MATCHER_H_ */
Signature · 1 line
2.25.1
PATCH v3 2/2 net/mlx5: add support to compare random value
In reply to Michael BaumAdd support to use "RTE_FLOW_ITEM_TYPE_COMPARE" with "RTE_FLOW_FIELD_RAMDOM" as an argument.
The random field is supported only when base is an immediate value, random field cannot be compared with enother field.
--- drivers/net/mlx5/mlx5_flow_hw.c | 70 ++++++++++++++++++++++++--------- 1 file changed, 52 insertions(+), 18 deletions(-)
drivers/net/mlx5/mlx5_flow_hw.c +52 -18
@@ -6717,18 +6717,55 @@ flow_hw_prepend_item(const struct rte_flow_item *items,return copied_items; } -static inline bool -flow_hw_item_compare_field_supported (enum rte_flow_field_id field) +static int +flow_hw_item_compare_field_validate (enum rte_flow_field_id arg_field, +enum rte_flow_field_id base_field, +struct rte_flow_error *error) { -switch (field) { +switch (arg_field) { +case RTE_FLOW_FIELD_TAG : +case RTE_FLOW_FIELD_META : +break ; +case RTE_FLOW_FIELD_RANDOM : +if (base_field ==RTE_FLOW_FIELD_VALUE ) +return 0 ; +return rte_flow_error_set (error,EINVAL , +RTE_FLOW_ERROR_TYPE_UNSPECIFIED , +NULL , +"compare random is supported only with immediate value" ); +default : +return rte_flow_error_set (error,ENOTSUP , +RTE_FLOW_ERROR_TYPE_UNSPECIFIED , +NULL , +"compare item argument field is not supported" ); + } +switch (base_field) {case RTE_FLOW_FIELD_TAG :case RTE_FLOW_FIELD_META :case RTE_FLOW_FIELD_VALUE : -return true; +break ; +default : +return rte_flow_error_set (error,ENOTSUP , +RTE_FLOW_ERROR_TYPE_UNSPECIFIED , +NULL , +"compare item base field is not supported" ); + } +return 0 ; +} + +static inline uint32_t +flow_hw_item_compare_width_supported (enum rte_flow_field_id field) +{ +switch (field) { +case RTE_FLOW_FIELD_TAG : +case RTE_FLOW_FIELD_META : +return 32 ; +case RTE_FLOW_FIELD_RANDOM : +return 16 ;default :break ; } -return false; +return 0 ; } static int
@@ -6737,6 +6774,7 @@ flow_hw_validate_item_compare(const struct rte_flow_item *item, {const struct rte_flow_item_compare *comp_m = item->mask;const struct rte_flow_item_compare *comp_v = item->spec; +int ret;if (unlikely (!comp_m)) return rte_flow_error_set(error, EINVAL,
@@ -6748,19 +6786,13 @@ flow_hw_validate_item_compare(const struct rte_flow_item *item,RTE_FLOW_ERROR_TYPE_UNSPECIFIED ,NULL , "compare item only support full mask"); -if (!flow_hw_item_compare_field_supported (comp_m->a.field) || - !flow_hw_item_compare_field_supported (comp_m->b.field)) -return rte_flow_error_set (error,ENOTSUP , -RTE_FLOW_ERROR_TYPE_UNSPECIFIED , -NULL , -"compare item field not support" ); -if (comp_m->a.field ==RTE_FLOW_FIELD_VALUE && - comp_m->b.field ==RTE_FLOW_FIELD_VALUE ) -return rte_flow_error_set (error,EINVAL , -RTE_FLOW_ERROR_TYPE_UNSPECIFIED , -NULL , -"compare between value is not valid" ); + ret =flow_hw_item_compare_field_validate (comp_m->a.field, + comp_m->b.field, error); +if (ret <0 ) +return ret;if (comp_v) { +uint32_t width; +if (comp_v->operation != comp_m->operation || comp_v->a.field != comp_m->a.field || comp_v->b.field != comp_m->b.field)
@@ -6768,7 +6800,9 @@ flow_hw_validate_item_compare(const struct rte_flow_item *item,RTE_FLOW_ERROR_TYPE_UNSPECIFIED ,NULL , "compare item spec/mask not matching"); -if ((comp_v->width & comp_m->width) !=32 ) + width =flow_hw_item_compare_width_supported (comp_v->a.field); +MLX5_ASSERT (width >0 ); +if ((comp_v->width & comp_m->width) != width) return rte_flow_error_set(error, EINVAL, RTE_FLOW_ERROR_TYPE_UNSPECIFIED, NULL,
Signature · 1 line
2.25.1
v4 cover net/mlx5: add random compare support
In reply to Michael BaumAdd support for compare item with "RTE_FLOW_FIELD_RANDOM".
v2:
- Rebase.
- Add "RTE_FLOW_FIELD_META" compare support.
- Reduce the "Depends-on" list.
v3:
- Rebase.
- Fix typo in function name, r/tranlate/translate.
- Fix adding a line without newline at end of file.
v4:
- Rebase.
- Update documentation.
- Remove the "Depends-on" label.
Hamdan Igbaria (1):
net/mlx5/hws: add support for compare matcher
Michael Baum (1):
net/mlx5: add support to compare random value
doc/guides/nics/mlx5.rst | 9 +- drivers/common/mlx5/mlx5_prm.h | 16 ++ drivers/net/mlx5/hws/mlx5dr_cmd.c | 9 +- drivers/net/mlx5/hws/mlx5dr_cmd.h | 1 + drivers/net/mlx5/hws/mlx5dr_debug.c | 4 +- drivers/net/mlx5/hws/mlx5dr_debug.h | 1 + drivers/net/mlx5/hws/mlx5dr_definer.c | 243 +++++++++++++++++++++++++- drivers/net/mlx5/hws/mlx5dr_definer.h | 33 ++++ drivers/net/mlx5/hws/mlx5dr_matcher.c | 48 +++++ drivers/net/mlx5/hws/mlx5dr_matcher.h | 12 +- drivers/net/mlx5/mlx5_flow_hw.c | 70 ++++++-- 11 files changed, 417 insertions(+), 29 deletions(-)
Signature · 1 line
2.25.1
PATCH v4 1/2 net/mlx5/hws: add support for compare matcher
From: Hamdan Igbaria <[email protected]>
Add support for compare matcher, this matcher will allow direct comparison between two packet fields, or a packet field and a value, with fully masked DW.
For now this matcher hash table is limited to size 1x1, thus it supports only 1 rule STE.
--- drivers/common/mlx5/mlx5_prm.h | 16 ++ drivers/net/mlx5/hws/mlx5dr_cmd.c | 9 +- drivers/net/mlx5/hws/mlx5dr_cmd.h | 1 + drivers/net/mlx5/hws/mlx5dr_debug.c | 4 +- drivers/net/mlx5/hws/mlx5dr_debug.h | 1 + drivers/net/mlx5/hws/mlx5dr_definer.c | 243 +++++++++++++++++++++++++- drivers/net/mlx5/hws/mlx5dr_definer.h | 33 ++++ drivers/net/mlx5/hws/mlx5dr_matcher.c | 48 +++++ drivers/net/mlx5/hws/mlx5dr_matcher.h | 12 +- 9 files changed, 358 insertions(+), 9 deletions(-)
drivers/common/mlx5/mlx5_prm.h +16 -0
@@ -3459,6 +3459,7 @@ enum mlx5_ifc_rtc_ste_format {MLX5_IFC_RTC_STE_FORMAT_8DW =0x4 ,MLX5_IFC_RTC_STE_FORMAT_11DW =0x5 ,MLX5_IFC_RTC_STE_FORMAT_RANGE =0x7 , + MLX5_IFC_RTC_STE_FORMAT_4DW_RANGE = 0x8, }; enum mlx5_ifc_rtc_reparse_mode {
@@ -3497,6 +3498,21 @@ struct mlx5_ifc_rtc_bits {u8 reserved_at_1a0[0x260 ]; }; +struct mlx5_ifc_ste_match_4dw_range_ctrl_dw_bits { +u8 match[0x1 ]; +u8 reserved_at_1[0x2 ]; +u8 base1[0x1 ]; +u8 inverse1[0x1 ]; +u8 reserved_at_5[0x1 ]; +u8 operator1[0x2 ]; +u8 reserved_at_8[0x3 ]; +u8 base0[0x1 ]; +u8 inverse0[0x1 ]; +u8 reserved_at_a[0x1 ]; +u8 operator0[0x2 ]; +u8 compare_delta[0x10 ]; +}; +struct mlx5_ifc_alias_context_bits {u8 vhca_id_to_be_accessed[0x10 ];u8 reserved_at_10[0xd ];
drivers/net/mlx5/hws/mlx5dr_cmd.c +6 -3
@@ -370,9 +370,12 @@ mlx5dr_cmd_rtc_create(struct ibv_context *ctx, attr, obj_type, MLX5_GENERAL_OBJ_TYPE_RTC); attr =MLX5_ADDR_OF (create_rtc_in, in, rtc); -MLX5_SET (rtc, attr, ste_format_0, rtc_attr->is_frst_jumbo ? -MLX5_IFC_RTC_STE_FORMAT_11DW : -MLX5_IFC_RTC_STE_FORMAT_8DW ); +if (rtc_attr->is_compare) { +MLX5_SET (rtc, attr, ste_format_0,MLX5_IFC_RTC_STE_FORMAT_4DW_RANGE ); + }else { +MLX5_SET (rtc, attr, ste_format_0, rtc_attr->is_frst_jumbo ? +MLX5_IFC_RTC_STE_FORMAT_11DW :MLX5_IFC_RTC_STE_FORMAT_8DW ); + }if (rtc_attr->is_scnd_range) {MLX5_SET (rtc, attr, ste_format_1,MLX5_IFC_RTC_STE_FORMAT_RANGE );
drivers/net/mlx5/hws/mlx5dr_cmd.h +1 -0
@@ -82,6 +82,7 @@ struct mlx5dr_cmd_rtc_create_attr {uint8_t reparse_mode;bool is_frst_jumbo;bool is_scnd_range; +bool is_compare; };struct mlx5dr_cmd_alias_obj_create_attr {
drivers/net/mlx5/hws/mlx5dr_debug.c +3 -1
@@ -99,6 +99,7 @@ static int mlx5dr_debug_dump_matcher_match_template(FILE *f, struct mlx5dr_matcher *matcher) {bool is_root = matcher->tbl->level ==MLX5DR_ROOT_LEVEL ; +bool is_compare =mlx5dr_matcher_is_compare (matcher);enum mlx5dr_debug_res_type type;int i, ret;
@@ -117,7 +118,8 @@ mlx5dr_debug_dump_matcher_match_template(FILE *f, struct mlx5dr_matcher *matcherreturn rte_errno; } - type =MLX5DR_DEBUG_RES_TYPE_MATCHER_TEMPLATE_MATCH_DEFINER ; + type = is_compare ?MLX5DR_DEBUG_RES_TYPE_MATCHER_TEMPLATE_COMPARE_MATCH_DEFINER : +MLX5DR_DEBUG_RES_TYPE_MATCHER_TEMPLATE_MATCH_DEFINER ; ret =mlx5dr_debug_dump_matcher_template_definer (f, mt, mt->definer, type);if (ret)return ret;
drivers/net/mlx5/hws/mlx5dr_debug.h +1 -0
@@ -24,6 +24,7 @@ enum mlx5dr_debug_res_type {MLX5DR_DEBUG_RES_TYPE_MATCHER_ACTION_TEMPLATE =4204 ,MLX5DR_DEBUG_RES_TYPE_MATCHER_TEMPLATE_HASH_DEFINER =4205 ,MLX5DR_DEBUG_RES_TYPE_MATCHER_TEMPLATE_RANGE_DEFINER =4206 , + MLX5DR_DEBUG_RES_TYPE_MATCHER_TEMPLATE_COMPARE_MATCH_DEFINER = 4207, }; static inline uint64_t
drivers/net/mlx5/hws/mlx5dr_definer.c +239 -4
302 lines not on this page · raw message
drivers/net/mlx5/hws/mlx5dr_definer.h +33 -0
@@ -17,6 +17,37 @@#define DW_SELECTORS_RANGE 2#define BYTE_SELECTORS_RANGE 8 +enum mlx5dr_definer_compare_ste_dw_offset { +/* In compare STE the matching DW's starts after the 3 actions */ +MLX5DR_DEFINER_COMPARE_STE_ARGUMENT_1 =3 , +MLX5DR_DEFINER_COMPARE_STE_ARGUMENT_0 , +MLX5DR_DEFINER_COMPARE_STE_BASE_1 , +MLX5DR_DEFINER_COMPARE_STE_BASE_0 , +MLX5DR_DEFINER_COMPARE_STE_TAG_DW_3 , +MLX5DR_DEFINER_COMPARE_STE_TAG_DW_2 , +MLX5DR_DEFINER_COMPARE_STE_TAG_DW_1 , +MLX5DR_DEFINER_COMPARE_STE_TAG_DW_0 , +}; + +enum mlx5dr_definer_dw_selectors { +MLX5DR_DEFINER_SELECTOR_DW0 , +MLX5DR_DEFINER_SELECTOR_DW1 , +MLX5DR_DEFINER_SELECTOR_DW2 , +MLX5DR_DEFINER_SELECTOR_DW3 , +MLX5DR_DEFINER_SELECTOR_DW4 , +MLX5DR_DEFINER_SELECTOR_DW5 , +MLX5DR_DEFINER_SELECTOR_DW6 , +MLX5DR_DEFINER_SELECTOR_DW7 , +MLX5DR_DEFINER_SELECTOR_DW8 , +}; + +enum mlx5dr_definer_compare_dw_selectors { +MLX5DR_DEFINER_COMPARE_ARGUMENT_0 =MLX5DR_DEFINER_SELECTOR_DW4 , +MLX5DR_DEFINER_COMPARE_ARGUMENT_1 =MLX5DR_DEFINER_SELECTOR_DW5 , +MLX5DR_DEFINER_COMPARE_BASE_0 =MLX5DR_DEFINER_SELECTOR_DW2 , +MLX5DR_DEFINER_COMPARE_BASE_1 =MLX5DR_DEFINER_SELECTOR_DW3 , +}; +enum mlx5dr_definer_fname {MLX5DR_DEFINER_FNAME_ETH_SMAC_48_16_O ,MLX5DR_DEFINER_FNAME_ETH_SMAC_48_16_I ,
@@ -188,6 +219,8 @@ struct mlx5dr_definer_fc {uint8_t item_idx;uint8_t is_range;uint16_t extra_data; +uint8_t compare_idx; +bool compare_set_base;uint32_t byte_off;int bit_off;uint32_t bit_mask;
drivers/net/mlx5/hws/mlx5dr_matcher.c +48 -0
63 lines not on this page · raw message
drivers/net/mlx5/hws/mlx5dr_matcher.h +11 -1
@@ -26,6 +26,7 @@ enum mlx5dr_matcher_flags {MLX5DR_MATCHER_FLAGS_RANGE_DEFINER =1 <<0 ,MLX5DR_MATCHER_FLAGS_HASH_DEFINER =1 <<1 ,MLX5DR_MATCHER_FLAGS_COLLISION =1 <<2 , + MLX5DR_MATCHER_FLAGS_COMPARE = 1 << 4, }; struct mlx5dr_match_template {
@@ -89,12 +90,19 @@ mlx5dr_matcher_mt_is_range(struct mlx5dr_match_template *mt)return (!!mt->range_definer); } +static inline bool +mlx5dr_matcher_is_compare (struct mlx5dr_matcher *matcher) +{ +return !!(matcher->flags &MLX5DR_MATCHER_FLAGS_COMPARE ); +} +static inline bool mlx5dr_matcher_req_fw_wqe (struct mlx5dr_matcher *matcher) {/* Currently HWS doesn't support hash different from match or range */ return unlikely (matcher->flags & (MLX5DR_MATCHER_FLAGS_HASH_DEFINER | -MLX5DR_MATCHER_FLAGS_RANGE_DEFINER )); +MLX5DR_MATCHER_FLAGS_RANGE_DEFINER | +MLX5DR_MATCHER_FLAGS_COMPARE )); } int mlx5dr_matcher_conv_items_to_prm(uint64_t *match_buf,
@@ -120,4 +128,6 @@ int mlx5dr_matcher_free_rtc_pointing(struct mlx5dr_context *ctx,enum mlx5dr_table_type type, struct mlx5dr_devx_obj *devx_obj); +int mlx5dr_matcher_validate_compare_attr (struct mlx5dr_matcher *matcher); +#endif /* MLX5DR_MATCHER_H_ */
Signature · 1 line
2.25.1
PATCH v4 2/2 net/mlx5: add support to compare random value
In reply to Michael BaumAdd support to use "RTE_FLOW_ITEM_TYPE_COMPARE" with "RTE_FLOW_FIELD_RAMDOM" as an argument.
The random field is supported only when base is an immediate value, random field cannot be compared with enother field.
--- doc/guides/nics/mlx5.rst | 9 ++++- drivers/net/mlx5/mlx5_flow_hw.c | 70 ++++++++++++++++++++++++--------- 2 files changed, 59 insertions(+), 20 deletions(-)
doc/guides/nics/mlx5.rst +7 -2
@@ -820,8 +820,13 @@ Limitations - Only supported in HW steering(``dv_flow_en`` = 2) mode. - Only single flow is supported to the flow table. - - Only 32-bit comparison is supported. - - Only match with compare result between packet fields is supported. + - Only single item is supported per pattern template. + - Only 32-bit comparison is supported or 16-bits for random field. + - Only supported for ``RTE_FLOW_FIELD_META``, ``RTE_FLOW_FIELD_TAG``, + ``RTE_FLOW_FIELD_RANDOM`` and ``RTE_FLOW_FIELD_VALUE``. + - The field type ``RTE_FLOW_FIELD_VALUE`` must be the base (``b``) field. + - The field type ``RTE_FLOW_FIELD_RANDOM`` can only be compared with + ``RTE_FLOW_FIELD_VALUE``. Statistics
drivers/net/mlx5/mlx5_flow_hw.c +52 -18
102 lines not on this page · raw message
Signature · 1 line
2.25.1
v5 cover net/mlx5: add compare item support
In reply to Michael BaumAdd HWS support for compare item with:
- "RTE_FLOW_FIELD_TAG".
- "RTE_FLOW_FIELD_NETA".
- "RTE_FLOW_FIELD_VALUE".
Add HWS + PMD support for compare item with:
- "RTE_FLOW_FIELD_RANDOM".
- "RTE_FLOW_FIELD_ESP_SEQ_NUM".
v2:
- Rebase.
- Add "RTE_FLOW_FIELD_META" compare support.
- Reduce the "Depends-on" list.
v3:
- Rebase.
- Fix typo in function name, r/tranlate/translate.
- Fix adding a line without newline at end of file.
v4:
- Rebase.
- Update documentation.
- Remove the "Depends-on" label.
v5:
- Rebase.
- Add ESP sequence number suppoert and rename the series accordingly.
Hamdan Igbaria (1):
net/mlx5/hws: add support for compare matcher
Michael Baum (2):
net/mlx5: add support to compare random value net/mlx5/hws: add compare ESP sequence number support
doc/guides/nics/mlx5.rst | 10 +- drivers/common/mlx5/mlx5_prm.h | 16 ++ drivers/net/mlx5/hws/mlx5dr_cmd.c | 9 +- drivers/net/mlx5/hws/mlx5dr_cmd.h | 1 + drivers/net/mlx5/hws/mlx5dr_debug.c | 4 +- drivers/net/mlx5/hws/mlx5dr_debug.h | 1 + drivers/net/mlx5/hws/mlx5dr_definer.c | 261 +++++++++++++++++++++++++- drivers/net/mlx5/hws/mlx5dr_definer.h | 33 ++++ drivers/net/mlx5/hws/mlx5dr_matcher.c | 48 +++++ drivers/net/mlx5/hws/mlx5dr_matcher.h | 12 +- drivers/net/mlx5/mlx5_flow_hw.c | 73 +++++-- 11 files changed, 439 insertions(+), 29 deletions(-)
Signature · 1 line
2.25.1
PATCH v5 1/3 net/mlx5/hws: add support for compare matcher
From: Hamdan Igbaria <[email protected]>
Add support for compare matcher, this matcher will allow direct comparison between two packet fields, or a packet field and a value, with fully masked DW.
For now this matcher hash table is limited to size 1x1, thus it supports only 1 rule STE.
--- drivers/common/mlx5/mlx5_prm.h | 16 ++ drivers/net/mlx5/hws/mlx5dr_cmd.c | 9 +- drivers/net/mlx5/hws/mlx5dr_cmd.h | 1 + drivers/net/mlx5/hws/mlx5dr_debug.c | 4 +- drivers/net/mlx5/hws/mlx5dr_debug.h | 1 + drivers/net/mlx5/hws/mlx5dr_definer.c | 243 +++++++++++++++++++++++++- drivers/net/mlx5/hws/mlx5dr_definer.h | 33 ++++ drivers/net/mlx5/hws/mlx5dr_matcher.c | 48 +++++ drivers/net/mlx5/hws/mlx5dr_matcher.h | 12 +- 9 files changed, 358 insertions(+), 9 deletions(-)
drivers/common/mlx5/mlx5_prm.h +16 -0
@@ -3459,6 +3459,7 @@ enum mlx5_ifc_rtc_ste_format {MLX5_IFC_RTC_STE_FORMAT_8DW =0x4 ,MLX5_IFC_RTC_STE_FORMAT_11DW =0x5 ,MLX5_IFC_RTC_STE_FORMAT_RANGE =0x7 , + MLX5_IFC_RTC_STE_FORMAT_4DW_RANGE = 0x8, }; enum mlx5_ifc_rtc_reparse_mode {
@@ -3497,6 +3498,21 @@ struct mlx5_ifc_rtc_bits {u8 reserved_at_1a0[0x260 ]; }; +struct mlx5_ifc_ste_match_4dw_range_ctrl_dw_bits { +u8 match[0x1 ]; +u8 reserved_at_1[0x2 ]; +u8 base1[0x1 ]; +u8 inverse1[0x1 ]; +u8 reserved_at_5[0x1 ]; +u8 operator1[0x2 ]; +u8 reserved_at_8[0x3 ]; +u8 base0[0x1 ]; +u8 inverse0[0x1 ]; +u8 reserved_at_a[0x1 ]; +u8 operator0[0x2 ]; +u8 compare_delta[0x10 ]; +}; +struct mlx5_ifc_alias_context_bits {u8 vhca_id_to_be_accessed[0x10 ];u8 reserved_at_10[0xd ];
drivers/net/mlx5/hws/mlx5dr_cmd.c +6 -3
@@ -370,9 +370,12 @@ mlx5dr_cmd_rtc_create(struct ibv_context *ctx, attr, obj_type, MLX5_GENERAL_OBJ_TYPE_RTC); attr =MLX5_ADDR_OF (create_rtc_in, in, rtc); -MLX5_SET (rtc, attr, ste_format_0, rtc_attr->is_frst_jumbo ? -MLX5_IFC_RTC_STE_FORMAT_11DW : -MLX5_IFC_RTC_STE_FORMAT_8DW ); +if (rtc_attr->is_compare) { +MLX5_SET (rtc, attr, ste_format_0,MLX5_IFC_RTC_STE_FORMAT_4DW_RANGE ); + }else { +MLX5_SET (rtc, attr, ste_format_0, rtc_attr->is_frst_jumbo ? +MLX5_IFC_RTC_STE_FORMAT_11DW :MLX5_IFC_RTC_STE_FORMAT_8DW ); + }if (rtc_attr->is_scnd_range) {MLX5_SET (rtc, attr, ste_format_1,MLX5_IFC_RTC_STE_FORMAT_RANGE );
drivers/net/mlx5/hws/mlx5dr_cmd.h +1 -0
@@ -82,6 +82,7 @@ struct mlx5dr_cmd_rtc_create_attr {uint8_t reparse_mode;bool is_frst_jumbo;bool is_scnd_range; +bool is_compare; };struct mlx5dr_cmd_alias_obj_create_attr {
drivers/net/mlx5/hws/mlx5dr_debug.c +3 -1
@@ -99,6 +99,7 @@ static int mlx5dr_debug_dump_matcher_match_template(FILE *f, struct mlx5dr_matcher *matcher) {bool is_root = matcher->tbl->level ==MLX5DR_ROOT_LEVEL ; +bool is_compare =mlx5dr_matcher_is_compare (matcher);enum mlx5dr_debug_res_type type;int i, ret;
@@ -117,7 +118,8 @@ mlx5dr_debug_dump_matcher_match_template(FILE *f, struct mlx5dr_matcher *matcherreturn rte_errno; } - type =MLX5DR_DEBUG_RES_TYPE_MATCHER_TEMPLATE_MATCH_DEFINER ; + type = is_compare ?MLX5DR_DEBUG_RES_TYPE_MATCHER_TEMPLATE_COMPARE_MATCH_DEFINER : +MLX5DR_DEBUG_RES_TYPE_MATCHER_TEMPLATE_MATCH_DEFINER ; ret =mlx5dr_debug_dump_matcher_template_definer (f, mt, mt->definer, type);if (ret)return ret;
drivers/net/mlx5/hws/mlx5dr_debug.h +1 -0
@@ -24,6 +24,7 @@ enum mlx5dr_debug_res_type {MLX5DR_DEBUG_RES_TYPE_MATCHER_ACTION_TEMPLATE =4204 ,MLX5DR_DEBUG_RES_TYPE_MATCHER_TEMPLATE_HASH_DEFINER =4205 ,MLX5DR_DEBUG_RES_TYPE_MATCHER_TEMPLATE_RANGE_DEFINER =4206 , + MLX5DR_DEBUG_RES_TYPE_MATCHER_TEMPLATE_COMPARE_MATCH_DEFINER = 4207, }; static inline uint64_t
drivers/net/mlx5/hws/mlx5dr_definer.c +239 -4
302 lines not on this page · raw message
drivers/net/mlx5/hws/mlx5dr_definer.h +33 -0
@@ -17,6 +17,37 @@#define DW_SELECTORS_RANGE 2#define BYTE_SELECTORS_RANGE 8 +enum mlx5dr_definer_compare_ste_dw_offset { +/* In compare STE the matching DW's starts after the 3 actions */ +MLX5DR_DEFINER_COMPARE_STE_ARGUMENT_1 =3 , +MLX5DR_DEFINER_COMPARE_STE_ARGUMENT_0 , +MLX5DR_DEFINER_COMPARE_STE_BASE_1 , +MLX5DR_DEFINER_COMPARE_STE_BASE_0 , +MLX5DR_DEFINER_COMPARE_STE_TAG_DW_3 , +MLX5DR_DEFINER_COMPARE_STE_TAG_DW_2 , +MLX5DR_DEFINER_COMPARE_STE_TAG_DW_1 , +MLX5DR_DEFINER_COMPARE_STE_TAG_DW_0 , +}; + +enum mlx5dr_definer_dw_selectors { +MLX5DR_DEFINER_SELECTOR_DW0 , +MLX5DR_DEFINER_SELECTOR_DW1 , +MLX5DR_DEFINER_SELECTOR_DW2 , +MLX5DR_DEFINER_SELECTOR_DW3 , +MLX5DR_DEFINER_SELECTOR_DW4 , +MLX5DR_DEFINER_SELECTOR_DW5 , +MLX5DR_DEFINER_SELECTOR_DW6 , +MLX5DR_DEFINER_SELECTOR_DW7 , +MLX5DR_DEFINER_SELECTOR_DW8 , +}; + +enum mlx5dr_definer_compare_dw_selectors { +MLX5DR_DEFINER_COMPARE_ARGUMENT_0 =MLX5DR_DEFINER_SELECTOR_DW4 , +MLX5DR_DEFINER_COMPARE_ARGUMENT_1 =MLX5DR_DEFINER_SELECTOR_DW5 , +MLX5DR_DEFINER_COMPARE_BASE_0 =MLX5DR_DEFINER_SELECTOR_DW2 , +MLX5DR_DEFINER_COMPARE_BASE_1 =MLX5DR_DEFINER_SELECTOR_DW3 , +}; +enum mlx5dr_definer_fname {MLX5DR_DEFINER_FNAME_ETH_SMAC_48_16_O ,MLX5DR_DEFINER_FNAME_ETH_SMAC_48_16_I ,
@@ -188,6 +219,8 @@ struct mlx5dr_definer_fc {uint8_t item_idx;uint8_t is_range;uint16_t extra_data; +uint8_t compare_idx; +bool compare_set_base;uint32_t byte_off;int bit_off;uint32_t bit_mask;
drivers/net/mlx5/hws/mlx5dr_matcher.c +48 -0
63 lines not on this page · raw message
drivers/net/mlx5/hws/mlx5dr_matcher.h +11 -1
@@ -26,6 +26,7 @@ enum mlx5dr_matcher_flags {MLX5DR_MATCHER_FLAGS_RANGE_DEFINER =1 <<0 ,MLX5DR_MATCHER_FLAGS_HASH_DEFINER =1 <<1 ,MLX5DR_MATCHER_FLAGS_COLLISION =1 <<2 , + MLX5DR_MATCHER_FLAGS_COMPARE = 1 << 4, }; struct mlx5dr_match_template {
@@ -89,12 +90,19 @@ mlx5dr_matcher_mt_is_range(struct mlx5dr_match_template *mt)return (!!mt->range_definer); } +static inline bool +mlx5dr_matcher_is_compare (struct mlx5dr_matcher *matcher) +{ +return !!(matcher->flags &MLX5DR_MATCHER_FLAGS_COMPARE ); +} +static inline bool mlx5dr_matcher_req_fw_wqe (struct mlx5dr_matcher *matcher) {/* Currently HWS doesn't support hash different from match or range */ return unlikely (matcher->flags & (MLX5DR_MATCHER_FLAGS_HASH_DEFINER | -MLX5DR_MATCHER_FLAGS_RANGE_DEFINER )); +MLX5DR_MATCHER_FLAGS_RANGE_DEFINER | +MLX5DR_MATCHER_FLAGS_COMPARE )); } int mlx5dr_matcher_conv_items_to_prm(uint64_t *match_buf,
@@ -120,4 +128,6 @@ int mlx5dr_matcher_free_rtc_pointing(struct mlx5dr_context *ctx,enum mlx5dr_table_type type, struct mlx5dr_devx_obj *devx_obj); +int mlx5dr_matcher_validate_compare_attr (struct mlx5dr_matcher *matcher); +#endif /* MLX5DR_MATCHER_H_ */
Signature · 1 line
2.25.1
RE: [PATCH v5 1/3] net/mlx5/hws: add support for compare matcher
Quoted 14 lines
-----Original Message-----
From: Michael Baum <[email protected]>
Sent: Wednesday, February 14, 2024 3:30 PM
To: [email protected]
Cc: Matan Azrad <[email protected]>; Dariusz Sosnowski <[email protected]>; Raslan Darawsheh <[email protected]>; Slava Ovsiienko <[email protected]>; Ori Kam <[email protected]>; Suanming Mou <[email protected]>; Hamdan Igbaria <[email protected]>
Subject: [PATCH v5 1/3]net/mlx5/hws: add support for compare matcherFrom: Hamdan Igbaria <[email protected]>
Quoted 7 lines
Add support for compare matcher, this matcher will allow direct comparison between two packet fields, or a packet field and a value, with fully masked DW. For now this matcher hash table is limited to size 1x1, thus it supports only 1 rule STE.
Signed-off-by Hamdan Igbaria <[email protected]>Signed-off-by Michael Baum <[email protected]>
Quoted 649 lines
--- drivers/common/mlx5/mlx5_prm.h | 16 ++ drivers/net/mlx5/hws/mlx5dr_cmd.c | 9 +- drivers/net/mlx5/hws/mlx5dr_cmd.h | 1 + drivers/net/mlx5/hws/mlx5dr_debug.c | 4 +- drivers/net/mlx5/hws/mlx5dr_debug.h | 1 + drivers/net/mlx5/hws/mlx5dr_definer.c | 243 +++++++++++++++++++++++++- drivers/net/mlx5/hws/mlx5dr_definer.h | 33 ++++ drivers/net/mlx5/hws/mlx5dr_matcher.c | 48 +++++ drivers/net/mlx5/hws/mlx5dr_matcher.h | 12 +- 9 files changed, 358 insertions(+), 9 deletions(-)(quoted diff) +0
-0
b/drivers/common/mlx5/mlx5_prm.hindex0035a1e616..f8956c8a87100644drivers/common/mlx5/mlx5_prm.h +16
-0@@ -3459,6 +3459,7 @@ enum mlx5_ifc_rtc_ste_format {MLX5_IFC_RTC_STE_FORMAT_8DW =0x4 ,MLX5_IFC_RTC_STE_FORMAT_11DW =0x5 ,MLX5_IFC_RTC_STE_FORMAT_RANGE =0x7 , + MLX5_IFC_RTC_STE_FORMAT_4DW_RANGE = 0x8, }; enum mlx5_ifc_rtc_reparse_mode {@@ -3497,6 +3498,21 @@ struct mlx5_ifc_rtc_bits {u8 reserved_at_1a0[0x260 ]; }; +struct mlx5_ifc_ste_match_4dw_range_ctrl_dw_bits { +u8 match[0x1 ]; +u8 reserved_at_1[0x2 ]; +u8 base1[0x1 ]; +u8 inverse1[0x1 ]; +u8 reserved_at_5[0x1 ]; +u8 operator1[0x2 ]; +u8 reserved_at_8[0x3 ]; +u8 base0[0x1 ]; +u8 inverse0[0x1 ]; +u8 reserved_at_a[0x1 ]; +u8 operator0[0x2 ]; +u8 compare_delta[0x10 ]; +}; +struct mlx5_ifc_alias_context_bits {u8 vhca_id_to_be_accessed[0x10 ];u8 reserved_at_10[0xd ];drivers/net/mlx5/hws/mlx5dr_cmd.c +6
-3@@ -370,9 +370,12 @@ mlx5dr_cmd_rtc_create(struct ibv_context *ctx, attr, obj_type, MLX5_GENERAL_OBJ_TYPE_RTC); attr =MLX5_ADDR_OF (create_rtc_in, in, rtc); -MLX5_SET (rtc, attr, ste_format_0, rtc_attr->is_frst_jumbo ? -MLX5_IFC_RTC_STE_FORMAT_11DW : -MLX5_IFC_RTC_STE_FORMAT_8DW ); +if (rtc_attr->is_compare) { +MLX5_SET (rtc, attr, ste_format_0,MLX5_IFC_RTC_STE_FORMAT_4DW_RANGE ); + }else { +MLX5_SET (rtc, attr, ste_format_0, rtc_attr->is_frst_jumbo ? +MLX5_IFC_RTC_STE_FORMAT_11DW :MLX5_IFC_RTC_STE_FORMAT_8DW ); + }drivers/net/mlx5/hws/mlx5dr_cmd.c +0
-0if (rtc_attr->is_scnd_range) { MLX5_SET(rtc, attr, ste_format_1,
MLX5_IFC_RTC_STE_FORMAT_RANGE); diff --gita/drivers/net/mlx5/hws/mlx5dr_cmd.hb/drivers/net/mlx5/hws/mlx5dr_cmd.hindex18c2b07fc8..073ffd9633100644drivers/net/mlx5/hws/mlx5dr_cmd.h +1
-0@@ -82,6 +82,7 @@ struct mlx5dr_cmd_rtc_create_attr {uint8_t reparse_mode;bool is_frst_jumbo;bool is_scnd_range; +bool is_compare; }; struct mlx5dr_cmd_alias_obj_create_attr { diff --git
a/drivers/net/mlx5/hws/mlx5dr_debug.cb/drivers/net/mlx5/hws/mlx5dr_debug.c
index11557bcab8..a9094cd35b100644drivers/net/mlx5/hws/mlx5dr_debug.c +1
-0@@ -99,6 +99,7 @@ static int mlx5dr_debug_dump_matcher_match_template(FILE *f, struct mlx5dr_matcher *matcher) {bool is_root = matcher->tbl->level ==MLX5DR_ROOT_LEVEL ; +bool is_compare =mlx5dr_matcher_is_compare (matcher);enum mlx5dr_debug_res_type type;int i, ret;@@ -117,7 +118,8 @@ mlx5dr_debug_dump_matcher_match_template(FILE *f,struct
mlx5dr_matcher*matcherdrivers/net/mlx5/hws/mlx5dr_debug.c +0
-1return rte_errno; } - type =
MLX5DR_DEBUG_RES_TYPE_MATCHER_TEMPLATE_MATCH_DEFINER;drivers/net/mlx5/hws/mlx5dr_debug.c +1
-0+ type = is_compare ?
MLX5DR_DEBUG_RES_TYPE_MATCHER_TEMPLATE_COMPARE_MATCH_DEFINE
R :
+MLX5DR_DEBUG_RES_TYPE_MATCHER_TEMPLATE_MATCH_DEFINER;
ret = mlx5dr_debug_dump_matcher_template_definer(f, mt, mt-Quoted 1 line
definer, type);
drivers/net/mlx5/hws/mlx5dr_debug.c +0
-0if (ret)return ret;drivers/net/mlx5/hws/mlx5dr_debug.h +1
-0@@ -24,6 +24,7 @@ enum mlx5dr_debug_res_type {MLX5DR_DEBUG_RES_TYPE_MATCHER_ACTION_TEMPLATE =4204 ,MLX5DR_DEBUG_RES_TYPE_MATCHER_TEMPLATE_HASH_DEFINER =4205 ,MLX5DR_DEBUG_RES_TYPE_MATCHER_TEMPLATE_RANGE_DEFINER =4206 , +MLX5DR_DEBUG_RES_TYPE_MATCHER_TEMPLATE_COMPARE_MATCH_ DEFINER = 4207,
};static inline
uint64_tdrivers/net/mlx5/hws/mlx5dr_definer.c +74
-0@@ -383,6 +383,86 @@ mlx5dr_definer_ptype_frag_set(struct mlx5dr_definer_fc *fc,DR_SET (tag, !!packet_type, fc->byte_off, fc->bit_off, fc->bit_mask); } +static void +mlx5dr_definer_compare_base_value_set (const void *item_spec, +uint8_t *tag) +{ +uint32_t *ctrl = &(((uint32_t *)tag)[MLX5DR_DEFINER_COMPARE_STE_ARGUMENT_1 ]); +uint32_t *base = &(((uint32_t *)tag)[MLX5DR_DEFINER_COMPARE_STE_BASE_0 ]); +const struct rte_flow_item_compare *v = item_spec; +const struct rte_flow_field_data *a = &v->a; +const struct rte_flow_field_data *b = &v->b; +const uint32_t *value; + + value = (const uint32_t *)&b->value[0 ]; + +if (a->field ==RTE_FLOW_FIELD_RANDOM ) + *base =htobe32 (*value <<16 ); +else + *base =htobe32 (*value); + +MLX5_SET (ste_match_4dw_range_ctrl_dw, ctrl, base0,1 ); } + +static void +mlx5dr_definer_compare_op_translate (enum rte_flow_item_compare_op op, +uint8_t *tag) +{ +uint32_t *ctrl = &(((uint32_t *)tag)[MLX5DR_DEFINER_COMPARE_STE_ARGUMENT_1 ]); +uint8_t operator =0 ; +uint8_t inverse =0 ; + +switch (op) { +case RTE_FLOW_ITEM_COMPARE_EQ : + operator =2 ; +break ; +case RTE_FLOW_ITEM_COMPARE_NE : + operator =2 ; + inverse =1 ; +break ; +case RTE_FLOW_ITEM_COMPARE_LT : + inverse =1 ; +break ; +case RTE_FLOW_ITEM_COMPARE_LE : + operator =1 ; +break ; +case RTE_FLOW_ITEM_COMPARE_GT : + operator =1 ; + inverse =1 ; +break ; +case RTE_FLOW_ITEM_COMPARE_GE : +break ; +default : +DR_LOG (ERR ,"Invalid operation type %d" , op); +assert (false); + } + +MLX5_SET (ste_match_4dw_range_ctrl_dw, ctrl, inverse0, inverse); +MLX5_SET (ste_match_4dw_range_ctrl_dw, ctrl, operator0, operator); } + +static void +mlx5dr_definer_compare_arg_set (const void *item_spec, +uint8_t *tag) +{ +const struct rte_flow_item_compare *v = item_spec; +enum rte_flow_item_compare_op op = v->operation; + +mlx5dr_definer_compare_op_translate (op, tag); } + +static void +mlx5dr_definer_compare_set (struct mlx5dr_definer_fc *fc, +const void *item_spec, +uint8_t *tag) +{ +if (fc->compare_idx ==MLX5DR_DEFINER_COMPARE_ARGUMENT_0 ) { +mlx5dr_definer_compare_arg_set (item_spec, tag); +if (fc->compare_set_base) + mlx5dr_definer_compare_base_value_set(item_spec,tag);
drivers/net/mlx5/hws/mlx5dr_definer.c +104
-0+ } +} + static void mlx5dr_definer_integrity_set(struct mlx5dr_definer_fc *fc, const void *item_spec,@@ -2739,10 +2819,124 @@ mlx5dr_definer_conv_item_vxlan_gpe(structmlx5dr_definer_conv_data *cd, return 0; } +static int +mlx5dr_definer_conv_item_compare_field (const struct rte_flow_field_data *f, +const struct rte_flow_field_data *other_f, +struct mlx5dr_definer_conv_data *cd, +int item_idx, +enum mlx5dr_definer_compare_dw_selectors dw_offset) { +struct mlx5dr_definer_fc *fc =NULL ; +int reg; + +if (f->offset) { +DR_LOG (ERR ,"field offset %u is not supported, only offset zero supported", + f->offset); + goto err_notsup; + } + +switch (f->field) { +case RTE_FLOW_FIELD_META : + reg =flow_hw_get_reg_id_from_ctx (cd->ctx, +RTE_FLOW_ITEM_TYPE_META ,-1 ); +if (reg <=0 ) { +DR_LOG (ERR ,"Invalid register for compare metadata field"); + rte_errno =EINVAL ; +return rte_errno; + } + + fc =mlx5dr_definer_get_register_fc (cd, reg); +if (!fc) +return rte_errno; + + fc->item_idx = item_idx; + fc->tag_set = &mlx5dr_definer_compare_set; + fc->tag_mask_set = &mlx5dr_definer_ones_set; + fc->compare_idx = dw_offset; +break ; +case RTE_FLOW_FIELD_TAG : + reg =flow_hw_get_reg_id_from_ctx (cd->ctx, +RTE_FLOW_ITEM_TYPE_TAG , + f->tag_index); +if (reg <=0 ) { +DR_LOG (ERR ,"Invalid register for compare tag field" ); + rte_errno =EINVAL ; +return rte_errno; + } + + fc =mlx5dr_definer_get_register_fc (cd, reg); +if (!fc) +return rte_errno; + + fc->item_idx = item_idx; + fc->tag_set = &mlx5dr_definer_compare_set; + fc->tag_mask_set = &mlx5dr_definer_ones_set; + fc->compare_idx = dw_offset; +break ; +case RTE_FLOW_FIELD_VALUE : +if (dw_offset ==MLX5DR_DEFINER_COMPARE_ARGUMENT_0 ) { + DR_LOG(ERR, "Argument field does not support immediate value"); + goto err_notsup; + } +break ; +case RTE_FLOW_FIELD_RANDOM : + fc = &cd->fc[MLX5DR_DEFINER_FNAME_RANDOM_NUM ]; + fc->item_idx = item_idx; + fc->tag_set = &mlx5dr_definer_compare_set; + fc->tag_mask_set = &mlx5dr_definer_ones_set; + fc->compare_idx = dw_offset; +DR_CALC_SET_HDR (fc, random_number, random_number); +break ; +default : +DR_LOG (ERR ,"%u field is not supported" , f->field); + goto err_notsup; + } + +if (fc && other_f && other_f->field ==RTE_FLOW_FIELD_VALUE ) + fc->compare_set_base = true; + +return 0 ; + +err_notsup: + rte_errno =ENOTSUP ; +return rte_errno; +} + +static int +mlx5dr_definer_conv_item_compare (struct mlx5dr_definer_conv_data *cd, +struct rte_flow_item *item, +int item_idx) +{ +const struct rte_flow_item_compare *m = item->mask; +const struct rte_flow_field_data *a = &m->a; +const struct rte_flow_field_data *b = &m->b; +int ret; + +if (m->width !=0xffffffff ) { + DR_LOG(ERR, "compare item width of 0x%x is not supported, only full DW supported", + m->width); + rte_errno =ENOTSUP ; +return rte_errno; + } + + ret = mlx5dr_definer_conv_item_compare_field(a, b, cd, item_idx, +
MLX5DR_DEFINER_COMPARE_ARGUMENT_0);drivers/net/mlx5/hws/mlx5dr_definer.c +5
-0+if (ret) +return ret; + + ret = mlx5dr_definer_conv_item_compare_field(b, NULL, cd, item_idx, +
MLX5DR_DEFINER_COMPARE_BASE_0);drivers/net/mlx5/hws/mlx5dr_definer.c +8
-1+if (ret) +return ret; + +return 0 ; +} +static int mlx5dr_definer_conv_items_to_hl (struct mlx5dr_context *ctx,struct mlx5dr_match_template *mt, -uint8_t *hl) +uint8_t *hl, +struct mlx5dr_matcher *matcher) {struct mlx5dr_definer_fc fc[MLX5DR_DEFINER_FNAME_MAX ] = {{0 }}; struct mlx5dr_definer_conv_data cd = {0}; @@ -2762,6 +2956,11 @@mlx5dr_definer_conv_items_to_hl(struct
mlx5dr_context*ctx,drivers/net/mlx5/hws/mlx5dr_definer.c +2
-0if (ret)return ret; +if (mlx5dr_matcher_is_compare (matcher)) { + DR_LOG(ERR, "Compare matcher not supported formore than one item");
drivers/net/mlx5/hws/mlx5dr_definer.c +3
-1+ goto not_supp; + } +switch ((int )items->type) {case RTE_FLOW_ITEM_TYPE_ETH : ret = mlx5dr_definer_conv_item_eth(&cd, items, i); @@ -2907,10 +3106,18 @@ mlx5dr_definer_conv_items_to_hl(struct mlx5dr_context*ctx,
ret = mlx5dr_definer_conv_item_vxlan_gpe(&cd, items,
i);drivers/net/mlx5/hws/mlx5dr_definer.c +3
-0item_flags |=MLX5_FLOW_LAYER_VXLAN_GPE ;break ; +case RTE_FLOW_ITEM_TYPE_COMPARE : +if (i) { + DR_LOG(ERR, "Compare matcher not supportedfor more than one item");
drivers/net/mlx5/hws/mlx5dr_definer.c +3
-0+ goto not_supp; + } + ret = mlx5dr_definer_conv_item_compare(&cd, items,i);
drivers/net/mlx5/hws/mlx5dr_definer.c +2
-0+ item_flags |=MLX5_FLOW_ITEM_COMPARE ; + matcher->flags |=
MLX5DR_MATCHER_FLAGS_COMPARE;drivers/net/mlx5/hws/mlx5dr_definer.c +1
-0+break ;default : DR_LOG(ERR, "Unsupported item type %d", items-Quoted 1 line
type);
drivers/net/mlx5/hws/mlx5dr_definer.c +5
-2- rte_errno =ENOTSUP ; -return rte_errno; + goto not_supp; } cd.last_item = items->type;@@ -2931,6 +3138,10 @@ mlx5dr_definer_conv_items_to_hl(struct mlx5dr_context *ctx, }return 0 ; + +not_supp: + rte_errno =ENOTSUP ; +return rte_errno; }static int
drivers/net/mlx5/hws/mlx5dr_definer.c +25
-1@@ -3318,6 +3529,7 @@ mlx5dr_definer_calc_layout(struct mlx5dr_matcher *matcher, {struct mlx5dr_context *ctx = matcher->tbl->ctx;struct mlx5dr_match_template *mt = matcher->mt; +struct mlx5dr_definer_fc *fc;uint8_t *match_hl;int i, ret;@@ -3335,13 +3547,35 @@ mlx5dr_definer_calc_layout(struct mlx5dr_matcher*matcher, * and allocate the match and range field copy array (fc & fcr). */ for (i =0 ; i < matcher->num_of_mt; i++) { - ret =mlx5dr_definer_conv_items_to_hl (ctx, &mt[i], match_hl); + ret =mlx5dr_definer_conv_items_to_hl (ctx, &mt[i], match_hl, +matcher);if (ret) {DR_LOG (ERR ,"Failed to convert items to header layout"); goto free_fc; } } +if (mlx5dr_matcher_is_compare (matcher)) { + ret =mlx5dr_matcher_validate_compare_attr (matcher); +if (ret) + goto free_fc; + +/* Due some HW limitation need to fill unused +* DW's 0-5 and byte selectors with 0xff. +*/ +for (i =0 ; i <DW_SELECTORS_MATCH ; i++) + match_definer->dw_selector[i] =0xff ; + +for (i =0 ; i <BYTE_SELECTORS ; i++) + match_definer->byte_selector[i] =0xff ; + +for (i =0 ; i < mt[0 ].fc_sz; i++) { + fc = &mt[0 ].fc[i]; + match_definer->dw_selector[fc->compare_idx] = fc- >byte_off / DW_SIZE; + } + + goto out; + } +/* Find the match definer layout for header layout match union */ ret = mlx5dr_definer_find_best_match_fit(ctx, match_definer,
match_hl);drivers/net/mlx5/hws/mlx5dr_definer.c +1
-0if (ret) {@@ -3356,6 +3590,7 @@ mlx5dr_definer_calc_layout(struct mlx5dr_matcher *matcher, goto free_fc; } +out:simple_free (match_hl);return 0 ;drivers/net/mlx5/hws/mlx5dr_definer.h +29
-0@@ -17,6 +17,37 @@#define DW_SELECTORS_RANGE 2#define BYTE_SELECTORS_RANGE 8 +enum mlx5dr_definer_compare_ste_dw_offset { +/* In compare STE the matching DW's starts after the 3 actions */ +MLX5DR_DEFINER_COMPARE_STE_ARGUMENT_1 =3 , +MLX5DR_DEFINER_COMPARE_STE_ARGUMENT_0 , +MLX5DR_DEFINER_COMPARE_STE_BASE_1 , +MLX5DR_DEFINER_COMPARE_STE_BASE_0 , +MLX5DR_DEFINER_COMPARE_STE_TAG_DW_3 , +MLX5DR_DEFINER_COMPARE_STE_TAG_DW_2 , +MLX5DR_DEFINER_COMPARE_STE_TAG_DW_1 , +MLX5DR_DEFINER_COMPARE_STE_TAG_DW_0 , +}; + +enum mlx5dr_definer_dw_selectors { +MLX5DR_DEFINER_SELECTOR_DW0 , +MLX5DR_DEFINER_SELECTOR_DW1 , +MLX5DR_DEFINER_SELECTOR_DW2 , +MLX5DR_DEFINER_SELECTOR_DW3 , +MLX5DR_DEFINER_SELECTOR_DW4 , +MLX5DR_DEFINER_SELECTOR_DW5 , +MLX5DR_DEFINER_SELECTOR_DW6 , +MLX5DR_DEFINER_SELECTOR_DW7 , +MLX5DR_DEFINER_SELECTOR_DW8 , +}; + +enum mlx5dr_definer_compare_dw_selectors { +MLX5DR_DEFINER_COMPARE_ARGUMENT_0 =MLX5DR_DEFINER_SELECTOR_DW4 , +MLX5DR_DEFINER_COMPARE_ARGUMENT_1 =MLX5DR_DEFINER_SELECTOR_DW5 , +MLX5DR_DEFINER_COMPARE_BASE_0 =MLX5DR_DEFINER_SELECTOR_DW2 , + MLX5DR_DEFINER_COMPARE_BASE_1 =
MLX5DR_DEFINER_SELECTOR_DW3, };drivers/net/mlx5/hws/mlx5dr_definer.h +3
-0+enum mlx5dr_definer_fname {MLX5DR_DEFINER_FNAME_ETH_SMAC_48_16_O ,MLX5DR_DEFINER_FNAME_ETH_SMAC_48_16_I ,@@ -188,6 +219,8 @@ struct mlx5dr_definer_fc {uint8_t item_idx;uint8_t is_range;uint16_t extra_data; +uint8_t compare_idx; +bool compare_set_base;uint32_t byte_off;int bit_off;uint32_t bit_mask;drivers/net/mlx5/hws/mlx5dr_matcher.c +1
-0@@ -485,6 +485,7 @@ static int mlx5dr_matcher_create_rtc(struct mlx5dr_matcher *matcher, rtc_attr.log_depth = attr->table.sz_col_log; rtc_attr.is_frst_jumbo =mlx5dr_matcher_mt_is_jumbo (mt); rtc_attr.is_scnd_range =mlx5dr_matcher_mt_is_range (mt); + rtc_attr.is_compare =mlx5dr_matcher_is_compare (matcher); rtc_attr.miss_ft_id = matcher->end_ft->id;if (
attr->insert_mode==MLX5DR_MATCHER_INSERT_BY_HASH)
{ @@ -497,6 +498,10 @@ static int mlx5dr_matcher_create_rtc(structmlx5dr_matcher*matcher,drivers/net/mlx5/hws/mlx5dr_matcher.c +0
-0rtc_attr.num_hash_definer =1 ; rtc_attr.match_definer_0 = mlx5dr_definer_get_id(matcher-Quoted 1 line
hash_definer);drivers/net/mlx5/hws/mlx5dr_matcher.c +2
-0+ }else if (mlx5dr_matcher_is_compare (matcher)) { + rtc_attr.match_definer_0 = ctx->caps-Quoted 1 line
trivial_match_definer;drivers/net/mlx5/hws/mlx5dr_matcher.c +2
-0+ rtc_attr.fw_gen_wqe = true; + rtc_attr.num_hash_definer =1 ; }else {/* The first mt is used since all share the same definer */
rtc_attr.match_definer_0 =mlx5dr_definer_get_id(mt->definer);drivers/net/mlx5/hws/mlx5dr_matcher.c +8
-0@@ -1452,3 +1457,46 @@ int mlx5dr_match_template_destroy(struct mlx5dr_match_template *mt)simple_free (mt );return 0 ; } + +int mlx5dr_matcher_validate_compare_attr (struct mlx5dr_matcher +*matcher) { +struct mlx5dr_cmd_query_caps *caps = matcher->tbl->ctx->caps; +struct mlx5dr_matcher_attr *attr = &matcher->attr; + +if (mlx5dr_table_is_root (matcher->tbl)) { + DR_LOG(ERR, "Compare matcher is not supported for roottables");
drivers/net/mlx5/hws/mlx5dr_matcher.c +5
-0+ goto err; + } + +if (attr->mode !=MLX5DR_MATCHER_RESOURCE_MODE_HTABLE ) { + DR_LOG(ERR, "Compare matcher is only supported with pre-defined table size");
drivers/net/mlx5/hws/mlx5dr_matcher.c +5
-0+ goto err; + } + +if (attr->insert_mode !=MLX5DR_MATCHER_INSERT_BY_HASH || + attr->distribute_mode !=
MLX5DR_MATCHER_DISTRIBUTE_BY_HASH) {drivers/net/mlx5/hws/mlx5dr_matcher.c +1
-0+ DR_LOG(ERR, "Gen WQE for compare matcher must be insertedand distribute by hash");
drivers/net/mlx5/hws/mlx5dr_matcher.c +5
-0+ goto err; + } + +if (matcher->num_of_mt !=1 || matcher->num_of_at !=1 ) { + DR_LOG(ERR, "Compare matcher match templates and actiontemplates must be 1 for each");
drivers/net/mlx5/hws/mlx5dr_matcher.c +9
-0+ goto err; + } + +if (attr->table.sz_col_log || attr->table.sz_row_log) { +DR_LOG (ERR ,"Compare matcher supports only 1x1 table size" ); + goto err; + } + + if (!IS_BIT_SET(caps->supp_ste_format_gen_wqe,
MLX5_IFC_RTC_STE_FORMAT_4DW_RANGE)) {drivers/net/mlx5/hws/mlx5dr_matcher.c +1
-0+ DR_LOG(ERR, "Gen WQE Compare match format notsupported");
drivers/net/mlx5/hws/mlx5dr_matcher.c +9
-0+ goto err; + } + +return 0 ; + +err: + rte_errno =ENOTSUP ; +return rte_errno; +}drivers/net/mlx5/hws/mlx5dr_matcher.h +11
-2@@ -26,6 +26,7 @@ enum mlx5dr_matcher_flags {MLX5DR_MATCHER_FLAGS_RANGE_DEFINER =1 <<0 ,MLX5DR_MATCHER_FLAGS_HASH_DEFINER =1 <<1 ,MLX5DR_MATCHER_FLAGS_COLLISION =1 <<2 , + MLX5DR_MATCHER_FLAGS_COMPARE = 1 << 4, }; struct mlx5dr_match_template {@@ -89,12 +90,19 @@ mlx5dr_matcher_mt_is_range(struct mlx5dr_match_template *mt)return (!!mt->range_definer); } +static inline bool +mlx5dr_matcher_is_compare (struct mlx5dr_matcher *matcher) { +return !!(matcher->flags &MLX5DR_MATCHER_FLAGS_COMPARE ); } +static inline bool mlx5dr_matcher_req_fw_wqe (struct mlx5dr_matcher *matcher) {/* Currently HWS doesn't support hash different from match or range */ return unlikely (matcher->flags & (MLX5DR_MATCHER_FLAGS_HASH_DEFINER | -MLX5DR_MATCHER_FLAGS_RANGE_DEFINER )); +MLX5DR_MATCHER_FLAGS_RANGE_DEFINER | +MLX5DR_MATCHER_FLAGS_COMPARE )); } int mlx5dr_matcher_conv_items_to_prm(uint64_t *match_buf, @@ -120,4 +128,6 @@ int mlx5dr_matcher_free_rtc_pointing(struct mlx5dr_context *ctx,enum mlx5dr_table_type type, struct mlx5dr_devx_obj *devx_obj); +int mlx5dr_matcher_validate_compare_attr (struct mlx5dr_matcher +*matcher); +#endif /* MLX5DR_MATCHER_H_ */ --2.25.1
PATCH v5 2/3 net/mlx5: add support to compare random value
In reply to Michael BaumAdd support to use "RTE_FLOW_ITEM_TYPE_COMPARE" with "RTE_FLOW_FIELD_RAMDOM" as an argument.
The random field is supported only when base is an immediate value, random field cannot be compared with enother field.
--- doc/guides/nics/mlx5.rst | 9 ++++- drivers/net/mlx5/mlx5_flow_hw.c | 70 ++++++++++++++++++++++++--------- 2 files changed, 59 insertions(+), 20 deletions(-)
doc/guides/nics/mlx5.rst +7 -2
@@ -820,8 +820,13 @@ Limitations - Only supported in HW steering(``dv_flow_en`` = 2) mode. - Only single flow is supported to the flow table. - - Only 32-bit comparison is supported. - - Only match with compare result between packet fields is supported. + - Only single item is supported per pattern template. + - Only 32-bit comparison is supported or 16-bits for random field. + - Only supported for ``RTE_FLOW_FIELD_META``, ``RTE_FLOW_FIELD_TAG``, + ``RTE_FLOW_FIELD_RANDOM`` and ``RTE_FLOW_FIELD_VALUE``. + - The field type ``RTE_FLOW_FIELD_VALUE`` must be the base (``b``) field. + - The field type ``RTE_FLOW_FIELD_RANDOM`` can only be compared with + ``RTE_FLOW_FIELD_VALUE``. Statistics
drivers/net/mlx5/mlx5_flow_hw.c +52 -18
102 lines not on this page · raw message
Signature · 1 line
2.25.1
RE: [PATCH v5 2/3] net/mlx5: add support to compare random value
Quoted 12 lines
-----Original Message-----
From: Michael Baum <[email protected]>
Sent: Wednesday, February 14, 2024 3:30 PM
To: [email protected]
Cc: Matan Azrad <[email protected]>; Dariusz Sosnowski <[email protected]>; Raslan Darawsheh <[email protected]>; Slava Ovsiienko <[email protected]>; Ori Kam <[email protected]>; Suanming Mou <[email protected]>
Subject: [PATCH v5 2/3] net/mlx5: add support to compare random value
Quoted 6 lines
Add support to use "
RTE_FLOW_ITEM_TYPE_COMPARE" with "RTE_FLOW_FIELD_RAMDOM" as an argument.
The random field is supported only when base is an immediate value, random field cannot be compared with enother field.Signed-off-by Michael Baum <[email protected]>
Quoted 147 lines
--- doc/guides/nics/mlx5.rst | 9 ++++- drivers/net/mlx5/mlx5_flow_hw.c | 70 ++++++++++++++++++++++++--------- 2 files changed, 59 insertions(+), 20 deletions(-)doc/guides/nics/mlx5.rst index renamed from doc/guides/nics/mlx5.rst +0
-0
fa013b03bb..43ef8a99dc100644doc/guides/nics/mlx5.rst +7
-2@@ -820,8 +820,13 @@ Limitations - Only supported in HW steering(``dv_flow_en`` = 2) mode. - Only single flow is supported to the flow table. - - Only 32-bit comparison is supported. - - Only match with compare result between packet fields is supported. + - Only single item is supported per pattern template. + - Only 32-bit comparison is supported or 16-bits for random field. + - Only supported for ``RTE_FLOW_FIELD_META``, ``RTE_FLOW_FIELD_TAG``, + ``RTE_FLOW_FIELD_RANDOM`` and ``RTE_FLOW_FIELD_VALUE``. + - The field type ``RTE_FLOW_FIELD_VALUE`` must be the base (``b``) field. + - The field type ``RTE_FLOW_FIELD_RANDOM`` can only be compared with + ``RTE_FLOW_FIELD_VALUE``. Statistics(quoted diff) +0
-0
b/drivers/net/mlx5/mlx5_flow_hw.cindex3af5e1f160..b5741f0817100644drivers/net/mlx5/mlx5_flow_hw.c +42
-5@@ -6717,18 +6717,55 @@ flow_hw_prepend_item(const struct rte_flow_item *items, return copied_items; } -static inline bool -flow_hw_item_compare_field_supported (enum rte_flow_field_id field) +static int +flow_hw_item_compare_field_validate (enum rte_flow_field_id arg_field, +enum rte_flow_field_id base_field, +struct rte_flow_error *error) { -switch (field) { +switch (arg_field) { +case RTE_FLOW_FIELD_TAG : +case RTE_FLOW_FIELD_META : +break ; +case RTE_FLOW_FIELD_RANDOM : +if (base_field ==RTE_FLOW_FIELD_VALUE ) +return 0 ; +return rte_flow_error_set (error,EINVAL , +RTE_FLOW_ERROR_TYPE_UNSPECIFIED , +NULL , + "compare random is supported only with immediate value"); + default: + return rte_flow_error_set(error, ENOTSUP, +RTE_FLOW_ERROR_TYPE_UNSPECIFIED , +NULL , +"compare item argument field is not supported"); + } +switch (base_field) {case RTE_FLOW_FIELD_TAG :case RTE_FLOW_FIELD_META :case RTE_FLOW_FIELD_VALUE : -return true; +break ; +default : +return rte_flow_error_set (error,ENOTSUP , +RTE_FLOW_ERROR_TYPE_UNSPECIFIED , +NULL , +"compare item base field is not supported"); + } +return 0 ; +} + +static inline uint32_t +flow_hw_item_compare_width_supported (enum rte_flow_field_id field) { +switch (field) { +case RTE_FLOW_FIELD_TAG : +case RTE_FLOW_FIELD_META : +return 32 ; +case RTE_FLOW_FIELD_RANDOM : +return 16 ;default :break ; } -return false; +return 0 ; } static int@@ -6737,6 +6774,7 @@ flow_hw_validate_item_compare(const struct rte_flow_item *item, {const struct rte_flow_item_compare *comp_m = item->mask;const struct rte_flow_item_compare *comp_v = item->spec; +int ret;if (unlikely (!comp_m)) return rte_flow_error_set(error, EINVAL, @@ -6748,19 +6786,13@@ flow_hw_validate_item_compare(const struct
rte_flow_item*item,drivers/net/mlx5/mlx5_flow_hw.c +6
-12RTE_FLOW_ERROR_TYPE_UNSPECIFIED ,NULL , "compare item only support full mask"); -if (!flow_hw_item_compare_field_supported (comp_m->a.field) || - !flow_hw_item_compare_field_supported (comp_m->b.field)) -return rte_flow_error_set (error,ENOTSUP , -RTE_FLOW_ERROR_TYPE_UNSPECIFIED , -NULL , -"compare item field not support" ); -if (comp_m->a.field ==RTE_FLOW_FIELD_VALUE && - comp_m->b.field ==RTE_FLOW_FIELD_VALUE ) -return rte_flow_error_set (error,EINVAL , -RTE_FLOW_ERROR_TYPE_UNSPECIFIED , -NULL , -"compare between value is not valid" ); + ret =flow_hw_item_compare_field_validate (comp_m->a.field, + comp_m->b.field, error); +if (ret <0 ) +return ret;if (comp_v) { +uint32_t width; +if (comp_v->operation != comp_m->operation || comp_v->a.field != comp_m->a.field || comp_v->b.field != comp_m->b.field) @@ -6768,7 +6800,9@@ flow_hw_validate_item_compare(const struct
rte_flow_item*item,
RTE_FLOW_ERROR_TYPE_UNSPECIFIED,drivers/net/mlx5/mlx5_flow_hw.c +0
-0NULL , "compare item spec/mask notmatching");
drivers/net/mlx5/mlx5_flow_hw.c +1
-1-if ((comp_v->width & comp_m->width) !=32 ) + width = flow_hw_item_compare_width_supported(comp_v-Quoted 1 line
a.field);
drivers/net/mlx5/mlx5_flow_hw.c +2
-0+MLX5_ASSERT (width >0 ); +if ((comp_v->width & comp_m->width) != width) return rte_flow_error_set(error, EINVAL,
RTE_FLOW_ERROR_TYPE_UNSPECIFIED,
NULL,
--
2.25.1
PATCH v5 3/3 net/mlx5/hws: add compare ESP sequence number support
In reply to Michael BaumAdd support for compare item with "RTE_FLOW_FIELD_ESP_SEQ_NUM" field.
--- doc/guides/nics/mlx5.rst | 1 + drivers/net/mlx5/hws/mlx5dr_definer.c | 22 ++++++++++++++++++++-- drivers/net/mlx5/mlx5_flow_hw.c | 3 +++ 3 files changed, 24 insertions(+), 2 deletions(-)
doc/guides/nics/mlx5.rst +1 -0
@@ -823,6 +823,7 @@ Limitations - Only single item is supported per pattern template. - Only 32-bit comparison is supported or 16-bits for random field. - Only supported for ``RTE_FLOW_FIELD_META``, ``RTE_FLOW_FIELD_TAG``, + ``RTE_FLOW_FIELD_ESP_SEQ_NUM``, ``RTE_FLOW_FIELD_RANDOM`` and ``RTE_FLOW_FIELD_VALUE``. - The field type ``RTE_FLOW_FIELD_VALUE`` must be the base (``b``) field. - The field type ``RTE_FLOW_FIELD_RANDOM`` can only be compared with
drivers/net/mlx5/hws/mlx5dr_definer.c +20 -2
@@ -396,10 +396,20 @@ mlx5dr_definer_compare_base_value_set(const void *item_spec, value = (const uint32_t *)&b->value[0 ]; -if (a->field ==RTE_FLOW_FIELD_RANDOM ) +switch (a->field) { +case RTE_FLOW_FIELD_RANDOM : *base =htobe32 (*value <<16 ); -else +break ; +case RTE_FLOW_FIELD_TAG : +case RTE_FLOW_FIELD_META : *base =htobe32 (*value); +break ; +case RTE_FLOW_FIELD_ESP_SEQ_NUM : + *base = *value; +break ; +default : +break ; + }MLX5_SET (ste_match_4dw_range_ctrl_dw, ctrl, base0,1 ); }
@@ -2887,6 +2897,14 @@ mlx5dr_definer_conv_item_compare_field(const struct rte_flow_field_data *f, fc->compare_idx = dw_offset;DR_CALC_SET_HDR (fc, random_number, random_number);break ; +case RTE_FLOW_FIELD_ESP_SEQ_NUM : + fc = &cd->fc[MLX5DR_DEFINER_FNAME_ESP_SEQUENCE_NUMBER ]; + fc->item_idx = item_idx; + fc->tag_set = &mlx5dr_definer_compare_set; + fc->tag_mask_set = &mlx5dr_definer_ones_set; + fc->compare_idx = dw_offset; +DR_CALC_SET_HDR (fc, ipsec, sequence_number); +break ;default :DR_LOG (ERR ,"%u field is not supported" , f->field); goto err_notsup;
drivers/net/mlx5/mlx5_flow_hw.c +3 -0
@@ -6725,6 +6725,7 @@ flow_hw_item_compare_field_validate(enum rte_flow_field_id arg_field,switch (arg_field) {case RTE_FLOW_FIELD_TAG :case RTE_FLOW_FIELD_META : +case RTE_FLOW_FIELD_ESP_SEQ_NUM :break ;case RTE_FLOW_FIELD_RANDOM :if (base_field ==RTE_FLOW_FIELD_VALUE )
@@ -6743,6 +6744,7 @@ flow_hw_item_compare_field_validate(enum rte_flow_field_id arg_field,case RTE_FLOW_FIELD_TAG :case RTE_FLOW_FIELD_META :case RTE_FLOW_FIELD_VALUE : +case RTE_FLOW_FIELD_ESP_SEQ_NUM :break ;default : return rte_flow_error_set(error, ENOTSUP,
@@ -6759,6 +6761,7 @@ flow_hw_item_compare_width_supported(enum rte_flow_field_id field)switch (field) {case RTE_FLOW_FIELD_TAG :case RTE_FLOW_FIELD_META : +case RTE_FLOW_FIELD_ESP_SEQ_NUM :return 32 ;case RTE_FLOW_FIELD_RANDOM :return 16 ;
Signature · 1 line
2.25.1
RE: [PATCH v5 3/3] net/mlx5/hws: add compare ESP sequence number support
Hi,
Quoted 11 lines
-----Original Message-----
From: Michael Baum <[email protected]>
Sent: Wednesday, February 14, 2024 3:30 PM
To: [email protected]
Cc: Matan Azrad <[email protected]>; Dariusz Sosnowski <[email protected]>; Raslan Darawsheh <[email protected]>; Slava Ovsiienko <[email protected]>; Ori Kam <[email protected]>; Suanming Mou <[email protected]>
Subject: [PATCH v5 3/3]net/mlx5/hws: add compare ESP sequence number support
Quoted 1 line
Add support for compare item with "
RTE_FLOW_FIELD_ESP_SEQ_NUM" field.
Small comment, please don't forget to add the new supported comparison field to rel_notes.
Quoted 2 lines
Signed-off-by Michael Baum <[email protected]>
Quoted 94 lines
--- doc/guides/nics/mlx5.rst | 1 + drivers/net/mlx5/hws/mlx5dr_definer.c | 22 ++++++++++++++++++++-- drivers/net/mlx5/mlx5_flow_hw.c | 3 +++ 3 files changed, 24 insertions(+), 2 deletions(-)doc/guides/nics/mlx5.rst index renamed from doc/guides/nics/mlx5.rst +0
-0
43ef8a99dc..b793f1ef58100644doc/guides/nics/mlx5.rst +1
-1@@ -823,6 +823,7 @@ Limitations - Only single item is supported per pattern template. - Only 32-bit comparison is supported or 16-bits for random field. - Only supported for ``RTE_FLOW_FIELD_META``, ``RTE_FLOW_FIELD_TAG``, + ``RTE_FLOW_FIELD_ESP_SEQ_NUM``, ``RTE_FLOW_FIELD_RANDOM`` and ``RTE_FLOW_FIELD_VALUE``. - The field type ``RTE_FLOW_FIELD_VALUE`` must be the base (``b``) field. - The field type ``RTE_FLOW_FIELD_RANDOM`` can only be compared with diff --git a/drivers/net/mlx5/hws/mlx5dr_definer.c
b/drivers/net/mlx5/hws/mlx5dr_definer.c
index2d86175ca2..b29d7451e7100644drivers/net/mlx5/hws/mlx5dr_definer.c +13
-2@@ -396,10 +396,20 @@ mlx5dr_definer_compare_base_value_set(const void *item_spec, value = (const uint32_t *)&b->value[0 ]; -if (a->field ==RTE_FLOW_FIELD_RANDOM ) +switch (a->field) { +case RTE_FLOW_FIELD_RANDOM : *base =htobe32 (*value <<16 ); -else +break ; +case RTE_FLOW_FIELD_TAG : +case RTE_FLOW_FIELD_META : *base =htobe32 (*value); +break ; +case RTE_FLOW_FIELD_ESP_SEQ_NUM : + *base = *value; +break ; +default : +break ; + } MLX5_SET(ste_match_4dw_range_ctrl_dw, ctrl, base0, 1); } @@ -2887,6 +2897,14 @@ mlx5dr_definer_conv_item_compare_field(const struct
rte_flow_field_data*f,drivers/net/mlx5/hws/mlx5dr_definer.c +2
-0fc->compare_idx = dw_offset;DR_CALC_SET_HDR (fc, random_number, random_number);break ; +case RTE_FLOW_FIELD_ESP_SEQ_NUM : + fc = &cd-Quoted 1 line
fc[MLX5DR_DEFINER_FNAME_ESP_SEQUENCE_NUMBER];
drivers/net/mlx5/hws/mlx5dr_definer.c +6
-0+ fc->item_idx = item_idx; + fc->tag_set = &mlx5dr_definer_compare_set; + fc->tag_mask_set = &mlx5dr_definer_ones_set; + fc->compare_idx = dw_offset; +DR_CALC_SET_HDR (fc, ipsec, sequence_number); +break ;default :DR_LOG (ERR ,"%u field is not supported" , f->field); goto err_notsup;(quoted diff) +0
-0
b/drivers/net/mlx5/mlx5_flow_hw.cindexb5741f0817..4d6fb489b2100644drivers/net/mlx5/mlx5_flow_hw.c +1
-0@@ -6725,6 +6725,7 @@ flow_hw_item_compare_field_validate(enum rte_flow_field_id arg_field, switch (arg_field) {case RTE_FLOW_FIELD_TAG :case RTE_FLOW_FIELD_META : +case RTE_FLOW_FIELD_ESP_SEQ_NUM :break ;case RTE_FLOW_FIELD_RANDOM :if (
base_field==RTE_FLOW_FIELD_VALUE) @@ -6743,6 +6744,7
@@ flow_hw_item_compare_field_validate(enumrte_flow_field_idarg_field,drivers/net/mlx5/mlx5_flow_hw.c +1
-0case RTE_FLOW_FIELD_TAG :case RTE_FLOW_FIELD_META :case RTE_FLOW_FIELD_VALUE : +case RTE_FLOW_FIELD_ESP_SEQ_NUM :break ;default : return rte_flow_error_set(error, ENOTSUP, @@ -6759,6 +6761,7@@
flow_hw_item_compare_width_supported(enum rte_flow_field_id field)drivers/net/mlx5/mlx5_flow_hw.c +1
-1switch (field) {case RTE_FLOW_FIELD_TAG :case RTE_FLOW_FIELD_META : +case RTE_FLOW_FIELD_ESP_SEQ_NUM :return 32 ;case RTE_FLOW_FIELD_RANDOM :return 16 ; --2.25.1
RE: [PATCH v5 3/3] net/mlx5/hws: add compare ESP sequence number support
Hi,
Quoted 23 lines
-----Original Message-----
From: Suanming Mou <[email protected]>
Sent: Monday, 19 February 2024 5:00
To: Michael Baum <[email protected]>; [email protected]
Cc: Matan Azrad <[email protected]>; Dariusz Sosnowski <[email protected]>; Raslan Darawsheh <[email protected]>; Slava Ovsiienko <[email protected]>; Ori Kam <[email protected]>
Subject: RE: [PATCH v5 3/3]net/mlx5/hws: add compare ESP sequence number supportHi,
Quoted 11 lines
-----Original Message-----
From: Michael Baum <[email protected]>
Sent: Wednesday, February 14, 2024 3:30 PM
To: [email protected]
Cc: Matan Azrad <[email protected]>; Dariusz Sosnowski <[email protected]>; Raslan Darawsheh <[email protected]>; Slava Ovsiienko <[email protected]>; Ori Kam <[email protected]>; Suanming Mou <[email protected]>
Subject: [PATCH v5 3/3]net/mlx5/hws: add compare ESP sequence number support
Quoted 2 lines
Quoted 1 line
Add support for compare item with "
RTE_FLOW_FIELD_ESP_SEQ_NUM"field.
The basic support of other fields is inserted in this release without specifying the supported fields. I kept the behavior with this field.
Quoted 108 lines
Small comment, please don't forget to add the new supported comparison field to
rel_notes.Quoted 2 lines
Signed-off-by Michael Baum <[email protected]>Acked-by Suanming Mou <[email protected]>drivers/net/mlx5/hws/mlx5dr_definer.c mlx5dr_definer_compare_base_value_set(const
Quoted 25 lines
--- doc/guides/nics/mlx5.rst | 1 + drivers/net/mlx5/hws/mlx5dr_definer.c | 22 ++++++++++++++++++++-- drivers/net/mlx5/mlx5_flow_hw.c | 3 +++ 3 files changed, 24 insertions(+), 2 deletions(-)doc/guides/nics/mlx5.rst index renamed from doc/guides/nics/mlx5.rst +0
-0
43ef8a99dc..b793f1ef58100644doc/guides/nics/mlx5.rst +1
-0@@ -823,6 +823,7 @@ Limitations - Only single item is supported per pattern template. - Only 32-bit comparison is supported or 16-bits for random field. - Only supported for ``RTE_FLOW_FIELD_META``, ``RTE_FLOW_FIELD_TAG``, + ``RTE_FLOW_FIELD_ESP_SEQ_NUM``, ``RTE_FLOW_FIELD_RANDOM`` and ``RTE_FLOW_FIELD_VALUE``. - The field type ``RTE_FLOW_FIELD_VALUE`` must be the base (``b``) field.- The field type ``RTE_FLOW_FIELD_RANDOM`` can only be compared
with diff --gita/drivers/net/mlx5/hws/mlx5dr_definer.cb/drivers/net/mlx5/hws/mlx5dr_definer.c
index2d86175ca2..b29d7451e7100644drivers/net/mlx5/hws/mlx5dr_definer.c +0
-0@@ -396,10 +396,20 @@ mlx5dr_definer_compare_base_value_set(constvoid
Quoted 12 lines
drivers/net/mlx5/hws/mlx5dr_definer.c +5
-2*item_spec, value = (const uint32_t *)&b->value[0 ]; -if (a->field ==RTE_FLOW_FIELD_RANDOM ) +switch (a->field) { +case RTE_FLOW_FIELD_RANDOM : *base =htobe32 (*value <<16 ); -else +break ; +case RTE_FLOW_FIELD_TAG : +case RTE_FLOW_FIELD_META :drivers/net/mlx5/hws/mlx5dr_definer.c mlx5dr_definer_compare_base_value_set(const void *item_spec,
Quoted 10 lines
drivers/net/mlx5/hws/mlx5dr_definer.c +7
-0*base =htobe32 (*value); +break ; +case RTE_FLOW_FIELD_ESP_SEQ_NUM : + *base = *value; +break ; +default : +break ; + } MLX5_SET(ste_match_4dw_range_ctrl_dw, ctrl, base0, 1); } @@ -2887,6
Quoted 18 lines
+2897,14 @@ mlx5dr_definer_conv_item_compare_field(const struct
rte_flow_field_data*f,drivers/net/mlx5/hws/mlx5dr_definer.c +2
-0fc->compare_idx = dw_offset;DR_CALC_SET_HDR (fc, random_number, random_number);break ; +case RTE_FLOW_FIELD_ESP_SEQ_NUM : + fc = &cd-Quoted 1 line
fc[MLX5DR_DEFINER_FNAME_ESP_SEQUENCE_NUMBER];
drivers/net/mlx5/hws/mlx5dr_definer.c +6
-0+ fc->item_idx = item_idx; + fc->tag_set = &mlx5dr_definer_compare_set; + fc->tag_mask_set = &mlx5dr_definer_ones_set; + fc->compare_idx = dw_offset; +DR_CALC_SET_HDR (fc, ipsec, sequence_number); +break ;default :DR_LOG (ERR ,"%u field is not supported" , f->field); goto err_notsup;(quoted diff) +0
-0Quoted 1 line
b/drivers/net/mlx5/mlx5_flow_hw.cindexb5741f0817..4d6fb489b2100644
Quoted 11 lines
drivers/net/mlx5/mlx5_flow_hw.c +1
-0@@ -6725,6 +6725,7 @@ flow_hw_item_compare_field_validate(enum rte_flow_field_id arg_field, switch (arg_field) {case RTE_FLOW_FIELD_TAG :case RTE_FLOW_FIELD_META : +case RTE_FLOW_FIELD_ESP_SEQ_NUM :break ;case RTE_FLOW_FIELD_RANDOM :if (
base_field==RTE_FLOW_FIELD_VALUE) @@ -6743,6+6744,7 @@
drivers/net/mlx5/mlx5_flow_hw.c flow_hw_item_compare_field_validate(enum rte_flow_field_id arg_field,
Quoted 8 lines
flow_hw_item_compare_field_validate(enum
rte_flow_field_idarg_field,drivers/net/mlx5/mlx5_flow_hw.c +1
-0case RTE_FLOW_FIELD_TAG :case RTE_FLOW_FIELD_META :case RTE_FLOW_FIELD_VALUE : +case RTE_FLOW_FIELD_ESP_SEQ_NUM :break ;default : return rte_flow_error_set(error, ENOTSUP, @@ -6759,6+6761,7 @@
Quoted 10 lines
flow_hw_item_compare_width_supported(enum rte_flow_field_id field)drivers/net/mlx5/mlx5_flow_hw.c +1
-1switch (field) {case RTE_FLOW_FIELD_TAG :case RTE_FLOW_FIELD_META : +case RTE_FLOW_FIELD_ESP_SEQ_NUM :return 32 ;case RTE_FLOW_FIELD_RANDOM :return 16 ; --2.25.1
RE: [PATCH v5 3/3] net/mlx5/hws: add compare ESP sequence number support
Quoted 37 lines
-----Original Message-----
From: Michael Baum <[email protected]>
Sent: Monday, February 19, 2024 3:22 PM
To: Suanming Mou <[email protected]>; [email protected]
Cc: Matan Azrad <[email protected]>; Dariusz Sosnowski <[email protected]>; Raslan Darawsheh <[email protected]>; Slava Ovsiienko <[email protected]>; Ori Kam <[email protected]>
Subject: RE: [PATCH v5 3/3]net/mlx5/hws: add compare ESP sequence number supportHi,
Quoted 23 lines
-----Original Message-----
From: Suanming Mou <[email protected]>
Sent: Monday, 19 February 2024 5:00
To: Michael Baum <[email protected]>; [email protected]
Cc: Matan Azrad <[email protected]>; Dariusz Sosnowski <[email protected]>; Raslan Darawsheh <[email protected]>; Slava Ovsiienko <[email protected]>; Ori Kam <[email protected]>
Subject: RE: [PATCH v5 3/3]net/mlx5/hws: add compare ESP sequence number supportHi,
Quoted 11 lines
-----Original Message-----
From: Michael Baum <[email protected]>
Sent: Wednesday, February 14, 2024 3:30 PM
To: [email protected]
Cc: Matan Azrad <[email protected]>; Dariusz Sosnowski <[email protected]>; Raslan Darawsheh <[email protected]>; Slava Ovsiienko <[email protected]>; Ori Kam <[email protected]>; Suanming Mou <[email protected]>
Subject: [PATCH v5 3/3]net/mlx5/hws: add compare ESP sequence number support
Quoted 6 lines
Quoted 2 lines
Quoted 1 line
Add support for compare item with "
RTE_FLOW_FIELD_ESP_SEQ_NUM"field.
The basic support of other fields is inserted in this release without specifying the supported fields.
I kept the behavior with this field.
OK, I see. Thanks.
Quoted 110 lines
Quoted 110 lines
Small comment, please don't forget to add the new supported comparison field to
rel_notes.Quoted 2 lines
Signed-off-by Michael Baum <[email protected]>Acked-by Suanming Mou <[email protected]>drivers/net/mlx5/hws/mlx5dr_definer.c mlx5dr_definer_compare_base_value_set(const
Quoted 26 lines
--- doc/guides/nics/mlx5.rst | 1 + drivers/net/mlx5/hws/mlx5dr_definer.c | 22 ++++++++++++++++++++-- drivers/net/mlx5/mlx5_flow_hw.c | 3 +++ 3 files changed, 24 insertions(+), 2 deletions(-)doc/guides/nics/mlx5.rst +0
-0index
43ef8a99dc..b793f1ef58100644doc/guides/nics/mlx5.rst +1
-0@@ -823,6 +823,7 @@ Limitations - Only single item is supported per pattern template. - Only 32-bit comparison is supported or 16-bits for random field. - Only supported for ``RTE_FLOW_FIELD_META``, ``RTE_FLOW_FIELD_TAG``, + ``RTE_FLOW_FIELD_ESP_SEQ_NUM``, ``RTE_FLOW_FIELD_RANDOM`` and ``RTE_FLOW_FIELD_VALUE``. - The field type ``RTE_FLOW_FIELD_VALUE`` must be the base (``b``) field.- The field type ``RTE_FLOW_FIELD_RANDOM`` can only be compared
with diff --gita/drivers/net/mlx5/hws/mlx5dr_definer.cb/drivers/net/mlx5/hws/mlx5dr_definer.c
index2d86175ca2..b29d7451e7100644drivers/net/mlx5/hws/mlx5dr_definer.c +0
-0@@ -396,10 +396,20 @@ mlx5dr_definer_compare_base_value_set(constvoid
Quoted 12 lines
drivers/net/mlx5/hws/mlx5dr_definer.c +5
-2*item_spec, value = (const uint32_t *)&b->value[0 ]; -if (a->field ==RTE_FLOW_FIELD_RANDOM ) +switch (a->field) { +case RTE_FLOW_FIELD_RANDOM : *base =htobe32 (*value <<16 ); -else +break ; +case RTE_FLOW_FIELD_TAG : +case RTE_FLOW_FIELD_META :drivers/net/mlx5/hws/mlx5dr_definer.c mlx5dr_definer_compare_base_value_set(const void *item_spec,
Quoted 10 lines
drivers/net/mlx5/hws/mlx5dr_definer.c +7
-0*base =htobe32 (*value); +break ; +case RTE_FLOW_FIELD_ESP_SEQ_NUM : + *base = *value; +break ; +default : +break ; + } MLX5_SET(ste_match_4dw_range_ctrl_dw, ctrl, base0, 1); } @@ -2887,6
Quoted 18 lines
+2897,14 @@ mlx5dr_definer_conv_item_compare_field(const struct
rte_flow_field_data*f,drivers/net/mlx5/hws/mlx5dr_definer.c +2
-0fc->compare_idx = dw_offset;DR_CALC_SET_HDR (fc, random_number, random_number);break ; +case RTE_FLOW_FIELD_ESP_SEQ_NUM : + fc = &cd-Quoted 1 line
fc[MLX5DR_DEFINER_FNAME_ESP_SEQUENCE_NUMBER];
drivers/net/mlx5/hws/mlx5dr_definer.c +6
-0+ fc->item_idx = item_idx; + fc->tag_set = &mlx5dr_definer_compare_set; + fc->tag_mask_set = &mlx5dr_definer_ones_set; + fc->compare_idx = dw_offset; +DR_CALC_SET_HDR (fc, ipsec, sequence_number); +break ;default :DR_LOG (ERR ,"%u field is not supported" , f->field); goto err_notsup;(quoted diff) +0
-0Quoted 1 line
b/drivers/net/mlx5/mlx5_flow_hw.cindexb5741f0817..4d6fb489b2100644
Quoted 11 lines
drivers/net/mlx5/mlx5_flow_hw.c +1
-0@@ -6725,6 +6725,7 @@ flow_hw_item_compare_field_validate(enum rte_flow_field_id arg_field, switch (arg_field) {case RTE_FLOW_FIELD_TAG :case RTE_FLOW_FIELD_META : +case RTE_FLOW_FIELD_ESP_SEQ_NUM :break ;case RTE_FLOW_FIELD_RANDOM :if (
base_field==RTE_FLOW_FIELD_VALUE) @@ -6743,6+6744,7 @@
drivers/net/mlx5/mlx5_flow_hw.c flow_hw_item_compare_field_validate(enum rte_flow_field_id arg_field,
Quoted 8 lines
flow_hw_item_compare_field_validate(enum
rte_flow_field_idarg_field,drivers/net/mlx5/mlx5_flow_hw.c +1
-0case RTE_FLOW_FIELD_TAG :case RTE_FLOW_FIELD_META :case RTE_FLOW_FIELD_VALUE : +case RTE_FLOW_FIELD_ESP_SEQ_NUM :break ;default : return rte_flow_error_set(error, ENOTSUP, @@ -6759,6+6761,7 @@
Quoted 10 lines
flow_hw_item_compare_width_supported(enum rte_flow_field_id field)drivers/net/mlx5/mlx5_flow_hw.c +1
-1switch (field) {case RTE_FLOW_FIELD_TAG :case RTE_FLOW_FIELD_META : +case RTE_FLOW_FIELD_ESP_SEQ_NUM :return 32 ;case RTE_FLOW_FIELD_RANDOM :return 16 ; --2.25.1
v6 cover net/mlx5: add compare item support
In reply to Michael BaumAdd HWS support for compare item with:
- "RTE_FLOW_FIELD_TAG".
- "RTE_FLOW_FIELD_NETA".
- "RTE_FLOW_FIELD_VALUE".
Add HWS + PMD support for compare item with:
- "RTE_FLOW_FIELD_RANDOM".
- "RTE_FLOW_FIELD_ESP_SEQ_NUM".
v2:
- Rebase.
- Add "RTE_FLOW_FIELD_META" compare support.
- Reduce the "Depends-on" list.
v3:
- Rebase.
- Fix typo in function name, r/tranlate/translate.
- Fix adding a line without newline at end of file.
v4:
- Rebase.
- Update documentation.
- Remove the "Depends-on" label.
v5:
- Rebase.
- Add ESP sequence number suppoert and rename the series accordingly.
v6:
- Rebase.
- Add "Acked-by" from v5.
Hamdan Igbaria (1):
net/mlx5/hws: add support for compare matcher
Michael Baum (2):
net/mlx5: add support to compare random value net/mlx5/hws: add compare ESP sequence number support
doc/guides/nics/mlx5.rst | 10 +- drivers/common/mlx5/mlx5_prm.h | 16 ++ drivers/net/mlx5/hws/mlx5dr_cmd.c | 9 +- drivers/net/mlx5/hws/mlx5dr_cmd.h | 1 + drivers/net/mlx5/hws/mlx5dr_debug.c | 4 +- drivers/net/mlx5/hws/mlx5dr_debug.h | 1 + drivers/net/mlx5/hws/mlx5dr_definer.c | 261 +++++++++++++++++++++++++- drivers/net/mlx5/hws/mlx5dr_definer.h | 33 ++++ drivers/net/mlx5/hws/mlx5dr_matcher.c | 53 ++++++ drivers/net/mlx5/hws/mlx5dr_matcher.h | 12 +- drivers/net/mlx5/mlx5_flow_hw.c | 73 +++++-- 11 files changed, 444 insertions(+), 29 deletions(-)
Signature · 1 line
2.25.1
PATCH v6 1/3 net/mlx5/hws: add support for compare matcher
From: Hamdan Igbaria <[email protected]>
Add support for compare matcher, this matcher will allow direct comparison between two packet fields, or a packet field and a value, with fully masked DW.
For now this matcher hash table is limited to size 1x1, thus it supports only 1 rule STE.
--- drivers/common/mlx5/mlx5_prm.h | 16 ++ drivers/net/mlx5/hws/mlx5dr_cmd.c | 9 +- drivers/net/mlx5/hws/mlx5dr_cmd.h | 1 + drivers/net/mlx5/hws/mlx5dr_debug.c | 4 +- drivers/net/mlx5/hws/mlx5dr_debug.h | 1 + drivers/net/mlx5/hws/mlx5dr_definer.c | 243 +++++++++++++++++++++++++- drivers/net/mlx5/hws/mlx5dr_definer.h | 33 ++++ drivers/net/mlx5/hws/mlx5dr_matcher.c | 53 ++++++ drivers/net/mlx5/hws/mlx5dr_matcher.h | 12 +- 9 files changed, 363 insertions(+), 9 deletions(-)
drivers/common/mlx5/mlx5_prm.h +16 -0
@@ -3463,6 +3463,7 @@ enum mlx5_ifc_rtc_ste_format {MLX5_IFC_RTC_STE_FORMAT_8DW =0x4 ,MLX5_IFC_RTC_STE_FORMAT_11DW =0x5 ,MLX5_IFC_RTC_STE_FORMAT_RANGE =0x7 , + MLX5_IFC_RTC_STE_FORMAT_4DW_RANGE = 0x8, }; enum mlx5_ifc_rtc_reparse_mode {
@@ -3501,6 +3502,21 @@ struct mlx5_ifc_rtc_bits {u8 reserved_at_1a0[0x260 ]; }; +struct mlx5_ifc_ste_match_4dw_range_ctrl_dw_bits { +u8 match[0x1 ]; +u8 reserved_at_1[0x2 ]; +u8 base1[0x1 ]; +u8 inverse1[0x1 ]; +u8 reserved_at_5[0x1 ]; +u8 operator1[0x2 ]; +u8 reserved_at_8[0x3 ]; +u8 base0[0x1 ]; +u8 inverse0[0x1 ]; +u8 reserved_at_a[0x1 ]; +u8 operator0[0x2 ]; +u8 compare_delta[0x10 ]; +}; +struct mlx5_ifc_alias_context_bits {u8 vhca_id_to_be_accessed[0x10 ];u8 reserved_at_10[0xd ];
drivers/net/mlx5/hws/mlx5dr_cmd.c +6 -3
@@ -370,9 +370,12 @@ mlx5dr_cmd_rtc_create(struct ibv_context *ctx, attr, obj_type, MLX5_GENERAL_OBJ_TYPE_RTC); attr =MLX5_ADDR_OF (create_rtc_in, in, rtc); -MLX5_SET (rtc, attr, ste_format_0, rtc_attr->is_frst_jumbo ? -MLX5_IFC_RTC_STE_FORMAT_11DW : -MLX5_IFC_RTC_STE_FORMAT_8DW ); +if (rtc_attr->is_compare) { +MLX5_SET (rtc, attr, ste_format_0,MLX5_IFC_RTC_STE_FORMAT_4DW_RANGE ); + }else { +MLX5_SET (rtc, attr, ste_format_0, rtc_attr->is_frst_jumbo ? +MLX5_IFC_RTC_STE_FORMAT_11DW :MLX5_IFC_RTC_STE_FORMAT_8DW ); + }if (rtc_attr->is_scnd_range) {MLX5_SET (rtc, attr, ste_format_1,MLX5_IFC_RTC_STE_FORMAT_RANGE );
drivers/net/mlx5/hws/mlx5dr_cmd.h +1 -0
@@ -82,6 +82,7 @@ struct mlx5dr_cmd_rtc_create_attr {uint8_t reparse_mode;bool is_frst_jumbo;bool is_scnd_range; +bool is_compare; };struct mlx5dr_cmd_alias_obj_create_attr {
drivers/net/mlx5/hws/mlx5dr_debug.c +3 -1
@@ -99,6 +99,7 @@ static int mlx5dr_debug_dump_matcher_match_template(FILE *f, struct mlx5dr_matcher *matcher) {bool is_root = matcher->tbl->level ==MLX5DR_ROOT_LEVEL ; +bool is_compare =mlx5dr_matcher_is_compare (matcher);enum mlx5dr_debug_res_type type;int i, ret;
@@ -117,7 +118,8 @@ mlx5dr_debug_dump_matcher_match_template(FILE *f, struct mlx5dr_matcher *matcherreturn rte_errno; } - type =MLX5DR_DEBUG_RES_TYPE_MATCHER_TEMPLATE_MATCH_DEFINER ; + type = is_compare ?MLX5DR_DEBUG_RES_TYPE_MATCHER_TEMPLATE_COMPARE_MATCH_DEFINER : +MLX5DR_DEBUG_RES_TYPE_MATCHER_TEMPLATE_MATCH_DEFINER ; ret =mlx5dr_debug_dump_matcher_template_definer (f, mt, mt->definer, type);if (ret)return ret;
drivers/net/mlx5/hws/mlx5dr_debug.h +1 -0
@@ -24,6 +24,7 @@ enum mlx5dr_debug_res_type {MLX5DR_DEBUG_RES_TYPE_MATCHER_ACTION_TEMPLATE =4204 ,MLX5DR_DEBUG_RES_TYPE_MATCHER_TEMPLATE_HASH_DEFINER =4205 ,MLX5DR_DEBUG_RES_TYPE_MATCHER_TEMPLATE_RANGE_DEFINER =4206 , + MLX5DR_DEBUG_RES_TYPE_MATCHER_TEMPLATE_COMPARE_MATCH_DEFINER = 4207, }; static inline uint64_t
drivers/net/mlx5/hws/mlx5dr_definer.c +239 -4
302 lines not on this page · raw message
drivers/net/mlx5/hws/mlx5dr_definer.h +33 -0
@@ -17,6 +17,37 @@#define DW_SELECTORS_RANGE 2#define BYTE_SELECTORS_RANGE 8 +enum mlx5dr_definer_compare_ste_dw_offset { +/* In compare STE the matching DW's starts after the 3 actions */ +MLX5DR_DEFINER_COMPARE_STE_ARGUMENT_1 =3 , +MLX5DR_DEFINER_COMPARE_STE_ARGUMENT_0 , +MLX5DR_DEFINER_COMPARE_STE_BASE_1 , +MLX5DR_DEFINER_COMPARE_STE_BASE_0 , +MLX5DR_DEFINER_COMPARE_STE_TAG_DW_3 , +MLX5DR_DEFINER_COMPARE_STE_TAG_DW_2 , +MLX5DR_DEFINER_COMPARE_STE_TAG_DW_1 , +MLX5DR_DEFINER_COMPARE_STE_TAG_DW_0 , +}; + +enum mlx5dr_definer_dw_selectors { +MLX5DR_DEFINER_SELECTOR_DW0 , +MLX5DR_DEFINER_SELECTOR_DW1 , +MLX5DR_DEFINER_SELECTOR_DW2 , +MLX5DR_DEFINER_SELECTOR_DW3 , +MLX5DR_DEFINER_SELECTOR_DW4 , +MLX5DR_DEFINER_SELECTOR_DW5 , +MLX5DR_DEFINER_SELECTOR_DW6 , +MLX5DR_DEFINER_SELECTOR_DW7 , +MLX5DR_DEFINER_SELECTOR_DW8 , +}; + +enum mlx5dr_definer_compare_dw_selectors { +MLX5DR_DEFINER_COMPARE_ARGUMENT_0 =MLX5DR_DEFINER_SELECTOR_DW4 , +MLX5DR_DEFINER_COMPARE_ARGUMENT_1 =MLX5DR_DEFINER_SELECTOR_DW5 , +MLX5DR_DEFINER_COMPARE_BASE_0 =MLX5DR_DEFINER_SELECTOR_DW2 , +MLX5DR_DEFINER_COMPARE_BASE_1 =MLX5DR_DEFINER_SELECTOR_DW3 , +}; +enum mlx5dr_definer_fname {MLX5DR_DEFINER_FNAME_ETH_SMAC_48_16_O ,MLX5DR_DEFINER_FNAME_ETH_SMAC_48_16_I ,
@@ -188,6 +219,8 @@ struct mlx5dr_definer_fc {uint8_t item_idx;uint8_t is_range;uint16_t extra_data; +uint8_t compare_idx; +bool compare_set_base;uint32_t byte_off;int bit_off;uint32_t bit_mask;
drivers/net/mlx5/hws/mlx5dr_matcher.c +53 -0
68 lines not on this page · raw message
drivers/net/mlx5/hws/mlx5dr_matcher.h +11 -1
@@ -27,6 +27,7 @@ enum mlx5dr_matcher_flags {MLX5DR_MATCHER_FLAGS_HASH_DEFINER =1 <<1 ,MLX5DR_MATCHER_FLAGS_COLLISION =1 <<2 ,MLX5DR_MATCHER_FLAGS_RESIZABLE =1 <<3 , + MLX5DR_MATCHER_FLAGS_COMPARE = 1 << 4, }; struct mlx5dr_match_template {
@@ -110,12 +111,19 @@ static inline bool mlx5dr_matcher_is_in_resize(struct mlx5dr_matcher *matcher)return !!matcher->resize_dst; } +static inline bool +mlx5dr_matcher_is_compare (struct mlx5dr_matcher *matcher) +{ +return !!(matcher->flags &MLX5DR_MATCHER_FLAGS_COMPARE ); +} +static inline bool mlx5dr_matcher_req_fw_wqe (struct mlx5dr_matcher *matcher) {/* Currently HWS doesn't support hash different from match or range */ return unlikely (matcher->flags & (MLX5DR_MATCHER_FLAGS_HASH_DEFINER | -MLX5DR_MATCHER_FLAGS_RANGE_DEFINER )); +MLX5DR_MATCHER_FLAGS_RANGE_DEFINER | +MLX5DR_MATCHER_FLAGS_COMPARE )); } int mlx5dr_matcher_conv_items_to_prm(uint64_t *match_buf,
@@ -141,4 +149,6 @@ int mlx5dr_matcher_free_rtc_pointing(struct mlx5dr_context *ctx,enum mlx5dr_table_type type, struct mlx5dr_devx_obj *devx_obj); +int mlx5dr_matcher_validate_compare_attr (struct mlx5dr_matcher *matcher); +#endif /* MLX5DR_MATCHER_H_ */
Signature · 1 line
2.25.1
PATCH v6 2/3 net/mlx5: add support to compare random value
In reply to Michael BaumAdd support to use "RTE_FLOW_ITEM_TYPE_COMPARE" with "RTE_FLOW_FIELD_RAMDOM" as an argument.
The random field is supported only when base is an immediate value, random field cannot be compared with enother field.
--- doc/guides/nics/mlx5.rst | 9 ++++- drivers/net/mlx5/mlx5_flow_hw.c | 70 ++++++++++++++++++++++++--------- 2 files changed, 59 insertions(+), 20 deletions(-)
doc/guides/nics/mlx5.rst +7 -2
@@ -431,8 +431,13 @@ Limitations - Only supported in HW steering(``dv_flow_en`` = 2) mode. - Only single flow is supported to the flow table. - - Only 32-bit comparison is supported. - - Only match with compare result between packet fields is supported. + - Only single item is supported per pattern template. + - Only 32-bit comparison is supported or 16-bits for random field. + - Only supported for ``RTE_FLOW_FIELD_META``, ``RTE_FLOW_FIELD_TAG``, + ``RTE_FLOW_FIELD_RANDOM`` and ``RTE_FLOW_FIELD_VALUE``. + - The field type ``RTE_FLOW_FIELD_VALUE`` must be the base (``b``) field. + - The field type ``RTE_FLOW_FIELD_RANDOM`` can only be compared with + ``RTE_FLOW_FIELD_VALUE``. - No Tx metadata go to the E-Switch steering domain for the Flow group 0. The flows within group 0 and set metadata action are rejected by hardware.
drivers/net/mlx5/mlx5_flow_hw.c +52 -18
102 lines not on this page · raw message
Signature · 1 line
2.25.1
PATCH v6 3/3 net/mlx5/hws: add compare ESP sequence number support
In reply to Michael BaumAdd support for compare item with "RTE_FLOW_FIELD_ESP_SEQ_NUM" field.
--- doc/guides/nics/mlx5.rst | 1 + drivers/net/mlx5/hws/mlx5dr_definer.c | 22 ++++++++++++++++++++-- drivers/net/mlx5/mlx5_flow_hw.c | 3 +++ 3 files changed, 24 insertions(+), 2 deletions(-)
doc/guides/nics/mlx5.rst +1 -0
@@ -434,6 +434,7 @@ Limitations - Only single item is supported per pattern template. - Only 32-bit comparison is supported or 16-bits for random field. - Only supported for ``RTE_FLOW_FIELD_META``, ``RTE_FLOW_FIELD_TAG``, + ``RTE_FLOW_FIELD_ESP_SEQ_NUM``, ``RTE_FLOW_FIELD_RANDOM`` and ``RTE_FLOW_FIELD_VALUE``. - The field type ``RTE_FLOW_FIELD_VALUE`` must be the base (``b``) field. - The field type ``RTE_FLOW_FIELD_RANDOM`` can only be compared with
drivers/net/mlx5/hws/mlx5dr_definer.c +20 -2
@@ -424,10 +424,20 @@ mlx5dr_definer_compare_base_value_set(const void *item_spec, value = (const uint32_t *)&b->value[0 ]; -if (a->field ==RTE_FLOW_FIELD_RANDOM ) +switch (a->field) { +case RTE_FLOW_FIELD_RANDOM : *base =htobe32 (*value <<16 ); -else +break ; +case RTE_FLOW_FIELD_TAG : +case RTE_FLOW_FIELD_META : *base =htobe32 (*value); +break ; +case RTE_FLOW_FIELD_ESP_SEQ_NUM : + *base = *value; +break ; +default : +break ; + }MLX5_SET (ste_match_4dw_range_ctrl_dw, ctrl, base0,1 ); }
@@ -2930,6 +2940,14 @@ mlx5dr_definer_conv_item_compare_field(const struct rte_flow_field_data *f, fc->compare_idx = dw_offset;DR_CALC_SET_HDR (fc, random_number, random_number);break ; +case RTE_FLOW_FIELD_ESP_SEQ_NUM : + fc = &cd->fc[MLX5DR_DEFINER_FNAME_ESP_SEQUENCE_NUMBER ]; + fc->item_idx = item_idx; + fc->tag_set = &mlx5dr_definer_compare_set; + fc->tag_mask_set = &mlx5dr_definer_ones_set; + fc->compare_idx = dw_offset; +DR_CALC_SET_HDR (fc, ipsec, sequence_number); +break ;default :DR_LOG (ERR ,"%u field is not supported" , f->field); goto err_notsup;
drivers/net/mlx5/mlx5_flow_hw.c +3 -0
@@ -6729,6 +6729,7 @@ flow_hw_item_compare_field_validate(enum rte_flow_field_id arg_field,switch (arg_field) {case RTE_FLOW_FIELD_TAG :case RTE_FLOW_FIELD_META : +case RTE_FLOW_FIELD_ESP_SEQ_NUM :break ;case RTE_FLOW_FIELD_RANDOM :if (base_field ==RTE_FLOW_FIELD_VALUE )
@@ -6747,6 +6748,7 @@ flow_hw_item_compare_field_validate(enum rte_flow_field_id arg_field,case RTE_FLOW_FIELD_TAG :case RTE_FLOW_FIELD_META :case RTE_FLOW_FIELD_VALUE : +case RTE_FLOW_FIELD_ESP_SEQ_NUM :break ;default : return rte_flow_error_set(error, ENOTSUP,
@@ -6763,6 +6765,7 @@ flow_hw_item_compare_width_supported(enum rte_flow_field_id field)switch (field) {case RTE_FLOW_FIELD_TAG :case RTE_FLOW_FIELD_META : +case RTE_FLOW_FIELD_ESP_SEQ_NUM :return 32 ;case RTE_FLOW_FIELD_RANDOM :return 16 ;
Signature · 1 line
2.25.1
v7 cover net/mlx5: add compare item support
In reply to Michael BaumAdd HWS support for compare item with:
- "RTE_FLOW_FIELD_TAG".
- "RTE_FLOW_FIELD_NETA".
- "RTE_FLOW_FIELD_VALUE".
Add HWS + PMD support for compare item with:
- "RTE_FLOW_FIELD_RANDOM".
- "RTE_FLOW_FIELD_ESP_SEQ_NUM".
v2:
- Rebase.
- Add "RTE_FLOW_FIELD_META" compare support.
- Reduce the "Depends-on" list.
v3:
- Rebase.
- Fix typo in function name, r/tranlate/translate.
- Fix adding a line without newline at end of file.
v4:
- Rebase.
- Update documentation.
- Remove the "Depends-on" label.
v5:
- Rebase.
- Add ESP sequence number suppoert and rename the series accordingly.
v6:
- Rebase.
- Add "Acked-by" from v5.
v7:
- Rebase.
Hamdan Igbaria (1):
net/mlx5/hws: add support for compare matcher
Michael Baum (2):
net/mlx5: add support to compare random value net/mlx5/hws: add compare ESP sequence number support
doc/guides/nics/mlx5.rst | 10 +- drivers/common/mlx5/mlx5_prm.h | 16 ++ drivers/net/mlx5/hws/mlx5dr_cmd.c | 9 +- drivers/net/mlx5/hws/mlx5dr_cmd.h | 1 + drivers/net/mlx5/hws/mlx5dr_debug.c | 4 +- drivers/net/mlx5/hws/mlx5dr_debug.h | 1 + drivers/net/mlx5/hws/mlx5dr_definer.c | 261 +++++++++++++++++++++++++- drivers/net/mlx5/hws/mlx5dr_definer.h | 33 ++++ drivers/net/mlx5/hws/mlx5dr_matcher.c | 53 ++++++ drivers/net/mlx5/hws/mlx5dr_matcher.h | 12 +- drivers/net/mlx5/mlx5_flow_hw.c | 73 +++++-- 11 files changed, 444 insertions(+), 29 deletions(-)
Signature · 1 line
2.25.1
PATCH v7 1/3 net/mlx5/hws: add support for compare matcher
From: Hamdan Igbaria <[email protected]>
Add support for compare matcher, this matcher will allow direct comparison between two packet fields, or a packet field and a value, with fully masked DW.
For now this matcher hash table is limited to size 1x1, thus it supports only 1 rule STE.
--- drivers/common/mlx5/mlx5_prm.h | 16 ++ drivers/net/mlx5/hws/mlx5dr_cmd.c | 9 +- drivers/net/mlx5/hws/mlx5dr_cmd.h | 1 + drivers/net/mlx5/hws/mlx5dr_debug.c | 4 +- drivers/net/mlx5/hws/mlx5dr_debug.h | 1 + drivers/net/mlx5/hws/mlx5dr_definer.c | 243 +++++++++++++++++++++++++- drivers/net/mlx5/hws/mlx5dr_definer.h | 33 ++++ drivers/net/mlx5/hws/mlx5dr_matcher.c | 53 ++++++ drivers/net/mlx5/hws/mlx5dr_matcher.h | 12 +- 9 files changed, 363 insertions(+), 9 deletions(-)
drivers/common/mlx5/mlx5_prm.h +16 -0
@@ -3463,6 +3463,7 @@ enum mlx5_ifc_rtc_ste_format {MLX5_IFC_RTC_STE_FORMAT_8DW =0x4 ,MLX5_IFC_RTC_STE_FORMAT_11DW =0x5 ,MLX5_IFC_RTC_STE_FORMAT_RANGE =0x7 , + MLX5_IFC_RTC_STE_FORMAT_4DW_RANGE = 0x8, }; enum mlx5_ifc_rtc_reparse_mode {
@@ -3501,6 +3502,21 @@ struct mlx5_ifc_rtc_bits {u8 reserved_at_1a0[0x260 ]; }; +struct mlx5_ifc_ste_match_4dw_range_ctrl_dw_bits { +u8 match[0x1 ]; +u8 reserved_at_1[0x2 ]; +u8 base1[0x1 ]; +u8 inverse1[0x1 ]; +u8 reserved_at_5[0x1 ]; +u8 operator1[0x2 ]; +u8 reserved_at_8[0x3 ]; +u8 base0[0x1 ]; +u8 inverse0[0x1 ]; +u8 reserved_at_a[0x1 ]; +u8 operator0[0x2 ]; +u8 compare_delta[0x10 ]; +}; +struct mlx5_ifc_alias_context_bits {u8 vhca_id_to_be_accessed[0x10 ];u8 reserved_at_10[0xd ];
drivers/net/mlx5/hws/mlx5dr_cmd.c +6 -3
@@ -370,9 +370,12 @@ mlx5dr_cmd_rtc_create(struct ibv_context *ctx, attr, obj_type, MLX5_GENERAL_OBJ_TYPE_RTC); attr =MLX5_ADDR_OF (create_rtc_in, in, rtc); -MLX5_SET (rtc, attr, ste_format_0, rtc_attr->is_frst_jumbo ? -MLX5_IFC_RTC_STE_FORMAT_11DW : -MLX5_IFC_RTC_STE_FORMAT_8DW ); +if (rtc_attr->is_compare) { +MLX5_SET (rtc, attr, ste_format_0,MLX5_IFC_RTC_STE_FORMAT_4DW_RANGE ); + }else { +MLX5_SET (rtc, attr, ste_format_0, rtc_attr->is_frst_jumbo ? +MLX5_IFC_RTC_STE_FORMAT_11DW :MLX5_IFC_RTC_STE_FORMAT_8DW ); + }if (rtc_attr->is_scnd_range) {MLX5_SET (rtc, attr, ste_format_1,MLX5_IFC_RTC_STE_FORMAT_RANGE );
drivers/net/mlx5/hws/mlx5dr_cmd.h +1 -0
@@ -82,6 +82,7 @@ struct mlx5dr_cmd_rtc_create_attr {uint8_t reparse_mode;bool is_frst_jumbo;bool is_scnd_range; +bool is_compare; };struct mlx5dr_cmd_alias_obj_create_attr {
drivers/net/mlx5/hws/mlx5dr_debug.c +3 -1
@@ -99,6 +99,7 @@ static int mlx5dr_debug_dump_matcher_match_template(FILE *f, struct mlx5dr_matcher *matcher) {bool is_root = matcher->tbl->level ==MLX5DR_ROOT_LEVEL ; +bool is_compare =mlx5dr_matcher_is_compare (matcher);enum mlx5dr_debug_res_type type;int i, ret;
@@ -117,7 +118,8 @@ mlx5dr_debug_dump_matcher_match_template(FILE *f, struct mlx5dr_matcher *matcherreturn rte_errno; } - type =MLX5DR_DEBUG_RES_TYPE_MATCHER_TEMPLATE_MATCH_DEFINER ; + type = is_compare ?MLX5DR_DEBUG_RES_TYPE_MATCHER_TEMPLATE_COMPARE_MATCH_DEFINER : +MLX5DR_DEBUG_RES_TYPE_MATCHER_TEMPLATE_MATCH_DEFINER ; ret =mlx5dr_debug_dump_matcher_template_definer (f, mt, mt->definer, type);if (ret)return ret;
drivers/net/mlx5/hws/mlx5dr_debug.h +1 -0
@@ -24,6 +24,7 @@ enum mlx5dr_debug_res_type {MLX5DR_DEBUG_RES_TYPE_MATCHER_ACTION_TEMPLATE =4204 ,MLX5DR_DEBUG_RES_TYPE_MATCHER_TEMPLATE_HASH_DEFINER =4205 ,MLX5DR_DEBUG_RES_TYPE_MATCHER_TEMPLATE_RANGE_DEFINER =4206 , + MLX5DR_DEBUG_RES_TYPE_MATCHER_TEMPLATE_COMPARE_MATCH_DEFINER = 4207, }; static inline uint64_t
drivers/net/mlx5/hws/mlx5dr_definer.c +239 -4
304 lines not on this page · raw message
drivers/net/mlx5/hws/mlx5dr_definer.h +33 -0
@@ -17,6 +17,37 @@#define DW_SELECTORS_RANGE 2#define BYTE_SELECTORS_RANGE 8 +enum mlx5dr_definer_compare_ste_dw_offset { +/* In compare STE the matching DW's starts after the 3 actions */ +MLX5DR_DEFINER_COMPARE_STE_ARGUMENT_1 =3 , +MLX5DR_DEFINER_COMPARE_STE_ARGUMENT_0 , +MLX5DR_DEFINER_COMPARE_STE_BASE_1 , +MLX5DR_DEFINER_COMPARE_STE_BASE_0 , +MLX5DR_DEFINER_COMPARE_STE_TAG_DW_3 , +MLX5DR_DEFINER_COMPARE_STE_TAG_DW_2 , +MLX5DR_DEFINER_COMPARE_STE_TAG_DW_1 , +MLX5DR_DEFINER_COMPARE_STE_TAG_DW_0 , +}; + +enum mlx5dr_definer_dw_selectors { +MLX5DR_DEFINER_SELECTOR_DW0 , +MLX5DR_DEFINER_SELECTOR_DW1 , +MLX5DR_DEFINER_SELECTOR_DW2 , +MLX5DR_DEFINER_SELECTOR_DW3 , +MLX5DR_DEFINER_SELECTOR_DW4 , +MLX5DR_DEFINER_SELECTOR_DW5 , +MLX5DR_DEFINER_SELECTOR_DW6 , +MLX5DR_DEFINER_SELECTOR_DW7 , +MLX5DR_DEFINER_SELECTOR_DW8 , +}; + +enum mlx5dr_definer_compare_dw_selectors { +MLX5DR_DEFINER_COMPARE_ARGUMENT_0 =MLX5DR_DEFINER_SELECTOR_DW4 , +MLX5DR_DEFINER_COMPARE_ARGUMENT_1 =MLX5DR_DEFINER_SELECTOR_DW5 , +MLX5DR_DEFINER_COMPARE_BASE_0 =MLX5DR_DEFINER_SELECTOR_DW2 , +MLX5DR_DEFINER_COMPARE_BASE_1 =MLX5DR_DEFINER_SELECTOR_DW3 , +}; +enum mlx5dr_definer_fname {MLX5DR_DEFINER_FNAME_ETH_SMAC_48_16_O ,MLX5DR_DEFINER_FNAME_ETH_SMAC_48_16_I ,
@@ -188,6 +219,8 @@ struct mlx5dr_definer_fc {uint8_t item_idx;uint8_t is_range;uint16_t extra_data; +uint8_t compare_idx; +bool compare_set_base;uint32_t byte_off;int bit_off;uint32_t bit_mask;
drivers/net/mlx5/hws/mlx5dr_matcher.c +53 -0
68 lines not on this page · raw message
drivers/net/mlx5/hws/mlx5dr_matcher.h +11 -1
@@ -27,6 +27,7 @@ enum mlx5dr_matcher_flags {MLX5DR_MATCHER_FLAGS_HASH_DEFINER =1 <<1 ,MLX5DR_MATCHER_FLAGS_COLLISION =1 <<2 ,MLX5DR_MATCHER_FLAGS_RESIZABLE =1 <<3 , + MLX5DR_MATCHER_FLAGS_COMPARE = 1 << 4, }; struct mlx5dr_match_template {
@@ -110,12 +111,19 @@ static inline bool mlx5dr_matcher_is_in_resize(struct mlx5dr_matcher *matcher)return !!matcher->resize_dst; } +static inline bool +mlx5dr_matcher_is_compare (struct mlx5dr_matcher *matcher) +{ +return !!(matcher->flags &MLX5DR_MATCHER_FLAGS_COMPARE ); +} +static inline bool mlx5dr_matcher_req_fw_wqe (struct mlx5dr_matcher *matcher) {/* Currently HWS doesn't support hash different from match or range */ return unlikely (matcher->flags & (MLX5DR_MATCHER_FLAGS_HASH_DEFINER | -MLX5DR_MATCHER_FLAGS_RANGE_DEFINER )); +MLX5DR_MATCHER_FLAGS_RANGE_DEFINER | +MLX5DR_MATCHER_FLAGS_COMPARE )); } int mlx5dr_matcher_conv_items_to_prm(uint64_t *match_buf,
@@ -141,4 +149,6 @@ int mlx5dr_matcher_free_rtc_pointing(struct mlx5dr_context *ctx,enum mlx5dr_table_type type, struct mlx5dr_devx_obj *devx_obj); +int mlx5dr_matcher_validate_compare_attr (struct mlx5dr_matcher *matcher); +#endif /* MLX5DR_MATCHER_H_ */
Signature · 1 line
2.25.1
PATCH v7 2/3 net/mlx5: add support to compare random value
In reply to Michael BaumAdd support to use "RTE_FLOW_ITEM_TYPE_COMPARE" with "RTE_FLOW_FIELD_RAMDOM" as an argument.
The random field is supported only when base is an immediate value, random field cannot be compared with enother field.
--- doc/guides/nics/mlx5.rst | 9 ++++- drivers/net/mlx5/mlx5_flow_hw.c | 70 ++++++++++++++++++++++++--------- 2 files changed, 59 insertions(+), 20 deletions(-)
doc/guides/nics/mlx5.rst +7 -2
@@ -431,8 +431,13 @@ Limitations - Only supported in HW steering(``dv_flow_en`` = 2) mode. - Only single flow is supported to the flow table. - - Only 32-bit comparison is supported. - - Only match with compare result between packet fields is supported. + - Only single item is supported per pattern template. + - Only 32-bit comparison is supported or 16-bits for random field. + - Only supported for ``RTE_FLOW_FIELD_META``, ``RTE_FLOW_FIELD_TAG``, + ``RTE_FLOW_FIELD_RANDOM`` and ``RTE_FLOW_FIELD_VALUE``. + - The field type ``RTE_FLOW_FIELD_VALUE`` must be the base (``b``) field. + - The field type ``RTE_FLOW_FIELD_RANDOM`` can only be compared with + ``RTE_FLOW_FIELD_VALUE``. - No Tx metadata go to the E-Switch steering domain for the Flow group 0. The flows within group 0 and set metadata action are rejected by hardware.
drivers/net/mlx5/mlx5_flow_hw.c +52 -18
102 lines not on this page · raw message
Signature · 1 line
2.25.1
PATCH v7 3/3 net/mlx5/hws: add compare ESP sequence number support
In reply to Michael BaumAdd support for compare item with "RTE_FLOW_FIELD_ESP_SEQ_NUM" field.
--- doc/guides/nics/mlx5.rst | 1 + drivers/net/mlx5/hws/mlx5dr_definer.c | 22 ++++++++++++++++++++-- drivers/net/mlx5/mlx5_flow_hw.c | 3 +++ 3 files changed, 24 insertions(+), 2 deletions(-)
doc/guides/nics/mlx5.rst +1 -0
@@ -434,6 +434,7 @@ Limitations - Only single item is supported per pattern template. - Only 32-bit comparison is supported or 16-bits for random field. - Only supported for ``RTE_FLOW_FIELD_META``, ``RTE_FLOW_FIELD_TAG``, + ``RTE_FLOW_FIELD_ESP_SEQ_NUM``, ``RTE_FLOW_FIELD_RANDOM`` and ``RTE_FLOW_FIELD_VALUE``. - The field type ``RTE_FLOW_FIELD_VALUE`` must be the base (``b``) field. - The field type ``RTE_FLOW_FIELD_RANDOM`` can only be compared with
drivers/net/mlx5/hws/mlx5dr_definer.c +20 -2
@@ -424,10 +424,20 @@ mlx5dr_definer_compare_base_value_set(const void *item_spec, value = (const uint32_t *)&b->value[0 ]; -if (a->field ==RTE_FLOW_FIELD_RANDOM ) +switch (a->field) { +case RTE_FLOW_FIELD_RANDOM : *base =htobe32 (*value <<16 ); -else +break ; +case RTE_FLOW_FIELD_TAG : +case RTE_FLOW_FIELD_META : *base =htobe32 (*value); +break ; +case RTE_FLOW_FIELD_ESP_SEQ_NUM : + *base = *value; +break ; +default : +break ; + }MLX5_SET (ste_match_4dw_range_ctrl_dw, ctrl, base0,1 ); }
@@ -2930,6 +2940,14 @@ mlx5dr_definer_conv_item_compare_field(const struct rte_flow_field_data *f, fc->compare_idx = dw_offset;DR_CALC_SET_HDR (fc, random_number, random_number);break ; +case RTE_FLOW_FIELD_ESP_SEQ_NUM : + fc = &cd->fc[MLX5DR_DEFINER_FNAME_ESP_SEQUENCE_NUMBER ]; + fc->item_idx = item_idx; + fc->tag_set = &mlx5dr_definer_compare_set; + fc->tag_mask_set = &mlx5dr_definer_ones_set; + fc->compare_idx = dw_offset; +DR_CALC_SET_HDR (fc, ipsec, sequence_number); +break ;default :DR_LOG (ERR ,"%u field is not supported" , f->field); goto err_notsup;
drivers/net/mlx5/mlx5_flow_hw.c +3 -0
@@ -6729,6 +6729,7 @@ flow_hw_item_compare_field_validate(enum rte_flow_field_id arg_field,switch (arg_field) {case RTE_FLOW_FIELD_TAG :case RTE_FLOW_FIELD_META : +case RTE_FLOW_FIELD_ESP_SEQ_NUM :break ;case RTE_FLOW_FIELD_RANDOM :if (base_field ==RTE_FLOW_FIELD_VALUE )
@@ -6747,6 +6748,7 @@ flow_hw_item_compare_field_validate(enum rte_flow_field_id arg_field,case RTE_FLOW_FIELD_TAG :case RTE_FLOW_FIELD_META :case RTE_FLOW_FIELD_VALUE : +case RTE_FLOW_FIELD_ESP_SEQ_NUM :break ;default : return rte_flow_error_set(error, ENOTSUP,
@@ -6763,6 +6765,7 @@ flow_hw_item_compare_width_supported(enum rte_flow_field_id field)switch (field) {case RTE_FLOW_FIELD_TAG :case RTE_FLOW_FIELD_META : +case RTE_FLOW_FIELD_ESP_SEQ_NUM :return 32 ;case RTE_FLOW_FIELD_RANDOM :return 16 ;
Signature · 1 line
2.25.1
RE: [PATCH v7 0/3] net/mlx5: add compare item support
In reply to Michael BaumHi,
Quoted 65 lines
-----Original Message-----
From: Michael Baum <[email protected]>
Sent: Monday, February 26, 2024 3:19 PM
To: [email protected]
Cc: Matan Azrad <[email protected]>; Dariusz Sosnowski <[email protected]>; Raslan Darawsheh <[email protected]>; Slava Ovsiienko <[email protected]>; Ori Kam <[email protected]>; Suanming Mou <[email protected]>
Subject: [PATCH v7 0/3] net/mlx5: add compare item supportAdd HWS support for compare item with:
- "RTE_FLOW_FIELD_TAG".
- "RTE_FLOW_FIELD_NETA".
- "RTE_FLOW_FIELD_VALUE".Add HWS + PMD support for compare item with:
- "RTE_FLOW_FIELD_RANDOM".
- "RTE_FLOW_FIELD_ESP_SEQ_NUM".v2:
- Rebase.
- Add "RTE_FLOW_FIELD_META" compare support.
- Reduce the "Depends-on" list.v3:
- Rebase.
- Fix typo in function name, r/tranlate/translate.
- Fix adding a line without newline at end of file.v4:
- Rebase.
- Update documentation.
- Remove the "Depends-on" label.v5:
- Rebase.
- Add ESP sequence number suppoert and rename the series accordingly.v6:
- Rebase.
- Add "Acked-by" from v5.v7:
- Rebase.Hamdan Igbaria (1):
net/mlx5/hws: add support for compare matcherMichael Baum (2):
net/mlx5: add support to compare random valuenet/mlx5/hws: add compare ESP sequence number supportdoc/guides/nics/mlx5.rst | 10 +- drivers/common/mlx5/mlx5_prm.h | 16 ++ drivers/net/mlx5/hws/mlx5dr_cmd.c | 9 +- drivers/net/mlx5/hws/mlx5dr_cmd.h | 1 + drivers/net/mlx5/hws/mlx5dr_debug.c | 4 +- drivers/net/mlx5/hws/mlx5dr_debug.h | 1 + drivers/net/mlx5/hws/mlx5dr_definer.c | 261 +++++++++++++++++++++++++- drivers/net/mlx5/hws/mlx5dr_definer.h | 33 ++++ drivers/net/mlx5/hws/mlx5dr_matcher.c | 53 ++++++ drivers/net/mlx5/hws/mlx5dr_matcher.h | 12 +- drivers/net/mlx5/mlx5_flow_hw.c | 73 +++++-- 11 files changed, 444 insertions(+), 29 deletions(-)
Quoted 2 lines
--
2.25.1
Series applied to next-net-mlx,
Kindest regards
Raslan Darawsheh