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 CDBBC46532 for ; Tue, 8 Apr 2025 10:03:24 +0200 (CEST) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id C75C34027F; Tue, 8 Apr 2025 10:03:24 +0200 (CEST) Received: from NAM10-DM6-obe.outbound.protection.outlook.com (mail-dm6nam10on2062.outbound.protection.outlook.com [40.107.93.62]) by mails.dpdk.org (Postfix) with ESMTP id 1C8704027F for ; Tue, 8 Apr 2025 10:03:23 +0200 (CEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=MqYI7+vRsxeDMDiencbWtHVsBt/TaPIQLyYUlXIwNpTpzH3RyNt1k2q/l9lsFi1q5kvVRF9j5GI1mSz2++5bwuFDtnKlMwKFLOunMYEHDNouF4mLRu4c/ed5z8iksbRG2n9B29VTL23b2021eOya1qSzc3hwg/1C+ZScf+4pXPbSTURnT0ffGn/uPzI6ZqCb1WY2/JGLU6HBO/dd7+smiKn9vahhWCyucT4FSJelObJOMl1SF3oA0Z8s2KeIubP4NsXsjl8DW2H320VQlLTbLg5Wq1zL0Ji4AwAWYxRCmUfChKxr4/VT/IaxEjMM7uNvtNzqGViowck+6kbfJm34Vg== 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=hbI7NfonjutuV74u4qraUf7iQ0qqg3+8Q6l0cPqUlC8=; b=A8qteMvMfe2Lev3MHjy/u0MnZI+7wQpC5kQ/w0Okola8ExONorIPdQUiPTWdcmvVfaORuU43o1804yxVwJHxZP+U4351vILLl44O46yp5I3Eie2T87k/aXMauJwuVz0w9Y0U6Fcz+nGZ2M5/ZVdOovM1YiYguqtChcxg1cPA5jKGu9cTICzy6yJLRHTQEbWJRcGe4TxjPUsyR5eNYnW3vigMM9XkJWg6s7Dk3c0xqP+jbEnqJBt50BgdIkOp2tZsHDbDKPzK+S3UALYJgK+9zaafYXisBQ/aNvgXwl3Fb/mVuM3+ZIFPLbF+BE5LnqbND16UhMKt13SDZa+QnZnACA== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 216.228.117.160) 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=hbI7NfonjutuV74u4qraUf7iQ0qqg3+8Q6l0cPqUlC8=; b=EHq7wckKTmRwth0g9A0mcuCbXcV1h7XzcofomzZ8e9gUnBEDlC7NVaevXXbkEjmpJnrc4qjmHTIxwVB/hugJ5byzjRR5EYBVoD1SYTZQ3kkDJXpNuVGSFnzfy74wRhFhz7ruWoENGUbMke0VAzgEfTl1fZc9WnSOxkgmGzKiz+h7X/MidN+xUGRKL0OqjCy6SRLJolHjOWQBBh1YXcz48EwhmQ7616RbeqqsGik3gXPW8ZkKDDnweHUwdYbBaqgRv5tCTj6WRV5fZarvJt3ap8sleQEBHB6PrKNRpUK/m5MuiHRj8qy8Y2hMGu2LCIuTuWbT/oltiqd1kZPkUJ4DEw== Received: from PH7P222CA0021.NAMP222.PROD.OUTLOOK.COM (2603:10b6:510:33a::33) by SA0PR12MB4366.namprd12.prod.outlook.com (2603:10b6:806:72::16) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8606.33; Tue, 8 Apr 2025 08:03:19 +0000 Received: from CO1PEPF000044FC.namprd21.prod.outlook.com (2603:10b6:510:33a:cafe::1f) by PH7P222CA0021.outlook.office365.com (2603:10b6:510:33a::33) with Microsoft SMTP Server (version=TLS1_3, cipher=TLS_AES_256_GCM_SHA384) id 15.20.8606.34 via Frontend Transport; Tue, 8 Apr 2025 08:03:19 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 216.228.117.160) 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.160 as permitted sender) receiver=protection.outlook.com; client-ip=216.228.117.160; helo=mail.nvidia.com; pr=C Received: from mail.nvidia.com (216.228.117.160) by CO1PEPF000044FC.mail.protection.outlook.com (10.167.241.202) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8655.0 via Frontend Transport; Tue, 8 Apr 2025 08:03:18 +0000 Received: from rnnvmail201.nvidia.com (10.129.68.8) by mail.nvidia.com (10.129.200.66) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.1544.4; Tue, 8 Apr 2025 01:03:02 -0700 Received: from nvidia.com (10.126.231.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, 8 Apr 2025 01:02:58 -0700 From: Xueming Li To: Alexander Kozyrev CC: Xueming Li , Dariusz Sosnowski , dpdk stable Subject: patch 'net/mlx5/hws: fix fragmented packet type matching' has been queued to stable release 23.11.4 Date: Tue, 8 Apr 2025 16:01:43 +0800 Message-ID: <20250408080214.371154-5-xuemingl@nvidia.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20250408080214.371154-1-xuemingl@nvidia.com> References: <20250218123523.36836-1-xuemingl@nvidia.com> <20250408080214.371154-1-xuemingl@nvidia.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain X-Originating-IP: [10.126.231.35] X-ClientProxiedBy: rnnvmail203.nvidia.com (10.129.68.9) To rnnvmail201.nvidia.com (10.129.68.8) X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: CO1PEPF000044FC:EE_|SA0PR12MB4366:EE_ X-MS-Office365-Filtering-Correlation-Id: d10458ef-b51e-479c-0bdd-08dd7673d30d X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; ARA:13230040|36860700013|1800799024|82310400026|376014|13003099007; X-Microsoft-Antispam-Message-Info: =?us-ascii?Q?OCFbfO4fJ/gKW329DfFQndvnLhSvmdMtl3rO3A3QE7C6xTOA6sRrMAVl2RB4?= =?us-ascii?Q?Lg502snFSOeU4L0QnhDfybYXwUsfaBygTkr5sOnGKWl/2Lzxh56TQ7q+KA3L?= =?us-ascii?Q?pNPxDFbYwM+Wa8dwaGkxMKsmBNfJRigIAjQb+qr4Tjf2bknp9iAqSQGYSYeT?= =?us-ascii?Q?f99VrhfE0BVDFeQJkaV0uOEXYN5anF4AVHQUD2XzG+4FNf8+pL4JjdHzAv/m?= =?us-ascii?Q?xh5UhsZOr61gjQeMq5IwQE0Rkh7iPuflyBx+Hu6qkt2o5aVu6GoJXCqngxEF?= =?us-ascii?Q?cw+xNjwIBcIAXwkSJuYOFNoYDOvrIbfqvoPba9NQzzfnOwxMeZ7KLg+7qOtj?= =?us-ascii?Q?A1M6EQYYq5+v+sepesB0DSpaiLR9N9BNZSoi31NxXL1UFuwAWQVpPQM9Vvhf?= =?us-ascii?Q?ZroSJ//etbIXRBaxcDInUTTBgVONVDm0cCqHwi4D0o8S8Ug+3paIUyJgqr1P?= =?us-ascii?Q?vQcoLVEizo9tbjxCWqeBfequ333JWLZXc/K8Fg//+0IFexCugJg9QY6VKlJK?= =?us-ascii?Q?gBkoTBO5Y353yCDpRLa8yk6t5qoqpoC0Rx7MJ/w2USs/ohjihuj1bOB1dfV7?= =?us-ascii?Q?Doh2wzCJASICKCl/AQnqyDzs+YCyQsXJVDicgKU9nmD0bn233ksLY6rUOxIa?= =?us-ascii?Q?f1LrjjBckxkDk/7TmRIBSUmGMDky82PWtwk5ja/vYXfqbLt79Nd0hlHnc3ew?= =?us-ascii?Q?ekBHSwm2WZrhsMxcOe4D65CuLC5OdpSrlySLNnNYjP3c4Q+RJRlo7BOs2MEW?= =?us-ascii?Q?R88Y9JbwqXcFm3B0GTgnrmWQvPMjKJpOeVLvJPq0FTwoUybJa4Xn6UCZLNiG?= =?us-ascii?Q?XLYQTjvOiphtpBK5z7WbHfRJFz6c1CbnvOG/dmFvuE6fvQkAaEDPwGEWDW6G?= =?us-ascii?Q?WZ+cGN2cnNQvtB40u4gAQ7ePUo3Kws9YYf98nq6WgdE3CIXvHfDUb0Fr0OQe?= =?us-ascii?Q?/pOPtFLM7rZUmp6/VWy9drjPRxrE0nVMxfChfqa5zyU4nIg41IvqeMCu7N3w?= =?us-ascii?Q?z/JvpOTsAbp3nLUY/hwep+NB3/DR2f4YAVupIUp5ZaK33DmLwp6reyWOXHTV?= =?us-ascii?Q?Ilw/wmuDwxpGOzQe2FlmmKqsBZb4WRdB0Vd8tfnnNuEqzDbgxpnjTpNIVrD2?= =?us-ascii?Q?pBccNRxaoxX3VodS2jeMtzxd3CrgG6a/vSp7SWw1hnTuQF6VufSLjQ9aDMLN?= =?us-ascii?Q?vt1ri5Av6rCm/dP2S599u6ynhfzudg/isxCYkXbMb7m5usqi6PO7LCIX6qC8?= =?us-ascii?Q?DJX7u+wCDbhkEbFLbPvcyvdOo9uBPIVDfRkzGTxNSUYSegv+xO1Uq2w5PfKt?= =?us-ascii?Q?rc8hz8cenoA3fCB2a9xq3cBaVxJkKI1hG9it2PiL97foOH4JUOsPSHH4f0yC?= =?us-ascii?Q?iqSBaOKOWQLeics0sLQnOKLypCa7i/fm92/kVIYVFIwqxDorzi+xFEi/kkim?= =?us-ascii?Q?JFj4+J66XOt/1rdpuPv2wRvLzPqD+CNdBK8jKcBLyQjGJeCyf6dquaoMJ9m4?= =?us-ascii?Q?L2SCUKPkurPHcqvb3dDhPx9zzi45Tln3r5gP?= X-Forefront-Antispam-Report: CIP:216.228.117.160; CTRY:US; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:mail.nvidia.com; PTR:dc6edge1.nvidia.com; CAT:NONE; SFS:(13230040)(36860700013)(1800799024)(82310400026)(376014)(13003099007); DIR:OUT; SFP:1101; X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 08 Apr 2025 08:03:18.9725 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: d10458ef-b51e-479c-0bdd-08dd7673d30d 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.160]; Helo=[mail.nvidia.com] X-MS-Exchange-CrossTenant-AuthSource: CO1PEPF000044FC.namprd21.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: SA0PR12MB4366 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. It will be pushed if I get no objections before 04/10/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://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=9cdc6c49e8edcb75146184e536fc1d8292565d7f Thanks. Xueming Li --- >From 9cdc6c49e8edcb75146184e536fc1d8292565d7f Mon Sep 17 00:00:00 2001 From: Alexander Kozyrev Date: Thu, 19 Dec 2024 18:05:49 +0200 Subject: [PATCH] net/mlx5/hws: fix fragmented packet type matching Cc: Xueming Li [ upstream commit 5782bb1a5902a498176cb2fd0903d7a97be1b01a ] Fragmented PTYPE matching requires setting the mask to the exact RTE_PTYPE_L4_FRAG value to avoid conflicts with other L4 types. Adding L2 or L3 types to the same mask should be allowed, but there is a check for the exact value for setting the definer. This prevents the fragmented packets from matching in case of L2/L3 mask is provided as well. Mask out L2/L3 types when setting L4_FRAG. Fixes: 761439a20f82 ("net/mlx5/hws: support fragmented packet type matching") Signed-off-by: Alexander Kozyrev Acked-by: Dariusz Sosnowski --- drivers/net/mlx5/hws/mlx5dr_definer.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/net/mlx5/hws/mlx5dr_definer.c b/drivers/net/mlx5/hws/mlx5dr_definer.c index ef437a6dbd..93e15122ed 100644 --- a/drivers/net/mlx5/hws/mlx5dr_definer.c +++ b/drivers/net/mlx5/hws/mlx5dr_definer.c @@ -1884,7 +1884,7 @@ mlx5dr_definer_conv_item_ptype(struct mlx5dr_definer_conv_data *cd, * Cannot be combined with Layer 4 Types (TCP/UDP). * The exact value must be specified in the mask. */ - if (m->packet_type == RTE_PTYPE_L4_FRAG) { + if ((m->packet_type & RTE_PTYPE_L4_MASK) == RTE_PTYPE_L4_FRAG) { fc = &cd->fc[DR_CALC_FNAME(PTYPE_FRAG, false)]; fc->item_idx = item_idx; fc->tag_set = &mlx5dr_definer_ptype_frag_set; @@ -1900,7 +1900,7 @@ mlx5dr_definer_conv_item_ptype(struct mlx5dr_definer_conv_data *cd, } if (m->packet_type & RTE_PTYPE_INNER_L4_MASK) { - if (m->packet_type == RTE_PTYPE_INNER_L4_FRAG) { + if ((m->packet_type & RTE_PTYPE_INNER_L4_MASK) == RTE_PTYPE_INNER_L4_FRAG) { fc = &cd->fc[DR_CALC_FNAME(PTYPE_FRAG, true)]; fc->item_idx = item_idx; fc->tag_set = &mlx5dr_definer_ptype_frag_set; -- 2.34.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2025-04-08 15:39:06.561060976 +0800 +++ 0019-net-mlx5-hws-fix-fragmented-packet-type-matching.patch 2025-04-08 15:39:05.916436584 +0800 @@ -1 +1 @@ -From 5782bb1a5902a498176cb2fd0903d7a97be1b01a Mon Sep 17 00:00:00 2001 +From 9cdc6c49e8edcb75146184e536fc1d8292565d7f Mon Sep 17 00:00:00 2001 @@ -4,0 +5,3 @@ +Cc: Xueming Li + +[ upstream commit 5782bb1a5902a498176cb2fd0903d7a97be1b01a ] @@ -14 +16,0 @@ -Cc: stable@dpdk.org @@ -23 +25 @@ -index e6d3dbfa46..837e0c47bd 100644 +index ef437a6dbd..93e15122ed 100644 @@ -26 +28 @@ -@@ -2205,7 +2205,7 @@ mlx5dr_definer_conv_item_ptype(struct mlx5dr_definer_conv_data *cd, +@@ -1884,7 +1884,7 @@ mlx5dr_definer_conv_item_ptype(struct mlx5dr_definer_conv_data *cd, @@ -35 +37 @@ -@@ -2227,7 +2227,7 @@ mlx5dr_definer_conv_item_ptype(struct mlx5dr_definer_conv_data *cd, +@@ -1900,7 +1900,7 @@ mlx5dr_definer_conv_item_ptype(struct mlx5dr_definer_conv_data *cd,