From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mails.dpdk.org (mails.dpdk.org [217.70.189.124]) by inbox.dpdk.org (Postfix) with ESMTP id 1503648A44 for ; Fri, 31 Oct 2025 15:38:51 +0100 (CET) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 0CCB94067E; Fri, 31 Oct 2025 15:38:51 +0100 (CET) Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) by mails.dpdk.org (Postfix) with ESMTP id F27DA40691 for ; Fri, 31 Oct 2025 15:38:46 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1761921526; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=3WCDOjGSFX5zcYa43OWKBUdKRglevAPetHjvNzErhpk=; b=IK8azUvuqzuZCq2xtyqGwaqolC8UHTjuZCHoZklWWChQZKnWH7bmLhhnDJhdubKqznxXM2 jGrQEPy+yQYGpDzSt71KJsBieiwkxa5CNhg3DEMTQQCuevmrAoKxR8kUpRp0zXJZ63b0nV rFB6qKD+uTvtOL66ULnUBH1NnWyvdoI= Received: from mx-prod-mc-01.mail-002.prod.us-west-2.aws.redhat.com (ec2-54-186-198-63.us-west-2.compute.amazonaws.com [54.186.198.63]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-103-7nAp5AllNCmQfO506ysqQA-1; Fri, 31 Oct 2025 10:38:44 -0400 X-MC-Unique: 7nAp5AllNCmQfO506ysqQA-1 X-Mimecast-MFC-AGG-ID: 7nAp5AllNCmQfO506ysqQA_1761921523 Received: from mx-prod-int-08.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-08.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.111]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by mx-prod-mc-01.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id 25DDE1953995; Fri, 31 Oct 2025 14:38:40 +0000 (UTC) Received: from rh.redhat.com (unknown [10.44.32.50]) by mx-prod-int-08.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id 911FB1800579; Fri, 31 Oct 2025 14:38:38 +0000 (UTC) From: Kevin Traynor To: Maayan Kashani Cc: Bing Zhao , dpdk stable Subject: patch 'net/mlx5: fix flow encapsulation hash' has been queued to stable release 24.11.4 Date: Fri, 31 Oct 2025 14:33:29 +0000 Message-ID: <20251031143421.324432-87-ktraynor@redhat.com> In-Reply-To: <20251031143421.324432-1-ktraynor@redhat.com> References: <20251031143421.324432-1-ktraynor@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.4.1 on 10.30.177.111 X-Mimecast-Spam-Score: 0 X-Mimecast-MFC-PROC-ID: Wg2sfVQJnJQCGBDIOZzvYm1fzln3aT5_NZBCjXAmHp4_1761921523 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: 8bit content-type: text/plain; charset="US-ASCII"; x-default=true X-BeenThere: stable@dpdk.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: patches for DPDK stable branches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: stable-bounces@dpdk.org 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 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 Acked-by: Bing Zhao --- 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@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,