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 61F864625C for ; Tue, 18 Feb 2025 13:40:08 +0100 (CET) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 5C4B4402E1; Tue, 18 Feb 2025 13:40:08 +0100 (CET) Received: from NAM12-BN8-obe.outbound.protection.outlook.com (mail-bn8nam12on2063.outbound.protection.outlook.com [40.107.237.63]) by mails.dpdk.org (Postfix) with ESMTP id B6811402A0 for ; Tue, 18 Feb 2025 13:40:06 +0100 (CET) ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=pTT/+dWr8O7L6ojNiLDatMbx5cOBL+8G+xCqBIP+WHWylalRs+iR8svWVc1VBbKop3LUTTQyERl0pmhNn/QSnuJJLScoiX2yz2MiRXsCO9vKmrSbz1OKvWM/ocCCZjcS0NHP8bbR0G9DlCmfiwhGC63/qUIdAoc9hYUbNKrDzrfcipJX3SRzT28XLSAupdxyezCr+dj+gJ9XN1W8ilRQS3WQeHTW9n9ZpB2HMArjowlv+Ns0l+9W6+NzND7/Xw1QvsimVtpj3CHw52G09SeGrMQMOSSot+w1lXEody/nSsKXCjvI1hW4Bphgc/7VgcNH5br8bZLr3oyFf/if2ZtUnA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector10001; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=gMyCcm0a6wD47KYHLkzRKr9ZOEalkx9K+k3cg5aOXKM=; b=Cs6WYsCq/fFOFJsK+1/tELz91OWFLxIPwhbI1xxGhYD4kux7h3J/2Kcarl1EY0mJkBf0Mx/VMfqawMyfkyW9xMzO3yLpDNizrwnx/jj+dH57ljWlQFUzT6qirswLp9Iog5E6ZLkfw+qV3BdabJ48ZMWRoBq3jnzPUrY1w06TcluA6QKvVRs1GfBB4osD3M6c2ozheq/kM8UUnLf5mUOmGUtQEk7oGvax7MQttDxSFYKDtoQBdwHQBjvkaEsNnFqQ2gJPncPm2fLMLrF65xIMl3XyMeUAigq9AgYqlyLyYsUURuFAWIY9pWmoTf5paOiysTg+cmxxsc1w21Owi/u11w== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 216.228.117.161) smtp.rcpttodomain=dpdk.org smtp.mailfrom=nvidia.com; dmarc=pass (p=reject sp=reject pct=100) action=none header.from=nvidia.com; dkim=none (message not signed); arc=none (0) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=Nvidia.com; s=selector2; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=gMyCcm0a6wD47KYHLkzRKr9ZOEalkx9K+k3cg5aOXKM=; b=fVYDFXSej7ZGqCCUFDk+xmW9gCD2XLtkAiPxUt812dvDYkMFa1ImowR3NJealcxbsNJXrWJLBLad2wRm48SD7u9eCLZQs9PSio4Oh2mWthoTuTmb5IwZAH2LOuINxVSg0cvFuyMwvyycrD67Ye3zF1G7J58TSVI7i0yBjvRgSEK4HqhBkgoMnrR9D/oCQd4oI6JM2/mPQvXqa87n6MPJ5H9OlGK1Lx+wddDPWUKwqRVx+87nazCX2rFVRnZ7TIwz7Qi/oKd1j+u2jRUUqHLhSvnQdvuEY9E6ssUwgi/L+RwdIloVFrbiTbPUvHKkEZ7OEf4dcZOd6b4axNBFnExOfw== Received: from MW3PR05CA0028.namprd05.prod.outlook.com (2603:10b6:303:2b::33) by CYXPR12MB9340.namprd12.prod.outlook.com (2603:10b6:930:e4::20) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8445.19; Tue, 18 Feb 2025 12:40:04 +0000 Received: from MWH0EPF000989E5.namprd02.prod.outlook.com (2603:10b6:303:2b:cafe::93) by MW3PR05CA0028.outlook.office365.com (2603:10b6:303:2b::33) with Microsoft SMTP Server (version=TLS1_3, cipher=TLS_AES_256_GCM_SHA384) id 15.20.8466.12 via Frontend Transport; Tue, 18 Feb 2025 12:40:03 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 216.228.117.161) smtp.mailfrom=nvidia.com; dkim=none (message not signed) header.d=none;dmarc=pass action=none header.from=nvidia.com; Received-SPF: Pass (protection.outlook.com: domain of nvidia.com designates 216.228.117.161 as permitted sender) receiver=protection.outlook.com; client-ip=216.228.117.161; helo=mail.nvidia.com; pr=C Received: from mail.nvidia.com (216.228.117.161) by MWH0EPF000989E5.mail.protection.outlook.com (10.167.241.132) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8466.11 via Frontend Transport; Tue, 18 Feb 2025 12:40:03 +0000 Received: from rnnvmail201.nvidia.com (10.129.68.8) by mail.nvidia.com (10.129.200.67) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.1544.4; Tue, 18 Feb 2025 04:39:53 -0800 Received: from nvidia.com (10.126.230.35) by rnnvmail201.nvidia.com (10.129.68.8) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.1544.14; Tue, 18 Feb 2025 04:39:51 -0800 From: Xueming Li To: Maayan Kashani CC: , Bing Zhao , dpdk stable Subject: patch 'net/mlx5: fix GRE flow match with SWS' has been queued to stable release 23.11.4 Date: Tue, 18 Feb 2025 20:34:39 +0800 Message-ID: <20250218123523.36836-45-xuemingl@nvidia.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20250218123523.36836-1-xuemingl@nvidia.com> References: <20250218123523.36836-1-xuemingl@nvidia.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain X-Originating-IP: [10.126.230.35] X-ClientProxiedBy: rnnvmail201.nvidia.com (10.129.68.8) To rnnvmail201.nvidia.com (10.129.68.8) X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: MWH0EPF000989E5:EE_|CYXPR12MB9340:EE_ X-MS-Office365-Filtering-Correlation-Id: 929993be-61d9-4e66-4471-08dd50195df6 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; ARA:13230040|1800799024|376014|82310400026|36860700013; X-Microsoft-Antispam-Message-Info: =?us-ascii?Q?YRh/7s1MVbzOTiuTqEHWVf27WsTbCcQuDI1BEFQHs5NvL5LubC8nhY/Vq6k7?= =?us-ascii?Q?upcdUt/PAxEphhAK5v7bf9pqhpdrXLMJf/ikTWD9BKVnbNR0185kO3Btvb9b?= =?us-ascii?Q?UIAXRg5BYaQ/1dFvITL8zXPhGpeuc1s1eu16I0hFqMozCuWRhmsm6T79/uN1?= =?us-ascii?Q?bAFz3WiljbpMooSmkmAC0pEo5njvqcNok1RpcPjMH6uW/n7LJwtJBVksYeNF?= =?us-ascii?Q?v4EPdPNJqcimOMYSHn+ECPPPJ2DIayIbFDxc227qDGSmNTII3/ffZNslXq7W?= =?us-ascii?Q?6odddi2zjzJhph5zTSGYZBdkEnZIOp2Arw3FlKQzDFR1yFhatxYBayexN9b/?= =?us-ascii?Q?89JdesRwvK6yjI37r3kKSdnOLDhH0LZsiagl6VF4OINfor8jSar+7z9Q1ttp?= =?us-ascii?Q?VAPkvrza3ThCtYYnkzObCB3TNS6/SaR5fZkfgDeDfA+Y7rmiDy6+2LTOZ5Sq?= =?us-ascii?Q?rhhOyMofZcNvF2gXUAI9skvgGgWXHy7HdRlfOSXeb4NuLdIl7eNWXoHAUjWQ?= =?us-ascii?Q?/L/Pn+IZARoGJyDbfEe51cnDqXaGW+A+mW9ucwPvuERZroPx4GYlhOXP6AfD?= =?us-ascii?Q?HWXZx6mMXGy7vwpOW++sYNKRRA72rIVYlPovgl2RW4NfIIb8zsJz5KOZPTkr?= =?us-ascii?Q?Co/ueUzrLNSPzEopGu4Vurcah3oDnVlEKVmAbYElhI1tyV4OZkI4ZWVhruLu?= =?us-ascii?Q?bHsdYydDDaGgdL4R/J7oucwaEuHaKaVaVcA9R8dP/WzfcOZw//EthCa0N9O2?= =?us-ascii?Q?cv3IU54fVRspPtnO9E22jFxf2nauWTVRfvtZFrMXYsLqwdegfCH+g90fB4D6?= =?us-ascii?Q?yEpJ+YvLdK5v4bQryi/EijtssOLwcnftLk+VzKXLlhCXnrfmf1y4y1fKZE1c?= =?us-ascii?Q?tuLpfKNkMopuGf6GRtQDfdvi/wUnAs2OVF6T5kzHTopcViq3LqXye+cTC1Td?= =?us-ascii?Q?XTaQBMWB2N+h1vJVmIXlayTl02r6dz0YH2UIb8V5+gEL4e40yz+VJyoFkpAf?= =?us-ascii?Q?SPdygL8U5EnvyI8092sSBsPbsknqMy1MaEFxfXlz63KcuGhJ3uGYmlAYDU3U?= =?us-ascii?Q?VdO2rvK8TOH+/poga3kWofOf3xjPPLkIKF7H88EvYWR7pL/aYpplcN3nP7gi?= =?us-ascii?Q?Jv1C+crh0K3GbsT+r61wG0t4nhRI2Dhr5WSmWimkRZXPhewcBP7EUq6L2Vvn?= =?us-ascii?Q?gE3nMw+fzEVRzn48j5YRzxiHahw5NjRVeUmMydjTIKenszzzIb8PV5MwpWzX?= =?us-ascii?Q?rSpGQEQwLNoCD5T4xs4Fv8vOlzQChWY02lT/3YlEwQg/T3tdYGDKQ7nQsyEV?= =?us-ascii?Q?GPU8zF0Rkr9DDoe9Eg9bd++QThc+Mwzx+t6HztpjL2dLq48r7d1lUu4ZWpWK?= =?us-ascii?Q?XZ0eRMDJ5lcqW0cWIMP3FIRb5wAnTqfvsTefcoKgxX44ao+CNlwZw8xzeLRO?= =?us-ascii?Q?NNJb/DNl7JGJguHUthAaeClU9Vfuszm9NLJWEgjIiDkAfkTBT0XHsG/w9lgm?= =?us-ascii?Q?YCo+sFo/YEY8hJA=3D?= X-Forefront-Antispam-Report: CIP:216.228.117.161; CTRY:US; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:mail.nvidia.com; PTR:dc6edge2.nvidia.com; CAT:NONE; SFS:(13230040)(1800799024)(376014)(82310400026)(36860700013); DIR:OUT; SFP:1101; X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 18 Feb 2025 12:40:03.6209 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 929993be-61d9-4e66-4471-08dd50195df6 X-MS-Exchange-CrossTenant-Id: 43083d15-7273-40c1-b7db-39efd9ccc17a X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=43083d15-7273-40c1-b7db-39efd9ccc17a; Ip=[216.228.117.161]; Helo=[mail.nvidia.com] X-MS-Exchange-CrossTenant-AuthSource: MWH0EPF000989E5.namprd02.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: CYXPR12MB9340 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 23.11.4 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. 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://git.dpdk.org/dpdk-stable/log/?h=23.11-staging This queued commit can be viewed at: https://git.dpdk.org/dpdk-stable/commit/?h=23.11-staging&id=b81990ea04c23689ce76df612e7ada1eb9c6de76 Thanks. Xueming Li --- >From b81990ea04c23689ce76df612e7ada1eb9c6de76 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 Cc: Xueming Li [ 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 | 27 +++++++++++++++------------ 1 file changed, 15 insertions(+), 12 deletions(-) diff --git a/drivers/net/mlx5/mlx5_flow_dv.c b/drivers/net/mlx5/mlx5_flow_dv.c index 09c7068339..80edb4e966 100644 --- a/drivers/net/mlx5/mlx5_flow_dv.c +++ b/drivers/net/mlx5/mlx5_flow_dv.c @@ -9476,23 +9476,26 @@ flow_dv_translate_item_gre(void *key, const struct rte_flow_item *item, } gre_crks_rsvd0_ver_m, gre_crks_rsvd0_ver_v; 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); + else + MLX5_SET(fte_match_set_lyr_2_4, headers_v, ip_protocol, + IPPROTO_GRE); + /* HWS mask logic only */ + if (key_type & MLX5_SET_MATCHER_HS_M) { if (!gre_m) gre_m = &rte_flow_item_gre_mask; gre_v = gre_m; - } 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) { - gre_m = &rte_flow_item_gre_mask; - } - if (key_type == MLX5_SET_MATCHER_HS_V) - gre_m = gre_v; + } 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); MLX5_SET(fte_match_set_misc, misc_v, gre_c_present, -- 2.34.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2025-02-18 19:39:02.306600159 +0800 +++ 0044-net-mlx5-fix-GRE-flow-match-with-SWS.patch 2025-02-18 19:39:00.608244051 +0800 @@ -1 +1 @@ -From 05db99c117e36c0cd28cda8f558309efd20055da Mon Sep 17 00:00:00 2001 +From b81990ea04c23689ce76df612e7ada1eb9c6de76 Mon Sep 17 00:00:00 2001 @@ -4,0 +5,3 @@ +Cc: Xueming Li + +[ upstream commit 05db99c117e36c0cd28cda8f558309efd20055da ] @@ -18 +20,0 @@ -Cc: stable@dpdk.org @@ -27 +29 @@ -index 41ebe0b61a..633c41e358 100644 +index 09c7068339..80edb4e966 100644 @@ -30 +32 @@ -@@ -9839,23 +9839,26 @@ flow_dv_translate_item_gre(void *key, const struct rte_flow_item *item, +@@ -9476,23 +9476,26 @@ flow_dv_translate_item_gre(void *key, const struct rte_flow_item *item,