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 EDE0846211 for ; Thu, 13 Feb 2025 11:02:43 +0100 (CET) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id E69B542F09; Thu, 13 Feb 2025 11:02:43 +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 E94B342EE7 for ; Thu, 13 Feb 2025 11:02:42 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1739440962; 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=p9jHFWmR3CgNJH3c9QzajLkMHqFevTgCl2/EvCF46dU=; b=QXaIm0O+3FWD/B/UU6WPynCAFh6JLQc30sDWMV9RSSMtyqyML6LHuHtgqsXK7lD7jJMqbt +tiFt/reRd3Xu5hnIS+ASOxpqMPLEczHQP1ooJkxQteUkZ7iPQblewcpjox5QH0i5NVPQ1 4x2ODx06WWwNHASMcs3QY017Fyoqh5Q= Received: from mx-prod-mc-04.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-678-jJVR6gjwO_Cw22nwURhxig-1; Thu, 13 Feb 2025 05:02:37 -0500 X-MC-Unique: jJVR6gjwO_Cw22nwURhxig-1 X-Mimecast-MFC-AGG-ID: jJVR6gjwO_Cw22nwURhxig Received: from mx-prod-int-06.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-06.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.93]) (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-04.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id 407B219039C5; Thu, 13 Feb 2025 10:02:36 +0000 (UTC) Received: from rh.Home (unknown [10.45.224.21]) by mx-prod-int-06.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id C8ADA1800360; Thu, 13 Feb 2025 10:02:34 +0000 (UTC) From: Kevin Traynor To: Maayan Kashani Cc: Bing Zhao , dpdk stable Subject: patch 'net/mlx5: fix GRE flow match with SWS' has been queued to stable release 24.11.2 Date: Thu, 13 Feb 2025 09:58:42 +0000 Message-ID: <20250213095933.362078-75-ktraynor@redhat.com> In-Reply-To: <20250213095933.362078-1-ktraynor@redhat.com> References: <20250213095933.362078-1-ktraynor@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.4.1 on 10.30.177.93 X-Mimecast-Spam-Score: 0 X-Mimecast-MFC-PROC-ID: ncOO_BZX0dFccvxqYmKwXEzwY4fJgLiri7TDPaTk7X4_1739440956 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 02/17/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/c38557155bbb84aeb3987b3eae9b8c4f211cc1ca Thanks. Kevin --- >From c38557155bbb84aeb3987b3eae9b8c4f211cc1ca Mon Sep 17 00:00:00 2001 From: Maayan Kashani Date: Tue, 28 Jan 2025 09:59:30 +0200 Subject: [PATCH] net/mlx5: fix GRE flow match with SWS [ upstream commit 05db99c117e36c0cd28cda8f558309efd20055da ] The previous GRE fix was meant to handle HWS behavior and changed the behavior for SWS causing degradation. After the previous fix, in case of an empty GRE match, GRE mask was initialized with protocol full mask, Instead of the empty mask with protocol mask equals zero. The current fix handles the SWS case as before the GRE fix, and HWS according to the latest fix. Also, combined common logic. 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 | 29 ++++++++++++++++------------- 1 file changed, 16 insertions(+), 13 deletions(-) diff --git a/drivers/net/mlx5/mlx5_flow_dv.c b/drivers/net/mlx5/mlx5_flow_dv.c index 41ebe0b61a..633c41e358 100644 --- a/drivers/net/mlx5/mlx5_flow_dv.c +++ b/drivers/net/mlx5/mlx5_flow_dv.c @@ -9840,21 +9840,24 @@ flow_dv_translate_item_gre(void *key, const struct rte_flow_item *item, uint16_t protocol_m, protocol_v; - if (key_type & MLX5_SET_MATCHER_M) { + /* Common logic to SWS/HWS */ + if (key_type & MLX5_SET_MATCHER_M) MLX5_SET(fte_match_set_lyr_2_4, headers_v, ip_protocol, 0xff); - if (!gre_m) - gre_m = &rte_flow_item_gre_mask; - gre_v = gre_m; - } else { + else MLX5_SET(fte_match_set_lyr_2_4, headers_v, ip_protocol, - IPPROTO_GRE); - if (!gre_v) { - gre_v = &empty_gre; - gre_m = &empty_gre; - } else if (!gre_m) { + IPPROTO_GRE); + /* HWS mask logic only */ + if (key_type & MLX5_SET_MATCHER_HS_M) { + if (!gre_m) gre_m = &rte_flow_item_gre_mask; - } - if (key_type == MLX5_SET_MATCHER_HS_V) - gre_m = gre_v; + gre_v = gre_m; + } else if (!gre_v) { + gre_v = &empty_gre; + gre_m = &empty_gre; + } else if (!gre_m) { + gre_m = &rte_flow_item_gre_mask; } + /* SWS logic only */ + if (key_type & MLX5_SET_MATCHER_SW_M) + gre_v = gre_m; gre_crks_rsvd0_ver_m.value = rte_be_to_cpu_16(gre_m->c_rsvd0_ver); gre_crks_rsvd0_ver_v.value = rte_be_to_cpu_16(gre_v->c_rsvd0_ver); -- 2.48.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2025-02-12 17:29:42.556948676 +0000 +++ 0075-net-mlx5-fix-GRE-flow-match-with-SWS.patch 2025-02-12 17:29:34.501946831 +0000 @@ -1 +1 @@ -From 05db99c117e36c0cd28cda8f558309efd20055da Mon Sep 17 00:00:00 2001 +From c38557155bbb84aeb3987b3eae9b8c4f211cc1ca Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit 05db99c117e36c0cd28cda8f558309efd20055da ] + @@ -18 +19,0 @@ -Cc: stable@dpdk.org