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 25ABF45610 for ; Fri, 12 Jul 2024 13:03:13 +0200 (CEST) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 1BB3C402E5; Fri, 12 Jul 2024 13:03:13 +0200 (CEST) Received: from NAM04-DM6-obe.outbound.protection.outlook.com (mail-dm6nam04on2044.outbound.protection.outlook.com [40.107.102.44]) by mails.dpdk.org (Postfix) with ESMTP id 710AB40261 for ; Fri, 12 Jul 2024 13:03:12 +0200 (CEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=nfDIxCGBFZzLhSMSdrr5OgQ1nRij8E/s7Tk7K6bsXg8ByOCR6k0YXssdgmfvkwjWS+2seM8h/W8W/m2xN9uFCl5LeZHDfIxBYPxpzWAAfs8WXLhztq1L9nslgLX+ZzdSBUZ/B+ODULmaSqrSNPyQvU5Z911LHBDzOfk64PP4WEw7vYERg7hXjnkx1RPU1yxeCXN+AzwKZkK0CjRNGj65XE/IgjxobOz+PzOCQkuP/FqO0XiG+sdrn3uIlpybi4McDPppeZ65OQZhrl1+N6B3kMt4ILNaSHuhqJTQ9a58U791v0zafZf3zreHYxvIBbxeeBEE6fVdjTGMiJ5I4YccbQ== 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=5904g2bBV3z2luzAWWHPp+yQ2poxdOdJZSlci/ynUBg=; b=wCib6zLnwZHXizPhFDhFSYR00VWSo1bwu3+al3puk2uFtxFZ6mSpa9i+WRKvlaNsqFgPcNhK9vZSbbQP8zlF0P8kc48sHHgKUPS1DYVkih/2vxM7MzBddx0atBvyOmpgmFjQarKAmQv5iMJuwtd4e/zLx+Z0mRc+ilX7mz60vZ4exYx/zHw9Njp5T4hQa5cNuzjThqRW1g5FDxg8Ma/NDb5nc9vDiJ0zN59pXfHPbeoJw4P++13EdkSuLF+VtPDCv4yzjFvguWDN+vhxFggLwxj/xyGH9OwhKkAWnu0x3T5xRhM2c8PhdVqerldnK3RkvIAfbLkMyFoywQOCPoST9g== 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=5904g2bBV3z2luzAWWHPp+yQ2poxdOdJZSlci/ynUBg=; b=ZZy1PCWneR04prXmSzd8nROngwCfcbd3X0Ao0qAyQ46Br5prBfYbvg2zje+rLV0/bhZ/GtcE2W9YDrWEJXmxfftHdroOFn2tajrgslgnKTzL7fF746K8ENpsJzMkRVKWOIFWlLFMfnTnUcZzt2FBEbnluZ2CZmZbD6Zzvkp6vat6KelETrA14RkJa/W00IhFXiGa2dH0d57rrrsj+O8msuslSW1p2cv96M4/LSNOEWH9dIbHo9xWv+kgCB9OuklJE7/wt7N5KN2PyQm6ceGOF1S4ekJS3PgmfKLhiOhVcvEFaV/Bs6B3vMbozhxKV/EzynKXniIYL1LGcVf7aSMiog== Received: from SJ0PR03CA0201.namprd03.prod.outlook.com (2603:10b6:a03:2ef::26) by SA1PR12MB7320.namprd12.prod.outlook.com (2603:10b6:806:2b7::17) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7741.35; Fri, 12 Jul 2024 11:03:01 +0000 Received: from SJ5PEPF000001EA.namprd05.prod.outlook.com (2603:10b6:a03:2ef:cafe::9a) by SJ0PR03CA0201.outlook.office365.com (2603:10b6:a03:2ef::26) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7762.23 via Frontend Transport; Fri, 12 Jul 2024 11:03:01 +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 SJ5PEPF000001EA.mail.protection.outlook.com (10.167.242.198) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7762.17 via Frontend Transport; Fri, 12 Jul 2024 11:03:01 +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; Fri, 12 Jul 2024 04:02:45 -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.4; Fri, 12 Jul 2024 04:02:43 -0700 From: Xueming Li To: Haifei Luo CC: Suanming Mou , dpdk stable Subject: patch 'net/mlx5: fix indexed pool with invalid index' has been queued to stable release 23.11.2 Date: Fri, 12 Jul 2024 19:01:40 +0800 Message-ID: <20240712110153.309690-10-xuemingl@nvidia.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20240712110153.309690-1-xuemingl@nvidia.com> References: <20240712104528.308638-1-xuemingl@nvidia.com> <20240712110153.309690-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: SJ5PEPF000001EA:EE_|SA1PR12MB7320:EE_ X-MS-Office365-Filtering-Correlation-Id: ae74128a-0075-4ce7-3d84-08dca2623245 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; ARA:13230040|82310400026|36860700013|1800799024|376014; X-Microsoft-Antispam-Message-Info: =?us-ascii?Q?+6GklsUEE5B8I6fHESScRWLr1UHSm4WLaB3sGk+/AYf372vfEy9TopIOHgK9?= =?us-ascii?Q?xIcN1Of7qcIG4nwM0nIBoCr9kOTcDKyHKivKAQh+3U3YFB0ipwal04vXYJEF?= =?us-ascii?Q?IBwHyjay7ALCKOGPlCib2uJ4juErYdgBDMmOeAkKR+Yh8F0Qm3ouXlYqTnZW?= =?us-ascii?Q?OfcVDFKnbbJt4JUjN8DNQRnVK/I4KJpJt7U+FNGH6V/Fw4fYKKHaqWZefyqX?= =?us-ascii?Q?6Gc0/LCv6MEdhTOaO43Ezo/NdZuJb4WTP2isEQPMsoLQOW6Q7/JYapejv4bs?= =?us-ascii?Q?zxRXR8e8RCLJNEjBq2OH02noh7QUNcZ3yYj2PWXJbnf6Fsoq4mb54zipjT9W?= =?us-ascii?Q?nO9VV6t2kqMzK/sATtd5lsVSVaILZWWM2H0Y5Fu4CkmIQqpDRi35iTfb77+N?= =?us-ascii?Q?Hz9itVDkBpKuQ1zBrXwOQAuJtno97hEsTxP7vWgdy0lszdqD1GFVP2uR9oHS?= =?us-ascii?Q?7FL0R4eXn73cp2mdv7JBXhUg9rCkOO88YlGZhtdg14bEP8SScBBNKDYrfVc0?= =?us-ascii?Q?CA/adgPyLOXjWkKMJJ2EbQEw6jfA96QC4YJ7EH+STzP3bnujtkZO1mU3sF4+?= =?us-ascii?Q?D2yHRE+acuQjAA+0Glppmh9jxTHlc6ga17hpEah4VCDS6XNbvkvQQjBpjFEH?= =?us-ascii?Q?XPyLysk8NikhCqX1IHHzs4x1K55nlIx7H+xPq5ziOm7kl1Fh2NywMNj5Dp0u?= =?us-ascii?Q?rpfPPEtzy8qjoaNl/VpDlwk+m7EIQJUEbAMFl7k7iI9T1HYhEBIot786KCl2?= =?us-ascii?Q?P7+FyeWdy0RL7VIea4ZUXYwGqY4ikdEufFsDcNucZqSAnwR0JFnD4QsIPvQC?= =?us-ascii?Q?9uhdG7oLAUHQ3RWjwG8ORc/bvpgQvj/bFAcJlMElCGxf5YFxeKO2g6GUQgTA?= =?us-ascii?Q?RZYCu4r0nkG5um9hqANkrWs4jbwm1UilaJNnWVK32S6CQY8nkLh+62owpBSC?= =?us-ascii?Q?M+MRzSO3hy0oNwKNk/zEzjWQjup6bpBIBZI1ojYL5bI4DTWBzILghULWJUop?= =?us-ascii?Q?ZVNrY7Y9IxHcjDqfOnQ1twrwhNAr2NvKocTZndWIBMwEmSzxxgVqb4igIJwH?= =?us-ascii?Q?whccoInUupp/WFiboUTIci7MorkAgLdBWy0MhLvX4z5gaoPBh/xTaaR4y8h3?= =?us-ascii?Q?Yv+lC0IRCghUFyl47M7Lv/BX6ORwi4HZkt3rBcgCv+QgYI5Lg6josFoGKEEF?= =?us-ascii?Q?JQ6u0bSMatE+F7bQDJPZl5OXliKL4fiafe/LClGhM0mlBZOFCih08c0aOGtV?= =?us-ascii?Q?WP80GckQuh+w47agftfXJ8uKt3nCob+QfHTuGQtVhjvad/0tsKqk0oRZ1AVu?= =?us-ascii?Q?fSsqVos31Tf5GbE2P8EkXkR6NkB27VG7hplBi1BJ+MSVE4BP0OrL2pcsHnNq?= =?us-ascii?Q?nadIsGiz1PZtcpP1yq7ZmBODVLMPs35bMx23JYIi2XeCX8HjrUnEE6ORys9i?= =?us-ascii?Q?3ULWZl5u/YMvzyeDBu/gCBS1wwyb20Jp?= 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)(1800799024)(376014); DIR:OUT; SFP:1101; X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 12 Jul 2024 11:03:01.2723 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: ae74128a-0075-4ce7-3d84-08dca2623245 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: SJ5PEPF000001EA.namprd05.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: SA1PR12MB7320 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 07/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=1c38fc4e31fe66a79696dfc9781cda403da01062 Thanks. Xueming Li --- >From 1c38fc4e31fe66a79696dfc9781cda403da01062 Mon Sep 17 00:00:00 2001 From: Haifei Luo Date: Wed, 15 May 2024 12:36:53 +0300 Subject: [PATCH] net/mlx5: fix indexed pool with invalid index Cc: Xueming Li [ upstream commit 16a7b5d14e3dfb4d3d385375b94bb2f360883cd6 ] When _mlx5_ipool_get_cache is called, idx may be invalid and the "trunk" is NULL in this case. Assert is not correct and add checks that if trunk is NULL or not. Return NULL If trunk is NULL. Fixes: 42f463395f8f ("net/mlx5: support indexed pool non-lcore operations") Signed-off-by: Haifei Luo Acked-by: Suanming Mou --- drivers/net/mlx5/mlx5_utils.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/drivers/net/mlx5/mlx5_utils.c b/drivers/net/mlx5/mlx5_utils.c index 4db738785f..b5b6c7c728 100644 --- a/drivers/net/mlx5/mlx5_utils.c +++ b/drivers/net/mlx5/mlx5_utils.c @@ -379,7 +379,8 @@ _mlx5_ipool_get_cache(struct mlx5_indexed_pool *pool, int cidx, uint32_t idx) idx -= 1; trunk_idx = mlx5_trunk_idx_get(pool, idx); trunk = lc->trunks[trunk_idx]; - MLX5_ASSERT(trunk); + if (!trunk) + return NULL; entry_idx = idx - mlx5_trunk_idx_offset_get(pool, trunk_idx); return &trunk->data[entry_idx * pool->cfg.size]; } -- 2.34.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2024-07-12 18:40:18.073804051 +0800 +++ 0089-net-mlx5-fix-indexed-pool-with-invalid-index.patch 2024-07-12 18:40:14.256594209 +0800 @@ -1 +1 @@ -From 16a7b5d14e3dfb4d3d385375b94bb2f360883cd6 Mon Sep 17 00:00:00 2001 +From 1c38fc4e31fe66a79696dfc9781cda403da01062 Mon Sep 17 00:00:00 2001 @@ -4,0 +5,3 @@ +Cc: Xueming Li + +[ upstream commit 16a7b5d14e3dfb4d3d385375b94bb2f360883cd6 ] @@ -11 +13,0 @@ -Cc: stable@dpdk.org @@ -20 +22 @@ -index fc03cc054b..d52119f0be 100644 +index 4db738785f..b5b6c7c728 100644