From c0278ca723280b26d80fd847800ebb12024b50e3 Mon Sep 17 00:00:00 2001 From: Rongwei Liu Date: Wed, 2 Mar 2022 13:19:38 +0200 Subject: [PATCH] net/mlx5: fix shared RSS destroy [ upstream commit e1786fd53d7e5631c9ffb9b2fba0fd402bc8cf74 ] When both shared and non-shared RSS actions are present in single flow rule shared RSS index is unset by mistake. For example: 1. flow indirect_action 0 create action_id 3 ingress action RSS ... 2. set sample_actions 0 mark id 43690 / queue index 0 / end 3. flow create 0 ingress group 107 pattern eth / sample ratio 2 index 0 / indirect 3 / end PMD translates the indirect action to a shared RSS description at first. In the split prefix flow, RSS->shared_RSS is unset when translating sample queue action, the subfix flow will treat the RSS as non-shared. Fixes: 8e61555657b2 ("net/mlx5: fix shared RSS and mark actions combination") Signed-off-by: Rongwei Liu Acked-by: Viacheslav Ovsiienko --- drivers/net/mlx5/mlx5_flow_dv.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/drivers/net/mlx5/mlx5_flow_dv.c b/drivers/net/mlx5/mlx5_flow_dv.c index e2dc48f471..4e87f7a952 100644 --- a/drivers/net/mlx5/mlx5_flow_dv.c +++ b/drivers/net/mlx5/mlx5_flow_dv.c @@ -8741,6 +8741,7 @@ flow_dv_hrxq_prepare(struct rte_eth_dev *dev, { struct mlx5_priv *priv = dev->data->dev_private; struct mlx5_flow_handle *dh = dev_flow->handle; + uint32_t shared_rss = rss_desc->shared_rss; struct mlx5_hrxq *hrxq; MLX5_ASSERT(rss_desc->queue_num); @@ -8755,6 +8756,7 @@ flow_dv_hrxq_prepare(struct rte_eth_dev *dev, return NULL; hrxq = mlx5_ipool_get(priv->sh->ipool[MLX5_IPOOL_HRXQ], *hrxq_idx); + rss_desc->shared_rss = shared_rss; return hrxq; }