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 9D73C457A1 for ; Mon, 12 Aug 2024 15:02:36 +0200 (CEST) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 9502940666; Mon, 12 Aug 2024 15:02:36 +0200 (CEST) Received: from NAM10-DM6-obe.outbound.protection.outlook.com (mail-dm6nam10on2075.outbound.protection.outlook.com [40.107.93.75]) by mails.dpdk.org (Postfix) with ESMTP id 30F6F402C3 for ; Mon, 12 Aug 2024 15:02:35 +0200 (CEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=mibgVhioBwLV7dlY0ZIuN8wb+JEPHLKPO5fgUwJTK3yv7xIM6tLba4KELm/Ue9WpNRm/U1QPpXiDV2RydTyCZnVMXuWRgb+eb8O4p0oSr8dzVBmxK+eBmkdqui3sMHKbax2anxr2hsB9aP8NXE7NF5uFWuBRCZpqprAg7EKhiafdTBQm6G4KFszQMKC2El9unWEQTtGG7UBVgmC4sIYJx+1m0IshzDS+jeAE7pxYX4cOdRX5CpiY8RPgcMbH9M0o/wfOsH6ASZyJZoGx7zT20HooHS1uC+jjnl9MU1wUQ8QAGbZHkLWzISm5W4FIfg378nAihZCQpAcJslhHovoq8w== 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=19QAT3alJl7PyAnknZwDEnnn/E7X3jEQCByehtD9cDM=; b=VFIxmKawQRzZlBaSRI8o5ZYATGuNk4gLqziIItz5rvPH1YDRWmk+cV5hDFZM7zxr3yBrr30hxACxoveAe48uTZQvEO23vixrZumsifjTk4y4ZJB+tt9d7J+S4vKaG5bhpd5+80na7Uy7Z5yxokED+ZzCY3NJSOGFNm0/YrhzOic0j2gLkWti/yWM7Ac8i7MV7s0DWA813Psst5Qzp7zg0lFumqx3F4Z4LuruGilsoibEBNTqE98rq69JLrk50/1TRw6hev4WrJsnkL3f3rmqIzy4xxZX5el0Up4ZKeDh3J1tcjzRHQdYFOBALElunvlkExAKbgx/3sz/AbJ0iqMN4g== 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=19QAT3alJl7PyAnknZwDEnnn/E7X3jEQCByehtD9cDM=; b=DZwcGq3PKGe6lnw7H9rj5lfi/QOkZSS4k1jC64RMpR6FgBZMfgHEhp07LyxCYeJjM70OC4axWQaKl9eUSV3R+Jj3lcokQP0HWUFZpbG2h6Lw2C09quJskkYyQGp0sTdi9ZG5XCTJ6kwvpjDGEe939Gt64H6noZ/4dWWdHnb/lhEMZkHeXWIUHE3kxwlzbjVTn0hObVdCYwo/lOhel6BiRiwHfIzgM2iwtBKFk61bG68SBgqnBFvwRxRtdNeSqJ9cHkf3uN3/xwPZFrGh91ZELsW3PSjAHadDFtZDOEVbRWN7MtaKxZpBZMGP6THdUl47v6U4Qj1+WLfxR0J4oozLrA== Received: from SA0PR11CA0003.namprd11.prod.outlook.com (2603:10b6:806:d3::8) by MW4PR12MB6999.namprd12.prod.outlook.com (2603:10b6:303:20a::11) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7849.22; Mon, 12 Aug 2024 13:02:31 +0000 Received: from SN1PEPF00026367.namprd02.prod.outlook.com (2603:10b6:806:d3:cafe::af) by SA0PR11CA0003.outlook.office365.com (2603:10b6:806:d3::8) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7828.33 via Frontend Transport; Mon, 12 Aug 2024 13:02:31 +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 SN1PEPF00026367.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.7849.8 via Frontend Transport; Mon, 12 Aug 2024 13:02:30 +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; Mon, 12 Aug 2024 06:02:11 -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.1544.4; Mon, 12 Aug 2024 06:02:10 -0700 From: Xueming Li To: Itamar Gozlan CC: , Matan Azrad , dpdk stable Subject: patch 'net/mlx5/hws: fix check of range templates' has been queued to stable release 23.11.2 Date: Mon, 12 Aug 2024 20:49:58 +0800 Message-ID: <20240812125035.389667-122-xuemingl@nvidia.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20240812125035.389667-1-xuemingl@nvidia.com> References: <20240712110153.309690-23-xuemingl@nvidia.com> <20240812125035.389667-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: SN1PEPF00026367:EE_|MW4PR12MB6999:EE_ X-MS-Office365-Filtering-Correlation-Id: cdcee8a7-28e4-4ce0-0952-08dcbacf066c X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; ARA:13230040|82310400026|36860700013|376014|1800799024; X-Microsoft-Antispam-Message-Info: =?us-ascii?Q?wXJbsWYeiQ1JDKKRO+FJ1KXNuqrdQPzIAKs52HKM5DJ85RQZ1s2Qm9F0dVSF?= =?us-ascii?Q?Nn8ypOPXNwFzRYsfFCm6gpp0kzGlzlXRH7PHTHJtYfdwcRCFpZiVxwlNOYCu?= =?us-ascii?Q?9USruSYsgkjBCkLBCUEqIs5Dh7x50KwOsup6y126w+oT/gg331vWJynlnR21?= =?us-ascii?Q?LQ1xNHBNeYphjW4wJJQ/dmqUkoyI5XY8FRuKKw01k/uwUOSBkuCNxF6x5Hs2?= =?us-ascii?Q?sxgQWvDtnjo8JTUxttYRyDpzRuh6ZIMISq5oIEAVYnGYO7lFfAyRvpBARJ9a?= =?us-ascii?Q?D65bcUqTNXmZlsOE0fO1w7p44OgfavUp7cqKHeCEweDSFuXTjNqzRNPYxJYL?= =?us-ascii?Q?mkoQ9nKi84cXXdGYAwRo0d72V8bKmGNy3hZepMwu6Wu00SpnFEOqyUQTk6Si?= =?us-ascii?Q?FE42gT9nB5uUyRzCnh9/CibTrC924WXK/cT7Q0h4W92XAQzU0HiYfcdo2vWI?= =?us-ascii?Q?bAIVl36suS0+DDUrlBkkkL9te2JeJQtJ/1Oz+XaMkCX8rslQscKHKh+WtqXv?= =?us-ascii?Q?qNWAksfLb7MSKMHd3wecgn/+eop/eYrJB22/6f8RPtX3x0JGf2zrl14UIOOZ?= =?us-ascii?Q?eHSzDLkbeS97KaFThwNwaswJhNvyMriy7Lx5RzOOru+64M/oqXfuz53mHjM+?= =?us-ascii?Q?RfZZUWdHMwbWWqNyuqA8SBcfkgTaEMZdXGYDSFrlMCmSAZHSmS/y5rSUttTS?= =?us-ascii?Q?+s/cL8+E1fO30UbZqKbwSA/qUbz/oSQnaTIBz5PvYSfHjnFkxpdadBmuUNoe?= =?us-ascii?Q?oEXwYYkHOk8aFxEgBogXPN3ysZRdSoQalp282CpKz/uUqzF0RMxda9xtv+4a?= =?us-ascii?Q?KJU2oM1scRPE9Y3FT80kplsavSo7DXfFUg2MpeEiD1RKuFRD3a8k4/c9Fr7Z?= =?us-ascii?Q?1+0SAh3cgCcDilUcTPRwS7IK0p1XsJK5Yslfj7ouuhtawoq6+tz+pxHRKUtf?= =?us-ascii?Q?LMaltzw1mirGU1AwboBhGFSeaUNQKkn1MjWMCRfzmkBGEZQVAlfbP1O388uv?= =?us-ascii?Q?kXi+rIl89ADfpacm/YW7LLUvZ9yU9csFUAqUbZO1G+SigLrBnH1uSX3CZwqW?= =?us-ascii?Q?Vte7VGaYCQz50kfZJPaURqV+UdcYRj2jzRokdyZT4/fGk2EZuSs5qPdTSGcX?= =?us-ascii?Q?acihkI6RV+Jqssp8Gc9K4AwuZ07DXXgustd1yTE9yrHtMbvu7AVgeBB28AJk?= =?us-ascii?Q?twlWLOMQfeKH9mMv1vRrlJoj1zIDcdTeDwFRQRyUh2uX1bbtfiVR+ACEdwsX?= =?us-ascii?Q?OVurVRF3dppiKUW1uhUyYmU+0rIB82Fn66LSAL2bqe2Xp7X8g3qBquWIa/FB?= =?us-ascii?Q?1B3tg54qYKDecNMXGRkYin34VjT3K3Sx5/sYnEJdGAJTgZVMio2KoEOw7gAy?= =?us-ascii?Q?GNbAUpTsTlhG9r+FgvfYncADHwxhHQnrJRSCFOKPy32yoNn7GpUKyy1xzOwM?= =?us-ascii?Q?AMjKoeUaQwQdC13Thhyh3IE2/SEKInYa?= 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)(82310400026)(36860700013)(376014)(1800799024); DIR:OUT; SFP:1101; X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 12 Aug 2024 13:02:30.6945 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: cdcee8a7-28e4-4ce0-0952-08dcbacf066c 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: SN1PEPF00026367.namprd02.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: MW4PR12MB6999 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.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 08/14/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=dcd02c715e00c5d2609a90248aff83980e1f2178 Thanks. Xueming Li --- >From dcd02c715e00c5d2609a90248aff83980e1f2178 Mon Sep 17 00:00:00 2001 From: Itamar Gozlan Date: Tue, 9 Jul 2024 15:30:58 +0300 Subject: [PATCH] net/mlx5/hws: fix check of range templates Cc: Xueming Li [ upstream commit 2cb66e444aa9066f697e157c51525126479b6dde ] Using range and non range templates is not allowed, and in HWS there is a check that enforce that limitation with constantly check that, in a loop, if the current template defined as range, the last one should also be defined as range. But, in the case where there are two templates in the following order: (1) template with range, and (2) template without range. The existing checks will not cover this case. This commit fixes that hole by maintain the invariant that if a template without a range exist, all the previous match template are also. Fixes: 9732ffe13bd6 ("net/mlx5/hws: add range definer creation") Signed-off-by: Itamar Gozlan Acked-by: Matan Azrad --- drivers/net/mlx5/hws/mlx5dr_definer.c | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/drivers/net/mlx5/hws/mlx5dr_definer.c b/drivers/net/mlx5/hws/mlx5dr_definer.c index 003b50623c..031e87bc0c 100644 --- a/drivers/net/mlx5/hws/mlx5dr_definer.c +++ b/drivers/net/mlx5/hws/mlx5dr_definer.c @@ -3206,15 +3206,18 @@ mlx5dr_definer_matcher_range_init(struct mlx5dr_context *ctx, /* Create optional range definers */ for (i = 0; i < matcher->num_of_mt; i++) { - if (!mt[i].fcr_sz) - continue; - /* All must use range if requested */ - if (i && !mt[i - 1].range_definer) { + bool is_range = !!mt[i].fcr_sz; + bool has_range = matcher->flags & MLX5DR_MATCHER_FLAGS_RANGE_DEFINER; + + if (i && ((is_range && !has_range) || (!is_range && has_range))) { DR_LOG(ERR, "Using range and non range templates is not allowed"); goto free_definers; } + if (!mt[i].fcr_sz) + continue; + matcher->flags |= MLX5DR_MATCHER_FLAGS_RANGE_DEFINER; /* Create definer without fcr binding, already binded */ mt[i].range_definer = mlx5dr_definer_alloc(ctx, -- 2.34.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2024-08-12 20:44:06.333529595 +0800 +++ 0121-net-mlx5-hws-fix-check-of-range-templates.patch 2024-08-12 20:44:02.495069373 +0800 @@ -1 +1 @@ -From 2cb66e444aa9066f697e157c51525126479b6dde Mon Sep 17 00:00:00 2001 +From dcd02c715e00c5d2609a90248aff83980e1f2178 Mon Sep 17 00:00:00 2001 @@ -4,0 +5,3 @@ +Cc: Xueming Li + +[ upstream commit 2cb66e444aa9066f697e157c51525126479b6dde ] @@ -17 +19,0 @@ -Cc: stable@dpdk.org @@ -26 +28 @@ -index 9ebda9267d..51a3f7be4b 100644 +index 003b50623c..031e87bc0c 100644 @@ -29 +31 @@ -@@ -4041,15 +4041,18 @@ mlx5dr_definer_matcher_range_init(struct mlx5dr_context *ctx, +@@ -3206,15 +3206,18 @@ mlx5dr_definer_matcher_range_init(struct mlx5dr_context *ctx,