[dpdk-stable] patch 'net/mlx5: fix multiple flow table hash list' has been queued to stable release 19.11.1

[luca.boccassi at gmail.com]

Hi,

FYI, your patch has been queued to stable release 19.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 02/13/20. 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.

Thanks.

Luca Boccassi

---
>From ba19ef396aaca14e49de7b88ef5a435423c68ce8 Mon Sep 17 00:00:00 2001
From: Xiaoyu Min <jackmin at mellanox.com>
Date: Mon, 16 Dec 2019 11:27:41 +0200
Subject: [PATCH] net/mlx5: fix multiple flow table hash list

[ upstream commit 6801116688fe82b5b32cf45ffa7b475d1cfdcea4 ]

The eth devices which share one ibv device only need one hash list of
flow table.

Currently, flow table hash list is created per each eth device
whatever whether they share one ibv device or not.

If the devices share one ibv device, the previously created hash list
will become dangle because the pointer point to (sh->flow_tbls) is
overwritten by the later created hast list.

To fix this, just don't create hash list if it is already created.

Fixes: 54534725d2f3 ("net/mlx5: fix flow table hash list conversion")

Reported-by: Zhike Wang <wangzhike at jd.com>
Signed-off-by: Xiaoyu Min <jackmin at mellanox.com>
Acked-by: Matan Azrad <matan at mellanox.com>
---
 drivers/net/mlx5/mlx5.c | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/drivers/net/mlx5/mlx5.c b/drivers/net/mlx5/mlx5.c
index d84a6f91b4..50960c91ce 100644
--- a/drivers/net/mlx5/mlx5.c
+++ b/drivers/net/mlx5/mlx5.c
@@ -868,8 +868,13 @@ mlx5_alloc_shared_dr(struct mlx5_priv *priv)
 {
 	struct mlx5_ibv_shared *sh = priv->sh;
 	char s[MLX5_HLIST_NAMESIZE];
-	int err = mlx5_alloc_table_hash_list(priv);
+	int err = 0;
 
+	if (!sh->flow_tbls)
+		err = mlx5_alloc_table_hash_list(priv);
+	else
+		DRV_LOG(DEBUG, "sh->flow_tbls[%p] already created, reuse\n",
+			(void *)sh->flow_tbls);
 	if (err)
 		return err;
 	/* Create tags hash list table. */
-- 
2.20.1

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2020-02-11 11:17:40.484967399 +0000
+++ 0039-net-mlx5-fix-multiple-flow-table-hash-list.patch	2020-02-11 11:17:38.372000824 +0000
@@ -1,8 +1,10 @@
-From 6801116688fe82b5b32cf45ffa7b475d1cfdcea4 Mon Sep 17 00:00:00 2001
+From ba19ef396aaca14e49de7b88ef5a435423c68ce8 Mon Sep 17 00:00:00 2001
 From: Xiaoyu Min <jackmin at mellanox.com>
 Date: Mon, 16 Dec 2019 11:27:41 +0200
 Subject: [PATCH] net/mlx5: fix multiple flow table hash list
 
+[ upstream commit 6801116688fe82b5b32cf45ffa7b475d1cfdcea4 ]
+
 The eth devices which share one ibv device only need one hash list of
 flow table.
 
@@ -16,7 +18,6 @@
 To fix this, just don't create hash list if it is already created.
 
 Fixes: 54534725d2f3 ("net/mlx5: fix flow table hash list conversion")
-Cc: stable at dpdk.org
 
 Reported-by: Zhike Wang <wangzhike at jd.com>
 Signed-off-by: Xiaoyu Min <jackmin at mellanox.com>