patch 'net/mlx5/hws: fix matcher reconnect' has been queued to stable release 23.11.2
Xueming Li
xuemingl at nvidia.com
Fri Jul 12 13:01:47 CEST 2024
Hi,
FYI, your patch has been queued to stable release 23.11.2
Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet.
It will be pushed if I get no objections before 07/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://git.dpdk.org/dpdk-stable/log/?h=23.11-staging
This queued commit can be viewed at:
https://git.dpdk.org/dpdk-stable/commit/?h=23.11-staging&id=82315fbf7fdf3b733c1a7d0df5368664e237ae4f
Thanks.
Xueming Li <xuemingl at nvidia.com>
---
>From 82315fbf7fdf3b733c1a7d0df5368664e237ae4f Mon Sep 17 00:00:00 2001
From: Yevgeny Kliteynik <kliteyn at nvidia.com>
Date: Thu, 6 Jun 2024 12:55:09 +0300
Subject: [PATCH] net/mlx5/hws: fix matcher reconnect
Cc: Xueming Li <xuemingl at nvidia.com>
[ upstream commit f21215b733abb2c80f1b58750d74de27f9233d62 ]
If error happens during disconnect of the first matcher in the
list, the matcher should be reconnected back as the first matcher.
Fixes: b81f95ca770d ("net/mlx5/hws: support default miss table")
Signed-off-by: Yevgeny Kliteynik <kliteyn at nvidia.com>
Acked-by: Dariusz Sosnowski <dsosnowski at nvidia.com>
---
drivers/net/mlx5/hws/mlx5dr_matcher.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/drivers/net/mlx5/hws/mlx5dr_matcher.c b/drivers/net/mlx5/hws/mlx5dr_matcher.c
index bb171a0340..89e52d6c28 100644
--- a/drivers/net/mlx5/hws/mlx5dr_matcher.c
+++ b/drivers/net/mlx5/hws/mlx5dr_matcher.c
@@ -340,7 +340,7 @@ static int mlx5dr_matcher_disconnect(struct mlx5dr_matcher *matcher)
return 0;
matcher_reconnect:
- if (LIST_EMPTY(&tbl->head))
+ if (LIST_EMPTY(&tbl->head) || prev_matcher == matcher)
LIST_INSERT_HEAD(&matcher->tbl->head, matcher, next);
else
LIST_INSERT_AFTER(prev_matcher, matcher, next);
--
2.34.1
---
Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- - 2024-07-12 18:40:18.397726512 +0800
+++ 0096-net-mlx5-hws-fix-matcher-reconnect.patch 2024-07-12 18:40:14.336594199 +0800
@@ -1 +1 @@
-From f21215b733abb2c80f1b58750d74de27f9233d62 Mon Sep 17 00:00:00 2001
+From 82315fbf7fdf3b733c1a7d0df5368664e237ae4f Mon Sep 17 00:00:00 2001
@@ -4,0 +5,3 @@
+Cc: Xueming Li <xuemingl at nvidia.com>
+
+[ upstream commit f21215b733abb2c80f1b58750d74de27f9233d62 ]
@@ -10 +12,0 @@
-Cc: stable at dpdk.org
@@ -19 +21 @@
-index 79e7401dfd..2a84145566 100644
+index bb171a0340..89e52d6c28 100644
More information about the stable
mailing list