patch 'net/mlx5: set flow error for hash list create' has been queued to stable release 21.11.1

Kevin Traynor ktraynor at redhat.com
Tue Mar 1 11:42:36 CET 2022


Hi,

FYI, your patch has been queued to stable release 21.11.1

Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet.
It will be pushed if I get no objections before 03/06/22. 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/kevintraynor/dpdk-stable

This queued commit can be viewed at:
https://github.com/kevintraynor/dpdk-stable/commit/383f7b7f800a445f546e977667334b9f1700814e

Thanks.

Kevin

---
>From 383f7b7f800a445f546e977667334b9f1700814e Mon Sep 17 00:00:00 2001
From: Suanming Mou <suanmingm at nvidia.com>
Date: Tue, 15 Feb 2022 12:10:52 +0200
Subject: [PATCH] net/mlx5: set flow error for hash list create

[ upstream commit 0c5d3e4cdf1bbc92d138bce1f98f0b260a10b8fc ]

While mlx5_hlist_create() failed, the rte_flow_error was not filled
with the corresponding error information.

This commit adds the missing rte_flow_error_set() for the failure case.

Fixes: f3020a331dca ("net/mlx5: optimize hash list table allocate on demand")

Signed-off-by: Suanming Mou <suanmingm at nvidia.com>
Acked-by: Viacheslav Ovsiienko <viacheslavo at nvidia.com>
---
 drivers/net/mlx5/mlx5_flow_dv.c | 16 +++++++++++-----
 1 file changed, 11 insertions(+), 5 deletions(-)

diff --git a/drivers/net/mlx5/mlx5_flow_dv.c b/drivers/net/mlx5/mlx5_flow_dv.c
index 10ef2af06a..c7f43c9ab4 100644
--- a/drivers/net/mlx5/mlx5_flow_dv.c
+++ b/drivers/net/mlx5/mlx5_flow_dv.c
@@ -313,5 +313,6 @@ flow_dv_hlist_prepare(struct mlx5_dev_ctx_shared *sh, struct mlx5_hlist **phl,
 		     mlx5_list_remove_cb cb_remove,
 		     mlx5_list_clone_cb cb_clone,
-		     mlx5_list_clone_free_cb cb_clone_free)
+		     mlx5_list_clone_free_cb cb_clone_free,
+		     struct rte_flow_error *error)
 {
 	struct mlx5_hlist *hl;
@@ -328,5 +329,7 @@ flow_dv_hlist_prepare(struct mlx5_dev_ctx_shared *sh, struct mlx5_hlist **phl,
 	if (!hl) {
 		DRV_LOG(ERR, "%s hash creation failed", name);
-		rte_errno = ENOMEM;
+		rte_flow_error_set(error, ENOMEM,
+				   RTE_FLOW_ERROR_TYPE_UNSPECIFIED, NULL,
+				   "cannot allocate resource memory");
 		return NULL;
 	}
@@ -3732,5 +3735,6 @@ flow_dv_encap_decap_resource_register
 				flow_dv_encap_decap_remove_cb,
 				flow_dv_encap_decap_clone_cb,
-				flow_dv_encap_decap_clone_free_cb);
+				flow_dv_encap_decap_clone_free_cb,
+				error);
 	if (unlikely(!encaps_decaps))
 		return -rte_errno;
@@ -5828,5 +5832,6 @@ flow_dv_modify_hdr_resource_register
 				flow_dv_modify_remove_cb,
 				flow_dv_modify_clone_cb,
-				flow_dv_modify_clone_free_cb);
+				flow_dv_modify_clone_free_cb,
+				error);
 	if (unlikely(!modify_cmds))
 		return -rte_errno;
@@ -10765,5 +10770,6 @@ flow_dv_tag_resource_register
 				      flow_dv_tag_remove_cb,
 				      flow_dv_tag_clone_cb,
-				      flow_dv_tag_clone_free_cb);
+				      flow_dv_tag_clone_free_cb,
+				      error);
 	if (unlikely(!tag_table))
 		return -rte_errno;
-- 
2.34.1

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2022-03-01 10:41:03.616418159 +0000
+++ 0080-net-mlx5-set-flow-error-for-hash-list-create.patch	2022-03-01 10:41:01.415244121 +0000
@@ -1 +1 @@
-From 0c5d3e4cdf1bbc92d138bce1f98f0b260a10b8fc Mon Sep 17 00:00:00 2001
+From 383f7b7f800a445f546e977667334b9f1700814e Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit 0c5d3e4cdf1bbc92d138bce1f98f0b260a10b8fc ]
+
@@ -12 +13,0 @@
-Cc: stable at dpdk.org
@@ -21 +22 @@
-index c30cb4c203..ce69b6ff3a 100644
+index 10ef2af06a..c7f43c9ab4 100644
@@ -41 +42 @@
-@@ -3728,5 +3731,6 @@ flow_dv_encap_decap_resource_register
+@@ -3732,5 +3735,6 @@ flow_dv_encap_decap_resource_register
@@ -49 +50 @@
-@@ -5826,5 +5830,6 @@ flow_dv_modify_hdr_resource_register
+@@ -5828,5 +5832,6 @@ flow_dv_modify_hdr_resource_register
@@ -57 +58 @@
-@@ -10758,5 +10763,6 @@ flow_dv_tag_resource_register
+@@ -10765,5 +10770,6 @@ flow_dv_tag_resource_register



More information about the stable mailing list