From patchwork Thu Feb 6 10:54:24 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Shani Peretz X-Patchwork-Id: 151042 X-Patchwork-Delegate: thomas@monjalon.net 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 A2DA5461AA; Thu, 6 Feb 2025 11:54:56 +0100 (CET) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 6B607402CE; Thu, 6 Feb 2025 11:54:56 +0100 (CET) Received: from NAM02-DM3-obe.outbound.protection.outlook.com (mail-dm3nam02on2071.outbound.protection.outlook.com [40.107.95.71]) by mails.dpdk.org (Postfix) with ESMTP id 550A84026C; Thu, 6 Feb 2025 11:54:54 +0100 (CET) ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=F/svMG5FSBlFhOCjbIeHJTUmgwNupWViQNz4x5yZYruiemQUB/EbG5MnhOhs3pTMSmR1LGC2gdy7pdvCqvAfLGTqJ1KA9fT9IT8E8xxF2hjYsu2mCjJ66sAsbiYSrpDiA8TG2CHlboPmqt9+ng8rjFgJQRBJwyp/Oqt9VleptXm7zhMYJtqLiwv3htbt99SJFc0LTICroSORI/HF3wbdmxIUo5nwe7tRW0mfbMsU+pl9dsFFKR7FWcKWnxdYoTW4A2GxrhWV0KFLE1VcUHf61NvoIeP7xNUWyMX+j9KyAzaMxMvueEPbFvxqOu4kkHGHAq8czxkA/ahG3qk2nPhE3Q== 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=LRkOmjXY62KhiNlrMy273Nr803nhri+0TQwaxHpgQRQ=; b=LdvTF583BekWT8nDwYn2Xbx+z47/yh2o2D/3ijbwPvTDh9KjGt/BACJ+RARyv/UAZzxn6iwEHneISbkpdQbv8VMbRJsP34W7axh0ANWT2hBkHNon21V/LSwmNgYs2IxEM13Jr5boAp1gy6efx10xkfkokYgLbw5xA0TKOpo5YR37vNWFyS7mfdHItMMTsjPOZAqW7VvzZCDgW8xlz3XNbaDgNVRF3KRNJVsCmPjkJ/l1P+xNssK8KcSZNbsFZo8Ou1GYHGm5avdW71XwTz74RCavknIuIAZsAyy8QIlEHUbJZhs9QionHyOCMQAs4zn0NaIVbyBRlvIpds7ZSMnISg== 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=LRkOmjXY62KhiNlrMy273Nr803nhri+0TQwaxHpgQRQ=; b=JPQsQLA/H2lxT0xNsx1L0ZJ27L5M5Lg2X+FLdk3J+Cc+fPaTnA1cPiQO5NOqwO8NLtcB5VT5M/jIBc2+9bRmidibMdyEBvo8HwBIsg2ABdu3DGYpjAFoimypmXMZNm0zTVJU7Y/Tofvo0d0epu3qKVukophZ9YdGaPQh4GYC1Cu2VogxPZAyAgMyt5E8FGReCsu+DQU7c2KRPpAGyVq6HT2jmQ52nC8ZtzgQUs3BKSWy0YQXCpvrhZA417WWxQLB7X//X4O4uXed8CjMzhE1iBlFjf9EUKfjw2ILPiunqRT+dG2tRCRnrtV/hY83VsFNEGKq7puYkSUJZzFwaD3m4Q== Received: from SJ0PR13CA0203.namprd13.prod.outlook.com (2603:10b6:a03:2c3::28) by SJ0PR12MB5636.namprd12.prod.outlook.com (2603:10b6:a03:42b::20) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8398.25; Thu, 6 Feb 2025 10:54:52 +0000 Received: from CY4PEPF0000EDD1.namprd03.prod.outlook.com (2603:10b6:a03:2c3:cafe::e) by SJ0PR13CA0203.outlook.office365.com (2603:10b6:a03:2c3::28) with Microsoft SMTP Server (version=TLS1_3, cipher=TLS_AES_256_GCM_SHA384) id 15.20.8445.6 via Frontend Transport; Thu, 6 Feb 2025 10:54:52 +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 CY4PEPF0000EDD1.mail.protection.outlook.com (10.167.241.197) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8398.14 via Frontend Transport; Thu, 6 Feb 2025 10:54:51 +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; Thu, 6 Feb 2025 02:54:35 -0800 Received: from rnnvmail201.nvidia.com (10.129.68.8) 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.14; Thu, 6 Feb 2025 02:54:34 -0800 Received: from nvidia.com (10.127.8.10) by mail.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.14 via Frontend Transport; Thu, 6 Feb 2025 02:54:32 -0800 From: Shani Peretz To: CC: , Shani Peretz , , Chenbo Xia , Nipun Gupta , Gaetan Rivet Subject: [PATCH v6 1/4] bus/pci: fix registration of PCI device Date: Thu, 6 Feb 2025 12:54:24 +0200 Message-ID: <20250206105428.237346-1-shperetz@nvidia.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20250206000838.23428-5-shperetz@nvidia.com> References: <20250206000838.23428-5-shperetz@nvidia.com> MIME-Version: 1.0 X-NV-OnPremToCloud: AnonymousSubmission X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: CY4PEPF0000EDD1:EE_|SJ0PR12MB5636:EE_ X-MS-Office365-Filtering-Correlation-Id: eae9652d-1f02-4d82-0ce2-08dd469caed6 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; ARA:13230040|376014|1800799024|36860700013|82310400026; X-Microsoft-Antispam-Message-Info: zirVmfp7xnoD4mzrt4AabzpVb6wHOKiR1c9w1i4xmeoXJwJZZsqyk/NKuYjVXlseMw5ypmMIxyy1F2pUewiusgXUHAiCZKeJ2psfqU+Y2LzDmJh7oyDZLNghJ3RfKgwbUGb0ZlW9/T2OhwGM0UMd3MOts/mwLmTBKxi5oENXdiOWKUi8D6c9ZCJ3QgdxO3wXbWWPABMsUA8zAtWRBAJ9FtXO4wTNM9pFfYPpWdCsmQrPepoNmTH7cBj+rW3SKugIo+dW0GcHSlcqduswioyWqGvdKv98OiUYQ1JBQtMHMeACVTU9zfMNzdlnalLQnpnH6SpHg/s6xag15wVaNIdYLgFg/3Dws8W9KDupt5p/UOYEpxl37vgNaDmAg87ar/eaC75OdoQyuhQ2wQLpl0Xg8RrTAgDgbtdZEQb/4oDxP0XX+vPTvGVXosRvkO3TTBDrwlvNNJSFtOGMDpQw1RH+s6IC1/FTfyM2Y/rajI9ckhz3MOP+dhIcFPdtC6ZIIqCSp1U+5ccfPTld9BiWlIka2oCdQNHawxMUSOmzR2yUpIFaXeT+9NHid2kBK1h/ACxtEHWQaiYVgz0PZ98NqnGnjtvBAgK4BxehuiKP4NB/cN+FGS9m5CXTM1pVbDuGmm2qYe98MIbfFv2uSVUUtdG8zVN6bugC8Zi286VVjvIEFo3wTrO6enk/+F2ARrg27H6jdKQFDZqAudi1LeyEctyRNda/ujsqHo0FsPNotDI5ShtnT6yUOFfG4aFeG88iI+TCwGqiaCQQzdIYulDkJ5/cVfZokulXX0mkeknUivFBpp0oNJPsc0h5N3U7jYw0OmQS1/VCraweamvDbHkWXR9mX2zcEHmdbYNUAO+2vMCrYDRGtopbMy93Fcu9Yif03VjvSbnIBWLkClT6paN4NYsKsehdvVIzXaHJNf6NxiEEJXX4Xelc1xBb18i8j4d0MFX/i+NHyQa+DhOFpdj54Ii5xOz50duLwF3L40RloA1M204bXABMPihWsk9Se/5K+6SCyCfrpmHK7NNwE+EsInkfObeb1eSxRkWiEZAsK/4DJYqOvBeT3jfwjb/DvOLvJ/iCgb8xAS60rd+L/Rb8G3G5iZ6NsTcLMRhiUZ2dCLSV/yy2PBK6XCCtVaSntHwdTA569N8T3Vv4ywyL3wWtV3YJiVQUC0Zx7dFquKLSqT55HTwg25atgtHxG6D7hXGfNDkXb/CewaDDwj5jlIK2pC8m0oqF5Cec1x9ogtunBqb89euwCd5SA/TOi8ZNT2EQcZCO/yIJyksXuJDTNZTQWsjQ84aRPkLuYMyM6hIvBC+ghgbWa7ErW7gGqZqTgYmwfiEWMytTEeHruDMdTXBsbiJuJdRMNrGQ1CYcRlDbWskgYw5Py7BlNGwWxb3EI/Q3JuThzaCbhTTZFdYBnz+yJNkodkETs3zAkKoul4gPoTcGd7B2c08m8TcVbDmnv0yzsHWUbDOijClI9oct99dm2fqg4XTvMInn4YQvShbXLVeWBq8= 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)(376014)(1800799024)(36860700013)(82310400026); DIR:OUT; SFP:1101; X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 06 Feb 2025 10:54:51.7022 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: eae9652d-1f02-4d82-0ce2-08dd469caed6 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: CY4PEPF0000EDD1.namprd03.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: SJ0PR12MB5636 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 registering a new PCI device, the device->name field stored the user-provided string from devargs (e.g., "08:00.0" or "0000:08:00.0"). This approach led to inconsistencies when registering new devices. This patch fix this issue by saving the parsed PCI in device->name, so when a new PCI device is registering the name displayed in the device list will be the parsed version. Fixes: 23eaa9059ec2 ("bus/pci: use given name as generic name") Cc: stable@dpdk.org Signed-off-by: Shani Peretz Tested-by: Bruce Richardson Acked-by: Stephen Hemminger --- drivers/bus/pci/pci_common.c | 14 ++------------ 1 file changed, 2 insertions(+), 12 deletions(-) diff --git a/drivers/bus/pci/pci_common.c b/drivers/bus/pci/pci_common.c index 1173f0887c..70faae4e44 100644 --- a/drivers/bus/pci/pci_common.c +++ b/drivers/bus/pci/pci_common.c @@ -99,21 +99,11 @@ pci_common_set(struct rte_pci_device *dev) /* Each device has its internal, canonical name set. */ rte_pci_device_name(&dev->addr, dev->name, sizeof(dev->name)); + dev->device.name = dev->name; + devargs = pci_devargs_lookup(&dev->addr); dev->device.devargs = devargs; - /* When using a blocklist, only blocked devices will have - * an rte_devargs. Allowed devices won't have one. - */ - if (devargs != NULL) - /* If an rte_devargs exists, the generic rte_device uses the - * given name as its name. - */ - dev->device.name = dev->device.devargs->name; - else - /* Otherwise, it uses the internal, canonical form. */ - dev->device.name = dev->name; - if (dev->bus_info != NULL || asprintf(&dev->bus_info, "vendor_id=%"PRIx16", device_id=%"PRIx16, dev->id.vendor_id, dev->id.device_id) != -1) From patchwork Thu Feb 6 10:54:25 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Shani Peretz X-Patchwork-Id: 151043 X-Patchwork-Delegate: thomas@monjalon.net 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 AB408461AA; Thu, 6 Feb 2025 11:55:04 +0100 (CET) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 9F6B440B9E; Thu, 6 Feb 2025 11:55:04 +0100 (CET) Received: from NAM11-BN8-obe.outbound.protection.outlook.com (mail-bn8nam11on2059.outbound.protection.outlook.com [40.107.236.59]) by mails.dpdk.org (Postfix) with ESMTP id E484C40B9C for ; Thu, 6 Feb 2025 11:55:02 +0100 (CET) ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=ZMSsUsSWHx1a9qM/TfkLXmgnZKoaFuzWDFFznprwUi8HLYpIwttLR7T0ORZMWGjLZN1/msnPOmZEKwNIVBv7xqP4R53sEapb3LJ4mtycBl4BKQFEOOHgWZTJkZ+G8pf2CWqqfFgKz7pkcUoXpGb8/63+/nBtLdkFC7EefrxvixET5gPvAWsYuRmKeYcJfBbiOjjXG1JbON36UVMrV2q4QoseWg62sFOVYN16appAK8eRqwaa84r5bhJf4zpK1uloCocbkqSnpqoD8lT3eh10wmX30oDC6Hsym517DColy0mpsRrbi+zdtZH4bvPSJRH+prJn0QgpCQPa3fSZAcj0VQ== 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=GvtmcNI6GN1rfIxTReITFnXowJAv0KuafVvlWE71Lmw=; b=qUDg2f2j/b8wX+8A+R/3XGMGV6LbcvcZWen4R8iKbveQ7ZmORNZv6D28mnJTX1h0B9pDjmLIsgRkD4H4VGNRaY7salUoDi4Ho2jScTFcYkmW4QfiVb1aLvXbIyTiWXH/9Xua5SR4Xcw2/3qVRcboPcSgomxDL5JwCLOaiAEHK0r5oh6AULFOmL7gySVfdy0pUgyZGAFXyDpjz6B1ifxjN+ExwsTMF+rKLeSSKDqHlNFsKQeFZ1xmY/xt+Pz4LVuvzj109NJ+BHjtjdpOENumP9q8aVg0LFEN/g4u+oN95N73jLD1rK9uL7YPiFpoTDoAGBWo81OHUKTU14NHDcVwJQ== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 216.228.117.160) 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=GvtmcNI6GN1rfIxTReITFnXowJAv0KuafVvlWE71Lmw=; b=Y1gNd6i0GEeilk6GN2y1IcxYoRJfA+nwsRaTD6CnSBs4ij8re4yAd/0FTtyF5p3zLnH3YJgg3/fLR/OjX0xrhh4Xiv4/y9nBN0Q+QJo0mbsVPdF11/8xSCIbUSKXcsPtSbsPLctXO+RPGZZVxwMkpqjyWOhRLA438qQRASX4GmRVp3AFFRy+xxsheASeqB6caG8ohcXMTrJCPHAe0/8B9V+NDUiUClAop31J1TYCYxOeA8u9GU9yN7J1CtbRl0w6RPkdUOuT7TM++gA/JACVa6M2/fdP1ErmDoNp8Kqvzw8y4TZ7nPn3ENxIEu3XLNIk30Cgp2XV+WXEe6AxubYIkA== Received: from CH0PR03CA0387.namprd03.prod.outlook.com (2603:10b6:610:119::21) by PH8PR12MB7422.namprd12.prod.outlook.com (2603:10b6:510:22a::12) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8398.24; Thu, 6 Feb 2025 10:54:56 +0000 Received: from CH3PEPF00000013.namprd21.prod.outlook.com (2603:10b6:610:119:cafe::1f) by CH0PR03CA0387.outlook.office365.com (2603:10b6:610:119::21) with Microsoft SMTP Server (version=TLS1_3, cipher=TLS_AES_256_GCM_SHA384) id 15.20.8398.25 via Frontend Transport; Thu, 6 Feb 2025 10:54:55 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 216.228.117.160) 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.160 as permitted sender) receiver=protection.outlook.com; client-ip=216.228.117.160; helo=mail.nvidia.com; pr=C Received: from mail.nvidia.com (216.228.117.160) by CH3PEPF00000013.mail.protection.outlook.com (10.167.244.118) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8445.2 via Frontend Transport; Thu, 6 Feb 2025 10:54:55 +0000 Received: from rnnvmail201.nvidia.com (10.129.68.8) by mail.nvidia.com (10.129.200.66) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.1544.4; Thu, 6 Feb 2025 02:54:41 -0800 Received: from rnnvmail201.nvidia.com (10.129.68.8) 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.14; Thu, 6 Feb 2025 02:54:40 -0800 Received: from nvidia.com (10.127.8.10) by mail.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.14 via Frontend Transport; Thu, 6 Feb 2025 02:54:36 -0800 From: Shani Peretz To: CC: , Shani Peretz , "Parav Pandit" , Xueming Li , Nipun Gupta , Nikhil Agarwal , "Hemant Agrawal" , Sachin Saxena , Rosen Xu , Chenbo Xia , "Tomasz Duszynski" , Chengwen Feng , Long Li , Wei Hu , Bruce Richardson , Kevin Laatz , "Tyler Retzlaff" , Jan Blunck Subject: [PATCH v6 2/4] lib: fix comparison between devices Date: Thu, 6 Feb 2025 12:54:25 +0200 Message-ID: <20250206105428.237346-2-shperetz@nvidia.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20250206105428.237346-1-shperetz@nvidia.com> References: <20250206000838.23428-5-shperetz@nvidia.com> <20250206105428.237346-1-shperetz@nvidia.com> MIME-Version: 1.0 X-NV-OnPremToCloud: AnonymousSubmission X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: CH3PEPF00000013:EE_|PH8PR12MB7422:EE_ X-MS-Office365-Filtering-Correlation-Id: 12d74372-3f95-4ef7-df8e-08dd469cb116 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:13230040|82310400026|36860700013|7416014|376014|1800799024; X-Microsoft-Antispam-Message-Info: FTvJ9pXw7b9tmzbaUFUw+wVGsjqEB2B/Ekg0Qhtvk7z5HBrLsZUic7W3VG70cGkOiWr0TeMJ8TOeLz55JfWtTwn0NYNxzSEVOgZg8WWL2BGPP4k+VLilYOD0buGEeol5t7R01Wh/Ql3Vx8F5Kz4IHtlikK5AwxRfMDDwyKmpd+gDsU1G3svay0fHhZrLP9B2ilLev9Gm3riBXKNJ+5dyPnvFAWBXkwvIm+AT1oEIRlVjsVlpn1eagtf42IvqGXgUf5iKeQqvfFVJkKBbAGSOIlgE6ohkS0Ui5f/ke8ISA9Q8fIa80M6f19Au11dpUUrQId0OT+o7x1r7blPaPex4J6qsSPNOTX3PPSoovaud5H5/9ULE+x9RRWxORF2yEtCN84FjWfO3S/0BD6sNnJA3rAeh+BBN0iKOpG+4z6ka+VMx+n1DyTX58R83ZNpGNtyZ9wG8rNmyiKVR5nEVrdZGwA4QXb3K3B80R51e/I9ByhnQVR7LHfrAQ+6EXaQ9vWROce631SkD9II4qZTCDqG9pkyZP/vPrz+/hizdeK/zHbZ5mwWtrtlpjRNUJGbZU5GGhAaUSD5NP7x5lhx2StLOLrrArbS9F/jwv6Av/S/NcnjhMjeO7h9tOkfztACUKMhhpq6v+l3NP5byiqfRLA1k0YHmMP7Hq0+s/Dpn/2s/j1AY81U3+0ZAp8zeAHtpwzgMs1t37UYbY+KI4hOIldswPTgoYWzA4PWduCbnqtHelyhN/Jcuh0D0EEs+N/HILbS9PoElfHM9XRk/UyX5pMTEuoKdHHm1MBwAj39kN9m6XQ9QWUPks8BFUPj7u25gkIjdBkRtZDTGrWUh6/3IZA5n5BzO/IoodzZcpCeNbuiB1SKOQCPg3TG3WOZD27LePb7QSJYXU4EG9P3EX37bR0PMTBSG9MoBROY1YjMqciozrNsiyGGQUekM8Me1xqc0tRoiZ3z7xXjhRQg22HTl9Q7Q1q5LJ3dUiqX7aKDdclFX7+9SHEmsT3oJhmoqzVcGoaLDMdSZyR7nMDc9D8cxhFFqUSUUm1K0OFV52D832VzEuMaWefHjC1yUg51dgjsC9FWXuEtGk3l5rLTiSBYD6gKNzNIQZb5xqZDnp7a7H9kf2L2YaGbwDVh5GwOVExHCFXoRYFZFli8S58Uv+54GZx8fInra3IrAmKLrH1JwDOUC3t0IaIDb1GjEtx6tGdoPxQ0VsZMT21wdJjxuF/Xm44d2SFJgwXZE4QR7zKM4vhn1l8JRHSsaDDNlHZ5dFMRcatrF6iDK6ROd1Go8ONqmijnTcHm+P9MqqXPrCbdtFLAmvHIFeSRcVCq1hJ7zw3uo7wXc0lY7tEifcBqunr5LBO1qFDUQZ/OJldT+KHNbR19nA2ok1ObtEHIvgFcNhL1LrIYJuJu8d+aoA70K6K/Jn9I+L/kxwYXJ2blawZ3e7pLrhcSDWaNYUIgNx5qMRHnTS4HDN45IZw0dQ1uOQJJSy+7sPLAVXMVa0U9DVgXkMn9UPxU= X-Forefront-Antispam-Report: CIP:216.228.117.160; CTRY:US; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:mail.nvidia.com; PTR:dc6edge1.nvidia.com; CAT:NONE; SFS:(13230040)(82310400026)(36860700013)(7416014)(376014)(1800799024); DIR:OUT; SFP:1101; X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 06 Feb 2025 10:54:55.4668 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 12d74372-3f95-4ef7-df8e-08dd469cb116 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.160]; Helo=[mail.nvidia.com] X-MS-Exchange-CrossTenant-AuthSource: CH3PEPF00000013.namprd21.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: PH8PR12MB7422 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 DPDK supports multiple formats for specifying buses, (such as "0000:08:00.0" and "08:00.0" for PCI). This flexibility can lead to inconsistencies when using one format while running testpmd, then attempts to use the other format in a later command, resulting in a failure. The issue arises from the find_device function, which compares the user-provided string directly with the device->name in the rte_device structure. If we want to accurately compare these names, we'll need to bring both sides to the same representation by invoking the parse function on the user input. The proposed solution is to utilize the parse function implemented by each bus. When comparing names, we will call parse on the supplied string as well as on the device name itself and compare the results. As part of the change the parse function will now return the size of the parsed address. This will allow consistent comparisons between different representations of same devices. In addition, fixed vdev test to use the rte_cmp_dev_name function instead of the custom one. Fixes: a3ee360f4440 ("eal: add hotplug add/remove device") Signed-off-by: Shani Peretz --- app/test/test_vdev.c | 10 ++---- drivers/bus/auxiliary/auxiliary_common.c | 17 +++++++--- drivers/bus/cdx/cdx.c | 13 +++++--- drivers/bus/dpaa/dpaa_bus.c | 7 ++-- drivers/bus/fslmc/fslmc_bus.c | 9 ++++-- drivers/bus/ifpga/ifpga_bus.c | 14 +++++--- drivers/bus/pci/pci_common.c | 7 ++-- drivers/bus/platform/platform.c | 15 ++++++--- drivers/bus/uacce/uacce.c | 14 +++++--- drivers/bus/vdev/vdev.c | 23 +++++++++++-- drivers/bus/vmbus/vmbus_common.c | 9 ++++-- drivers/dma/idxd/idxd_bus.c | 9 ++++-- drivers/raw/ifpga/ifpga_rawdev.c | 8 +---- lib/eal/common/eal_common_bus.c | 2 +- lib/eal/common/eal_common_dev.c | 41 +++++++++++++++++++++--- lib/eal/common/hotplug_mp.c | 11 ++----- lib/eal/include/bus_driver.h | 24 +++++++++++++- lib/eal/include/rte_dev.h | 15 +++++++++ lib/eal/linux/eal_dev.c | 10 +----- lib/eal/version.map | 1 + 20 files changed, 180 insertions(+), 79 deletions(-) diff --git a/app/test/test_vdev.c b/app/test/test_vdev.c index 3e262f30bc..860fa260af 100644 --- a/app/test/test_vdev.c +++ b/app/test/test_vdev.c @@ -20,12 +20,6 @@ static const char * const valid_keys[] = { NULL, }; -static int -cmp_dev_name(const struct rte_device *dev, const void *name) -{ - return strcmp(rte_dev_name(dev), name); -} - static int cmp_dev_match(const struct rte_device *dev, const void *_kvlist) { @@ -82,7 +76,7 @@ test_vdev_bus(void) printf("Failed to create vdev net_null_test0\n"); goto fail; } - dev0 = vdev_bus->find_device(NULL, cmp_dev_name, "net_null_test0"); + dev0 = vdev_bus->find_device(NULL, rte_cmp_dev_name, "net_null_test0"); if (dev0 == NULL) { printf("Cannot find net_null_test0 vdev\n"); goto fail; @@ -93,7 +87,7 @@ test_vdev_bus(void) printf("Failed to create vdev net_null_test1\n"); goto fail; } - dev1 = vdev_bus->find_device(NULL, cmp_dev_name, "net_null_test1"); + dev1 = vdev_bus->find_device(NULL, rte_cmp_dev_name, "net_null_test1"); if (dev1 == NULL) { printf("Cannot find net_null_test1 vdev\n"); goto fail; diff --git a/drivers/bus/auxiliary/auxiliary_common.c b/drivers/bus/auxiliary/auxiliary_common.c index e6cbc4d356..ba2f69e851 100644 --- a/drivers/bus/auxiliary/auxiliary_common.c +++ b/drivers/bus/auxiliary/auxiliary_common.c @@ -237,10 +237,9 @@ auxiliary_probe(void) } static int -auxiliary_parse(const char *name, void *addr) +auxiliary_parse(const char *name, void *addr, int *size) { struct rte_auxiliary_driver *drv = NULL; - const char **out = addr; /* Allow empty device name "auxiliary:" to bypass entire bus scan. */ if (strlen(name) == 0) @@ -250,9 +249,17 @@ auxiliary_parse(const char *name, void *addr) if (drv->match(name)) break; } - if (drv != NULL && addr != NULL) - *out = name; - return drv != NULL ? 0 : -1; + + if (drv == NULL) + return -1; + + if (size != NULL) + *size = strlen(name) + 1; + + if (addr != NULL) + rte_strscpy(addr, name, strlen(name) + 1); + + return 0; } /* Register a driver */ diff --git a/drivers/bus/cdx/cdx.c b/drivers/bus/cdx/cdx.c index 62b108e082..b97f1ce1af 100644 --- a/drivers/bus/cdx/cdx.c +++ b/drivers/bus/cdx/cdx.c @@ -464,15 +464,20 @@ cdx_probe(void) } static int -cdx_parse(const char *name, void *addr) +cdx_parse(const char *name, void *addr, int *size) { - const char **out = addr; int ret; ret = strncmp(name, CDX_DEV_PREFIX, strlen(CDX_DEV_PREFIX)); - if (ret == 0 && addr) - *out = name; + if (ret != 0) + return ret; + + if (size != NULL) + *size = strlen(name) + 1; + + if (addr != NULL) + rte_strscpy(addr, name, strlen(name) + 1); return ret; } diff --git a/drivers/bus/dpaa/dpaa_bus.c b/drivers/bus/dpaa/dpaa_bus.c index 9ffbe07c93..f768fb9454 100644 --- a/drivers/bus/dpaa/dpaa_bus.c +++ b/drivers/bus/dpaa/dpaa_bus.c @@ -153,7 +153,7 @@ dpaa_devargs_lookup(struct rte_dpaa_device *dev) char dev_name[32]; RTE_EAL_DEVARGS_FOREACH("dpaa_bus", devargs) { - devargs->bus->parse(devargs->name, &dev_name); + devargs->bus->parse(devargs->name, &dev_name, NULL); if (strcmp(dev_name, dev->device.name) == 0) { DPAA_BUS_INFO("**Devargs matched %s", dev_name); return devargs; @@ -447,7 +447,7 @@ dpaa_portal_finish(void *arg) } static int -rte_dpaa_bus_parse(const char *name, void *out) +rte_dpaa_bus_parse(const char *name, void *out, int *size) { unsigned int i, j; size_t delta, dev_delta; @@ -494,6 +494,9 @@ rte_dpaa_bus_parse(const char *name, void *out) max_name_len = sizeof("fm.-mac..") - 1; } + if (size != NULL) + *size = max_name_len + 1; + if (out != NULL) { char *out_name = out; diff --git a/drivers/bus/fslmc/fslmc_bus.c b/drivers/bus/fslmc/fslmc_bus.c index 68ad2b801e..a525b5e245 100644 --- a/drivers/bus/fslmc/fslmc_bus.c +++ b/drivers/bus/fslmc/fslmc_bus.c @@ -103,7 +103,7 @@ fslmc_devargs_lookup(struct rte_dpaa2_device *dev) char dev_name[32]; RTE_EAL_DEVARGS_FOREACH("fslmc", devargs) { - devargs->bus->parse(devargs->name, &dev_name); + devargs->bus->parse(devargs->name, &dev_name, NULL); if (strcmp(dev_name, dev->device.name) == 0) { DPAA2_BUS_INFO("**Devargs matched %s", dev_name); return devargs; @@ -235,7 +235,7 @@ scan_one_fslmc_device(char *dev_name) } static int -rte_fslmc_parse(const char *name, void *addr) +rte_fslmc_parse(const char *name, void *addr, int *size) { uint16_t dev_id; char *t_ptr; @@ -298,7 +298,10 @@ rte_fslmc_parse(const char *name, void *addr) goto err_out; } - if (addr) + if (size != NULL) + *size = strlen(sep) + 1; + + if (addr != NULL) strcpy(addr, sep); ret = 0; diff --git a/drivers/bus/ifpga/ifpga_bus.c b/drivers/bus/ifpga/ifpga_bus.c index 11b31eee4f..d5d9a86a97 100644 --- a/drivers/bus/ifpga/ifpga_bus.c +++ b/drivers/bus/ifpga/ifpga_bus.c @@ -459,9 +459,8 @@ ifpga_find_device(const struct rte_device *start, return NULL; } static int -ifpga_parse(const char *name, void *addr) +ifpga_parse(const char *name, void *addr, int *size) { - int *out = addr; struct rte_rawdev *rawdev = NULL; char rawdev_name[RTE_RAWDEV_NAME_MAX_LEN]; char *c1 = NULL; @@ -491,9 +490,14 @@ ifpga_parse(const char *name, void *addr) rawdev = rte_rawdev_pmd_get_named_dev(rawdev_name); if ((port < IFPGA_BUS_DEV_PORT_MAX) && - rawdev && - (addr != NULL)) - *out = port; + rawdev) { + if (size != NULL) + *size = sizeof(port); + + if (addr != NULL) + *(int *)addr = port; + } + if ((port < IFPGA_BUS_DEV_PORT_MAX) && rawdev) diff --git a/drivers/bus/pci/pci_common.c b/drivers/bus/pci/pci_common.c index 70faae4e44..82632bc473 100644 --- a/drivers/bus/pci/pci_common.c +++ b/drivers/bus/pci/pci_common.c @@ -84,7 +84,7 @@ pci_devargs_lookup(const struct rte_pci_addr *pci_addr) struct rte_pci_addr addr; RTE_EAL_DEVARGS_FOREACH("pci", devargs) { - devargs->bus->parse(devargs->name, &addr); + devargs->bus->parse(devargs->name, &addr, NULL); if (!rte_pci_addr_cmp(pci_addr, &addr)) return devargs; } @@ -487,12 +487,15 @@ rte_pci_dump(FILE *f) } static int -pci_parse(const char *name, void *addr) +pci_parse(const char *name, void *addr, int *size) { struct rte_pci_addr *out = addr; struct rte_pci_addr pci_addr; bool parse; + if (size != NULL) + *size = sizeof(struct rte_pci_addr); + parse = (rte_pci_addr_parse(name, &pci_addr) == 0); if (parse && addr != NULL) *out = pci_addr; diff --git a/drivers/bus/platform/platform.c b/drivers/bus/platform/platform.c index 11892caa24..87ed7404e1 100644 --- a/drivers/bus/platform/platform.c +++ b/drivers/bus/platform/platform.c @@ -542,11 +542,10 @@ platform_bus_unplug(struct rte_device *dev) } static int -platform_bus_parse(const char *name, void *addr) +platform_bus_parse(const char *name, void *addr, int *size) { struct rte_platform_device pdev = { }; struct rte_platform_driver *pdrv; - const char **out = addr; rte_strscpy(pdev.name, name, sizeof(pdev.name)); @@ -555,10 +554,16 @@ platform_bus_parse(const char *name, void *addr) break; } - if (pdrv != NULL && addr != NULL) - *out = name; + if (pdrv == NULL) + return -ENODEV; + + if (size != NULL) + *size = strlen(name) + 1; - return pdrv != NULL ? 0 : -ENODEV; + if (addr != NULL) + rte_strscpy(addr, name, strlen(name) + 1); + + return 0; } static int diff --git a/drivers/bus/uacce/uacce.c b/drivers/bus/uacce/uacce.c index 9ca048122d..b18fbe1103 100644 --- a/drivers/bus/uacce/uacce.c +++ b/drivers/bus/uacce/uacce.c @@ -20,6 +20,7 @@ #include #include #include +#include #include #include "bus_uacce_driver.h" @@ -529,15 +530,20 @@ uacce_find_device(const struct rte_device *start, rte_dev_cmp_t cmp, const void } static int -uacce_parse(const char *name, void *addr) +uacce_parse(const char *name, void *addr, int *size) { - const char **out = addr; int ret; ret = strncmp(name, UACCE_DEV_PREFIX, strlen(UACCE_DEV_PREFIX)); - if (ret == 0 && addr) - *out = name; + if (ret != 0) + return ret; + + if (size != NULL) + *size = strlen(name) + 1; + + if (addr != NULL) + rte_strscpy(addr, name, strlen(name) + 1); return ret; } diff --git a/drivers/bus/vdev/vdev.c b/drivers/bus/vdev/vdev.c index ec7abe7cda..0d3c8ca3c5 100644 --- a/drivers/bus/vdev/vdev.c +++ b/drivers/bus/vdev/vdev.c @@ -113,7 +113,7 @@ rte_vdev_remove_custom_scan(rte_vdev_scan_callback callback, void *user_arg) } static int -vdev_parse(const char *name, void *addr) +vdev_find_driver(const char *name, void *addr) { struct rte_vdev_driver **out = addr; struct rte_vdev_driver *driver = NULL; @@ -197,7 +197,7 @@ vdev_probe_all_drivers(struct rte_vdev_device *dev) name = rte_vdev_device_name(dev); VDEV_LOG(DEBUG, "Search driver to probe device %s", name); - if (vdev_parse(name, &driver)) + if (vdev_find_driver(name, &driver)) return -1; iova_mode = rte_eal_iova_mode(); @@ -232,6 +232,23 @@ find_vdev(const char *name) return NULL; } +static int +vdev_parse(const char *name, void *addr, int *size) +{ + struct rte_vdev_driver *driver; + + if (vdev_find_driver(name, &driver)) + return 1; + + if (size != NULL) + *size = strlen(name) + 1; + + if (addr != NULL) + rte_strscpy(addr, name, strlen(name) + 1); + + return 0; +} + static struct rte_devargs * alloc_devargs(const char *name, const char *args) { @@ -647,7 +664,7 @@ vdev_get_iommu_class(void) TAILQ_FOREACH(dev, &vdev_device_list, next) { name = rte_vdev_device_name(dev); - if (vdev_parse(name, &driver)) + if (vdev_find_driver(name, &driver)) continue; if (driver->drv_flags & RTE_VDEV_DRV_NEED_IOVA_AS_VA) diff --git a/drivers/bus/vmbus/vmbus_common.c b/drivers/bus/vmbus/vmbus_common.c index 8a965d10d9..18805aee0d 100644 --- a/drivers/bus/vmbus/vmbus_common.c +++ b/drivers/bus/vmbus/vmbus_common.c @@ -245,13 +245,16 @@ rte_vmbus_cleanup(void) } static int -vmbus_parse(const char *name, void *addr) +vmbus_parse(const char *name, void *addr, int *size) { rte_uuid_t guid; int ret; + if (size != NULL) + *size = sizeof(guid); + ret = rte_uuid_parse(name, guid); - if (ret == 0 && addr) + if (ret == 0 && addr != NULL) memcpy(addr, &guid, sizeof(guid)); return ret; @@ -269,7 +272,7 @@ vmbus_devargs_lookup(struct rte_vmbus_device *dev) rte_uuid_t addr; RTE_EAL_DEVARGS_FOREACH("vmbus", devargs) { - vmbus_parse(devargs->name, &addr); + vmbus_parse(devargs->name, &addr, NULL); if (rte_uuid_compare(dev->device_id, addr) == 0) return devargs; diff --git a/drivers/dma/idxd/idxd_bus.c b/drivers/dma/idxd/idxd_bus.c index ba8076715d..d68e8b630e 100644 --- a/drivers/dma/idxd/idxd_bus.c +++ b/drivers/dma/idxd/idxd_bus.c @@ -47,7 +47,7 @@ static int dsa_probe(void); static struct rte_device *dsa_find_device(const struct rte_device *start, rte_dev_cmp_t cmp, const void *data); static enum rte_iova_mode dsa_get_iommu_class(void); -static int dsa_addr_parse(const char *name, void *addr); +static int dsa_addr_parse(const char *name, void *addr, int *size); /** List of devices */ TAILQ_HEAD(dsa_device_list, rte_dsa_device); @@ -345,7 +345,7 @@ dsa_scan(void) closedir(dev_dir); return -ENOMEM; } - if (dsa_addr_parse(wq->d_name, &dev->addr) < 0) { + if (dsa_addr_parse(wq->d_name, &dev->addr, NULL) < 0) { IDXD_PMD_ERR("Error parsing WQ name: %s", wq->d_name); free(dev); continue; @@ -391,11 +391,14 @@ dsa_get_iommu_class(void) } static int -dsa_addr_parse(const char *name, void *addr) +dsa_addr_parse(const char *name, void *addr, int *size) { struct dsa_wq_addr *wq = addr; unsigned int device_id, wq_id; + if (size != NULL) + *size = sizeof(struct dsa_wq_addr); + if (sscanf(name, "wq%u.%u", &device_id, &wq_id) != 2) { IDXD_PMD_DEBUG("Parsing WQ name failed: %s", name); return -1; diff --git a/drivers/raw/ifpga/ifpga_rawdev.c b/drivers/raw/ifpga/ifpga_rawdev.c index 5b9b596435..7238246e1c 100644 --- a/drivers/raw/ifpga/ifpga_rawdev.c +++ b/drivers/raw/ifpga/ifpga_rawdev.c @@ -1833,12 +1833,6 @@ ifpga_cfg_probe(struct rte_vdev_device *vdev) return ret; } -static int cmp_dev_name(const struct rte_device *dev, const void *_name) -{ - const char *name = _name; - return strcmp(dev->name, name); -} - static int ifpga_cfg_remove(struct rte_vdev_device *vdev) { @@ -1874,7 +1868,7 @@ ifpga_cfg_remove(struct rte_vdev_device *vdev) args.port, args.bdf); bus = rte_bus_find_by_name(RTE_STR(IFPGA_BUS_NAME)); if (bus) { - if (bus->find_device(NULL, cmp_dev_name, dev_name)) { + if (bus->find_device(NULL, rte_cmp_dev_name, dev_name)) { ret = rte_eal_hotplug_remove(RTE_STR(IFPGA_BUS_NAME), dev_name); } diff --git a/lib/eal/common/eal_common_bus.c b/lib/eal/common/eal_common_bus.c index 7cbd09c421..b1bb5df5b7 100644 --- a/lib/eal/common/eal_common_bus.c +++ b/lib/eal/common/eal_common_bus.c @@ -200,7 +200,7 @@ bus_can_parse(const struct rte_bus *bus, const void *_name) { const char *name = _name; - return !(bus->parse && bus->parse(name, NULL) == 0); + return !(bus->parse && bus->parse(name, NULL, NULL) == 0); } struct rte_bus * diff --git a/lib/eal/common/eal_common_dev.c b/lib/eal/common/eal_common_dev.c index 70aa04dcd9..c0e2202482 100644 --- a/lib/eal/common/eal_common_dev.c +++ b/lib/eal/common/eal_common_dev.c @@ -107,11 +107,42 @@ struct dev_next_ctx { #define CLSCTX(ptr) \ (((struct dev_next_ctx *)(intptr_t)ptr)->cls_str) -static int cmp_dev_name(const struct rte_device *dev, const void *_name) +int +rte_cmp_dev_name(const struct rte_device *dev1, const void *name2) { - const char *name = _name; + void *parsed_name1; + void *parsed_name2; + int size1 = 0; + int size2 = 0; + int ret; + + if (dev1->bus->parse(dev1->name, NULL, &size1) != 0 || + dev1->bus->parse(name2, NULL, &size2) != 0) + return 1; + + if (size1 != size2) + return 1; + + parsed_name1 = malloc(size1); + if (parsed_name1 == NULL) + return 1; + + parsed_name2 = malloc(size2); + if (parsed_name2 == NULL) { + free(parsed_name1); + return 1; + } - return strcmp(dev->name, name); + memset(parsed_name1, 0, size1); + memset(parsed_name2, 0, size2); + + dev1->bus->parse(dev1->name, parsed_name1, NULL); + dev1->bus->parse(name2, parsed_name2, NULL); + + ret = memcmp(parsed_name1, parsed_name2, size1); + free(parsed_name1); + free(parsed_name2); + return ret; } int @@ -197,7 +228,7 @@ local_dev_probe(const char *devargs, struct rte_device **new_dev) if (ret) goto err_devarg; - dev = da->bus->find_device(NULL, cmp_dev_name, da->name); + dev = da->bus->find_device(NULL, rte_cmp_dev_name, da->name); if (dev == NULL) { EAL_LOG(ERR, "Cannot find device (%s)", da->name); @@ -335,7 +366,7 @@ rte_eal_hotplug_remove(const char *busname, const char *devname) return -ENOENT; } - dev = bus->find_device(NULL, cmp_dev_name, devname); + dev = bus->find_device(NULL, rte_cmp_dev_name, devname); if (dev == NULL) { EAL_LOG(ERR, "Cannot find plugged device (%s)", devname); return -EINVAL; diff --git a/lib/eal/common/hotplug_mp.c b/lib/eal/common/hotplug_mp.c index 17089ca3db..a2623c96c3 100644 --- a/lib/eal/common/hotplug_mp.c +++ b/lib/eal/common/hotplug_mp.c @@ -21,13 +21,6 @@ struct mp_reply_bundle { void *peer; }; -static int cmp_dev_name(const struct rte_device *dev, const void *_name) -{ - const char *name = _name; - - return strcmp(dev->name, name); -} - /** * Secondary to primary request. * start from function eal_dev_hotplug_request_to_primary. @@ -135,7 +128,7 @@ __handle_secondary_request(void *param) goto finish; } - dev = bus->find_device(NULL, cmp_dev_name, da.name); + dev = bus->find_device(NULL, rte_cmp_dev_name, da.name); if (dev == NULL) { EAL_LOG(ERR, "Cannot find plugged device (%s)", da.name); ret = -ENOENT; @@ -262,7 +255,7 @@ static void __handle_primary_request(void *param) goto quit; } - dev = bus->find_device(NULL, cmp_dev_name, da->name); + dev = bus->find_device(NULL, rte_cmp_dev_name, da->name); if (dev == NULL) { EAL_LOG(ERR, "Cannot find plugged device (%s)", da->name); ret = -ENOENT; diff --git a/lib/eal/include/bus_driver.h b/lib/eal/include/bus_driver.h index 60527b75b6..01447670de 100644 --- a/lib/eal/include/bus_driver.h +++ b/lib/eal/include/bus_driver.h @@ -112,11 +112,32 @@ typedef int (*rte_bus_unplug_t)(struct rte_device *dev); * should be written. If NULL, nothing should be written, which * is not an error. * + * @param[out] size + * device information size. If NULL, nothing should + * be written, which is not an error. + * * @return * 0 if parsing was successful. * !0 for any error. */ -typedef int (*rte_bus_parse_t)(const char *name, void *addr); +typedef int (*rte_bus_parse_t)(const char *name, void *addr, int *size); + +/** + * Bus specific device name comparison function. + * + * This type of function is used to compare a bus name with an arbitrary + * name. + * + * @param dev + * Device handle. + * + * @param name + * Name to compare against. + * + * @return + * 0 if the device matches the name. Nonzero otherwise. + */ +typedef int (*rte_bus_cmp_name_t)(const struct rte_device *dev, const void *name); /** * Parse bus part of the device arguments. @@ -258,6 +279,7 @@ struct rte_bus { rte_bus_plug_t plug; /**< Probe single device for drivers */ rte_bus_unplug_t unplug; /**< Remove single device from driver */ rte_bus_parse_t parse; /**< Parse a device name */ + rte_bus_cmp_name_t cmp_name; /**< Compare device name */ rte_bus_devargs_parse_t devargs_parse; /**< Parse bus devargs */ rte_dev_dma_map_t dma_map; /**< DMA map for device in the bus */ rte_dev_dma_unmap_t dma_unmap; /**< DMA unmap for device in the bus */ diff --git a/lib/eal/include/rte_dev.h b/lib/eal/include/rte_dev.h index 738400e8d1..2df8143af1 100644 --- a/lib/eal/include/rte_dev.h +++ b/lib/eal/include/rte_dev.h @@ -17,6 +17,7 @@ #include #include +#include #include #ifdef __cplusplus @@ -170,6 +171,20 @@ int rte_dev_is_probed(const struct rte_device *dev); int rte_eal_hotplug_add(const char *busname, const char *devname, const char *drvargs); +/** + * General device name comparison. Will compare by using the specific bus + * compare function or by comparing the names directly. + * + * @param dev + * Device handle. + * @param name + * Name to compare against. + * @return + * 0 if the device matches the name. Nonzero otherwise. + */ +__rte_internal +int rte_cmp_dev_name(const struct rte_device *dev, const void *name); + /** * Add matching devices. * diff --git a/lib/eal/linux/eal_dev.c b/lib/eal/linux/eal_dev.c index e63f24d108..3b68cda87f 100644 --- a/lib/eal/linux/eal_dev.c +++ b/lib/eal/linux/eal_dev.c @@ -91,14 +91,6 @@ static void sigbus_handler(int signum, siginfo_t *info, EAL_LOG(DEBUG, "Success to handle SIGBUS for hot-unplug!"); } -static int cmp_dev_name(const struct rte_device *dev, - const void *_name) -{ - const char *name = _name; - - return strcmp(dev->name, name); -} - static int dev_uev_socket_fd_create(void) { @@ -280,7 +272,7 @@ dev_uev_handler(__rte_unused void *param) goto failure_handle_err; } - dev = bus->find_device(NULL, cmp_dev_name, + dev = bus->find_device(NULL, rte_cmp_dev_name, uevent.devname); if (dev == NULL) { EAL_LOG(ERR, "Cannot find device (%s) on " diff --git a/lib/eal/version.map b/lib/eal/version.map index a20c713eb1..e50a95fd31 100644 --- a/lib/eal/version.map +++ b/lib/eal/version.map @@ -448,4 +448,5 @@ INTERNAL { rte_mem_unmap; rte_thread_create_internal_control; rte_thread_set_prefixed_name; + rte_cmp_dev_name; }; From patchwork Thu Feb 6 10:54:26 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Shani Peretz X-Patchwork-Id: 151044 X-Patchwork-Delegate: thomas@monjalon.net 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 538BB461AA; Thu, 6 Feb 2025 11:55:12 +0100 (CET) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 05A3440DD6; Thu, 6 Feb 2025 11:55:09 +0100 (CET) Received: from NAM11-DM6-obe.outbound.protection.outlook.com (mail-dm6nam11on2089.outbound.protection.outlook.com [40.107.223.89]) by mails.dpdk.org (Postfix) with ESMTP id 5A2BC40B9D for ; Thu, 6 Feb 2025 11:55:07 +0100 (CET) ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=M2zeWfeccgIguyOCSs1D16tYVMnhfsOb3zAKZ6fM+tF1xdmBByNQWmtnpCYIt+qx9Abt4mEixdweQcMqBFFvqjWmO8BELGG5m04YQ5GR3vNwNBVxUYsZRKttEDYhpit07UZvEDWp16oGJTeTpPnXVTyeHY9DOWcST7JdYf1kdHFNftGgZ23X6QyiNPRKR66Tsoow5x5GLbaSH16j3yZCC8oqcdNpLSiowioUgI45OqZ62ezWMSD32waQNh6SS6pNOLXKRAj5mw6vg/atwxuAnOwosFpxF+D69JbU+jurc1uiSmYSNT/At6r9OrqelsCYQh+1yC6nLag6UGPMHsK1DQ== 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=NHoO2/zEASsttOnwN1exQbB2Rb/uPBW/ITIMhn0EcTw=; b=Lwts1+m5ssEiNcUlphAWiZhxnfKypS7gUAu/bX5Z6xcrucLEP1PWXy5+OdmJh1PtAdgqCHc7BoB9XMc8lDa8w+zhf3Ve7kXYIPx6w1inVTOqlw6kCnHGJ1LIVGWFwf2yOK9zeExF0FmYGui8Yv2S313M0O6czj/J4SUlA5Uc8Mz0J5LMeqeskwSjQ1jQg/8L2g2PSiApMpyda2tU41k21bpvsdTuubtjx7bG8zh4AR5EORtiqo6sLnBkwVde+ZHeu0MkRjndeTQQj+qWEkgjLZSsb9wMfYE4v7we0qBE7DjqBO9Pp8WTlSY0xEleHkeUGCjvdVaY9go1Ai+6DOP9ug== 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=NHoO2/zEASsttOnwN1exQbB2Rb/uPBW/ITIMhn0EcTw=; b=ri58JVs13nBQSyH70wSJ6dohMTYEG7Ppdq3tOfaVN9TsjV/DCsFDMOo8iyh94XKTnhBDtnIqxE9KMSvGm3vzv/PQMhvJeYxOCgTEzwG23zUbJf5sgZMU8iiLziDZk2OzJtT8T5fAT6SOG3jjqkaB7X20J2+BHuv3lRGuivp3J2nJ+1NvBvmWBiwjtiBYbthVZI5zaGtlNWS8EX59SwMHHeHObt3jb7WG0xBK/xqblo2kXXo6Azv0jaylK4HEN0TK+3/amtZFmPur9dNzJPBIuO92Gm/5Wh+0cg6RgMSYF9tBmfbyeYXle1T/EahPBMOtcEBUl22jaMKtZgOBMJMSeg== Received: from SJ0PR05CA0188.namprd05.prod.outlook.com (2603:10b6:a03:330::13) by SA3PR12MB8438.namprd12.prod.outlook.com (2603:10b6:806:2f6::21) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8422.11; Thu, 6 Feb 2025 10:55:02 +0000 Received: from CY4PEPF0000EDD4.namprd03.prod.outlook.com (2603:10b6:a03:330:cafe::62) by SJ0PR05CA0188.outlook.office365.com (2603:10b6:a03:330::13) with Microsoft SMTP Server (version=TLS1_3, cipher=TLS_AES_256_GCM_SHA384) id 15.20.8398.26 via Frontend Transport; Thu, 6 Feb 2025 10:55: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 CY4PEPF0000EDD4.mail.protection.outlook.com (10.167.241.200) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8398.14 via Frontend Transport; Thu, 6 Feb 2025 10:55: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; Thu, 6 Feb 2025 02:54:43 -0800 Received: from rnnvmail201.nvidia.com (10.129.68.8) 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.14; Thu, 6 Feb 2025 02:54:43 -0800 Received: from nvidia.com (10.127.8.10) by mail.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.14 via Frontend Transport; Thu, 6 Feb 2025 02:54:42 -0800 From: Shani Peretz To: CC: , Shani Peretz , "Tyler Retzlaff" Subject: [PATCH v6 3/4] app/test: add tests to find devices Date: Thu, 6 Feb 2025 12:54:26 +0200 Message-ID: <20250206105428.237346-3-shperetz@nvidia.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20250206105428.237346-1-shperetz@nvidia.com> References: <20250206000838.23428-5-shperetz@nvidia.com> <20250206105428.237346-1-shperetz@nvidia.com> MIME-Version: 1.0 X-NV-OnPremToCloud: AnonymousSubmission X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: CY4PEPF0000EDD4:EE_|SA3PR12MB8438:EE_ X-MS-Office365-Filtering-Correlation-Id: 8320f208-8db3-4f81-44ec-08dd469cb4a9 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; ARA:13230040|1800799024|82310400026|376014|36860700013; X-Microsoft-Antispam-Message-Info: 4d1vKq5CXlQwFL7U1jqj0XSCvChj9UWEHQKe4WEwQIbq16PClBzMekXx0CFZdaSwYsEE+rmbRmL9IhOp46OdfHkc1MXBacRcR7RkNBKavBmL2wfhhNkejE4qF8K9NFcO6TnJ56SG9GdcSJn+7CUtroIwFKOM1eRJEfTcLFsr9ZiM/FgbGy1tNMoLSBCroy9hdQWUKjzbzPF6vxsLF8YO3vP9zVo5Y024F9s4SE+x9f1k1wB+YoZV3yPT6w2IQZnQF01kx2ZUs/kSrMDS6zKTan1Jt4gOA0+ATP7f31xtxwQjufY0nNU68xxCrY2u5lKzovCM1r63eXOl9LD6hfj3vcmv6NgLjR9g3vGzQJpeAwSklslNb6nhMjoPb9nbF5U+2SAmV8p43+tdX+3j5rkYppzugFXWERng4V88gLz5W+sdrEiCgrUrdBo9KrQHng2nKDcP72Sw9Ad+4FvJtKWJ4fbcgJZx/WgaxvZFq4yIFfo/KSoqod70FaEwA8rIcdcAQnm6m5TFEAy9+/Mi+SScbDyoYAVvb04e5RkyyC9Y/AGzOvK0wA7Raqs9C0aEE24mdD/qBI9CllCrOOjxsjhaz63nnFk7QFs71oSj5dFUETThiRNbhllUvk0YIUIW8fTIGW5ZVJJ0FnmVFIJir4zb4q+xVs2XDzkNeaS0fDizDj7C3neLMVg/6C8wNdO5JbADM3t+E8/lv/ON2QY2eAH5wuXnijb15mgbt6/RwG/y4QoXx9VbZpLAxPDFOu5RvKWMyt2zi5EbYtFD8f4reYkv1rFQVYfensl4jE6JOjR2nGxjXVyCA93Ic8/5JeTbePIyxKmQ+I7LvBAbAL3MKv7Ptc3sXVIc5ES4jvhnq/Pbg2LXmb8xBXzznQGsJg+qF/kqF7BNBqhdGhssE9GewrRn+mmjap1Ykpy2w17IxBPqyEE8m0CBvii30s86orBOWN1+ObXdafX6e50jzyUKJzpYWc7DmFQ85Hm+hfD1uZvl5jJCEJWAu7H6mzqcbd6GtpEUF4JyWinaojpVAZhfzjCKDNvFJsUen+isKGfgj64Oc6MUIefeO02NJg3WfdwCEBNEXQw4O6YDpDNzsaLBCcsbjwOkVY05CoZzD1zeBpf9jQeIFae/rERsWR9ScWG3wc+OJEv7IL9o8Zyu47EpChQSAfAX365z1oSptdgXfMBVhGwi5/CoGmmE/mM0c89LZZhZXtO3APZp8NNGYuH7gf7R6V5XBYcm0L9cE1setf8fE1YH/aT3uQcmeoEVSGR3yjWUA6i1EUVju8QJYb9CFTPY/sYnc5iOgyK1WbEdHvNp+L9it67TlfY01WkRPpadlnAxGwVyoFoCKRzvF9iFIOFavGbrLQ6iyS5XKByltx+TSNVsNLUNWKDySliqVXtMbqdAcarmhKnCjtWFsIDwvJpri2s9eVaksUH0bW9agM9wozPsNDLiUkoVwxqXuL0RaDqaL6UZApcXXIGrcg8aszIqAktTM9wtCgjp1+mM8m2vY0o= 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)(1800799024)(82310400026)(376014)(36860700013); DIR:OUT; SFP:1101; X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 06 Feb 2025 10:55:01.5063 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 8320f208-8db3-4f81-44ec-08dd469cb4a9 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: CY4PEPF0000EDD4.namprd03.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: SA3PR12MB8438 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 Added tests to PCI and vdev bus that compare and find devices in various forms of names under test_devargs. The tests check the functionality of the rte_cmp_dev_name function by calling it with different variations of names, like short and full, full and full, etc. Signed-off-by: Shani Peretz --- app/test/test_devargs.c | 122 +++++++++++++++++++++++++++++++++++++++- 1 file changed, 121 insertions(+), 1 deletion(-) diff --git a/app/test/test_devargs.c b/app/test/test_devargs.c index 4166b2bea2..fab88b00ee 100644 --- a/app/test/test_devargs.c +++ b/app/test/test_devargs.c @@ -12,7 +12,9 @@ #include #include #include +#include +#include "virtual_pmd.h" #include "test.h" /* Check layer arguments. */ @@ -171,7 +173,7 @@ test_valid_devargs(void) int ret; ret = test_valid_devargs_cases(list, RTE_DIM(list)); - if (vdev_bus != NULL && vdev_bus->parse("net_ring0", NULL) == 0) + if (vdev_bus != NULL && vdev_bus->parse("net_ring0", NULL, NULL) == 0) /* Ring vdev driver enabled. */ ret |= test_valid_devargs_cases(legacy_ring_list, RTE_DIM(legacy_ring_list)); @@ -302,6 +304,118 @@ test_invalid_devargs_parsing(void) return fail; } +static struct rte_device * +create_pci_dev(const char *name) +{ + int port_id; + struct rte_ether_addr rand_ea = {0}; + rte_eth_random_addr(rand_ea.addr_bytes); + + char pmd_name[RTE_ETH_NAME_MAX_LEN]; + strlcpy(pmd_name, name, RTE_ETH_NAME_MAX_LEN); + + port_id = virtual_ethdev_create(pmd_name, + &rand_ea, rte_socket_id(), 1); + + if (port_id < 0) + return NULL; + + return (&rte_eth_devices[port_id])->device; +} + +static int +test_pci(struct rte_bus *pci_bus, const char *dev_name, const char *name2) +{ + struct rte_device *pci_dev = create_pci_dev(dev_name); + + if (pci_dev == NULL) + return -1; + + pci_dev->bus = pci_bus; + + if (rte_cmp_dev_name(pci_dev, name2) != 0) { + printf("rte_cmp_dev_name(%s, %s) device name (%s) not expected (%s)\n", + pci_dev->name, name2, pci_dev->name, name2); + return -1; + } + return 0; +} + +static int +test_vdev(struct rte_bus *vdev_bus, const char *dev_name, const char *name2) +{ + /* create vdev */ + if (rte_vdev_init(dev_name, "") < 0) { + printf("Failed to create vdev %s\n", dev_name); + return -1; + } + + struct rte_device *vdev_dev = vdev_bus->find_device(NULL, rte_cmp_dev_name, dev_name); + if (vdev_dev == NULL) { + printf("Cannot find %s vdev\n", dev_name); + rte_vdev_uninit(dev_name); + return -1; + } + int ret = rte_cmp_dev_name(vdev_dev, name2); + if (ret != 0) { + printf("rte_cmp_dev_name(%s, %s) device name (%s) not expected (%s)\n", + vdev_dev->name, name2, vdev_dev->name, name2); + return -1; + } + + if (vdev_dev != vdev_bus->find_device(NULL, rte_cmp_dev_name, name2)) { + printf("rte_cmp_dev_name(%s, %s) device name (%s) not expected (%s)\n", + vdev_dev->name, name2, vdev_dev->name, name2); + return -1; + } + + rte_vdev_uninit(dev_name); + return 0; +} + +static int +test_valid_cmp_dev_name(void) +{ + struct rte_bus *pci_bus = rte_bus_find_by_name("pci"); + struct rte_bus *vdev_bus = rte_bus_find_by_name("vdev"); + + if (pci_bus) { + if ((test_pci(pci_bus, "0000:08:11.0", "08:11.0") != 0) || + (test_pci(pci_bus, "08:12.0", "0000:08:12.0") != 0) || + (test_pci(pci_bus, "08:13.0", "08:13.0") != 0) || + (test_pci(pci_bus, "0000:08:14.0", "0000:08:14.0") != 0)) + return -1; + } + + if (vdev_bus) { + if (test_vdev(vdev_bus, "net_null_test0", "net_null_test0") != 0) + return -1; + } + return 0; +} + +static int +test_invalid_cmp_dev_name(void) +{ + struct rte_bus *pci_bus = rte_bus_find_by_name("pci"); + struct rte_bus *vdev_bus = rte_bus_find_by_name("vdev"); + + if (pci_bus) { + if ((test_pci(pci_bus, "0000:08:15.0", "08:00.0") == 0) || + (test_pci(pci_bus, "08:16.0", "0000:08:15.0") == 0) || + (test_pci(pci_bus, "08:17.0", "08:13.0") == 0) || + (test_pci(pci_bus, "0000:08:18.0", "0000:08:14.0") == 0)) + return -1; + } + + if (vdev_bus) { + if ((test_vdev(vdev_bus, "net_null_test0", "net_null_test") == 0) || + (test_vdev(vdev_bus, "net_null_test1", "net_null_test2") == 0)) + return -1; + } + return 0; +} + static int test_devargs(void) { @@ -317,6 +431,12 @@ test_devargs(void) printf("== test devargs parsing invalid case ==\n"); if (test_invalid_devargs_parsing() < 0) return -1; + printf("== test find device valid case ==\n"); + if (test_valid_cmp_dev_name() < 0) + return -1; + printf("== test find device invalid case ==\n"); + if (test_invalid_cmp_dev_name() < 0) + return -1; return 0; } From patchwork Thu Feb 6 10:54:27 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Shani Peretz X-Patchwork-Id: 151045 X-Patchwork-Delegate: thomas@monjalon.net 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 68635461AA; Thu, 6 Feb 2025 11:55:18 +0100 (CET) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id E7A6140DD3; Thu, 6 Feb 2025 11:55:17 +0100 (CET) Received: from NAM12-BN8-obe.outbound.protection.outlook.com (mail-bn8nam12on2071.outbound.protection.outlook.com [40.107.237.71]) by mails.dpdk.org (Postfix) with ESMTP id 4DE0C40C35 for ; Thu, 6 Feb 2025 11:55:16 +0100 (CET) ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=sk+smbP+dqNj7S9R0j7PsDkGNkujX+oEag2n5YE2ly1DQzotTSz8OBAjb7YVH3sNN4/ILeIvfKN8PoEpy+KGvnTM1Y36HvAJA44IKGOF8ODYJ5ahCQ9Y3p3/nm1LUCrJZkCjdZTsxhwZuHJu/V8oMMuIMQ5cXFuL1ucPbzvTBfe1bz39sQCpTfRCby4Pxz+3Uyjxnz5Q0XaaPwOwzgy6owV7iJWOnFvABaLw3XHGy7KWQbCSs9TWGmMT3tGwqGjLEhfclkEZhJjAc6bT1Z3ih5jkbDlaIdyM2A8Ni7+yoEE0zdOuq61pFWesRYOjZACILvRIVa+M0pNTmML53dYDOQ== 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=vSx68up67IYzooyln1BP7LQkG/2V31GpNEoTq6MktJA=; b=U5QerquoOX5LrDvLhK9g+poX2OjV0wAWlEURQAA16DkKflWQcFDQaz5tmy1X1MHfY4gGHbdv6eO6G++/VUSZWE26WLeL9/SlAMTE8XRDB5RcA9VJpNSG0HSnqt17MbovRyHLpw30UXLB13C3sVsuQN/ozNPNdlcfk8nXvRjnqaBDvwtz07OfXtXi2WbBajLxyfocPWphQAK8/iNZi6aFSjYZ/w0TwRpl/Npo29V1Smiwkw8s7FPikV2r5JOHtb3IiaZrzw+z/tL/aRHbo79o2XMCWKq2if5GDv2lCvNg0x8lCiWg8BuvRNhU4ruY91sybayVDlBRKyOU/ITs+xECYQ== 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=vSx68up67IYzooyln1BP7LQkG/2V31GpNEoTq6MktJA=; b=eJT5dqeRjF51Sjy0iHABYjleAy5juahfBtzkT7a1E2njIPfXl5wc388hZSHJmEtDLgONyy/cSHhanSm1Niqcs36H46fQvfQdKi+3nVFL31qyOw7WNgMaODVmfDRkDLBwuWyYH09lknFADgLAcc+ukQhK0LhIADfVc3LlcVHZ2H0yChJ/RO6kdCh57zqmLlEexq/HUXLmy41qXemEYtX8yy0xmW4vzn/iBKclG9wD8Uqemfa1g9297rM9tZgseAfItRAfwJR0hqMcSruRHucqtLDNl3yCBLciF5oHc8gABjbXqilvFEeNGTM+/CCRS7Z9ezPqD2A717qJKKF4ZO2vMg== Received: from PH8PR02CA0025.namprd02.prod.outlook.com (2603:10b6:510:2da::15) by IA1PR12MB6602.namprd12.prod.outlook.com (2603:10b6:208:3a2::7) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8422.11; Thu, 6 Feb 2025 10:55:09 +0000 Received: from CY4PEPF0000EDD5.namprd03.prod.outlook.com (2603:10b6:510:2da:cafe::ad) by PH8PR02CA0025.outlook.office365.com (2603:10b6:510:2da::15) with Microsoft SMTP Server (version=TLS1_3, cipher=TLS_AES_256_GCM_SHA384) id 15.20.8398.28 via Frontend Transport; Thu, 6 Feb 2025 10: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 CY4PEPF0000EDD5.mail.protection.outlook.com (10.167.241.201) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8398.14 via Frontend Transport; Thu, 6 Feb 2025 10: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.1544.4; Thu, 6 Feb 2025 02:54:50 -0800 Received: from rnnvmail201.nvidia.com (10.129.68.8) 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.14; Thu, 6 Feb 2025 02:54:49 -0800 Received: from nvidia.com (10.127.8.10) by mail.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.14 via Frontend Transport; Thu, 6 Feb 2025 02:54:44 -0800 From: Shani Peretz To: CC: , Shani Peretz , "Tyler Retzlaff" , Parav Pandit , Xueming Li , Nipun Gupta , "Nikhil Agarwal" , Hemant Agrawal , Sachin Saxena , Rosen Xu , "Chenbo Xia" , Tomasz Duszynski , "Chengwen Feng" , Long Li , Wei Hu , Bruce Richardson , "Kevin Laatz" , Chas Williams , "Min Hu (Connor)" , Matan Azrad Subject: [PATCH v6 4/4] lib: change find device and cmp dev name functions Date: Thu, 6 Feb 2025 12:54:27 +0200 Message-ID: <20250206105428.237346-4-shperetz@nvidia.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20250206105428.237346-1-shperetz@nvidia.com> References: <20250206000838.23428-5-shperetz@nvidia.com> <20250206105428.237346-1-shperetz@nvidia.com> MIME-Version: 1.0 X-NV-OnPremToCloud: AnonymousSubmission X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: CY4PEPF0000EDD5:EE_|IA1PR12MB6602:EE_ X-MS-Office365-Filtering-Correlation-Id: a75f88f7-c281-4b9c-fa15-08dd469cb896 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:13230040|36860700013|7416014|376014|82310400026|1800799024; X-Microsoft-Antispam-Message-Info: mmD830Z07joXe1PyN4LXX0EWWq5LSB3+EW7V98epMgiZoJWaYxNS8902zU78rVSRXwFbAKTpn3oGI9LKcwhmtiQMJB2MiQ5QHO1/ftO7Ng/3O+Kn/6pIaMolm5g7wJZZ63CwgWFVx2H0emdxc2AOF7/1Lec80KLX+xkcmVdsPYtKGMr+LDH1mpWry+z44L1WgXtcY/XWYAdpUb+9RvYXqr0V6mbyztBiyjrT5vf602QNREH5cvqyRzCjtw/OwCbDKNOm91NZWHC4T5VjM7uMurVw53jdj3Sc444Oi+e0o53mdAjsLT0kkhar/kZMPsbcZIzjyB+Ijw8tnU5IXn+EAtE9x+tGjdU6yeaWDdOCrtdyMulUBi5WBnwvaetD3q/nRHbUvcyHf/krdKz42an9V8RO7CmAGUMc9voRMVjkkXzqgFmk4OxiofvOZhP26LDE7zqkN6qk9kjkQBTaN05NqjHvSxJ9bslMuzHxNKdbN89C3YGKNYuAJRtRPEtaYWt0tb7CmjxxBPnHONiZidBMTqpc4/2tn7JVocMpbIcQX1Cfjk2YrBYqGZDZeH/IRlv5O+iThtGG7t62q5POuLsnUfhmlTFD1Z+65buxRkaKwvTo3B/jrFqOSllTqml58pYDeO150DQapcMwYYz+YX7H5nPzCG7takgOJOHxlxUv860tCAmlOs0jPYVo7N7W3QUsVU9tevRQEs6HdwOFRnbM2ipfYQSOVx77mH3NNJ875n/pwy+995f2AFIIo4AA6JRnXBvCGE5rMzxUzs4ErinR1NB2BUn0XxyK1CZ3x6q/h8v8Y/SnKI26hbDcFxVeRwT5Tr/VnIvltMBYvWNMHG0ivKa38FzT83Hl9sOtaz3IIfg64SyR+WDDoGuG1+iSDL3LDIXG0ww+oQe9AhPQI2TXX99zpX1ycwdIuTP0cpaXfQpu3jVLha0PN9vndXEsUHVYRSAtJWclM2+weyjq+yHXXqP4fOY4OR67MhRLCZd8f0pCWl9SzPd/fAiqx+zjWUikjz0a3HTuESILFOIb3FGfuA+5mMP4mJvo9Bj2wZ60Z1sS6zAIiq1YC5Weu+KLrzA7YHL93co7Faj4wAKtCu2I1f72GRneWa9b+2CxXXsmtrvwZXjJpOoGDu0La4kC9Ya0/PRv2P8bLKhOShf0ZGlKDwhbVI0KQwE3yqx5IHhsMP8K1/DvdWnNcgE9AJDg5Nch/4BAw/jrm3i4A9Rc/Xd8oaOJ/UZ35AyHi4rmufAIMpGIjc/3aRdngFywpjvFqgVonNuQchWRyBokoUYzapb253yzuc+PDsKV7n3H0/vhn0dZTTtntQyy8XbkmtyuUE33iop2V9griCgA8lB+eK+/CyruaDz1SAvNaMm4Nazd4FFOUdkDd5T1g7MPLiFXMympIE1bcK7djVB2O6XEfB6wGbvEW4VZFlsLBwEWEmnVvLtzK4dRaWMc6YPJgj5P0+PigcAzgHqmnQHZEPNOyXCWpCiQAGx+5llaHteu14JhtXk= 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)(36860700013)(7416014)(376014)(82310400026)(1800799024); DIR:OUT; SFP:1101; X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 06 Feb 2025 10:55:08.0660 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: a75f88f7-c281-4b9c-fa15-08dd469cb896 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: CY4PEPF0000EDD5.namprd03.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: IA1PR12MB6602 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 Change find_device and rte_cmp_dev_name to accept a struct with pointer and size instead of a void* pointer. Signed-off-by: Shani Peretz --- app/test/test_devargs.c | 23 +++++++++++++++++++---- app/test/test_vdev.c | 23 ++++++++++++++++++----- drivers/bus/auxiliary/auxiliary_common.c | 2 +- drivers/bus/auxiliary/auxiliary_params.c | 10 +++++++--- drivers/bus/cdx/cdx.c | 12 ++++++++---- drivers/bus/dpaa/dpaa_bus.c | 2 +- drivers/bus/fslmc/fslmc_bus.c | 2 +- drivers/bus/ifpga/ifpga_bus.c | 2 +- drivers/bus/pci/pci_common.c | 2 +- drivers/bus/pci/pci_params.c | 10 +++++++--- drivers/bus/platform/platform.c | 3 ++- drivers/bus/platform/platform_params.c | 10 +++++++--- drivers/bus/uacce/uacce.c | 13 +++++++++---- drivers/bus/vdev/vdev.c | 2 +- drivers/bus/vdev/vdev_params.c | 10 +++++++--- drivers/bus/vdev/vdev_private.h | 2 +- drivers/bus/vmbus/vmbus_common.c | 2 +- drivers/dma/idxd/idxd_bus.c | 4 ++-- drivers/net/bonding/rte_eth_bond_args.c | 15 +++++---------- drivers/net/vdev_netvsc/vdev_netvsc.c | 8 ++++++-- drivers/raw/ifpga/ifpga_rawdev.c | 6 +++++- lib/eal/common/eal_common_bus.c | 10 +++++++--- lib/eal/common/eal_common_dev.c | 18 +++++++++++++----- lib/eal/common/hotplug_mp.c | 12 ++++++++++-- lib/eal/include/bus_driver.h | 2 +- lib/eal/include/rte_dev.h | 15 ++++++++++----- lib/eal/linux/eal_dev.c | 6 +++++- 27 files changed, 156 insertions(+), 70 deletions(-) diff --git a/app/test/test_devargs.c b/app/test/test_devargs.c index fab88b00ee..54dc4e122e 100644 --- a/app/test/test_devargs.c +++ b/app/test/test_devargs.c @@ -333,7 +333,12 @@ test_pci(struct rte_bus *pci_bus, const char *dev_name, const char *name2) pci_dev->bus = pci_bus; - if (rte_cmp_dev_name(pci_dev, name2) != 0) { + struct rte_bus_address addr = { + .addr = name2, + .size = strlen(name2) + }; + + if (rte_cmp_dev_name(pci_dev, &addr) != 0) { printf("rte_cmp_dev_name(%s, %s) device name (%s) not expected (%s)\n", pci_dev->name, name2, pci_dev->name, name2); return -1; @@ -350,20 +355,30 @@ test_vdev(struct rte_bus *vdev_bus, const char *dev_name, const char *name2) return -1; } - struct rte_device *vdev_dev = vdev_bus->find_device(NULL, rte_cmp_dev_name, dev_name); + struct rte_bus_address dev_addr = { + .addr = dev_name, + .size = strlen(dev_name) + }; + + struct rte_device *vdev_dev = vdev_bus->find_device(NULL, rte_cmp_dev_name, &dev_addr); if (vdev_dev == NULL) { printf("Cannot find %s vdev\n", dev_name); rte_vdev_uninit(dev_name); return -1; } - int ret = rte_cmp_dev_name(vdev_dev, name2); + + struct rte_bus_address dev_addr2 = { + .addr = name2, + .size = strlen(name2) + }; + int ret = rte_cmp_dev_name(vdev_dev, &dev_addr2); if (ret != 0) { printf("rte_cmp_dev_name(%s, %s) device name (%s) not expected (%s)\n", vdev_dev->name, name2, vdev_dev->name, name2); return -1; } - if (vdev_dev != vdev_bus->find_device(NULL, rte_cmp_dev_name, name2)) { + if (vdev_dev != vdev_bus->find_device(NULL, rte_cmp_dev_name, &dev_addr2)) { printf("rte_cmp_dev_name(%s, %s) device name (%s) not expected (%s)\n", vdev_dev->name, name2, vdev_dev->name, name2); return -1; diff --git a/app/test/test_vdev.c b/app/test/test_vdev.c index 860fa260af..568c16593e 100644 --- a/app/test/test_vdev.c +++ b/app/test/test_vdev.c @@ -21,9 +21,9 @@ static const char * const valid_keys[] = { }; static int -cmp_dev_match(const struct rte_device *dev, const void *_kvlist) +cmp_dev_match(const struct rte_device *dev, const struct rte_bus_address *_kvlist) { - const struct rte_kvargs *kvlist = _kvlist; + const struct rte_kvargs *kvlist = _kvlist->addr; const char *key = TEST_VDEV_KEY_NAME; const char *name; @@ -54,7 +54,11 @@ get_matching_vdev(const char *match_str) } } - dev = vdev_bus->find_device(NULL, cmp_dev_match, kvargs); + struct rte_bus_address dev_addr = { + .addr = kvargs, + .size = sizeof(struct rte_kvargs), + }; + dev = vdev_bus->find_device(NULL, cmp_dev_match, &dev_addr); rte_kvargs_free(kvargs); return dev; @@ -76,7 +80,12 @@ test_vdev_bus(void) printf("Failed to create vdev net_null_test0\n"); goto fail; } - dev0 = vdev_bus->find_device(NULL, rte_cmp_dev_name, "net_null_test0"); + + struct rte_bus_address dev0_addr = { + .addr = "net_null_test0", + .size = strlen("net_null_test0") + }; + dev0 = vdev_bus->find_device(NULL, rte_cmp_dev_name, &dev0_addr); if (dev0 == NULL) { printf("Cannot find net_null_test0 vdev\n"); goto fail; @@ -87,7 +96,11 @@ test_vdev_bus(void) printf("Failed to create vdev net_null_test1\n"); goto fail; } - dev1 = vdev_bus->find_device(NULL, rte_cmp_dev_name, "net_null_test1"); + struct rte_bus_address dev1_addr = { + .addr = "net_null_test1", + .size = strlen("net_null_test1") + }; + dev1 = vdev_bus->find_device(NULL, rte_cmp_dev_name, &dev1_addr); if (dev1 == NULL) { printf("Cannot find net_null_test1 vdev\n"); goto fail; diff --git a/drivers/bus/auxiliary/auxiliary_common.c b/drivers/bus/auxiliary/auxiliary_common.c index ba2f69e851..091e559c60 100644 --- a/drivers/bus/auxiliary/auxiliary_common.c +++ b/drivers/bus/auxiliary/auxiliary_common.c @@ -300,7 +300,7 @@ rte_auxiliary_remove_device(struct rte_auxiliary_device *auxiliary_dev) static struct rte_device * auxiliary_find_device(const struct rte_device *start, rte_dev_cmp_t cmp, - const void *data) + const struct rte_bus_address *data) { const struct rte_auxiliary_device *pstart; struct rte_auxiliary_device *adev; diff --git a/drivers/bus/auxiliary/auxiliary_params.c b/drivers/bus/auxiliary/auxiliary_params.c index e4c7ee0c3b..93f0bd46be 100644 --- a/drivers/bus/auxiliary/auxiliary_params.c +++ b/drivers/bus/auxiliary/auxiliary_params.c @@ -22,9 +22,9 @@ static const char * const auxiliary_params_keys[] = { static int auxiliary_dev_match(const struct rte_device *dev, - const void *_kvlist) + const struct rte_bus_address *_kvlist) { - const struct rte_kvargs *kvlist = _kvlist; + const struct rte_kvargs *kvlist = _kvlist->addr; const char *key = auxiliary_params_keys[RTE_AUXILIARY_PARAM_NAME]; const char *name; @@ -59,7 +59,11 @@ auxiliary_dev_iterate(const void *start, } } find_device = auxiliary_bus.bus.find_device; - dev = find_device(start, auxiliary_dev_match, kvargs); + struct rte_bus_address dev_addr = { + .addr = kvargs, + .size = sizeof(struct rte_kvargs), + }; + dev = find_device(start, auxiliary_dev_match, &dev_addr); rte_kvargs_free(kvargs); return dev; } diff --git a/drivers/bus/cdx/cdx.c b/drivers/bus/cdx/cdx.c index b97f1ce1af..58596d1f71 100644 --- a/drivers/bus/cdx/cdx.c +++ b/drivers/bus/cdx/cdx.c @@ -500,7 +500,7 @@ rte_cdx_unregister(struct rte_cdx_driver *driver) static struct rte_device * cdx_find_device(const struct rte_device *start, rte_dev_cmp_t cmp, - const void *data) + const struct rte_bus_address *data) { const struct rte_cdx_device *cdx_start; struct rte_cdx_device *cdx_dev; @@ -613,9 +613,9 @@ cdx_get_iommu_class(void) static int cdx_dev_match(const struct rte_device *dev, - const void *_kvlist) + const struct rte_bus_address *_kvlist) { - const struct rte_kvargs *kvlist = _kvlist; + const struct rte_kvargs *kvlist = _kvlist->addr; const char *key = cdx_params_keys[RTE_CDX_PARAM_NAME]; const char *name; @@ -649,7 +649,11 @@ cdx_dev_iterate(const void *start, } } find_device = rte_cdx_bus.bus.find_device; - dev = find_device(start, cdx_dev_match, kvargs); + struct rte_bus_address dev_addr = { + .addr = kvargs, + .size = sizeof(struct rte_kvargs), + }; + dev = find_device(start, cdx_dev_match, &dev_addr); rte_kvargs_free(kvargs); return dev; } diff --git a/drivers/bus/dpaa/dpaa_bus.c b/drivers/bus/dpaa/dpaa_bus.c index f768fb9454..5a24fc2f47 100644 --- a/drivers/bus/dpaa/dpaa_bus.c +++ b/drivers/bus/dpaa/dpaa_bus.c @@ -745,7 +745,7 @@ rte_dpaa_bus_probe(void) static struct rte_device * rte_dpaa_find_device(const struct rte_device *start, rte_dev_cmp_t cmp, - const void *data) + const struct rte_bus_address *data) { struct rte_dpaa_device *dev; const struct rte_dpaa_device *dstart; diff --git a/drivers/bus/fslmc/fslmc_bus.c b/drivers/bus/fslmc/fslmc_bus.c index a525b5e245..7a80cb41f1 100644 --- a/drivers/bus/fslmc/fslmc_bus.c +++ b/drivers/bus/fslmc/fslmc_bus.c @@ -497,7 +497,7 @@ rte_fslmc_probe(void) static struct rte_device * rte_fslmc_find_device(const struct rte_device *start, rte_dev_cmp_t cmp, - const void *data) + const struct rte_bus_address *data) { const struct rte_dpaa2_device *dstart; struct rte_dpaa2_device *dev; diff --git a/drivers/bus/ifpga/ifpga_bus.c b/drivers/bus/ifpga/ifpga_bus.c index d5d9a86a97..195429c1d4 100644 --- a/drivers/bus/ifpga/ifpga_bus.c +++ b/drivers/bus/ifpga/ifpga_bus.c @@ -443,7 +443,7 @@ ifpga_unplug(struct rte_device *dev) static struct rte_device * ifpga_find_device(const struct rte_device *start, - rte_dev_cmp_t cmp, const void *data) + rte_dev_cmp_t cmp, const struct rte_bus_address *data) { struct rte_afu_device *afu_dev; diff --git a/drivers/bus/pci/pci_common.c b/drivers/bus/pci/pci_common.c index 82632bc473..29cec5f588 100644 --- a/drivers/bus/pci/pci_common.c +++ b/drivers/bus/pci/pci_common.c @@ -540,7 +540,7 @@ rte_pci_remove_device(struct rte_pci_device *pci_dev) static struct rte_device * pci_find_device(const struct rte_device *start, rte_dev_cmp_t cmp, - const void *data) + const struct rte_bus_address *data) { const struct rte_pci_device *pstart; struct rte_pci_device *pdev; diff --git a/drivers/bus/pci/pci_params.c b/drivers/bus/pci/pci_params.c index 087ec38bb9..de7ea8f2f8 100644 --- a/drivers/bus/pci/pci_params.c +++ b/drivers/bus/pci/pci_params.c @@ -41,9 +41,9 @@ pci_addr_kv_cmp(const char *key __rte_unused, static int pci_dev_match(const struct rte_device *dev, - const void *_kvlist) + const struct rte_bus_address *_kvlist) { - const struct rte_kvargs *kvlist = _kvlist; + const struct rte_kvargs *kvlist = _kvlist->addr; const struct rte_pci_device *pdev; if (kvlist == NULL) @@ -76,7 +76,11 @@ rte_pci_dev_iterate(const void *start, } } find_device = rte_pci_bus.bus.find_device; - dev = find_device(start, pci_dev_match, kvargs); + struct rte_bus_address dev_addr = { + .addr = kvargs, + .size = sizeof(struct rte_kvargs), + }; + dev = find_device(start, pci_dev_match, &dev_addr); rte_kvargs_free(kvargs); return dev; } diff --git a/drivers/bus/platform/platform.c b/drivers/bus/platform/platform.c index 87ed7404e1..5b72418ad0 100644 --- a/drivers/bus/platform/platform.c +++ b/drivers/bus/platform/platform.c @@ -473,7 +473,8 @@ platform_bus_probe(void) } static struct rte_device * -platform_bus_find_device(const struct rte_device *start, rte_dev_cmp_t cmp, const void *data) +platform_bus_find_device(const struct rte_device *start, rte_dev_cmp_t cmp, + const struct rte_bus_address *data) { struct rte_platform_device *pdev; diff --git a/drivers/bus/platform/platform_params.c b/drivers/bus/platform/platform_params.c index 8a6214b97c..00f6774c8c 100644 --- a/drivers/bus/platform/platform_params.c +++ b/drivers/bus/platform/platform_params.c @@ -27,10 +27,10 @@ static const char * const platform_params_keys[] = { }; static int -platform_dev_match(const struct rte_device *dev, const void *_kvlist) +platform_dev_match(const struct rte_device *dev, const struct rte_bus_address *_kvlist) { const char *key = platform_params_keys[RTE_PLATFORM_PARAM_NAME]; - const struct rte_kvargs *kvlist = _kvlist; + const struct rte_kvargs *kvlist = _kvlist->addr; const char *name; /* no kvlist arg, all devices match */ @@ -68,7 +68,11 @@ platform_bus_dev_iterate(const void *start, const char *str, return NULL; } - dev = platform_bus.bus.find_device(start, platform_dev_match, kvargs); + struct rte_bus_address dev_addr = { + .addr = kvargs, + .size = sizeof(struct rte_kvargs), + }; + dev = platform_bus.bus.find_device(start, platform_dev_match, &dev_addr); rte_kvargs_free(kvargs); return dev; diff --git a/drivers/bus/uacce/uacce.c b/drivers/bus/uacce/uacce.c index b18fbe1103..76d4c3f467 100644 --- a/drivers/bus/uacce/uacce.c +++ b/drivers/bus/uacce/uacce.c @@ -508,7 +508,8 @@ uacce_unplug(struct rte_device *dev) } static struct rte_device * -uacce_find_device(const struct rte_device *start, rte_dev_cmp_t cmp, const void *data) +uacce_find_device(const struct rte_device *start, rte_dev_cmp_t cmp, + const struct rte_bus_address *data) { const struct rte_uacce_device *uacce_start; struct rte_uacce_device *uacce_dev; @@ -549,10 +550,10 @@ uacce_parse(const char *name, void *addr, int *size) } static int -uacce_dev_match(const struct rte_device *dev, const void *_kvlist) +uacce_dev_match(const struct rte_device *dev, const struct rte_bus_address *_kvlist) { const char *key = uacce_params_keys[RTE_UACCE_PARAM_NAME]; - const struct rte_kvargs *kvlist = _kvlist; + const struct rte_kvargs *kvlist = _kvlist->addr; const char *name; /* no kvlist arg, all devices match. */ @@ -583,7 +584,11 @@ uacce_dev_iterate(const void *start, const char *str, } } find_device = uacce_bus.bus.find_device; - dev = find_device(start, uacce_dev_match, kvargs); + struct rte_bus_address dev_addr = { + .addr = kvargs, + .size = sizeof(struct rte_kvargs), + }; + dev = find_device(start, uacce_dev_match, &dev_addr); rte_kvargs_free(kvargs); return dev; } diff --git a/drivers/bus/vdev/vdev.c b/drivers/bus/vdev/vdev.c index 0d3c8ca3c5..e287c8cf64 100644 --- a/drivers/bus/vdev/vdev.c +++ b/drivers/bus/vdev/vdev.c @@ -621,7 +621,7 @@ vdev_cleanup(void) struct rte_device * rte_vdev_find_device(const struct rte_device *start, rte_dev_cmp_t cmp, - const void *data) + const struct rte_bus_address *data) { const struct rte_vdev_device *vstart; struct rte_vdev_device *dev; diff --git a/drivers/bus/vdev/vdev_params.c b/drivers/bus/vdev/vdev_params.c index 68ae09e2e9..7197c0f350 100644 --- a/drivers/bus/vdev/vdev_params.c +++ b/drivers/bus/vdev/vdev_params.c @@ -24,9 +24,9 @@ static const char * const vdev_params_keys[] = { static int vdev_dev_match(const struct rte_device *dev, - const void *_kvlist) + const struct rte_bus_address *_kvlist) { - const struct rte_kvargs *kvlist = _kvlist; + const struct rte_kvargs *kvlist = _kvlist->addr; const char *key = vdev_params_keys[RTE_VDEV_PARAM_NAME]; const char *name; @@ -58,7 +58,11 @@ rte_vdev_dev_iterate(const void *start, return NULL; } } - dev = rte_vdev_find_device(start, vdev_dev_match, kvargs); + struct rte_bus_address dev_addr = { + .addr = kvargs, + .size = sizeof(struct rte_kvargs), + }; + dev = rte_vdev_find_device(start, vdev_dev_match, &dev_addr); rte_kvargs_free(kvargs); return dev; } diff --git a/drivers/bus/vdev/vdev_private.h b/drivers/bus/vdev/vdev_private.h index e683f5f133..ef15266b16 100644 --- a/drivers/bus/vdev/vdev_private.h +++ b/drivers/bus/vdev/vdev_private.h @@ -14,7 +14,7 @@ extern "C" { struct rte_device * rte_vdev_find_device(const struct rte_device *start, rte_dev_cmp_t cmp, - const void *data); + const struct rte_bus_address *data); void * rte_vdev_dev_iterate(const void *start, diff --git a/drivers/bus/vmbus/vmbus_common.c b/drivers/bus/vmbus/vmbus_common.c index 18805aee0d..06aa64c20d 100644 --- a/drivers/bus/vmbus/vmbus_common.c +++ b/drivers/bus/vmbus/vmbus_common.c @@ -323,7 +323,7 @@ vmbus_remove_device(struct rte_vmbus_device *vmbus_dev) /* VMBUS doesn't support hotplug */ static struct rte_device * vmbus_find_device(const struct rte_device *start, rte_dev_cmp_t cmp, - const void *data) + const struct rte_bus_address *data) { struct rte_vmbus_device *dev; diff --git a/drivers/dma/idxd/idxd_bus.c b/drivers/dma/idxd/idxd_bus.c index d68e8b630e..ee33ddbfb4 100644 --- a/drivers/dma/idxd/idxd_bus.c +++ b/drivers/dma/idxd/idxd_bus.c @@ -45,7 +45,7 @@ struct dsa_bus; static int dsa_scan(void); static int dsa_probe(void); static struct rte_device *dsa_find_device(const struct rte_device *start, - rte_dev_cmp_t cmp, const void *data); + rte_dev_cmp_t cmp, const struct rte_bus_address *data); static enum rte_iova_mode dsa_get_iommu_class(void); static int dsa_addr_parse(const char *name, void *addr, int *size); @@ -366,7 +366,7 @@ dsa_scan(void) static struct rte_device * dsa_find_device(const struct rte_device *start, rte_dev_cmp_t cmp, - const void *data) + const struct rte_bus_address *data) { struct rte_dsa_device *dev = TAILQ_FIRST(&dsa_bus.device_list); diff --git a/drivers/net/bonding/rte_eth_bond_args.c b/drivers/net/bonding/rte_eth_bond_args.c index bdec5d61d4..2ef42db796 100644 --- a/drivers/net/bonding/rte_eth_bond_args.c +++ b/drivers/net/bonding/rte_eth_bond_args.c @@ -23,15 +23,6 @@ const char *pmd_bond_init_valid_arguments[] = { NULL }; -static inline int -bond_pci_addr_cmp(const struct rte_device *dev, const void *_pci_addr) -{ - const struct rte_pci_device *pdev = RTE_DEV_TO_PCI_CONST(dev); - const struct rte_pci_addr *paddr = _pci_addr; - - return rte_pci_addr_cmp(&pdev->addr, paddr); -} - static inline int find_port_id_by_pci_addr(const struct rte_pci_addr *pci_addr) { @@ -45,7 +36,11 @@ find_port_id_by_pci_addr(const struct rte_pci_addr *pci_addr) return -1; } - dev = pci_bus->find_device(NULL, bond_pci_addr_cmp, pci_addr); + struct rte_bus_address dev_addr = { + .addr = pci_addr, + .size = PCI_PRI_STR_SIZE + }; + dev = pci_bus->find_device(NULL, rte_cmp_dev_name, &dev_addr); if (dev == NULL) { RTE_BOND_LOG(ERR, "unable to find PCI device"); return -1; diff --git a/drivers/net/vdev_netvsc/vdev_netvsc.c b/drivers/net/vdev_netvsc/vdev_netvsc.c index f4a84783ce..020b703906 100644 --- a/drivers/net/vdev_netvsc/vdev_netvsc.c +++ b/drivers/net/vdev_netvsc/vdev_netvsc.c @@ -771,7 +771,7 @@ RTE_PMD_REGISTER_PARAM_STRING(net_vdev_netvsc, /** Compare function for vdev find device operation. */ static int vdev_netvsc_cmp_rte_device(const struct rte_device *dev1, - __rte_unused const void *_dev2) + __rte_unused const struct rte_bus_address *_dev2) { return strncmp(dev1->devargs->name, VDEV_NETVSC_DRIVER_NAME, VDEV_NETVSC_DRIVER_NAME_LEN); @@ -794,8 +794,12 @@ vdev_netvsc_scan_callback(__rte_unused void *arg) VDEV_NETVSC_DRIVER_NAME_LEN)) return; + struct rte_bus_address dev_addr = { + .addr = VDEV_NETVSC_DRIVER_NAME, + .size = VDEV_NETVSC_DRIVER_NAME_LEN, + }; dev = vbus->find_device(NULL, vdev_netvsc_cmp_rte_device, - VDEV_NETVSC_DRIVER_NAME); + &dev_addr); if (dev) return; if (rte_devargs_add(RTE_DEVTYPE_VIRTUAL, VDEV_NETVSC_DRIVER_NAME)) diff --git a/drivers/raw/ifpga/ifpga_rawdev.c b/drivers/raw/ifpga/ifpga_rawdev.c index 7238246e1c..9a081fd5d8 100644 --- a/drivers/raw/ifpga/ifpga_rawdev.c +++ b/drivers/raw/ifpga/ifpga_rawdev.c @@ -1868,7 +1868,11 @@ ifpga_cfg_remove(struct rte_vdev_device *vdev) args.port, args.bdf); bus = rte_bus_find_by_name(RTE_STR(IFPGA_BUS_NAME)); if (bus) { - if (bus->find_device(NULL, rte_cmp_dev_name, dev_name)) { + struct rte_bus_address dev_addr = { + .addr = dev_name, + .size = RTE_RAWDEV_NAME_MAX_LEN + }; + if (bus->find_device(NULL, rte_cmp_dev_name, &dev_addr)) { ret = rte_eal_hotplug_remove(RTE_STR(IFPGA_BUS_NAME), dev_name); } diff --git a/lib/eal/common/eal_common_bus.c b/lib/eal/common/eal_common_bus.c index b1bb5df5b7..15d3cfb29b 100644 --- a/lib/eal/common/eal_common_bus.c +++ b/lib/eal/common/eal_common_bus.c @@ -159,9 +159,9 @@ rte_bus_find(const struct rte_bus *start, rte_bus_cmp_t cmp, } static int -cmp_rte_device(const struct rte_device *dev1, const void *_dev2) +cmp_rte_device(const struct rte_device *dev1, const struct rte_bus_address *_dev2) { - const struct rte_device *dev2 = _dev2; + const struct rte_device *dev2 = _dev2->addr; return dev1 != dev2; } @@ -171,7 +171,11 @@ bus_find_device(const struct rte_bus *bus, const void *_dev) { struct rte_device *dev; - dev = bus->find_device(NULL, cmp_rte_device, _dev); + struct rte_bus_address dev_addr = { + .addr = _dev, + .size = 0, + }; + dev = bus->find_device(NULL, cmp_rte_device, &dev_addr); return dev == NULL; } diff --git a/lib/eal/common/eal_common_dev.c b/lib/eal/common/eal_common_dev.c index c0e2202482..4e4951a73f 100644 --- a/lib/eal/common/eal_common_dev.c +++ b/lib/eal/common/eal_common_dev.c @@ -108,7 +108,7 @@ struct dev_next_ctx { (((struct dev_next_ctx *)(intptr_t)ptr)->cls_str) int -rte_cmp_dev_name(const struct rte_device *dev1, const void *name2) +rte_cmp_dev_name(const struct rte_device *dev1, const struct rte_bus_address *dev2_addr) { void *parsed_name1; void *parsed_name2; @@ -117,7 +117,7 @@ rte_cmp_dev_name(const struct rte_device *dev1, const void *name2) int ret; if (dev1->bus->parse(dev1->name, NULL, &size1) != 0 || - dev1->bus->parse(name2, NULL, &size2) != 0) + dev1->bus->parse(dev2_addr->addr, NULL, &size2) != 0) return 1; if (size1 != size2) @@ -137,7 +137,7 @@ rte_cmp_dev_name(const struct rte_device *dev1, const void *name2) memset(parsed_name2, 0, size2); dev1->bus->parse(dev1->name, parsed_name1, NULL); - dev1->bus->parse(name2, parsed_name2, NULL); + dev1->bus->parse(dev2_addr->addr, parsed_name2, NULL); ret = memcmp(parsed_name1, parsed_name2, size1); free(parsed_name1); @@ -228,7 +228,11 @@ local_dev_probe(const char *devargs, struct rte_device **new_dev) if (ret) goto err_devarg; - dev = da->bus->find_device(NULL, rte_cmp_dev_name, da->name); + struct rte_bus_address dev_addr = { + .addr = da->name, + .size = RTE_DEV_NAME_MAX_LEN + }; + dev = da->bus->find_device(NULL, rte_cmp_dev_name, &dev_addr); if (dev == NULL) { EAL_LOG(ERR, "Cannot find device (%s)", da->name); @@ -366,7 +370,11 @@ rte_eal_hotplug_remove(const char *busname, const char *devname) return -ENOENT; } - dev = bus->find_device(NULL, rte_cmp_dev_name, devname); + struct rte_bus_address dev_addr = { + .addr = devname, + .size = strlen(devname) + }; + dev = bus->find_device(NULL, rte_cmp_dev_name, &dev_addr); if (dev == NULL) { EAL_LOG(ERR, "Cannot find plugged device (%s)", devname); return -EINVAL; diff --git a/lib/eal/common/hotplug_mp.c b/lib/eal/common/hotplug_mp.c index a2623c96c3..f4cce7c2e5 100644 --- a/lib/eal/common/hotplug_mp.c +++ b/lib/eal/common/hotplug_mp.c @@ -128,7 +128,11 @@ __handle_secondary_request(void *param) goto finish; } - dev = bus->find_device(NULL, rte_cmp_dev_name, da.name); + struct rte_bus_address dev_addr = { + .addr = da.name, + .size = RTE_DEV_NAME_MAX_LEN + }; + dev = bus->find_device(NULL, rte_cmp_dev_name, &dev_addr); if (dev == NULL) { EAL_LOG(ERR, "Cannot find plugged device (%s)", da.name); ret = -ENOENT; @@ -255,7 +259,11 @@ static void __handle_primary_request(void *param) goto quit; } - dev = bus->find_device(NULL, rte_cmp_dev_name, da->name); + struct rte_bus_address dev_addr = { + .addr = da->name, + .size = RTE_DEV_NAME_MAX_LEN + }; + dev = bus->find_device(NULL, rte_cmp_dev_name, &dev_addr); if (dev == NULL) { EAL_LOG(ERR, "Cannot find plugged device (%s)", da->name); ret = -ENOENT; diff --git a/lib/eal/include/bus_driver.h b/lib/eal/include/bus_driver.h index 01447670de..16e8838868 100644 --- a/lib/eal/include/bus_driver.h +++ b/lib/eal/include/bus_driver.h @@ -70,7 +70,7 @@ typedef int (*rte_bus_probe_t)(void); */ typedef struct rte_device * (*rte_bus_find_device_t)(const struct rte_device *start, rte_dev_cmp_t cmp, - const void *data); + const struct rte_bus_address *data); /** * Implementation specific probe function which is responsible for linking diff --git a/lib/eal/include/rte_dev.h b/lib/eal/include/rte_dev.h index 2df8143af1..47a6c22b53 100644 --- a/lib/eal/include/rte_dev.h +++ b/lib/eal/include/rte_dev.h @@ -171,19 +171,24 @@ int rte_dev_is_probed(const struct rte_device *dev); int rte_eal_hotplug_add(const char *busname, const char *devname, const char *drvargs); +struct rte_bus_address { + const void *addr; + size_t size; +}; + /** * General device name comparison. Will compare by using the specific bus * compare function or by comparing the names directly. * * @param dev * Device handle. - * @param name - * Name to compare against. + * @param addr + * Address to compare against. * @return - * 0 if the device matches the name. Nonzero otherwise. + * 0 if the device matches the address. Nonzero otherwise. */ __rte_internal -int rte_cmp_dev_name(const struct rte_device *dev, const void *name); +int rte_cmp_dev_name(const struct rte_device *dev, const struct rte_bus_address *addr); /** * Add matching devices. @@ -245,7 +250,7 @@ int rte_dev_remove(struct rte_device *dev); * <0 if ordering is possible and the device is lower than the data. * >0 if ordering is possible and the device is greater than the data. */ -typedef int (*rte_dev_cmp_t)(const struct rte_device *dev, const void *data); +typedef int (*rte_dev_cmp_t)(const struct rte_device *dev, const struct rte_bus_address *data); #define RTE_PMD_EXPORT_NAME_ARRAY(n, idx) n##idx[] diff --git a/lib/eal/linux/eal_dev.c b/lib/eal/linux/eal_dev.c index 3b68cda87f..22c126278b 100644 --- a/lib/eal/linux/eal_dev.c +++ b/lib/eal/linux/eal_dev.c @@ -272,8 +272,12 @@ dev_uev_handler(__rte_unused void *param) goto failure_handle_err; } + const struct rte_bus_address dev_addr = { + .addr = uevent.devname, + .size = strlen(uevent.devname) + }; dev = bus->find_device(NULL, rte_cmp_dev_name, - uevent.devname); + &dev_addr); if (dev == NULL) { EAL_LOG(ERR, "Cannot find device (%s) on " "bus (%s)", uevent.devname, busname);