From 273b09376c224c4efeafc77371bf706a386d2ae0 Mon Sep 17 00:00:00 2001 From: Bing Zhao Date: Mon, 18 Oct 2021 16:53:05 +0300 Subject: [PATCH] net/mlx5: fix meter yellow policy with RSS action The RSS configuration in a policy action container was a pointer inside a union, and the pointer area could be used as other fate action. In the current implementation, the RSS of the green color was prior to that of the yellow color. There was a high possibility the pointer was considered as the RSS and result in a error flow expansion when only the yellow color had the RSS action. The check of the fate action type should also be done to get rid of the misjudgment. Fixes: b38a12272b3a ("net/mlx5: split meter color policy handling") Cc: stable@dpdk.org Signed-off-by: Bing Zhao Acked-by: Matan Azrad --- drivers/net/mlx5/mlx5_flow.c | 17 ++++++++++++++--- 1 file changed, 14 insertions(+), 3 deletions(-) diff --git a/drivers/net/mlx5/mlx5_flow.c b/drivers/net/mlx5/mlx5_flow.c index 1d493f1207..c7e8f88856 100644 --- a/drivers/net/mlx5/mlx5_flow.c +++ b/drivers/net/mlx5/mlx5_flow.c @@ -3599,6 +3599,8 @@ flow_get_rss_action(struct rte_eth_dev *dev, { struct mlx5_priv *priv = dev->data->dev_private; const struct rte_flow_action_rss *rss = NULL; + struct mlx5_meter_policy_action_container *acg; + struct mlx5_meter_policy_action_container *acy; for (; actions->type != RTE_FLOW_ACTION_TYPE_END; actions++) { switch (actions->type) { @@ -3634,9 +3636,18 @@ flow_get_rss_action(struct rte_eth_dev *dev, if (!policy) return NULL; } - if (policy->is_rss) - rss = - policy->act_cnt[RTE_COLOR_GREEN].rss->conf; + if (policy->is_rss) { + acg = + &policy->act_cnt[RTE_COLOR_GREEN]; + acy = + &policy->act_cnt[RTE_COLOR_YELLOW]; + if (acg->fate_action == + MLX5_FLOW_FATE_SHARED_RSS) + rss = acg->rss->conf; + else if (acy->fate_action == + MLX5_FLOW_FATE_SHARED_RSS) + rss = acy->rss->conf; + } } break; } -- 2.20.1