net/mlx5: add eCPRI support
PATCH 1/1 net/mlx5: add eCPRI support
Support eCPRI item matching over L2 (ETHER / VLAN) in HWS, both for template API and backward compatibility API.
--- drivers/net/mlx5/hws/mlx5dr_definer.c | 86 +++++++++++++++++++++++++++ drivers/net/mlx5/mlx5_flow.h | 3 + drivers/net/mlx5/mlx5_flow_hw.c | 61 +++++++++++++++++++ 3 files changed, 150 insertions(+)
drivers/net/mlx5/hws/mlx5dr_definer.c +86 -0
@@ -583,6 +583,35 @@ mlx5dr_definer_ipv6_routing_ext_set(struct mlx5dr_definer_fc *fc,DR_SET (tag, val, fc->byte_off,0 , fc->bit_mask); } +static void +mlx5dr_definer_ecpri_common_set (struct mlx5dr_definer_fc *fc, +const void *item, +uint8_t *tag) +{ +const struct rte_flow_item_ecpri *ec = item; +uint32_t val; + + val = ec->hdr.common.u32; + +DR_SET_BE32 (tag, val, fc->byte_off,0 , fc->bit_mask); +} + +static void +mlx5dr_definer_ecpri_body_set (struct mlx5dr_definer_fc *fc, +const void *item, +uint8_t *tag) +{ +const struct rte_flow_item_ecpri *ec = item; +uint32_t val, idx; + + + idx = fc->fname -MLX5DR_DEFINER_FNAME_FLEX_PARSER_0 ; +/* The 1st DW is used for common field, indeed, there are only 2 DWs. */ + val = ec->hdr.dummy[idx -1 ]; + +DR_SET_BE32 (tag, val, fc->byte_off,0 , fc->bit_mask); +} + static void mlx5dr_definer_flex_parser_set(struct mlx5dr_definer_fc *fc, const void *item,
@@ -2555,6 +2584,59 @@ mlx5dr_definer_conv_item_random(struct mlx5dr_definer_conv_data *cd,return 0 ; } +static uint32_t +mlx5dr_definer_get_ecpri_parser_byte_off_from_ctx (void *dr_ctx,uint32_t *byte_off) +{ +uint32_t base_off =MLX5_BYTE_OFF (definer_hl, flex_parser.flex_parser_0); +struct mlx5_ecpri_parser_profile *ecp; +uint32_t i; + + ecp =flow_hw_get_ecpri_parser_profile (dr_ctx); +if (!ecp) +return UINT32_MAX ; +for (i =0 ; i < ecp->num; i++) + byte_off[i] = base_off - ecp->ids[i] *sizeof (uint32_t ); +return i; +} + +static int +mlx5dr_definer_conv_item_ecpri (struct mlx5dr_definer_conv_data *cd, +struct rte_flow_item *item, +int item_idx) +{ +const struct rte_flow_item_ecpri *m; +uint32_t i, mask, byte_off[8 ] = {0 }; +struct mlx5dr_definer_fc *fc; +uint32_t num_dws; + + num_dws =mlx5dr_definer_get_ecpri_parser_byte_off_from_ctx (cd->ctx, byte_off); +if (num_dws ==UINT32_MAX ) { +DR_LOG (ERR ,"failed to get eCPRI samples %d" , -rte_errno); +return rte_errno; + } + + m = item->mask; +if (!m) +return 0 ; + +for (i =0 ; i < num_dws; i++) { + mask = i ==0 ? m->hdr.common.u32 : m->hdr.dummy[i -1 ]; +if (!mask) +continue ; + mask =htobe32 (mask); + fc =mlx5dr_definer_get_flex_parser_fc (cd, byte_off[i]); +if (!fc) +return rte_errno; + + fc->item_idx = item_idx; + fc->tag_set = i ==0 ? &mlx5dr_definer_ecpri_common_set : + &mlx5dr_definer_ecpri_body_set; + fc->tag_mask_set = &mlx5dr_definer_ones_set; + fc->bit_mask = mask; + } +return 0 ; +} + static int mlx5dr_definer_conv_item_geneve(struct mlx5dr_definer_conv_data *cd, struct rte_flow_item *item,
@@ -3314,6 +3396,10 @@ mlx5dr_definer_conv_items_to_hl(struct mlx5dr_context *ctx,MLX5_FLOW_ITEM_OUTER_FLEX ; }break ; +case RTE_FLOW_ITEM_TYPE_ECPRI : + ret =mlx5dr_definer_conv_item_ecpri (&cd, items, i); + item_flags |=MLX5_FLOW_LAYER_ECPRI ; +break ;case RTE_FLOW_ITEM_TYPE_MPLS : ret =mlx5dr_definer_conv_item_mpls (&cd, items, i); item_flags |=MLX5_FLOW_LAYER_MPLS ;
drivers/net/mlx5/mlx5_flow.h +3 -0
@@ -1812,6 +1812,7 @@ flow_hw_get_reg_id_from_ctx(void *dr_ctx, enum rte_flow_item_type type,#endif +/* * Define list of valid combinations of RX Hash fields * (see enum ibv_rx_hash_fields).
@@ -3704,5 +3705,7 @@ mlx5_flow_nta_update_copy_table(struct rte_eth_dev *dev,uint64_t action_flags, struct rte_flow_error *error); +struct mlx5_ecpri_parser_profile *flow_hw_get_ecpri_parser_profile (void *dr_ctx); +#endif #endif /* RTE_PMD_MLX5_FLOW_H_ */
drivers/net/mlx5/mlx5_flow_hw.c +61 -0
97 lines not on this page · raw message
Signature · 1 line
2.34.1
Quoted 12 lines
-----Original Message-----
From: Bing Zhao <[email protected]>
Sent: Tuesday, February 25, 2025 17:03
To: Slava Ovsiienko <[email protected]>; [email protected]; Raslan Darawsheh <[email protected]>
Cc: Ori Kam <[email protected]>; Dariusz Sosnowski <[email protected]>; Suanming Mou <[email protected]>; Matan Azrad <[email protected]>; Hamdan Agbariya <[email protected]>
Subject: [PATCH] net/mlx5: add eCPRI support
Quoted 4 lines
Support eCPRI item matching over L2 (ETHER / VLAN) in HWS, both for template API and backward compatibility API.
Signed-off-by Bing Zhao <[email protected]>
Best regards,
Dariusz Sosnowski
PATCH v2 1/1 net/mlx5: add eCPRI support
In reply to Bing ZhaoSupport eCPRI item matching over L2 (ETHER / VLAN) in HWS, both for template API and backward compatibility API.
---
v2: fix the checkpatch warning of unneeded else
--- drivers/net/mlx5/hws/mlx5dr_definer.c | 86 +++++++++++++++++++++++++++ drivers/net/mlx5/mlx5_flow.h | 3 + drivers/net/mlx5/mlx5_flow_hw.c | 60 +++++++++++++++++++ 3 files changed, 149 insertions(+)
drivers/net/mlx5/hws/mlx5dr_definer.c +86 -0
@@ -583,6 +583,35 @@ mlx5dr_definer_ipv6_routing_ext_set(struct mlx5dr_definer_fc *fc,DR_SET (tag, val, fc->byte_off,0 , fc->bit_mask); } +static void +mlx5dr_definer_ecpri_common_set (struct mlx5dr_definer_fc *fc, +const void *item, +uint8_t *tag) +{ +const struct rte_flow_item_ecpri *ec = item; +uint32_t val; + + val = ec->hdr.common.u32; + +DR_SET_BE32 (tag, val, fc->byte_off,0 , fc->bit_mask); +} + +static void +mlx5dr_definer_ecpri_body_set (struct mlx5dr_definer_fc *fc, +const void *item, +uint8_t *tag) +{ +const struct rte_flow_item_ecpri *ec = item; +uint32_t val, idx; + + + idx = fc->fname -MLX5DR_DEFINER_FNAME_FLEX_PARSER_0 ; +/* The 1st DW is used for common field, indeed, there are only 2 DWs. */ + val = ec->hdr.dummy[idx -1 ]; + +DR_SET_BE32 (tag, val, fc->byte_off,0 , fc->bit_mask); +} + static void mlx5dr_definer_flex_parser_set(struct mlx5dr_definer_fc *fc, const void *item,
@@ -2555,6 +2584,59 @@ mlx5dr_definer_conv_item_random(struct mlx5dr_definer_conv_data *cd,return 0 ; } +static uint32_t +mlx5dr_definer_get_ecpri_parser_byte_off_from_ctx (void *dr_ctx,uint32_t *byte_off) +{ +uint32_t base_off =MLX5_BYTE_OFF (definer_hl, flex_parser.flex_parser_0); +struct mlx5_ecpri_parser_profile *ecp; +uint32_t i; + + ecp =flow_hw_get_ecpri_parser_profile (dr_ctx); +if (!ecp) +return UINT32_MAX ; +for (i =0 ; i < ecp->num; i++) + byte_off[i] = base_off - ecp->ids[i] *sizeof (uint32_t ); +return i; +} + +static int +mlx5dr_definer_conv_item_ecpri (struct mlx5dr_definer_conv_data *cd, +struct rte_flow_item *item, +int item_idx) +{ +const struct rte_flow_item_ecpri *m; +uint32_t i, mask, byte_off[8 ] = {0 }; +struct mlx5dr_definer_fc *fc; +uint32_t num_dws; + + num_dws =mlx5dr_definer_get_ecpri_parser_byte_off_from_ctx (cd->ctx, byte_off); +if (num_dws ==UINT32_MAX ) { +DR_LOG (ERR ,"failed to get eCPRI samples %d" , -rte_errno); +return rte_errno; + } + + m = item->mask; +if (!m) +return 0 ; + +for (i =0 ; i < num_dws; i++) { + mask = i ==0 ? m->hdr.common.u32 : m->hdr.dummy[i -1 ]; +if (!mask) +continue ; + mask =htobe32 (mask); + fc =mlx5dr_definer_get_flex_parser_fc (cd, byte_off[i]); +if (!fc) +return rte_errno; + + fc->item_idx = item_idx; + fc->tag_set = i ==0 ? &mlx5dr_definer_ecpri_common_set : + &mlx5dr_definer_ecpri_body_set; + fc->tag_mask_set = &mlx5dr_definer_ones_set; + fc->bit_mask = mask; + } +return 0 ; +} + static int mlx5dr_definer_conv_item_geneve(struct mlx5dr_definer_conv_data *cd, struct rte_flow_item *item,
@@ -3314,6 +3396,10 @@ mlx5dr_definer_conv_items_to_hl(struct mlx5dr_context *ctx,MLX5_FLOW_ITEM_OUTER_FLEX ; }break ; +case RTE_FLOW_ITEM_TYPE_ECPRI : + ret =mlx5dr_definer_conv_item_ecpri (&cd, items, i); + item_flags |=MLX5_FLOW_LAYER_ECPRI ; +break ;case RTE_FLOW_ITEM_TYPE_MPLS : ret =mlx5dr_definer_conv_item_mpls (&cd, items, i); item_flags |=MLX5_FLOW_LAYER_MPLS ;
drivers/net/mlx5/mlx5_flow.h +3 -0
@@ -1812,6 +1812,7 @@ flow_hw_get_reg_id_from_ctx(void *dr_ctx, enum rte_flow_item_type type,#endif +/* * Define list of valid combinations of RX Hash fields * (see enum ibv_rx_hash_fields).
@@ -3704,5 +3705,7 @@ mlx5_flow_nta_update_copy_table(struct rte_eth_dev *dev,uint64_t action_flags, struct rte_flow_error *error); +struct mlx5_ecpri_parser_profile *flow_hw_get_ecpri_parser_profile (void *dr_ctx); +#endif #endif /* RTE_PMD_MLX5_FLOW_H_ */
drivers/net/mlx5/mlx5_flow_hw.c +60 -0
96 lines not on this page · raw message
Signature · 1 line
2.34.1
PATCH v3 1/1 net/mlx5: add eCPRI support
Support eCPRI item matching over L2 (ETHER / VLAN) in HWS, both for template API and backward compatibility API.
---
v2: fix the checkpatch warning of unneeded else
v3: fix single line if condition code style warning
--- drivers/net/mlx5/hws/mlx5dr_definer.c | 86 +++++++++++++++++++++++++++ drivers/net/mlx5/mlx5_flow.h | 3 + drivers/net/mlx5/mlx5_flow_hw.c | 59 ++++++++++++++++++ 3 files changed, 148 insertions(+)
drivers/net/mlx5/hws/mlx5dr_definer.c +86 -0
@@ -583,6 +583,35 @@ mlx5dr_definer_ipv6_routing_ext_set(struct mlx5dr_definer_fc *fc,DR_SET (tag, val, fc->byte_off,0 , fc->bit_mask); } +static void +mlx5dr_definer_ecpri_common_set (struct mlx5dr_definer_fc *fc, +const void *item, +uint8_t *tag) +{ +const struct rte_flow_item_ecpri *ec = item; +uint32_t val; + + val = ec->hdr.common.u32; + +DR_SET_BE32 (tag, val, fc->byte_off,0 , fc->bit_mask); +} + +static void +mlx5dr_definer_ecpri_body_set (struct mlx5dr_definer_fc *fc, +const void *item, +uint8_t *tag) +{ +const struct rte_flow_item_ecpri *ec = item; +uint32_t val, idx; + + + idx = fc->fname -MLX5DR_DEFINER_FNAME_FLEX_PARSER_0 ; +/* The 1st DW is used for common field, indeed, there are only 2 DWs. */ + val = ec->hdr.dummy[idx -1 ]; + +DR_SET_BE32 (tag, val, fc->byte_off,0 , fc->bit_mask); +} + static void mlx5dr_definer_flex_parser_set(struct mlx5dr_definer_fc *fc, const void *item,
@@ -2555,6 +2584,59 @@ mlx5dr_definer_conv_item_random(struct mlx5dr_definer_conv_data *cd,return 0 ; } +static uint32_t +mlx5dr_definer_get_ecpri_parser_byte_off_from_ctx (void *dr_ctx,uint32_t *byte_off) +{ +uint32_t base_off =MLX5_BYTE_OFF (definer_hl, flex_parser.flex_parser_0); +struct mlx5_ecpri_parser_profile *ecp; +uint32_t i; + + ecp =flow_hw_get_ecpri_parser_profile (dr_ctx); +if (!ecp) +return UINT32_MAX ; +for (i =0 ; i < ecp->num; i++) + byte_off[i] = base_off - ecp->ids[i] *sizeof (uint32_t ); +return i; +} + +static int +mlx5dr_definer_conv_item_ecpri (struct mlx5dr_definer_conv_data *cd, +struct rte_flow_item *item, +int item_idx) +{ +const struct rte_flow_item_ecpri *m; +uint32_t i, mask, byte_off[8 ] = {0 }; +struct mlx5dr_definer_fc *fc; +uint32_t num_dws; + + num_dws =mlx5dr_definer_get_ecpri_parser_byte_off_from_ctx (cd->ctx, byte_off); +if (num_dws ==UINT32_MAX ) { +DR_LOG (ERR ,"failed to get eCPRI samples %d" , -rte_errno); +return rte_errno; + } + + m = item->mask; +if (!m) +return 0 ; + +for (i =0 ; i < num_dws; i++) { + mask = i ==0 ? m->hdr.common.u32 : m->hdr.dummy[i -1 ]; +if (!mask) +continue ; + mask =htobe32 (mask); + fc =mlx5dr_definer_get_flex_parser_fc (cd, byte_off[i]); +if (!fc) +return rte_errno; + + fc->item_idx = item_idx; + fc->tag_set = i ==0 ? &mlx5dr_definer_ecpri_common_set : + &mlx5dr_definer_ecpri_body_set; + fc->tag_mask_set = &mlx5dr_definer_ones_set; + fc->bit_mask = mask; + } +return 0 ; +} + static int mlx5dr_definer_conv_item_geneve(struct mlx5dr_definer_conv_data *cd, struct rte_flow_item *item,
@@ -3314,6 +3396,10 @@ mlx5dr_definer_conv_items_to_hl(struct mlx5dr_context *ctx,MLX5_FLOW_ITEM_OUTER_FLEX ; }break ; +case RTE_FLOW_ITEM_TYPE_ECPRI : + ret =mlx5dr_definer_conv_item_ecpri (&cd, items, i); + item_flags |=MLX5_FLOW_LAYER_ECPRI ; +break ;case RTE_FLOW_ITEM_TYPE_MPLS : ret =mlx5dr_definer_conv_item_mpls (&cd, items, i); item_flags |=MLX5_FLOW_LAYER_MPLS ;
drivers/net/mlx5/mlx5_flow.h +3 -0
@@ -1812,6 +1812,7 @@ flow_hw_get_reg_id_from_ctx(void *dr_ctx, enum rte_flow_item_type type,#endif +/* * Define list of valid combinations of RX Hash fields * (see enum ibv_rx_hash_fields).
@@ -3704,5 +3705,7 @@ mlx5_flow_nta_update_copy_table(struct rte_eth_dev *dev,uint64_t action_flags, struct rte_flow_error *error); +struct mlx5_ecpri_parser_profile *flow_hw_get_ecpri_parser_profile (void *dr_ctx); +#endif #endif /* RTE_PMD_MLX5_FLOW_H_ */
drivers/net/mlx5/mlx5_flow_hw.c +59 -0
95 lines not on this page · raw message
Signature · 1 line
2.34.1
Hi,
From: Bing Zhao <[email protected]>
Sent: Wednesday, February 26, 2025 9:17 AM
To: Slava Ovsiienko; [email protected]; Raslan Darawsheh
Cc: Ori Kam; Dariusz Sosnowski; Suanming Mou; Matan Azrad; Hamdan Agbariya
Subject: [PATCH v3] net/mlx5: add eCPRI support
Support eCPRI item matching over L2 (ETHER / VLAN) in HWS, both for template API and backward compatibility API.
---
v2: fix the checkpatch warning of unneeded else
v3: fix single line if condition code style warning
---
Patch applied to next-net-mlx,
Kindest regards,
Raslan Darawsheh