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 81A9C46468 for ; Mon, 24 Mar 2025 17:18:32 +0100 (CET) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 7A50740DDA; Mon, 24 Mar 2025 17:18:32 +0100 (CET) Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by mails.dpdk.org (Postfix) with ESMTP id 46EAA40DDA for ; Mon, 24 Mar 2025 17:18:31 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1742833110; 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=Qr92zu2vmq2upL1MVdkw0BVAOJyHbc3+EV/Ckpf/zfs=; b=dAtuP0w7g6/4FAzJlXI0xcm3bSgEvM1dfaKS3Ejy5SU1znIhwm9aKDX7OFZEvu7aZxEPAA fyp5JLXufVwrJeZNo7882AN/kVwqDPxOfP//09gEMZFclnQ8DNzq2J4JRUKWoUV3711PRR M7ddkW6Joax+42noADiGjQ5a0RqJxUQ= Received: from mx-prod-mc-08.mail-002.prod.us-west-2.aws.redhat.com (ec2-35-165-154-97.us-west-2.compute.amazonaws.com [35.165.154.97]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-686-NH2KJqX7NU6emg11q6p15A-1; Mon, 24 Mar 2025 12:18:29 -0400 X-MC-Unique: NH2KJqX7NU6emg11q6p15A-1 X-Mimecast-MFC-AGG-ID: NH2KJqX7NU6emg11q6p15A_1742833108 Received: from mx-prod-int-01.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-01.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.4]) (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-08.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id 6BEEB180AF53; Mon, 24 Mar 2025 16:18:28 +0000 (UTC) Received: from rh.redhat.com (unknown [10.44.32.16]) by mx-prod-int-01.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id 3372430001A2; Mon, 24 Mar 2025 16:18:25 +0000 (UTC) From: Kevin Traynor To: Maayan Kashani Cc: Bing Zhao , dpdk stable Subject: patch 'net/mlx5: fix GRE matching on root table' has been queued to stable release 24.11.2 Date: Mon, 24 Mar 2025 16:16:28 +0000 Message-ID: <20250324161731.63950-21-ktraynor@redhat.com> In-Reply-To: <20250324161731.63950-1-ktraynor@redhat.com> References: <20250324161731.63950-1-ktraynor@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.4.1 on 10.30.177.4 X-Mimecast-Spam-Score: 0 X-Mimecast-MFC-PROC-ID: hHdL3rzDgRCRVknPWwym7JnNIJl9gNTSDMB7l742drk_1742833108 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.2 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/28/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/9d941764d961e80eca3b4de2e123548ea2736380 Thanks. Kevin --- >From 9d941764d961e80eca3b4de2e123548ea2736380 Mon Sep 17 00:00:00 2001 From: Maayan Kashani Date: Wed, 12 Mar 2025 13:23:48 +0200 Subject: [PATCH] net/mlx5: fix GRE matching on root table [ upstream commit 111bde25455114e1d4ad843e7b3a03c5ffd6eca5 ] The current implementation sets a gre mask with protocol masked in case the user did not supply the protocol mask. In template mode, for group 0, the gre translation was called once with the mask and later with the value. with gre open matcher(mask/value is null) default values were assigned gre protocol mask=0xffff and gre protocol value=0. Therefore gre packet with protocol value not equal zero, will not match the rule. Changed the default protocol mask to be zero instead of 0xffff. In case of empty gre match, this fix will ignore the protocol field matching, gre will only be matched by the IP next header field in previous header in packet. Fixes: 25ab2cbba31d ("net/mlx5: fix GRE flow item translation for root table") Signed-off-by: Maayan Kashani Acked-by: Bing Zhao --- drivers/net/mlx5/mlx5_flow_dv.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/net/mlx5/mlx5_flow_dv.c b/drivers/net/mlx5/mlx5_flow_dv.c index 6fe4204c1f..62eb835b7c 100644 --- a/drivers/net/mlx5/mlx5_flow_dv.c +++ b/drivers/net/mlx5/mlx5_flow_dv.c @@ -9855,5 +9855,5 @@ flow_dv_translate_item_gre(void *key, const struct rte_flow_item *item, if (key_type & MLX5_SET_MATCHER_HS_M) { if (!gre_m) - gre_m = &rte_flow_item_gre_mask; + gre_m = &empty_gre; gre_v = gre_m; } else if (!gre_v) { -- 2.48.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2025-03-24 16:15:15.599408888 +0000 +++ 0021-net-mlx5-fix-GRE-matching-on-root-table.patch 2025-03-24 16:15:14.845735888 +0000 @@ -1 +1 @@ -From 111bde25455114e1d4ad843e7b3a03c5ffd6eca5 Mon Sep 17 00:00:00 2001 +From 9d941764d961e80eca3b4de2e123548ea2736380 Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit 111bde25455114e1d4ad843e7b3a03c5ffd6eca5 ] + @@ -24 +25,0 @@ -Cc: stable@dpdk.org @@ -33 +34 @@ -index 8703403b8f..608c42db1d 100644 +index 6fe4204c1f..62eb835b7c 100644 @@ -36 +37 @@ -@@ -9857,5 +9857,5 @@ flow_dv_translate_item_gre(void *key, const struct rte_flow_item *item, +@@ -9855,5 +9855,5 @@ flow_dv_translate_item_gre(void *key, const struct rte_flow_item *item,