patch 'net/mlx5: reduce flex item flow handle size' has been queued to stable release 21.11.1

[Kevin Traynor <ktraynor@redhat.com>]

Hi,

FYI, your patch has been queued to stable release 21.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 03/14/22. 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/kevintraynor/dpdk-stable

This queued commit can be viewed at:
https://github.com/kevintraynor/dpdk-stable/commit/949a09c9ba237e3820eed2595738ef69a721075a

Thanks.

Kevin

---
From 949a09c9ba237e3820eed2595738ef69a721075a Mon Sep 17 00:00:00 2001
From: Gregory Etelson <getelson@nvidia.com>
Date: Mon, 28 Feb 2022 12:01:24 +0200
Subject: [PATCH] net/mlx5: reduce flex item flow handle size

[ upstream commit cfe337e7157e7b8f9e3d136f5a1882d2af8a1dc0 ]

Reduce flex item flow handle size from 32 bits to 8 bits for each
flow.
The patch will save memory in setups with millions of flows.

Fixes: a23e9b6e3ee9 ("net/mlx5: handle flex item in flows")

Signed-off-by: Gregory Etelson <getelson@nvidia.com>
Acked-by: Viacheslav Ovsiienko <viacheslavo@nvidia.com>
---
 drivers/net/mlx5/mlx5_flow.h    | 2 +-
 drivers/net/mlx5/mlx5_flow_dv.c | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/drivers/net/mlx5/mlx5_flow.h b/drivers/net/mlx5/mlx5_flow.h
index 7fec79afb3..f8bce92e9f 100644
--- a/drivers/net/mlx5/mlx5_flow.h
+++ b/drivers/net/mlx5/mlx5_flow.h
@@ -699,5 +699,4 @@ struct mlx5_flow_handle {
 	uint32_t is_meter_flow_id:1; /**< Indicate if flow_id is for meter. */
 	uint32_t fate_action:3; /**< Fate action type. */
-	uint32_t flex_item; /**< referenced Flex Item bitmask. */
 	union {
 		uint32_t rix_hrxq; /**< Hash Rx queue object index. */
@@ -715,4 +714,5 @@ struct mlx5_flow_handle {
 	struct mlx5_flow_handle_dv dvh;
 #endif
+	uint8_t flex_item; /**< referenced Flex Item bitmask. */
 } __rte_packed;
 
diff --git a/drivers/net/mlx5/mlx5_flow_dv.c b/drivers/net/mlx5/mlx5_flow_dv.c
index 7d22ac388e..ce0d5b1e37 100644
--- a/drivers/net/mlx5/mlx5_flow_dv.c
+++ b/drivers/net/mlx5/mlx5_flow_dv.c
@@ -10197,5 +10197,5 @@ flow_dv_translate_item_flex(struct rte_eth_dev *dev, void *matcher, void *key,
 		if (mlx5_flex_acquire_index(dev, spec->handle, true) != index)
 			MLX5_ASSERT(false);
-		dev_flow->handle->flex_item |= RTE_BIT32(index);
+		dev_flow->handle->flex_item |= (uint8_t)RTE_BIT32(index);
 	}
 	mlx5_flex_flow_translate_item(dev, matcher, key, item, is_inner);
@@ -14536,5 +14536,5 @@ flow_dv_destroy(struct rte_eth_dev *dev, struct rte_flow *flow)
 
 			mlx5_flex_release_index(dev, index);
-			dev_handle->flex_item &= ~RTE_BIT32(index);
+			dev_handle->flex_item &= ~(uint8_t)RTE_BIT32(index);
 		}
 		if (dev_handle->dvh.matcher)
-- 
2.34.1

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2022-03-08 13:55:29.049126827 +0000
+++ 0025-net-mlx5-reduce-flex-item-flow-handle-size.patch	2022-03-08 13:55:28.481315122 +0000
@@ -1 +1 @@
-From cfe337e7157e7b8f9e3d136f5a1882d2af8a1dc0 Mon Sep 17 00:00:00 2001
+From 949a09c9ba237e3820eed2595738ef69a721075a Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit cfe337e7157e7b8f9e3d136f5a1882d2af8a1dc0 ]
+
@@ -11 +12,0 @@
-Cc: stable@dpdk.org
@@ -21 +22 @@
-index e510921a3f..484ce5791e 100644
+index 7fec79afb3..f8bce92e9f 100644
@@ -24 +25 @@
-@@ -701,5 +701,4 @@ struct mlx5_flow_handle {
+@@ -699,5 +699,4 @@ struct mlx5_flow_handle {
@@ -30 +31 @@
-@@ -717,4 +716,5 @@ struct mlx5_flow_handle {
+@@ -715,4 +714,5 @@ struct mlx5_flow_handle {
@@ -37 +38 @@
-index 0b9df5f6f1..c4a9b022b7 100644
+index 7d22ac388e..ce0d5b1e37 100644
@@ -40 +41 @@
-@@ -10299,5 +10299,5 @@ flow_dv_translate_item_flex(struct rte_eth_dev *dev, void *matcher, void *key,
+@@ -10197,5 +10197,5 @@ flow_dv_translate_item_flex(struct rte_eth_dev *dev, void *matcher, void *key,
@@ -47 +48 @@
-@@ -14650,5 +14650,5 @@ flow_dv_destroy(struct rte_eth_dev *dev, struct rte_flow *flow)
+@@ -14536,5 +14536,5 @@ flow_dv_destroy(struct rte_eth_dev *dev, struct rte_flow *flow)