[dpdk-stable] patch 'net/mlx5: fix meter table definitions' has been queued to stable release 19.11.6

[luca.boccassi at gmail.com]

Hi,

FYI, your patch has been queued to stable release 19.11.6

Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet.
It will be pushed if I get no objections before 10/30/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 1015860cae9b0cc9e57bcc9941f2b00ab815116b Mon Sep 17 00:00:00 2001
From: Suanming Mou <suanmingm at nvidia.com>
Date: Wed, 30 Sep 2020 14:47:01 +0800
Subject: [PATCH] net/mlx5: fix meter table definitions

[ upstream commit 3e8f3e51fd930674b5b0a481f35a4914a1a3accb ]

As metering and metadata features were developed at the same time. The
metering and metadata tables are defined conflicted.

This cause the meter suffix flow jump to the same metadata table and
cause flow deadloop.

Adjust the metering table define to fix that issue.

Fixes: 46a5e6bc6a85 ("net/mlx5: prepare meter flow tables")

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

diff --git a/drivers/net/mlx5/mlx5.h b/drivers/net/mlx5/mlx5.h
index 07be509f65..fd66aaf318 100644
--- a/drivers/net/mlx5/mlx5.h
+++ b/drivers/net/mlx5/mlx5.h
@@ -602,14 +602,14 @@ struct mlx5_flow_tbl_resource {
 };
 
 #define MLX5_MAX_TABLES UINT16_MAX
-#define MLX5_FLOW_TABLE_LEVEL_METER (UINT16_MAX - 3)
-#define MLX5_FLOW_TABLE_LEVEL_SUFFIX (UINT16_MAX - 2)
 #define MLX5_HAIRPIN_TX_TABLE (UINT16_MAX - 1)
 /* Reserve the last two tables for metadata register copy. */
 #define MLX5_FLOW_MREG_ACT_TABLE_GROUP (MLX5_MAX_TABLES - 1)
 #define MLX5_FLOW_MREG_CP_TABLE_GROUP (MLX5_MAX_TABLES - 2)
 /* Tables for metering splits should be added here. */
 #define MLX5_MAX_TABLES_EXTERNAL (MLX5_MAX_TABLES - 3)
+#define MLX5_FLOW_TABLE_LEVEL_METER (MLX5_MAX_TABLES - 4)
+#define MLX5_FLOW_TABLE_LEVEL_SUFFIX (MLX5_MAX_TABLES - 3)
 #define MLX5_MAX_TABLES_FDB UINT16_MAX
 
 #define MLX5_DBR_SIZE RTE_CACHE_LINE_SIZE
-- 
2.20.1

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2020-10-28 10:35:15.536307889 +0000
+++ 0122-net-mlx5-fix-meter-table-definitions.patch	2020-10-28 10:35:11.680832615 +0000
@@ -1,8 +1,10 @@
-From 3e8f3e51fd930674b5b0a481f35a4914a1a3accb Mon Sep 17 00:00:00 2001
+From 1015860cae9b0cc9e57bcc9941f2b00ab815116b Mon Sep 17 00:00:00 2001
 From: Suanming Mou <suanmingm at nvidia.com>
 Date: Wed, 30 Sep 2020 14:47:01 +0800
 Subject: [PATCH] net/mlx5: fix meter table definitions
 
+[ upstream commit 3e8f3e51fd930674b5b0a481f35a4914a1a3accb ]
+
 As metering and metadata features were developed at the same time. The
 metering and metadata tables are defined conflicted.
 
@@ -12,7 +14,6 @@
 Adjust the metering table define to fix that issue.
 
 Fixes: 46a5e6bc6a85 ("net/mlx5: prepare meter flow tables")
-Cc: stable at dpdk.org
 
 Signed-off-by: Suanming Mou <suanmingm at nvidia.com>
 Acked-by: Viacheslav Ovsiienko <viacheslavo at nvidia.com>
@@ -21,10 +22,10 @@
  1 file changed, 2 insertions(+), 2 deletions(-)
 
 diff --git a/drivers/net/mlx5/mlx5.h b/drivers/net/mlx5/mlx5.h
-index 43da9a1fb4..bd91e167e0 100644
+index 07be509f65..fd66aaf318 100644
 --- a/drivers/net/mlx5/mlx5.h
 +++ b/drivers/net/mlx5/mlx5.h
-@@ -503,14 +503,14 @@ struct mlx5_flow_tbl_resource {
+@@ -602,14 +602,14 @@ struct mlx5_flow_tbl_resource {
  };
  
  #define MLX5_MAX_TABLES UINT16_MAX
@@ -40,7 +41,7 @@
 +#define MLX5_FLOW_TABLE_LEVEL_SUFFIX (MLX5_MAX_TABLES - 3)
  #define MLX5_MAX_TABLES_FDB UINT16_MAX
  
- /* ID generation structure. */
+ #define MLX5_DBR_SIZE RTE_CACHE_LINE_SIZE
 -- 
 2.20.1