[dpdk-stable] patch 'net/mlx5: fix missing meter packet' 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 11/19/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.

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/bfaad169296d556ef4b46e96f92c68e4755b16c4

Thanks.

Luca Boccassi

---
>From bfaad169296d556ef4b46e96f92c68e4755b16c4 Mon Sep 17 00:00:00 2001
From: Xueming Li <xuemingl at nvidia.com>
Date: Tue, 3 Nov 2020 11:01:39 +0000
Subject: [PATCH] net/mlx5: fix missing meter packet

[ upstream commit c3ba8ecb767f0d34c792c82a92c378195f3530b4 ]

For transfer flow with meter, packet was passed without applying flow
action. The group level was multiplied by 10 for group level 65531.

This patch fixes this issue by correcting suffix table group level
calculation.

Fixes: 3e8f3e51fd93 ("net/mlx5: fix meter table definitions")

Signed-off-by: Xueming Li <xuemingl at nvidia.com>
Reviewed-by: Suanming Mou <suanmingm at nvidia.com>
Acked-by: Matan Azrad <matan 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 2f76d162cf..d2e4f446f4 100644
--- a/drivers/net/mlx5/mlx5.h
+++ b/drivers/net/mlx5/mlx5.h
@@ -607,9 +607,9 @@ struct mlx5_flow_tbl_resource {
 #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_FLOW_TABLE_LEVEL_METER (MLX5_MAX_TABLES - 4)
+#define MLX5_MAX_TABLES_EXTERNAL MLX5_FLOW_TABLE_LEVEL_METER
 #define MLX5_MAX_TABLES_FDB UINT16_MAX
 
 #define MLX5_DBR_SIZE RTE_CACHE_LINE_SIZE
-- 
2.27.0

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2020-11-17 11:13:13.959413587 +0000
+++ 0023-net-mlx5-fix-missing-meter-packet.patch	2020-11-17 11:13:12.917116528 +0000
@@ -1 +1 @@
-From c3ba8ecb767f0d34c792c82a92c378195f3530b4 Mon Sep 17 00:00:00 2001
+From bfaad169296d556ef4b46e96f92c68e4755b16c4 Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit c3ba8ecb767f0d34c792c82a92c378195f3530b4 ]
+
@@ -13 +14,0 @@
-Cc: stable at dpdk.org
@@ -23 +24 @@
-index 9a87800112..ed791c8565 100644
+index 2f76d162cf..d2e4f446f4 100644
@@ -26 +27 @@
-@@ -611,9 +611,9 @@ struct mlx5_flow_tbl_resource {
+@@ -607,9 +607,9 @@ struct mlx5_flow_tbl_resource {
@@ -36 +36,0 @@
- #define MLX5_FLOW_TABLE_FACTOR 10
@@ -37,0 +38 @@
+ #define MLX5_DBR_SIZE RTE_CACHE_LINE_SIZE