patch 'net/mlx5: fix SWS meter state initialization' has been queued to stable release 22.11.7

[luca.boccassi@gmail.com]

Hi,

FYI, your patch has been queued to stable release 22.11.7

Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet.
It will be pushed if I get no objections before 11/14/24. So please
shout if anyone has objections.

Also note that after the patch there's a diff of the upstream commit vs the
patch applied to the branch. This will indicate if there was any rebasing
needed to apply to the stable branch. If there were code changes for rebasing
(ie: not only metadata diffs), please double check that the rebase was
correctly done.

Queued patches are on a temporary branch at:
https://github.com/bluca/dpdk-stable

This queued commit can be viewed at:
https://github.com/bluca/dpdk-stable/commit/602cc6b95d5aa91bfc977f0fabbb81d9899f7361

Thanks.

Luca Boccassi

---
From 602cc6b95d5aa91bfc977f0fabbb81d9899f7361 Mon Sep 17 00:00:00 2001
From: Gregory Etelson <getelson@nvidia.com>
Date: Sun, 27 Oct 2024 17:31:36 +0200
Subject: [PATCH] net/mlx5: fix SWS meter state initialization

[ upstream commit 0c37d8f7ba2cac289896de024d9c58a65ba3ece9 ]

Update the state initialization for SWS meter objects to properly
monitor ASO object availability. The PMD uses the meter 'state'
variable to track whether ASO objects are available for use.

This ensures that the SWS meter object state is correctly
initialized, allowing the PMD to accurately manage ASO resources
for metering functionality.

Fixes: 4359d9d1f76b ("net/mlx5: fix sync meter processing in HWS")

Signed-off-by: Gregory Etelson <getelson@nvidia.com>
Acked-by: Dariusz Sosnowski <dsosnowski@nvidia.com>
---
 drivers/net/mlx5/mlx5_flow_meter.c | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/drivers/net/mlx5/mlx5_flow_meter.c b/drivers/net/mlx5/mlx5_flow_meter.c
index 1078d6497d..0ffe738ec5 100644
--- a/drivers/net/mlx5/mlx5_flow_meter.c
+++ b/drivers/net/mlx5/mlx5_flow_meter.c
@@ -1636,6 +1636,7 @@ mlx5_flow_meter_action_modify(struct mlx5_priv *priv,
 	if (priv->sh->meter_aso_en) {
 		fm->is_enable = !!is_enable;
 		aso_mtr = container_of(fm, struct mlx5_aso_mtr, fm);
+		aso_mtr->state = ASO_METER_WAIT;
 		ret = mlx5_aso_meter_update_by_wqe(priv->sh, MLX5_HW_INV_QUEUE,
 						   aso_mtr, &priv->mtr_bulk, NULL, true);
 		if (ret)
@@ -1886,6 +1887,7 @@ mlx5_flow_meter_create(struct rte_eth_dev *dev, uint32_t meter_id,
 	/* If ASO meter supported, update ASO flow meter by wqe. */
 	if (priv->sh->meter_aso_en) {
 		aso_mtr = container_of(fm, struct mlx5_aso_mtr, fm);
+		aso_mtr->state = ASO_METER_WAIT;
 		ret = mlx5_aso_meter_update_by_wqe(priv->sh, MLX5_HW_INV_QUEUE,
 						   aso_mtr, &priv->mtr_bulk, NULL, true);
 		if (ret)
-- 
2.45.2

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2024-11-12 22:06:59.119033707 +0000
+++ 0013-net-mlx5-fix-SWS-meter-state-initialization.patch	2024-11-12 22:06:58.655307014 +0000
@@ -1 +1 @@
-From 0c37d8f7ba2cac289896de024d9c58a65ba3ece9 Mon Sep 17 00:00:00 2001
+From 602cc6b95d5aa91bfc977f0fabbb81d9899f7361 Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit 0c37d8f7ba2cac289896de024d9c58a65ba3ece9 ]
+
@@ -15 +16,0 @@
-Cc: stable@dpdk.org
@@ -24 +25 @@
-index 98a61cbdd4..233b140785 100644
+index 1078d6497d..0ffe738ec5 100644
@@ -27,2 +28,2 @@
-@@ -1914,6 +1914,7 @@ mlx5_flow_meter_action_modify(struct mlx5_priv *priv,
- 	if (sh->meter_aso_en) {
+@@ -1636,6 +1636,7 @@ mlx5_flow_meter_action_modify(struct mlx5_priv *priv,
+ 	if (priv->sh->meter_aso_en) {
@@ -32,4 +33,4 @@
- 		ret = mlx5_aso_meter_update_by_wqe(priv, MLX5_HW_INV_QUEUE,
- 						   aso_mtr, &priv->mtr_bulk,
- 						   NULL, true);
-@@ -2165,6 +2166,7 @@ mlx5_flow_meter_create(struct rte_eth_dev *dev, uint32_t meter_id,
+ 		ret = mlx5_aso_meter_update_by_wqe(priv->sh, MLX5_HW_INV_QUEUE,
+ 						   aso_mtr, &priv->mtr_bulk, NULL, true);
+ 		if (ret)
+@@ -1886,6 +1887,7 @@ mlx5_flow_meter_create(struct rte_eth_dev *dev, uint32_t meter_id,
@@ -40 +41 @@
- 		ret = mlx5_aso_meter_update_by_wqe(priv, MLX5_HW_INV_QUEUE,
+ 		ret = mlx5_aso_meter_update_by_wqe(priv->sh, MLX5_HW_INV_QUEUE,