From patchwork Wed May 15 09:36:53 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Haifei Luo X-Patchwork-Id: 140123 X-Patchwork-Delegate: rasland@nvidia.com Return-Path: X-Original-To: patchwork@inbox.dpdk.org Delivered-To: patchwork@inbox.dpdk.org Received: from mails.dpdk.org (mails.dpdk.org [217.70.189.124]) by inbox.dpdk.org (Postfix) with ESMTP id 77CCB44034; Wed, 15 May 2024 11:37:50 +0200 (CEST) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id E947C4029E; Wed, 15 May 2024 11:37:49 +0200 (CEST) Received: from NAM02-BN1-obe.outbound.protection.outlook.com (mail-bn1nam02on2074.outbound.protection.outlook.com [40.107.212.74]) by mails.dpdk.org (Postfix) with ESMTP id 75D024021D; Wed, 15 May 2024 11:37:48 +0200 (CEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=kU8ZzSUljAGDymkIEV+AM9Y+4paWaUdJGS9KvG7rek6+NX74216P9XFC4mGSFUT5U7k3tvKeHP72WD8MLIQGChk7sIDc6GZ14TLHnhq1tvt4u/kbIeRhVrSZG+cyCqgVqAlULa9tBFq9Ol4R4oWqLEDYD/n/X9H/b9Bg4mNRHbEK7i8plD6oFIi/GJk1njKV3q5Ueh2BIkXS9I1Ts8HAexPGBOn0skjbHazT/ktJkdjiOxWIl21sQnJBKGmTC4sYBXxpaccKuygI5zSyyfxsUAz4cN1Gb9vRxYGiItHDaHKwdcHRBZ4ov9fy0eg0dBDRpPcKMcsruN2HDh9PWnE5bg== 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=OjDCjEYEB870+8NCsbm5HbwJrIolxSLZhzqYdU8tMkQ=; b=a83LxHKqAzogEzemgrg0vHco7HiFLrDFZjNt7gQQ2tBnFC7550ezncGwOX6RMTdNTiP/LSV2HROqZMlwSYE97LRMug9Z1kPAMfs+axf7fpV9Pmiucs8PxhDch6shHfWz1kOsrZcFPHDh7sEqyOjhsmFvPTVC1uDdFmazbTa28Zs5k3WVFeYF+zJMQu9lkRZycd49/abxg5j6OWLNCm5ylyODrtpisGyetEdQnPzfVFMX0FVZEufe9kPYQe03als0QfZDJBmejnme+bz5BldKdfOQIoPAgovwfJEA01WQlmwkQvnrh0ANyxpSyRtmAiuCGWf1Xxsve22qusGx3pM1wA== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 216.228.117.161) smtp.rcpttodomain=intel.com 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=OjDCjEYEB870+8NCsbm5HbwJrIolxSLZhzqYdU8tMkQ=; b=A7PexWk1mrd9HCVbVVqaP+Bi8u17cHfL2VxMyLavlow4AnnMk/0z31/HTINSB07+Nc42HmzMXHYp7kDQZE1UVaVcfXqWv1RvB9bXLT520xOKInyGt9qD5CZAb0DkKf5fJ3411Ju+xrFDRCVXtITRWWZ+5UigMxqsecaeTJuFZIYRtn36Xx9dBVb3JjsYonwOENY78Dilud/xlzglJK+65o/itmnL65VnChb9xqMrHfphtFvTObacPjv0ozMBMIiu5yOOZxRhWjT0RkjFBGGJtVSeoGcerx266eO6d5CWnylbSIzlEIVZeyFBDW6u78eafW8QLnel8pS03/Vo2W6SNg== Received: from CH2PR02CA0006.namprd02.prod.outlook.com (2603:10b6:610:4e::16) by PH7PR12MB8779.namprd12.prod.outlook.com (2603:10b6:510:26b::8) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7544.55; Wed, 15 May 2024 09:37:45 +0000 Received: from DS1PEPF0001708E.namprd03.prod.outlook.com (2603:10b6:610:4e:cafe::6a) by CH2PR02CA0006.outlook.office365.com (2603:10b6:610:4e::16) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7587.27 via Frontend Transport; Wed, 15 May 2024 09:37:44 +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 DS1PEPF0001708E.mail.protection.outlook.com (10.167.17.134) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7587.21 via Frontend Transport; Wed, 15 May 2024 09:37:44 +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; Wed, 15 May 2024 02:37:31 -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; Wed, 15 May 2024 02:37:28 -0700 From: Haifei Luo To: , , , , Dariusz Sosnowski , "Suanming Mou" CC: , , , Subject: [PATCH] net/mlx5: fix bug trunk is null Date: Wed, 15 May 2024 12:36:53 +0300 Message-ID: <20240515093653.216563-1-haifeil@nvidia.com> X-Mailer: git-send-email 2.39.3 MIME-Version: 1.0 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: DS1PEPF0001708E:EE_|PH7PR12MB8779:EE_ X-MS-Office365-Filtering-Correlation-Id: 06e787f0-8133-4b03-c0a3-08dc74c2ac9d X-LD-Processed: 43083d15-7273-40c1-b7db-39efd9ccc17a,ExtAddr X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; ARA:13230031|376005|36860700004|82310400017|1800799015; X-Microsoft-Antispam-Message-Info: KWeEsGG5pMqg94AkTZEI3QO7mg/dVVcB8uyFwVqcdxTOON1PxEipuTX30/evlgB4VlOaia1JmwPf40nQH8Vt0E+QKneT0l1XCINww43VkwNlixcaWkv6o7zpVc4VtQifJH9CcBg9cpjODA4Bp+S14cj8luau/vVb1fzK4sU44Y//1qnnznnSapuYtUu87IX0x0JpsvJiIZXRuDJWrTeL/jsfjyxS4LwRqE4A0BltD24OKXIvOXXJ+4NR5pl52fabEglc76MSRCSuxcYLCPQGRi50IJqwOPuQQfqD8+rvkjIYpnoBbWPjhY4xsojP6G6HHWxaGEn75BM3ACQxCXOIymb5g9HGhrHsb6kqX2gBhtomUUOT5Vp+ZQl11oAu3ra04m908NpmHzfGIVZoHVRO2MIZDWeC5YRGtU1eodwj4KZYJmnw/dhVgmgA5fcvs7M3cf54vywAbu3v1s6dBK8CR9qVY+Iw4MRLUs+Ol3h9g3vZ1IJC/TSfKGH8DZth4fT1oohf6naUKY9WQrWlk+iO3bfhUUAwd081X6VnFu+W7sJO/+PHUJxXlLCs1Kl43aFMLkV1guyYGfnxfTW4gCzQtXohfIn0F+SsOa+bS0S4ddDFeJpJ84dNpRH5kW2WgUyMU2B5soOla9FYeT5Wh2hWCxNgyjWOqPkmt1TEp4s+J3COSXsgzcTzh/pEXK3L6ICacVOxTj63V4O5bi1xu8MdyMCjBBAvEIwTZmWDsEz5xDt/xMl0whmZZopt8cHJqp0BV9HeGzyp5+nniAgjKr8dRvTXXA8AjR/C69tK5GOYY/5bF83v3uhCtG+goassjbgb8AgBk3jgMnRHbwt0xZZxbXFpi4zStwwbXLoSiAQMNJ+cG4eU/IjXu3uZgqkUh6PivK2h3xHTAMblytL7eB9toN4e9BSSviJNw3yDSOJEi6gEQAub38zSWtpOfUR41yPiVzPXv7GeATi+D2GVK248cbTMwZlbYrokVmoSBhP2bBZdqkVgRMVpxttiN9oCbglKXUNHL15XBa6tGayb6akyEjOv5Y4DSw0YIB56xO7g2sew02X5Y6FGxOb9eQq5lVbpG9TbzNXW+Z5v7udLs1vYgfFoV2p2kDdQqVMOzeYh+pL14KVOUvOdM4a/kGLBSjOyRp+c1R7PbOPaF8vQR3p9dG6KcyVh7WvKAXkK5ucu46WUyfqeGEDYMcRah2U7PGUq8zMyWePDlzRs4eUCAyCmcxG7rXMA6LX23/iPVZogYpceG6Zd2jhZ5RWcfnk5FsFYBflbYFXsGAdEqmhGUiS0tL6jdwr4feEmXSYjRtDkA8p9a3zZJr1gDmbSaxKBVhiuTcuGRUod2IVlzO43IUEjCQKd9bYf/nASopN+qQEtb4YH9kkz3sUGwTYv8Df4ryMZ 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)(376005)(36860700004)(82310400017)(1800799015); DIR:OUT; SFP:1101; X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 15 May 2024 09:37:44.6702 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 06e787f0-8133-4b03-c0a3-08dc74c2ac9d 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: DS1PEPF0001708E.namprd03.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: PH7PR12MB8779 X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: DPDK patches and discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dev-bounces@dpdk.org 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: 42f463395f ("net/mlx5: support indexed pool non-lcore operations") Cc: stable@dpdk.org Signed-off-by: Haifei Luo Acked-by: Suanming Mou 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 e28db2ec43..93c10f20a7 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]; }