From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mails.dpdk.org (mails.dpdk.org [217.70.189.124]) by inbox.dpdk.org (Postfix) with ESMTP id 8B465A052A; Tue, 2 Feb 2021 17:42:54 +0100 (CET) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 0A25D24033E; Tue, 2 Feb 2021 17:42:54 +0100 (CET) Received: from mellanox.co.il (mail-il-dmz.mellanox.com [193.47.165.129]) by mails.dpdk.org (Postfix) with ESMTP id D659624033D for ; Tue, 2 Feb 2021 17:42:52 +0100 (CET) Received: from Internal Mail-Server by MTLPINE1 (envelope-from jiaweiw@nvidia.com) with SMTP; 2 Feb 2021 18:42:49 +0200 Received: from nvidia.com (gen-l-vrt-280.mtl.labs.mlnx [10.237.45.1]) by labmailer.mlnx (8.13.8/8.13.8) with ESMTP id 112Ggnhi024791; Tue, 2 Feb 2021 18:42:49 +0200 From: Jiawei Wang To: matan@nvidia.com, viacheslavo@nvidia.com, orika@nvidia.com, thomas@monjalon.net Cc: dev@dpdk.org, rasland@nvidia.com, stable@dpdk.org Date: Tue, 2 Feb 2021 18:42:49 +0200 Message-Id: <1612284169-31627-1-git-send-email-jiaweiw@nvidia.com> X-Mailer: git-send-email 1.8.3.1 Subject: [dpdk-dev] [PATCH] net/mlx5: fix validation for counter and age X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: DPDK patches and discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dev-bounces@dpdk.org Sender: "dev" Currently old age action was implemented by flow counter and only one counter index was maintained in each flow. While there was old age action and share count action in one flow, and the same share count action in the another flow, the counter was updated if second flow was hit, so it may cause the first flow didn't aged out since the counter was updated by second flow. This patch updates the validation function for count and old age action: - Old age and shared count action combination is not supported. - Old age and count(not shared) action could work in the same sub flow. Fixes: e7138997e07d ("net/mlx5: make shared counters thread safe") Cc: stable@dpdk.org Signed-off-by: Jiawei Wang Acked-by: Matan Azrad --- drivers/net/mlx5/mlx5_flow_dv.c | 55 ++++++++++++++++++++++++++++++++--------- 1 file changed, 44 insertions(+), 11 deletions(-) diff --git a/drivers/net/mlx5/mlx5_flow_dv.c b/drivers/net/mlx5/mlx5_flow_dv.c index e0874e3..4410c51 100644 --- a/drivers/net/mlx5/mlx5_flow_dv.c +++ b/drivers/net/mlx5/mlx5_flow_dv.c @@ -3118,6 +3118,8 @@ struct field_modify_info modify_tcp[] = { * * @param[in] dev * Pointer to rte_eth_dev structure. + * @param[in] action + * Pointer to the action structure. * @param[in] action_flags * Holds the actions detected until now. * @param[out] error @@ -3128,17 +3130,25 @@ struct field_modify_info modify_tcp[] = { */ static int flow_dv_validate_action_count(struct rte_eth_dev *dev, + const struct rte_flow_action *action, uint64_t action_flags, struct rte_flow_error *error) { struct mlx5_priv *priv = dev->data->dev_private; + const struct rte_flow_action_count *count; + if (!priv->config.devx) + goto notsup_err; if (action_flags & MLX5_FLOW_ACTION_COUNT) return rte_flow_error_set(error, EINVAL, RTE_FLOW_ERROR_TYPE_ACTION, NULL, "duplicate count actions set"); - if (!priv->config.devx) - goto notsup_err; + count = (const struct rte_flow_action_count *)action->conf; + if (count && count->shared && (action_flags & MLX5_FLOW_ACTION_AGE) && + !priv->sh->flow_hit_aso_en) + return rte_flow_error_set(error, EINVAL, + RTE_FLOW_ERROR_TYPE_ACTION, NULL, + "old age and shared count combination is not supported"); #ifdef HAVE_IBV_FLOW_DEVX_COUNTERS return 0; #endif @@ -5081,6 +5091,8 @@ struct mlx5_hlist_entry * * Pointer to the RSS action. * @param[out] sample_rss * Pointer to the RSS action in sample action list. + * @param[out] count + * Pointer to the COUNT action in sample action list. * @param[out] error * Pointer to error structure. * @@ -5095,6 +5107,7 @@ struct mlx5_hlist_entry * uint64_t item_flags, const struct rte_flow_action_rss *rss, const struct rte_flow_action_rss **sample_rss, + const struct rte_flow_action_count **count, struct rte_flow_error *error) { struct mlx5_priv *priv = dev->data->dev_private; @@ -5189,16 +5202,13 @@ struct mlx5_hlist_entry * ++actions_n; break; case RTE_FLOW_ACTION_TYPE_COUNT: - if (*action_flags & MLX5_FLOW_ACTION_COUNT) - return rte_flow_error_set(error, EINVAL, - RTE_FLOW_ERROR_TYPE_ACTION, - action, - "duplicate count action set"); - ret = flow_dv_validate_action_count(dev, - sub_action_flags, - error); + ret = flow_dv_validate_action_count + (dev, act, + *action_flags | sub_action_flags, + error); if (ret < 0) return ret; + *count = act->conf; sub_action_flags |= MLX5_FLOW_ACTION_COUNT; *action_flags |= MLX5_FLOW_ACTION_COUNT; ++actions_n; @@ -6017,6 +6027,8 @@ struct mlx5_hlist_entry * const struct rte_flow_action_raw_encap *encap; const struct rte_flow_action_rss *rss = NULL; const struct rte_flow_action_rss *sample_rss = NULL; + const struct rte_flow_action_count *count = NULL; + const struct rte_flow_action_count *sample_count = NULL; const struct rte_flow_item_tcp nic_tcp_mask = { .hdr = { .tcp_flags = 0xFF, @@ -6528,10 +6540,12 @@ struct mlx5_hlist_entry * ++actions_n; break; case RTE_FLOW_ACTION_TYPE_COUNT: - ret = flow_dv_validate_action_count(dev, action_flags, + ret = flow_dv_validate_action_count(dev, actions, + action_flags, error); if (ret < 0) return ret; + count = actions->conf; action_flags |= MLX5_FLOW_ACTION_COUNT; ++actions_n; break; @@ -6797,6 +6811,24 @@ struct mlx5_hlist_entry * error); if (ret < 0) return ret; + /* + * Validate the regular AGE action (using counter) + * mutual exclusion with share counter actions. + */ + if (!priv->sh->flow_hit_aso_en) { + if (count && count->shared) + return rte_flow_error_set + (error, EINVAL, + RTE_FLOW_ERROR_TYPE_ACTION, + NULL, + "old age and shared count combination is not supported"); + if (sample_count) + return rte_flow_error_set + (error, EINVAL, + RTE_FLOW_ERROR_TYPE_ACTION, + NULL, + "old age action and count must be in the same sub flow"); + } action_flags |= MLX5_FLOW_ACTION_AGE; ++actions_n; break; @@ -6833,6 +6865,7 @@ struct mlx5_hlist_entry * actions, dev, attr, item_flags, rss, &sample_rss, + &sample_count, error); if (ret < 0) return ret; -- 1.8.3.1