patch 'net/mlx5: fix error set for age pool initialization' has been queued to stable release 22.11.3

Xueming Li xuemingl at nvidia.com
Thu Aug 10 01:58:56 CEST 2023


Hi,

FYI, your patch has been queued to stable release 22.11.3

Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet.
It will be pushed if I get no objections before 08/11/23. 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://git.dpdk.org/dpdk-stable/log/?h=22.11-staging

This queued commit can be viewed at:
https://git.dpdk.org/dpdk-stable/commit/?h=22.11-staging&id=ab04a7f2da4eb590dd62b0d8498d61f2a3c32d8d

Thanks.

Xueming Li <xuemingl at nvidia.com>

---
>From ab04a7f2da4eb590dd62b0d8498d61f2a3c32d8d Mon Sep 17 00:00:00 2001
From: Bing Zhao <bingz at nvidia.com>
Date: Fri, 30 Jun 2023 13:26:49 +0300
Subject: [PATCH] net/mlx5: fix error set for age pool initialization
Cc: Xueming Li <xuemingl at nvidia.com>

[ upstream commit e8c51fa3ab0c43801ab144c6a4d7837dc7ab1cc2 ]

The rte_flow_error needs to be set when the age pool initialization
has a failure. Or else the application will crash due to the access
of the invalid "message" field.

Fixes: 04a4de756e14 ("net/mlx5: support flow age action with HWS")

Signed-off-by: Bing Zhao <bingz at nvidia.com>
Acked-by: Ori Kam <orika at nvidia.com>
---
 drivers/net/mlx5/mlx5_flow_hw.c | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/drivers/net/mlx5/mlx5_flow_hw.c b/drivers/net/mlx5/mlx5_flow_hw.c
index 3a1b3dfd06..5fe4cfa071 100644
--- a/drivers/net/mlx5/mlx5_flow_hw.c
+++ b/drivers/net/mlx5/mlx5_flow_hw.c
@@ -7072,8 +7072,11 @@ flow_hw_configure(struct rte_eth_dev *dev,
 			goto err;
 		}
 		ret = mlx5_hws_age_pool_init(dev, port_attr, nb_queue);
-		if (ret < 0)
+		if (ret < 0) {
+			rte_flow_error_set(error, -ret, RTE_FLOW_ERROR_TYPE_UNSPECIFIED,
+					   NULL, "Failed to init age pool.");
 			goto err;
+		}
 	}
 	ret = flow_hw_create_vlan(dev);
 	if (ret)
-- 
2.25.1

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2023-08-09 21:51:20.136740400 +0800
+++ 0077-net-mlx5-fix-error-set-for-age-pool-initialization.patch	2023-08-09 21:51:18.234352000 +0800
@@ -1 +1 @@
-From e8c51fa3ab0c43801ab144c6a4d7837dc7ab1cc2 Mon Sep 17 00:00:00 2001
+From ab04a7f2da4eb590dd62b0d8498d61f2a3c32d8d Mon Sep 17 00:00:00 2001
@@ -4,0 +5,3 @@
+Cc: Xueming Li <xuemingl at nvidia.com>
+
+[ upstream commit e8c51fa3ab0c43801ab144c6a4d7837dc7ab1cc2 ]
@@ -11 +13,0 @@
-Cc: stable at dpdk.org
@@ -20 +22 @@
-index 94179ff747..0c72324617 100644
+index 3a1b3dfd06..5fe4cfa071 100644
@@ -23 +25 @@
-@@ -7914,8 +7914,11 @@ flow_hw_configure(struct rte_eth_dev *dev,
+@@ -7072,8 +7072,11 @@ flow_hw_configure(struct rte_eth_dev *dev,


More information about the stable mailing list