From patchwork Mon Feb 21 19:29:18 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Baum X-Patchwork-Id: 107911 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 947F5A034F; Mon, 21 Feb 2022 20:30:03 +0100 (CET) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 0999841165; Mon, 21 Feb 2022 20:29:38 +0100 (CET) Received: from NAM12-BN8-obe.outbound.protection.outlook.com (mail-bn8nam12on2053.outbound.protection.outlook.com [40.107.237.53]) by mails.dpdk.org (Postfix) with ESMTP id 53DD94115E for ; Mon, 21 Feb 2022 20:29:36 +0100 (CET) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=QG9rYSxZVhCetM1X8pu0DGR3dO9amGxajofZNwA3K73aNW/8E52ehkmXEHdNU8bO8CltTeNeVTzqubrVAFY+TgbULzdw4wQCh9+pDkcdDz3Z/jbKeMHdUEWr56VvqLY1MdbKN21W5elATmGBiTfq5X2dXsAtbKlNyL0F4RX9J7MIHlCcuhQstzP6OuYktQ5UTheK3VBteOFK61NdV1Yvs7ZB0c+vxY7Ij7TaWUEUjzD5c22AHXbXDzGmrEi/HKZqq761DxIit9jrKWAcWdzo/QRWckNS3Nb/QsAQM0xc23e5yaW+eVrMHrvMAoeuVsaTM3exilA9ZVGg+r9u6FZXFw== 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=9mAMz/+8/6vEoLwUxNSe2OQS13gZWF6IUQkarfoSQBA=; b=gXZJcNSOUfMdS6iTjDeT23OWNtTwPUgHJsol2+rfCVrHVKPULNNvXLuEXneV2cD6LdQrgSYO+Vs9HJj/QvcAy3FuipbquA1Wck8murXv1DlCNGcPFxMqu86FD1PipIplC8yXJGvAtQKVG2dFlWpzzZqCVC7xuXSidozMNH9Z1NTGqUhEnJYQzowf9O2x2J6RfmkcpfsZpY3J0Xd9tHfxIpZXZJy/nYo3QKb2gRZTURZmtDjsxdssMEPH1wRAOdoQxKRJvsaYNgil2PN4+BOV1U5UaRvCYwYsqSwFCBKnoRZgb7Vw1pDqiEbV+oRqgCU1Hnfi0MDM+AlvrzQvcJKO/Q== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 12.22.5.234) 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 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=9mAMz/+8/6vEoLwUxNSe2OQS13gZWF6IUQkarfoSQBA=; b=BZAlEycJzISJSIyM57mkYXmVSDbZ43b/+UJ6HQhdjHTcuqsv11bLewi2CvR7LhhTekobsZvQaBNNICwebMSs8N8957iptx+F1HjxI9B62U1Xdi272fQTRMBtupeYrWON9ox9CZJUztJcpE8Gdwz1UeSpERF5suvgsbRp1mlGN+7/yJkg6v4cI67hKISChnSMoqqBnw4d1siCyVAxW7pVTsy3qOxZiQL8OVyVEs452uXsM3bXfVIq4p5OiccvRbBSin5ulNBvp0iers/nyep7zhvEqX0lZOaWo41v5Ys2nFiaqmdoRcqgV69Y/mUkx1qsBcnxOZ6tSPfC9HD5JLKDTg== Received: from BN9PR03CA0635.namprd03.prod.outlook.com (2603:10b6:408:13b::10) by MN0PR12MB5786.namprd12.prod.outlook.com (2603:10b6:208:375::13) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4995.24; Mon, 21 Feb 2022 19:29:34 +0000 Received: from BN8NAM11FT031.eop-nam11.prod.protection.outlook.com (2603:10b6:408:13b:cafe::66) by BN9PR03CA0635.outlook.office365.com (2603:10b6:408:13b::10) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4995.16 via Frontend Transport; Mon, 21 Feb 2022 19:29:34 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 12.22.5.234) 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 12.22.5.234 as permitted sender) receiver=protection.outlook.com; client-ip=12.22.5.234; helo=mail.nvidia.com; Received: from mail.nvidia.com (12.22.5.234) by BN8NAM11FT031.mail.protection.outlook.com (10.13.177.25) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384) id 15.20.4995.15 via Frontend Transport; Mon, 21 Feb 2022 19:29:33 +0000 Received: from rnnvmail203.nvidia.com (10.129.68.9) by DRHQMAIL101.nvidia.com (10.27.9.10) with Microsoft SMTP Server (TLS) id 15.0.1497.18; Mon, 21 Feb 2022 19:29:33 +0000 Received: from rnnvmail202.nvidia.com (10.129.68.7) by rnnvmail203.nvidia.com (10.129.68.9) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.986.9; Mon, 21 Feb 2022 11:29:31 -0800 Received: from nvidia.com (10.127.8.13) by mail.nvidia.com (10.129.68.7) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.986.9 via Frontend Transport; Mon, 21 Feb 2022 11:29:30 -0800 From: Michael Baum To: CC: Matan Azrad , Viacheslav Ovsiienko Subject: [PATCH 20.11 5/5] common/mlx5: fix error handling in multi-class probe Date: Mon, 21 Feb 2022 21:29:18 +0200 Message-ID: <20220221192918.2455579-6-michaelba@nvidia.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20220221192918.2455579-1-michaelba@nvidia.com> References: <20220221192918.2455579-1-michaelba@nvidia.com> MIME-Version: 1.0 X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 2a026c65-d73d-4a1e-2d60-08d9f5707d6e X-MS-TrafficTypeDiagnostic: MN0PR12MB5786:EE_ X-Microsoft-Antispam-PRVS: X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: j9jYcpRD2rN9oYY1Y5ksccUwtYwJy7GJdbhdKHoUwsM8f0PgYi50S3++QazltLlV4rW3rfe1xj8h6dsr7a8jTzCkTEArBN5RbHw5RE/i8jHOtrvLu4DF5GaYArbP+t9YkE/FT4cCMb2MAgTIbqzVIGm7stdnnm6qlirjBkWN5Z/SqNH1neLZr2wlp9xkMm2P00Y8ESNYsVLPz2f3eyMCh000QdE9t9K7vclsX96pSrh2TEpi7EjnpAUxJhdxhGnJI3X6vbnpQZXzK1qDuA8xWT6bH5UmgGbfq18B6FHMs1XISz2IT6kusDoKnCTlHsDjBcTAq+vZGzk8qz7U35Z44bZ3mLhQyOO3rEZmHe4VE8pCv4iSl3eB3GIT9WHFu/xX18d3Ynihi92c4QldWKHI7ghF7URn2mhbqmdHSXcf2LlMHYgbZrFY3MydWfZg+UKJuZAqjU4KBkMItHwgEOCdP6kJbAy9REgCsX7OuTPBICryh9PTHQbux8DV70Mmkk4FviS7H9U7hSnWxPmkfGpXnsN6+KRKsh+A7Vir5/pYXF0HD6L33krQs/RYu3ZDKdt1cdVUbELSobzY7Fe8aihVx3Xh32c/oUjpKU+8z8bR4TCBz8rYvwQpZ5aF+rx1M3GU1TI3jEqoA2x/R38nnJvxDUNOsvtEnlROTnGufnOwfHVsu6ryuR3k06DSe1Ild/w6M6vgAqvlidJq21AArdlGyA== X-Forefront-Antispam-Report: CIP:12.22.5.234; CTRY:US; LANG:en; SCL:1; SRV:; IPV:CAL; SFV:NSPM; H:mail.nvidia.com; PTR:InfoNoRecords; CAT:NONE; SFS:(13230001)(4636009)(36840700001)(40470700004)(46966006)(2616005)(81166007)(356005)(8676002)(83380400001)(55016003)(54906003)(40460700003)(6916009)(4326008)(36756003)(2906002)(6286002)(508600001)(186003)(86362001)(6666004)(70586007)(47076005)(107886003)(70206006)(7696005)(1076003)(5660300002)(26005)(426003)(336012)(8936002)(82310400004)(36860700001)(316002)(36900700001); DIR:OUT; SFP:1101; X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 21 Feb 2022 19:29:33.7432 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 2a026c65-d73d-4a1e-2d60-08d9f5707d6e X-MS-Exchange-CrossTenant-Id: 43083d15-7273-40c1-b7db-39efd9ccc17a X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=43083d15-7273-40c1-b7db-39efd9ccc17a; Ip=[12.22.5.234]; Helo=[mail.nvidia.com] X-MS-Exchange-CrossTenant-AuthSource: BN8NAM11FT031.eop-nam11.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: MN0PR12MB5786 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 [ upstream commit 8928997a1388ba1b045a55732acced4baf00b21d ] The common drivers_probe function calls in a loop to all probe functions for classes requested by the user. After it manages to probe them all, it updates this on the device in the "classes_loaded" field. If one of them fails, all those probed to it are remove using the drivers_remove function. However, this function only releases the classes in the "classes_loaded" field on the given device and misses the newly probed classes. This patch removes the condition from the release function, and ensures that the caller function sends a more accurate parameter. Fixes: 8a41f4deccc3 ("common/mlx5: introduce layer for multiple class drivers") Signed-off-by: Michael Baum Acked-by: Matan Azrad --- drivers/common/mlx5/mlx5_common_pci.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/drivers/common/mlx5/mlx5_common_pci.c b/drivers/common/mlx5/mlx5_common_pci.c index 5208972bb6..fa6e89efd3 100644 --- a/drivers/common/mlx5/mlx5_common_pci.c +++ b/drivers/common/mlx5/mlx5_common_pci.c @@ -203,7 +203,6 @@ drivers_remove(struct mlx5_pci_device *dev, uint32_t enabled_classes) unsigned int i = 0; int ret = 0; - enabled_classes &= dev->classes_loaded; while (enabled_classes) { driver = driver_get(RTE_BIT64(i)); if (driver) { @@ -254,9 +253,11 @@ drivers_probe(struct mlx5_pci_device *dev, struct rte_pci_driver *pci_drv, dev->classes_loaded |= enabled_classes; return 0; probe_err: - /* Only unload drivers which are enabled which were enabled - * in this probe instance. + /* + * Need to remove only drivers which were not probed before this probe + * instance, but have already been probed before this failure. */ + enabled_classes &= ~dev->classes_loaded; drivers_remove(dev, enabled_classes); return ret; }