patch 'net/mlx5: fix flow encapsulation hash' has been queued to stable release 24.11.4

[Kevin Traynor]

Hi,

FYI, your patch has been queued to stable release 24.11.4

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/05/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/kevintraynor/dpdk-stable

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

Thanks.

Kevin

---
>From a4c3f462057f607e1f0b6810e47d8d0be4f2c47e Mon Sep 17 00:00:00 2001
From: Maayan Kashani <mkashani at nvidia.com>
Date: Mon, 15 Sep 2025 13:40:12 +0300
Subject: [PATCH] net/mlx5: fix flow encapsulation hash

[ upstream commit 76583343fb62bf416500ee0df87c934cea18a979 ]

Add missing memcpy for next_protocol field when processing IPv4/6 items
in flow_hw_calc_encap_hash function. This ensures the IPv4/6 header's
proto field is properly copied to the hash calculation data structure.
This function is used in rte_flow_calc_encap_hash() API.

Fixes: bb328f44afe9 ("net/mlx5: support encapsulation hash calculation")

Signed-off-by: Maayan Kashani <mkashani at nvidia.com>
Acked-by: Bing Zhao <bingz at nvidia.com>
---
 drivers/net/mlx5/mlx5_flow_hw.c | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/drivers/net/mlx5/mlx5_flow_hw.c b/drivers/net/mlx5/mlx5_flow_hw.c
index 74ee3c665f..110fb8e88a 100644
--- a/drivers/net/mlx5/mlx5_flow_hw.c
+++ b/drivers/net/mlx5/mlx5_flow_hw.c
@@ -14795,4 +14795,6 @@ flow_hw_calc_encap_hash(struct rte_eth_dev *dev,
 			data.src.ipv4_addr =
 				((const struct rte_flow_item_ipv4 *)(pattern->spec))->hdr.src_addr;
+			data.next_protocol = ((const struct rte_flow_item_ipv4 *)
+				(pattern->spec))->hdr.next_proto_id;
 			break;
 		case RTE_FLOW_ITEM_TYPE_IPV6:
@@ -14803,4 +14805,6 @@ flow_hw_calc_encap_hash(struct rte_eth_dev *dev,
 			       &((const struct rte_flow_item_ipv6 *)(pattern->spec))->hdr.src_addr,
 			       sizeof(data.src.ipv6_addr));
+			data.next_protocol = ((const struct rte_flow_item_ipv6 *)
+			       (pattern->spec))->hdr.proto;
 			break;
 		case RTE_FLOW_ITEM_TYPE_UDP:
-- 
2.51.0

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2025-10-31 13:53:54.890444030 +0000
+++ 0087-net-mlx5-fix-flow-encapsulation-hash.patch	2025-10-31 13:53:52.228523967 +0000
@@ -1 +1 @@
-From 76583343fb62bf416500ee0df87c934cea18a979 Mon Sep 17 00:00:00 2001
+From a4c3f462057f607e1f0b6810e47d8d0be4f2c47e Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit 76583343fb62bf416500ee0df87c934cea18a979 ]
+
@@ -12 +13,0 @@
-Cc: stable at dpdk.org
@@ -21 +22 @@
-index 2ca40b4146..ee8f8c35e5 100644
+index 74ee3c665f..110fb8e88a 100644
@@ -24 +25 @@
-@@ -15097,4 +15097,6 @@ flow_hw_calc_encap_hash(struct rte_eth_dev *dev,
+@@ -14795,4 +14795,6 @@ flow_hw_calc_encap_hash(struct rte_eth_dev *dev,
@@ -31 +32 @@
-@@ -15105,4 +15107,6 @@ flow_hw_calc_encap_hash(struct rte_eth_dev *dev,
+@@ -14803,4 +14805,6 @@ flow_hw_calc_encap_hash(struct rte_eth_dev *dev,