[dpdk-stable] patch 'net/mlx5: fix indirect action modify rollback' has been queued to stable release 20.11.3

luca.boccassi at gmail.com luca.boccassi at gmail.com
Mon Jul 26 15:52:54 CEST 2021


Hi,

FYI, your patch has been queued to stable release 20.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 07/28/21. 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/453f8bb23518e6625dc1cb7e9799449a41080055

Thanks.

Luca Boccassi

---
>From 453f8bb23518e6625dc1cb7e9799449a41080055 Mon Sep 17 00:00:00 2001
From: Dmitry Kozlyuk <dkozlyuk at nvidia.com>
Date: Wed, 21 Jul 2021 15:51:12 +0300
Subject: [PATCH] net/mlx5: fix indirect action modify rollback

[ upstream commit b7c8ea62d00f02c206ec2aded5581c2e0f01c377 ]

mlx5_ind_table_obj_modify() first references queues from the new list,
then applies the new list to HW. In case of apply failure the function
dereferenced queues from the old list, while it should be the new list.

Fixes: fa7ad49e96b5 ("net/mlx5: fix shared RSS action update")

Signed-off-by: Dmitry Kozlyuk <dkozlyuk at nvidia.com>
Acked-by: Matan Azrad <matan at nvidia.com>
---
 drivers/net/mlx5/mlx5_rxq.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/net/mlx5/mlx5_rxq.c b/drivers/net/mlx5/mlx5_rxq.c
index edf91254b1..002df27ab4 100644
--- a/drivers/net/mlx5/mlx5_rxq.c
+++ b/drivers/net/mlx5/mlx5_rxq.c
@@ -2150,7 +2150,7 @@ mlx5_ind_table_obj_modify(struct rte_eth_dev *dev,
 error:
 	err = rte_errno;
 	for (j = 0; j < i; j++)
-		mlx5_rxq_release(dev, ind_tbl->queues[j]);
+		mlx5_rxq_release(dev, queues[j]);
 	rte_errno = err;
 	DEBUG("Port %u cannot setup indirection table.", dev->data->port_id);
 	return ret;
-- 
2.30.2

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2021-07-26 13:53:17.473702541 +0100
+++ 0031-net-mlx5-fix-indirect-action-modify-rollback.patch	2021-07-26 13:53:15.865292959 +0100
@@ -1 +1 @@
-From b7c8ea62d00f02c206ec2aded5581c2e0f01c377 Mon Sep 17 00:00:00 2001
+From 453f8bb23518e6625dc1cb7e9799449a41080055 Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit b7c8ea62d00f02c206ec2aded5581c2e0f01c377 ]
+
@@ -11 +12,0 @@
-Cc: stable at dpdk.org
@@ -20 +21 @@
-index 4a8b67e731..49165f482e 100644
+index edf91254b1..002df27ab4 100644
@@ -23 +24 @@
-@@ -2086,7 +2086,7 @@ mlx5_ind_table_obj_modify(struct rte_eth_dev *dev,
+@@ -2150,7 +2150,7 @@ mlx5_ind_table_obj_modify(struct rte_eth_dev *dev,
@@ -30,2 +31,2 @@
- 	DRV_LOG(DEBUG, "Port %u cannot setup indirection table.",
- 		dev->data->port_id);
+ 	DEBUG("Port %u cannot setup indirection table.", dev->data->port_id);
+ 	return ret;


More information about the stable mailing list