Enable yellow meter hierarchy
cover Enable yellow meter hierarchy
To support yellow meter hierarchy, need to support meter action in yellow policy flow, so both green and yellow packet can go to next meter. Currently there's the limitation that only the same next meter supported for green and yellow.
Meanwhile, color aware mode is supported, so the next meter can be aware of the previous color, so can have different process strategy.
Shun Hao (4):
net/mlx5: support previous meter color aware net/mlx5: support yellow meter action in hierarchy net/mlx5: support yellow meter action for hierarchy tag rule net/mlx5: add validation for yellow meter action
doc/guides/nics/mlx5.rst | 6 +- drivers/net/mlx5/mlx5.c | 8 +- drivers/net/mlx5/mlx5.h | 10 +- drivers/net/mlx5/mlx5_flow_aso.c | 19 +- drivers/net/mlx5/mlx5_flow_dv.c | 406 +++++++++++++++++++---------- drivers/net/mlx5/mlx5_flow_meter.c | 60 +++-- 6 files changed, 345 insertions(+), 164 deletions(-)
Signature · 1 line
2.20.0
PATCH 1/4 net/mlx5: support previous meter color aware
This patch adds the support for previous color aware for meter. Start_color setting is set to UNDEFINED when creating meter object that is color aware.
--- drivers/net/mlx5/mlx5.h | 2 ++ drivers/net/mlx5/mlx5_flow_aso.c | 19 +++++++++++-------- drivers/net/mlx5/mlx5_flow_meter.c | 3 ++- 3 files changed, 15 insertions(+), 9 deletions(-)
drivers/net/mlx5/mlx5.h +2 -0
@@ -859,6 +859,8 @@ struct mlx5_flow_meter_info { uint32_t transfer:1; uint32_t def_policy:1;/* Meter points to default policy. */ + uint32_t color_aware:1; +/* Meter is color aware mode. */ void *drop_rule[MLX5_MTR_DOMAIN_MAX ];/* Meter drop rule in drop table. */ uint32_t drop_cnt;
drivers/net/mlx5/mlx5_flow_aso.c +11 -8
@@ -652,6 +652,7 @@ mlx5_aso_mtr_sq_enqueue_single(struct mlx5_dev_ctx_shared *sh,uint16_t res;uint32_t dseg_idx =0 ;struct mlx5_aso_mtr_pool *pool =NULL ; +uint32_t param_le;rte_spinlock_lock (&sq->sqsl); res = size - (uint16_t )(sq->head - sq->tail);
@@ -688,15 +689,14 @@ mlx5_aso_mtr_sq_enqueue_single(struct mlx5_dev_ctx_shared *sh, wqe->aso_dseg.mtrs[dseg_idx].ebs_eir =0 ; } fmp = fm->profile; -if (fmp->profile.packet_mode) - wqe->aso_dseg.mtrs[dseg_idx].v_bo_sc_bbog_mm = -RTE_BE32 ((1 <<ASO_DSEG_VALID_OFFSET ) | - (MLX5_FLOW_COLOR_GREEN <<ASO_DSEG_SC_OFFSET ) | - (MLX5_METER_MODE_PKT <<ASO_DSEG_MTR_MODE )); + param_le = (1 <<ASO_DSEG_VALID_OFFSET ); +if (fm->color_aware) + param_le |= (MLX5_FLOW_COLOR_UNDEFINED <<ASO_DSEG_SC_OFFSET );else - wqe->aso_dseg.mtrs[dseg_idx].v_bo_sc_bbog_mm = -RTE_BE32 ((1 <<ASO_DSEG_VALID_OFFSET ) | - (MLX5_FLOW_COLOR_GREEN <<ASO_DSEG_SC_OFFSET )); + param_le |= (MLX5_FLOW_COLOR_GREEN <<ASO_DSEG_SC_OFFSET ); +if (fmp->profile.packet_mode) + param_le |= (MLX5_METER_MODE_PKT <<ASO_DSEG_MTR_MODE ); + wqe->aso_dseg.mtrs[dseg_idx].v_bo_sc_bbog_mm =RTE_BE32 (param_le);switch (fmp->profile.alg) {case RTE_MTR_SRTCM_RFC2697 :/* Only needed for RFC2697. */
@@ -709,6 +709,9 @@ mlx5_aso_mtr_sq_enqueue_single(struct mlx5_dev_ctx_shared *sh,RTE_BE32 (1 <<ASO_DSEG_BBOG_OFFSET );break ;case RTE_MTR_TRTCM_RFC4115 : + wqe->aso_dseg.mtrs[dseg_idx].v_bo_sc_bbog_mm |= +RTE_BE32 (1 <<ASO_DSEG_BO_OFFSET ); +break ;default :break ; }
drivers/net/mlx5/mlx5_flow_meter.c +2 -1
@@ -1005,7 +1005,7 @@ mlx5_flow_meter_validate(struct mlx5_priv *priv, uint32_t meter_id,RTE_MTR_ERROR_TYPE_MTR_PARAMS , NULL, "Meter object params null.");/* Previous meter color is not supported. */ -if (params->use_prev_mtr_color) +if (params->use_prev_mtr_color && !priv->sh->meter_aso_en) return -rte_mtr_error_set(error, ENOTSUP, RTE_MTR_ERROR_TYPE_MTR_PARAMS, NULL,
@@ -1293,6 +1293,7 @@ mlx5_flow_meter_create(struct rte_eth_dev *dev, uint32_t meter_id, fm->active_state =1 ;/* Config meter starts as active. */ fm->is_enable = params->meter_enable; fm->shared = !!shared; + fm->color_aware = !!params->use_prev_mtr_color;__atomic_add_fetch (&fm->profile->ref_cnt,1 , __ATOMIC_RELAXED);if (params->meter_policy_id == priv->sh->mtrmng->def_policy_id) { fm->def_policy =1 ;
Signature · 1 line
2.20.0
PATCH 2/4 net/mlx5: support yellow meter action in hierarchy
In reply to Shun HaoThis patch adds the support of meter action for yellow meter policy flow, so can use meter action for both green and yellow policy flows in meter hierarchy.
Currently must use the same meter within one meter policy. Packets passing green/yellow policy flow will have previous meter color of green/yellow in subsequent meter.
--- drivers/net/mlx5/mlx5.c | 8 ++- drivers/net/mlx5/mlx5.h | 8 ++- drivers/net/mlx5/mlx5_flow_dv.c | 100 ++++++++++++++++++++++------- drivers/net/mlx5/mlx5_flow_meter.c | 57 +++++++++++----- 4 files changed, 132 insertions(+), 41 deletions(-)
drivers/net/mlx5/mlx5.c +6 -2
@@ -686,10 +686,14 @@ mlx5_aso_flow_mtrs_mng_close(struct mlx5_dev_ctx_shared *sh)#ifdef HAVE_MLX5_DR_CREATE_ACTION_ASO for (i =0 ; i <MLX5_ASO_MTRS_PER_POOL ; i++) { aso_mtr = &mtr_pool->mtrs[i]; -if (aso_mtr->fm.meter_action) +if (aso_mtr->fm.meter_action_g)claim_zero (mlx5_glue->destroy_flow_action - (aso_mtr->fm.meter_action)); + (aso_mtr->fm.meter_action_g)); +if (aso_mtr->fm.meter_action_y) +claim_zero + (mlx5_glue->destroy_flow_action + (aso_mtr->fm.meter_action_y)); }#endif /* HAVE_MLX5_DR_CREATE_ACTION_ASO */ claim_zero(mlx5_devx_cmd_destroy
drivers/net/mlx5/mlx5.h +7 -1
@@ -869,8 +869,10 @@ struct mlx5_flow_meter_info {/**< Use count. */ struct mlx5_indexed_pool *flow_ipool;/**< Index pool for flow id. */ -void *meter_action; +void *meter_action_g;/**< Flow meter action. */ +void *meter_action_y; +/**< Flow meter action for yellow init_color. */ };/* PPS(packets per second) map to BPS(Bytes per second).
@@ -1873,6 +1875,10 @@ struct mlx5_flow_meter_policy *mlx5_flow_meter_policy_find (struct rte_eth_dev *dev, uint32_t policy_id, uint32_t *policy_idx); +struct mlx5_flow_meter_info * +mlx5_flow_meter_hierarchy_next_meter (struct mlx5_priv *priv, +struct mlx5_flow_meter_policy *policy, +uint32_t *mtr_idx);struct mlx5_flow_meter_policy *mlx5_flow_meter_hierarchy_get_final_policy (struct rte_eth_dev *dev,struct mlx5_flow_meter_policy *policy);
drivers/net/mlx5/mlx5_flow_dv.c +77 -23
215 lines not on this page · raw message
drivers/net/mlx5/mlx5_flow_meter.c +42 -15
107 lines not on this page · raw message
Signature · 1 line
2.20.0
PATCH 3/4 net/mlx5: support yellow meter action for hierarchy tag rule
In reply to Shun HaoWhen a hierarchy meter is shared by other ports, it's needed to iterate all meter policies in hierarchy to create tag rules, to set packet with next meter ID, which will be used by related meter drop count. This patch adds the tag rule for yellow support in hierarchy, so both green/yellow policy flows can set the correct meter ID.
--- drivers/net/mlx5/mlx5_flow_dv.c | 270 +++++++++++++++++++++----------- 1 file changed, 175 insertions(+), 95 deletions(-)
drivers/net/mlx5/mlx5_flow_dv.c +175 -95
@@ -17293,6 +17293,68 @@ flow_dv_meter_sub_policy_rss_prepare(struct rte_eth_dev *dev,return NULL ; } +/** +* Check if need to create hierarchy tag rule. +* +* @param[in] priv +* Pointer to mlx5_priv. +* @param[in] mtr_policy +* Pointer to current meter policy. +* @param[in] src_port +* The src port this extra rule should use. +* @param[out] next_fm +* Pointer to next meter in hierarchy. +* @param[out] skip +* Indicate if skip the tag rule creation. +* @param[out] error +* Perform verbose error reporting if not NULL. +* @return +* 0 on success, a negative errno value otherwise and rte_errno is set. +*/ +static int +mlx5_meter_hierarchy_skip_tag_rule (struct mlx5_priv *priv, +struct mlx5_flow_meter_policy *mtr_policy, +int32_t src_port, +struct mlx5_flow_meter_info **next_fm, +bool *skip, +struct rte_flow_error *error) +{ +struct mlx5_flow_meter_sub_policy *sub_policy; +struct mlx5_sub_policy_color_rule *color_rule; +uint32_t domain =MLX5_MTR_DOMAIN_TRANSFER ; +int ret =0 ; +int i; + + *next_fm =NULL ; + *skip = false; +rte_spinlock_lock (&mtr_policy->sl); +if (!mtr_policy->is_hierarchy) + goto exit; + *next_fm =mlx5_flow_meter_hierarchy_next_meter (priv, mtr_policy,NULL ); +if (!*next_fm) { + ret =rte_flow_error_set (error,EINVAL ,RTE_FLOW_ERROR_TYPE_ACTION , +NULL ,"Failed to find next meter in hierarchy." ); + goto exit; + } +if (!(*next_fm)->drop_cnt) { + *skip = true; + goto exit; + } + sub_policy = mtr_policy->sub_policys[domain][0 ]; +for (i =0 ; i <MLX5_MTR_RTE_COLORS ; i++) { +if (mtr_policy->act_cnt[i].fate_action !=MLX5_FLOW_FATE_MTR ) +continue ; + TAILQ_FOREACH(color_rule, &sub_policy->color_rules[i], next_port) +if (color_rule->src_port == src_port) { + *skip = true; + goto exit; + } + } +exit: +rte_spinlock_unlock (&mtr_policy->sl); +return ret; +} +/** * Create the sub policy tag rule for all meters in hierarchy. *
@@ -17336,111 +17398,129 @@ flow_dv_meter_hierarchy_rule_create(struct rte_eth_dev *dev, .reserved = 0, };uint32_t domain =MLX5_MTR_DOMAIN_TRANSFER ; -int i; +struct { +struct mlx5_flow_meter_policy *fm_policy; +struct mlx5_flow_meter_info *next_fm; +struct mlx5_sub_policy_color_rule *tag_rule[MLX5_MTR_RTE_COLORS ]; + } fm_info[MLX5_MTR_CHAIN_MAX_NUM ] = { {0 } }; +uint32_t fm_cnt =0 ; +uint32_t i, j; - mtr_policy =mlx5_flow_meter_policy_find (dev, fm->policy_id,NULL ); -MLX5_ASSERT (mtr_policy); -if (!mtr_policy->is_hierarchy) -return 0 ; - next_fm =mlx5_flow_meter_find (priv, - mtr_policy->act_cnt[RTE_COLOR_GREEN ].next_mtr_id,NULL ); -if (!next_fm) { -return rte_flow_error_set (error,EINVAL , -RTE_FLOW_ERROR_TYPE_ACTION ,NULL , -"Failed to find next meter in hierarchy." ); - } -if (!next_fm->drop_cnt) - goto exit; color_reg_c_idx =mlx5_flow_get_reg_id (dev,MLX5_MTR_COLOR ,0 , error); - sub_policy = mtr_policy->sub_policys[domain][0 ]; -for (i =0 ; i <RTE_COLORS ; i++) { -bool rule_exist = false; -struct mlx5_meter_policy_action_container *act_cnt; +/* Get all fms who need to create the tag color rule. */ +do { +bool skip = false; -if (i >=RTE_COLOR_YELLOW ) -break ; -TAILQ_FOREACH (color_rule, - &sub_policy->color_rules[i], next_port) -if (color_rule->src_port == src_port) { - rule_exist = true; -break ; - } -if (rule_exist) -continue ; - color_rule =mlx5_malloc (MLX5_MEM_ZERO , -sizeof (struct mlx5_sub_policy_color_rule ), -0 ,SOCKET_ID_ANY ); -if (!color_rule) -return rte_flow_error_set (error,ENOMEM , -RTE_FLOW_ERROR_TYPE_ACTION , -NULL ,"No memory to create tag color rule." ); - color_rule->src_port = src_port; - attr.priority = i; - next_policy =mlx5_flow_meter_policy_find (dev, - next_fm->policy_id,NULL ); -MLX5_ASSERT (next_policy); - next_sub_policy = next_policy->sub_policys[domain][0 ]; - tbl_data =container_of (next_sub_policy->tbl_rsc, - struct mlx5_flow_tbl_data_entry, tbl); - act_cnt = &mtr_policy->act_cnt[i]; -if (mtr_first) { - acts.dv_actions[0 ] = next_fm->meter_action_g; - acts.dv_actions[1 ] = act_cnt->modify_hdr->action; - }else { - acts.dv_actions[0 ] = act_cnt->modify_hdr->action; - acts.dv_actions[1 ] = next_fm->meter_action_g; - } - acts.dv_actions[2 ] = tbl_data->jump.action; - acts.actions_n =3 ; -if (mlx5_flow_meter_attach (priv, next_fm, &attr, error)) { - next_fm =NULL ; - goto err_exit; - } -if (__flow_dv_create_policy_matcher (dev, color_reg_c_idx, -MLX5_MTR_POLICY_MATCHER_PRIO , sub_policy, - &attr, true, item, - &color_rule->matcher, error)) { -rte_flow_error_set (error, errno, -RTE_FLOW_ERROR_TYPE_UNSPECIFIED ,NULL , -"Failed to create hierarchy meter matcher." ); + mtr_policy =mlx5_flow_meter_policy_find (dev, fm->policy_id,NULL ); +MLX5_ASSERT (mtr_policy); +if (mlx5_meter_hierarchy_skip_tag_rule (priv, mtr_policy, src_port, + &next_fm, &skip, error)) goto err_exit; +if (next_fm && !skip) { + fm_info[fm_cnt].fm_policy = mtr_policy; + fm_info[fm_cnt].next_fm = next_fm; +if (++fm_cnt >=MLX5_MTR_CHAIN_MAX_NUM ) { +rte_flow_error_set (error, errno, +RTE_FLOW_ERROR_TYPE_UNSPECIFIED ,NULL , +"Exceed max meter number in hierarchy." ); + goto err_exit; + } } -if (__flow_dv_create_policy_flow (dev, color_reg_c_idx, - (enum rte_color )i, - color_rule->matcher->matcher_object, - acts.actions_n, acts.dv_actions, - true, item, - &color_rule->rule, &attr)) { -rte_flow_error_set (error, errno, -RTE_FLOW_ERROR_TYPE_UNSPECIFIED ,NULL , -"Failed to create hierarchy meter rule." ); - goto err_exit; + fm = next_fm; + }while (fm); +/* Create tag color rules for all needed fms. */ +for (i =0 ; i < fm_cnt; i++) { +void *mtr_action; + + mtr_policy = fm_info[i].fm_policy; +rte_spinlock_lock (&mtr_policy->sl); + sub_policy = mtr_policy->sub_policys[domain][0 ]; +for (j =0 ; j <MLX5_MTR_RTE_COLORS ; j++) { +if (mtr_policy->act_cnt[j].fate_action !=MLX5_FLOW_FATE_MTR ) +continue ; + color_rule =mlx5_malloc (MLX5_MEM_ZERO , +sizeof (struct mlx5_sub_policy_color_rule ), +0 ,SOCKET_ID_ANY ); +if (!color_rule) { +rte_spinlock_unlock (&mtr_policy->sl); +rte_flow_error_set (error,ENOMEM , +RTE_FLOW_ERROR_TYPE_ACTION ,NULL , +"No memory to create tag color rule." ); + goto err_exit; + } + color_rule->src_port = src_port; + next_fm = fm_info[i].next_fm; +if (mlx5_flow_meter_attach (priv, next_fm, &attr, error)) { +mlx5_free (color_rule); +rte_spinlock_unlock (&mtr_policy->sl); + goto err_exit; + } + fm_info[i].tag_rule[j] = color_rule; +TAILQ_INSERT_TAIL (&sub_policy->color_rules[j], color_rule, next_port); +/* Prepare to create color rule. */ + mtr_action = (next_fm->color_aware && j ==RTE_COLOR_YELLOW ) ? + next_fm->meter_action_y : + next_fm->meter_action_g; + next_policy =mlx5_flow_meter_policy_find (dev, next_fm->policy_id,NULL ); +MLX5_ASSERT (next_policy); + next_sub_policy = next_policy->sub_policys[domain][0 ]; + tbl_data =container_of (next_sub_policy->tbl_rsc, + struct mlx5_flow_tbl_data_entry, tbl); +if (mtr_first) { + acts.dv_actions[0 ] = mtr_action; + acts.dv_actions[1 ] = mtr_policy->act_cnt[j].modify_hdr->action; + }else { + acts.dv_actions[0 ] = mtr_policy->act_cnt[j].modify_hdr->action; + acts.dv_actions[1 ] = mtr_action; + } + acts.dv_actions[2 ] = tbl_data->jump.action; + acts.actions_n =3 ; +if (__flow_dv_create_policy_matcher (dev, color_reg_c_idx, +MLX5_MTR_POLICY_MATCHER_PRIO , sub_policy, + &attr, true, item, &color_rule->matcher, error)) { +rte_spinlock_unlock (&mtr_policy->sl); +rte_flow_error_set (error, errno, +RTE_FLOW_ERROR_TYPE_UNSPECIFIED ,NULL , +"Failed to create hierarchy meter matcher." ); + goto err_exit; + } +if (__flow_dv_create_policy_flow (dev, color_reg_c_idx, (enum rte_color )j, + color_rule->matcher->matcher_object, + acts.actions_n, acts.dv_actions, + true, item, &color_rule->rule, &attr)) { +rte_spinlock_unlock (&mtr_policy->sl); +rte_flow_error_set (error, errno, +RTE_FLOW_ERROR_TYPE_UNSPECIFIED ,NULL , +"Failed to create hierarchy meter rule." ); + goto err_exit; + } } -TAILQ_INSERT_TAIL (&sub_policy->color_rules[i], - color_rule, next_port); +rte_spinlock_unlock (&mtr_policy->sl); } -exit: -/** -* Recursive call to iterate all meters in hierarchy and -* create needed rules. -*/ -return flow_dv_meter_hierarchy_rule_create (dev, next_fm, - src_port, item, error); +return 0 ; err_exit: -if (color_rule) { -if (color_rule->rule) -mlx5_flow_os_destroy_flow (color_rule->rule); -if (color_rule->matcher) { -struct mlx5_flow_tbl_data_entry *tbl = -container_of (color_rule->matcher->tbl, -typeof (*tbl), tbl); -mlx5_list_unregister (tbl->matchers, - &color_rule->matcher->entry); +for (i =0 ; i < fm_cnt; i++) { + mtr_policy = fm_info[i].fm_policy; +rte_spinlock_lock (&mtr_policy->sl); + sub_policy = mtr_policy->sub_policys[domain][0 ]; +for (j =0 ; j <MLX5_MTR_RTE_COLORS ; j++) { + color_rule = fm_info[i].tag_rule[j]; +if (!color_rule) +continue ; +if (color_rule->rule) +mlx5_flow_os_destroy_flow (color_rule->rule); +if (color_rule->matcher) { +struct mlx5_flow_tbl_data_entry *tbl = +container_of (color_rule->matcher->tbl,typeof (*tbl), tbl); +mlx5_list_unregister (tbl->matchers, &color_rule->matcher->entry); + } +if (fm_info[i].next_fm) +mlx5_flow_meter_detach (priv, fm_info[i].next_fm); +TAILQ_REMOVE (&sub_policy->color_rules[j], color_rule, next_port); +mlx5_free (color_rule); } -mlx5_free (color_rule); +rte_spinlock_unlock (&mtr_policy->sl); } -if (next_fm) -mlx5_flow_meter_detach (priv, next_fm);return -rte_errno; }
Signature · 1 line
2.20.0
PATCH 4/4 net/mlx5: add validation for yellow meter action
In reply to Shun HaoYellow meter action support is added in meter hierarchy validation. If one color uses meter action, the other can only use NULL action or the same meter action. And only shared meter is supported.
--- doc/guides/nics/mlx5.rst | 6 +++-- drivers/net/mlx5/mlx5_flow_dv.c | 40 +++++++++++++++++---------------- 2 files changed, 25 insertions(+), 21 deletions(-)
doc/guides/nics/mlx5.rst +4 -2
@@ -443,13 +443,15 @@ Limitations - yellow: NULL or END. - RED: DROP / END. - The only supported meter policy actions: - - green: QUEUE, RSS, PORT_ID, REPRESENTED_PORT, JUMP, DROP, MARK and SET_TAG. - - yellow: QUEUE, RSS, PORT_ID, REPRESENTED_PORT, JUMP, DROP, MARK and SET_TAG. + - green: QUEUE, RSS, PORT_ID, REPRESENTED_PORT, JUMP, DROP, MARK, METER and SET_TAG. + - yellow: QUEUE, RSS, PORT_ID, REPRESENTED_PORT, JUMP, DROP, MARK, METER and SET_TAG. - RED: must be DROP. - Policy actions of RSS for green and yellow should have the same configuration except queues. - Policy with RSS/queue action is not supported when ``dv_xmeta_en`` enabled. + - If green action is METER, yellow action must be the same METER action or NULL. - meter profile packet mode is supported. - meter profiles of RFC2697, RFC2698 and RFC4115 are supported. + - RFC4115 implementation is following MEF, meaning yellow traffic may reclaim unused green bandwidth when green token bucket is full. - Integrity:
drivers/net/mlx5/mlx5_flow_dv.c +21 -19
@@ -18003,8 +18003,8 @@ flow_dv_validate_policy_mtr_hierarchy(struct rte_eth_dev *dev,NULL , "Multiple fate actions not supported."); *hierarchy_domain =0 ; + fm =mlx5_flow_meter_find (priv, meter_id,NULL );while (true) { - fm =mlx5_flow_meter_find (priv, meter_id,NULL );if (!fm) return -rte_mtr_error_set(error, EINVAL, RTE_MTR_ERROR_TYPE_MTR_ID, NULL,
@@ -18013,6 +18013,10 @@ flow_dv_validate_policy_mtr_hierarchy(struct rte_eth_dev *dev,return -rte_mtr_error_set (error,EINVAL ,RTE_MTR_ERROR_TYPE_MTR_ID ,NULL ,"Non termination meter not supported in hierarchy." ); +if (!fm->shared) +return -rte_mtr_error_set (error,EINVAL , +RTE_MTR_ERROR_TYPE_MTR_ID ,NULL , +"Only shared meter supported in hierarchy." ); policy =mlx5_flow_meter_policy_find (dev, fm->policy_id,NULL );MLX5_ASSERT (policy);/**
@@ -18034,7 +18038,9 @@ flow_dv_validate_policy_mtr_hierarchy(struct rte_eth_dev *dev, *is_rss = policy->is_rss;break ; } - meter_id = policy->act_cnt[RTE_COLOR_GREEN ].next_mtr_id; +rte_spinlock_lock (&policy->sl); + fm =mlx5_flow_meter_hierarchy_next_meter (priv, policy,NULL ); +rte_spinlock_unlock (&policy->sl);if (++cnt >=MLX5_MTR_CHAIN_MAX_NUM ) return -rte_mtr_error_set(error, EINVAL, RTE_MTR_ERROR_TYPE_METER_POLICY, NULL,
@@ -18080,6 +18086,7 @@ flow_dv_validate_mtr_policy_acts(struct rte_eth_dev *dev,uint8_t def_domain =MLX5_MTR_ALL_DOMAIN_BIT ;uint8_t hierarchy_domain =0 ;const struct rte_flow_action_meter *mtr; +const struct rte_flow_action_meter *next_mtr =NULL ;bool def_green = false;bool def_yellow = false;const struct rte_flow_action_rss *rss_color[RTE_COLORS ] = {NULL };
@@ -18263,25 +18270,12 @@ flow_dv_validate_mtr_policy_acts(struct rte_eth_dev *dev, ++actions_n; action_flags[i] |=MLX5_FLOW_ACTION_JUMP ;break ; -/* -* Only the last meter in the hierarchy will support -* the YELLOW color steering. Then in the meter policy -* actions list, there should be no other meter inside. -*/ case RTE_FLOW_ACTION_TYPE_METER : -if (i !=RTE_COLOR_GREEN ) -return -rte_mtr_error_set (error, -ENOTSUP , -RTE_MTR_ERROR_TYPE_METER_POLICY , -NULL , -"Meter hierarchy only supports GREEN color." ); -if (*policy_mode !=MLX5_MTR_POLICY_MODE_OG ) -return -rte_mtr_error_set (error, -ENOTSUP , -RTE_MTR_ERROR_TYPE_METER_POLICY , -NULL , -"No yellow policy should be provided in meter hierarchy." ); mtr = act->conf; +if (next_mtr && next_mtr->mtr_id != mtr->mtr_id) +return -rte_mtr_error_set (error,ENOTSUP , +RTE_MTR_ERROR_TYPE_METER_POLICY ,NULL , +"Green and Yellow must use the same meter." ); ret = flow_dv_validate_policy_mtr_hierarchy(dev, mtr->mtr_id, action_flags[i],
@@ -18293,6 +18287,7 @@ flow_dv_validate_mtr_policy_acts(struct rte_eth_dev *dev, ++actions_n; action_flags[i] |=MLX5_FLOW_ACTION_METER_WITH_TERMINATED_POLICY ; + next_mtr = mtr;break ;default : return -rte_mtr_error_set(error, ENOTSUP,
@@ -18378,6 +18373,13 @@ flow_dv_validate_mtr_policy_acts(struct rte_eth_dev *dev, } } } +if (next_mtr && *policy_mode ==MLX5_MTR_POLICY_MODE_ALL ) { +if (!(action_flags[RTE_COLOR_GREEN ] & action_flags[RTE_COLOR_YELLOW ] & +MLX5_FLOW_ACTION_METER_WITH_TERMINATED_POLICY )) +return -rte_mtr_error_set (error,EINVAL ,RTE_MTR_ERROR_TYPE_METER_POLICY , +NULL , +"Meter hierarchy supports meter action only." ); + }/* If both colors have RSS, the attributes should be the same. */ if (flow_dv_mtr_policy_rss_compare (rss_color[RTE_COLOR_GREEN ], rss_color[RTE_COLOR_YELLOW ]))
Signature · 1 line
2.20.0
Hi,
Quoted 30 lines
-----Original Message-----
From: Shun Hao <[email protected]>
Sent: Friday, May 13, 2022 10:33 AM
To: Slava Ovsiienko <[email protected]>; Matan Azrad <[email protected]>; Ori Kam <[email protected]>
Cc: [email protected]; Raslan Darawsheh <[email protected]>
Subject: [PATCH v1 0/4] Enable yellow meter hierarchyTo support yellow meter hierarchy, need to support meter action in yellow policy flow, so both green and yellow packet can go to next meter. Currently there's the limitation that only the same next meter supported for green and yellow.
Meanwhile, color aware mode is supported, so the next meter can be aware of the previous color, so can have different process strategy.
Shun Hao (4):
net/mlx5: support previous meter color aware net/mlx5: support yellow meter action in hierarchy net/mlx5: support yellow meter action for hierarchy tag rule net/mlx5: add validation for yellow meter actiondoc/guides/nics/mlx5.rst | 6 +- drivers/net/mlx5/mlx5.c | 8 +- drivers/net/mlx5/mlx5.h | 10 +- drivers/net/mlx5/mlx5_flow_aso.c | 19 +- drivers/net/mlx5/mlx5_flow_dv.c | 406 +++++++++++++++++++---------- drivers/net/mlx5/mlx5_flow_meter.c | 60 +++-- 6 files changed, 345 insertions(+), 164 deletions(-)
Quoted 2 lines
--
2.20.0
Series applied to next-net-mlx,
Kindest regards,
Raslan Darawsheh