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 0617D43E57 for ; Sat, 13 Apr 2024 14:55:13 +0200 (CEST) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id F2F7C40294; Sat, 13 Apr 2024 14:55:12 +0200 (CEST) Received: from NAM12-DM6-obe.outbound.protection.outlook.com (mail-dm6nam12on2052.outbound.protection.outlook.com [40.107.243.52]) by mails.dpdk.org (Postfix) with ESMTP id 2B765400D6 for ; Sat, 13 Apr 2024 14:55:11 +0200 (CEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=dhBUnIVF2gQXORxPLFgX7D/0czB6KB/ILcWKAEtCYcJd0Sjt3z/s4fhx9LYFtc0e1SwEbsgsYp72cxGw7qVAD6k+kmo897aQtRXyJy2JcY53h3PamtEfD5XsBohiriL993BSTl6cCXtBTvKkO+OQNsJ5Z9JiO2Ii1rWno39f0blP5uS39/T+CywB+pMG3s4SadtOoBg/nMmnoswxHxcgEPeA5EYS3+2dz6XsqfEBHPVxX51cUNJNo/RxP8yj3toz4RJzul0lG6d2NbnpWXKt31Vv+dZxbNcfWIdcffGl8U9vmYY6WveHA+VmC0KRPIt1mdIaTglCItFPfUJuLs+hYw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; 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=fYi9MCqWu+NhkWQQA2+bjOcLpsd91pUVKAkEU1BiRoU=; b=ZRxLmAxCz1G6ItIh5bdS7652leS0T6hYRZe0q0tCKGGG6hcJEeKcmOp1tScMpf0Le0HUbr2N79qsMVmYnYcAfNkx3eg3PJa6GqyfNnYxb/nGV1vkS70s7AyDiHWQhFiwgbkeosALjIRXWBwxPGQ4qs5pWzZfEJiieXkZktrYExny+0GOR3Ay/5jB8AUJbRrHBvJWsZNJ7/ykNNII6/dm75diBEPKYk0mESxkzIRYvUWMiDZHLmENYrgn6Wj5HXwDvutbgEf/FMEwzPioQsVR/YDq1DqfcPnkoqtw9Iah+aAf5pc9IM1XliFdL/DWnUOeKnS7DUltdWQcPjwyDjRvaA== 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=fYi9MCqWu+NhkWQQA2+bjOcLpsd91pUVKAkEU1BiRoU=; b=hBoydgAXoNg5rSD1MByo3Lz4I0uWGyHZfrY8QsoG0eZVO0UllzASXLyIQfnc2jDK/DdnPujyVyH3id3EZe7SJEXKND+2vMFkmyhQk1Om+8jGtPg18lUQQHi4uQrfAkSqs3dxcRhq2Yzgh6QoYpU1O6MUHiL3YwLwMhrVpQzbY9EAwkZj0jtXI6/05uajDx49C7LKw4eMsXG/shdpI40eommIndMsTM3d1gJ3ozsee3rTnX8smcAPURaE1BfAdUoLprYrqdzKq4yfsLYWTGXTsDO4hDRsLw1SWj1pech6130KvptvUOzNVoJKJJoCKFP6HA9Kwzg8iQnJ58ZD9tkhMQ== Received: from DS7PR03CA0150.namprd03.prod.outlook.com (2603:10b6:5:3b4::35) by BL1PR12MB5876.namprd12.prod.outlook.com (2603:10b6:208:398::19) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7409.55; Sat, 13 Apr 2024 12:55:08 +0000 Received: from DS3PEPF0000C37C.namprd04.prod.outlook.com (2603:10b6:5:3b4:cafe::9e) by DS7PR03CA0150.outlook.office365.com (2603:10b6:5:3b4::35) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7472.22 via Frontend Transport; Sat, 13 Apr 2024 12:55:08 +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 DS3PEPF0000C37C.mail.protection.outlook.com (10.167.23.6) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7452.22 via Frontend Transport; Sat, 13 Apr 2024 12:55:08 +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.986.41; Sat, 13 Apr 2024 05:54:50 -0700 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.1258.12; Sat, 13 Apr 2024 05:54:49 -0700 From: Xueming Li To: Dariusz Sosnowski CC: Ori Kam , dpdk stable Subject: patch 'net/mlx5: fix conntrack action handle representation' has been queued to stable release 23.11.1 Date: Sat, 13 Apr 2024 20:48:53 +0800 Message-ID: <20240413125005.725659-53-xuemingl@nvidia.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20240413125005.725659-1-xuemingl@nvidia.com> References: <20240305094757.439387-1-xuemingl@nvidia.com> <20240413125005.725659-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: DS3PEPF0000C37C:EE_|BL1PR12MB5876:EE_ X-MS-Office365-Filtering-Correlation-Id: 408bb84d-b8eb-4e0b-d5a8-08dc5bb8f2c5 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: amAPnZ2OOtAhIMl0087fku6x0afNOYFaVSh8b2rkNMZh6y8Dn/pC/8owoY+uJh0Fouac7w8zyvbFUQWdDSy7kJQ4k6GBWtREvV8+zyfXU+RpGlKoDJAjRR2tQiGaGWAyk/xFOcie3yhQa0+lm8ObsXDzeVZtnSJ068Y5qoWli+U1r8s4pPY060TL6NDz7C/9TzAOb52u27L8oslazmTT8Cj1n8h+mhecbuW8Jq/Y6uTqoXGCD+xR96pq6sQZ3k8Nv6eoZT24Twhvjy03mA88F+Ycp7Ja0VoWTUZb5Jl/6yhwr1F95QB2deumKsH1pTVs31Zq1dmd/AZWPxP9zfOUA1qgARsKN7ljW+wMl7hJVbdq617eehu35JWby0cHV9c9OwwJ7gadk3S502SfnLR9WVUjM23xVRQPl7NqE3MMBgXHfi7eCObwMlI33vPCOuIIODwONeWnPYylgE1+IkZTOy11EDabDZjCnF5phGN+q9KbgvHHhQCu8H2VJidN7Y2ycjM2xdftm8ZbLTZv5oFjLbpf0OTurPPfhrP/LqVW40RkJ/mdOxn224HtiNg+WrMEx+QbeAIw6bFXfX86QR9KgU3+KUYjtfE+c4I0AhKAn6fOn7GkkMsAu2QVuDfKz23XAYuI+BkKV+fbVdNElAkIoWSDAhOjIBVjZVK0aoPqXdnT/XcRjKOVtRGr2rW7N/TZSRl+TtHk2/+sgdxnnFLscqiLV+Z392ZjlaIV5Ic3tTS6KiLxYSw2jJAuvIx6dkEr 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:(13230031)(82310400014)(36860700004)(376005)(1800799015); DIR:OUT; SFP:1101; X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 13 Apr 2024 12:55:08.3366 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 408bb84d-b8eb-4e0b-d5a8-08dc5bb8f2c5 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: DS3PEPF0000C37C.namprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: BL1PR12MB5876 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.1 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/15/24. 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=1d65510ff679b97cd6689ca28633fea9af4e0042 Thanks. Xueming Li --- >From 1d65510ff679b97cd6689ca28633fea9af4e0042 Mon Sep 17 00:00:00 2001 From: Dariusz Sosnowski Date: Tue, 27 Feb 2024 15:52:21 +0200 Subject: [PATCH] net/mlx5: fix conntrack action handle representation Cc: Xueming Li [ upstream commit 4487a79277a11bd5e78f57234b29b77b62f4e653 ] In mlx5 PMD, handles to indirect connection tracking flow actions are encoded in 32-bit unsigned integers as follows: - Bits 31-29 - indirect action type. - Bits 28-25 - port on which connection tracking action was created. - Bits 24-0 - index of connection tracking object. Macro defining a bit shift for owner part in this representation was incorrectly defined as 22. This patch fixes that, as well as aligns documented limitations. Fixes: 463170a7c934 ("net/mlx5: support connection tracking with HWS") Fixes: 48fbb0e93d06 ("net/mlx5: support flow meter mark indirect action with HWS") Signed-off-by: Dariusz Sosnowski Acked-by: Ori Kam --- doc/guides/nics/mlx5.rst | 4 ++-- drivers/net/mlx5/mlx5_flow.h | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/doc/guides/nics/mlx5.rst b/doc/guides/nics/mlx5.rst index 6b52fb93c5..d0ebc101b4 100644 --- a/doc/guides/nics/mlx5.rst +++ b/doc/guides/nics/mlx5.rst @@ -708,8 +708,8 @@ Limitations - Cannot co-exist with ASO meter, ASO age action in a single flow rule. - Flow rules insertion rate and memory consumption need more optimization. - - 256 ports maximum. - - 4M connections maximum with ``dv_flow_en`` 1 mode. 16M with ``dv_flow_en`` 2. + - 16 ports maximum. + - 32M connections maximum. - Multi-thread flow insertion: diff --git a/drivers/net/mlx5/mlx5_flow.h b/drivers/net/mlx5/mlx5_flow.h index 6dde9de688..edc273c518 100644 --- a/drivers/net/mlx5/mlx5_flow.h +++ b/drivers/net/mlx5/mlx5_flow.h @@ -77,7 +77,7 @@ enum mlx5_indirect_type { /* Now, the maximal ports will be supported is 16, action number is 32M. */ #define MLX5_INDIRECT_ACT_CT_MAX_PORT 0x10 -#define MLX5_INDIRECT_ACT_CT_OWNER_SHIFT 22 +#define MLX5_INDIRECT_ACT_CT_OWNER_SHIFT 25 #define MLX5_INDIRECT_ACT_CT_OWNER_MASK (MLX5_INDIRECT_ACT_CT_MAX_PORT - 1) /* 29-31: type, 25-28: owner port, 0-24: index */ -- 2.34.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2024-04-13 20:43:06.674066242 +0800 +++ 0053-net-mlx5-fix-conntrack-action-handle-representation.patch 2024-04-13 20:43:04.977753958 +0800 @@ -1 +1 @@ -From 4487a79277a11bd5e78f57234b29b77b62f4e653 Mon Sep 17 00:00:00 2001 +From 1d65510ff679b97cd6689ca28633fea9af4e0042 Mon Sep 17 00:00:00 2001 @@ -4,0 +5,3 @@ +Cc: Xueming Li + +[ upstream commit 4487a79277a11bd5e78f57234b29b77b62f4e653 ] @@ -19 +21,0 @@ -Cc: stable@dpdk.org @@ -29 +31 @@ -index 6dce4f1c98..de286c67c8 100644 +index 6b52fb93c5..d0ebc101b4 100644 @@ -32 +34 @@ -@@ -814,8 +814,8 @@ Limitations +@@ -708,8 +708,8 @@ Limitations @@ -44 +46 @@ -index a4d0ff7b13..b4bf96cd64 100644 +index 6dde9de688..edc273c518 100644