patch 'net/mlx5: validate GTP PSC QFI width' has been queued to stable release 22.11.9

[luca.boccassi at gmail.com]

Hi,

FYI, your patch has been queued to stable release 22.11.9

Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet.
It will be pushed if I get no objections before 06/14/25. 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/82a0323b75c18c81f3764b9c788c59c39677638b

Thanks.

Luca Boccassi

---
>From 82a0323b75c18c81f3764b9c788c59c39677638b Mon Sep 17 00:00:00 2001
From: Dariusz Sosnowski <dsosnowski at nvidia.com>
Date: Fri, 25 Apr 2025 21:35:07 +0200
Subject: [PATCH] net/mlx5: validate GTP PSC QFI width

[ upstream commit 34471d1645fae0e936c44f2f6d7fea6d22e4173e ]

Add missing validation of GTP PSC QFI flow field width for
modify field flow action.

Fixes: 0f4aa72b99da ("net/mlx5: support flow modify field with HWS")

Signed-off-by: Dariusz Sosnowski <dsosnowski at nvidia.com>
Acked-by: Bing Zhao <bingz at nvidia.com>
---
 drivers/net/mlx5/mlx5_flow_dv.c | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/drivers/net/mlx5/mlx5_flow_dv.c b/drivers/net/mlx5/mlx5_flow_dv.c
index 73f047e41b..d11e39431f 100644
--- a/drivers/net/mlx5/mlx5_flow_dv.c
+++ b/drivers/net/mlx5/mlx5_flow_dv.c
@@ -1403,6 +1403,8 @@ mlx5_flow_item_field_width(struct rte_eth_dev *dev,
 	case RTE_FLOW_FIELD_META:
 		return (flow_dv_get_metadata_reg(dev, attr, error) == REG_C_0) ?
 			__builtin_popcount(priv->sh->dv_meta_mask) : 32;
+	case RTE_FLOW_FIELD_GTP_PSC_QFI:
+		return 6;
 	case RTE_FLOW_FIELD_POINTER:
 	case RTE_FLOW_FIELD_VALUE:
 		return inherit < 0 ? 0 : inherit;
-- 
2.47.2

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2025-06-12 22:06:24.635284618 +0100
+++ 0020-net-mlx5-validate-GTP-PSC-QFI-width.patch	2025-06-12 22:06:23.822043624 +0100
@@ -1 +1 @@
-From 34471d1645fae0e936c44f2f6d7fea6d22e4173e Mon Sep 17 00:00:00 2001
+From 82a0323b75c18c81f3764b9c788c59c39677638b Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit 34471d1645fae0e936c44f2f6d7fea6d22e4173e ]
+
@@ -10 +11,0 @@
-Cc: stable at dpdk.org
@@ -19 +20 @@
-index 608c42db1d..c217634d9b 100644
+index 73f047e41b..d11e39431f 100644
@@ -22 +23 @@
-@@ -1451,6 +1451,8 @@ mlx5_flow_item_field_width(struct rte_eth_dev *dev,
+@@ -1403,6 +1403,8 @@ mlx5_flow_item_field_width(struct rte_eth_dev *dev,
@@ -25 +26 @@
- 			rte_popcount32(priv->sh->dv_meta_mask) : 32;
+ 			__builtin_popcount(priv->sh->dv_meta_mask) : 32;