From patchwork Mon Jul 8 05:55:36 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Shay Drori X-Patchwork-Id: 13726174 Received: from NAM10-DM6-obe.outbound.protection.outlook.com (mail-dm6nam10on2088.outbound.protection.outlook.com [40.107.93.88]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 7383A12B6C; Mon, 8 Jul 2024 05:56:30 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=fail smtp.client-ip=40.107.93.88 ARC-Seal: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1720418192; cv=fail; b=NBX/92y8JrFnZxak7wQz0By1z4jTtBCsGr/rd62Qq+L2Vzp4LUC3m8PHOwP4dqXU5JYvxOgTLsQniuMiG5y8myL2LlxMPZ2LVJL5h0mxAn5TioyAVYe3iPg6qNCHTHETLp3jRbwqKbHZiPRjkbwO4oDqcHMrgyT8us9YI67X0GU= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1720418192; c=relaxed/simple; bh=EUJ9Bt4MmwiL6sTj5XE49RYcdkjNfcEHuWI2vNQiXDs=; h=From:To:CC:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=UFjjvT1d5iV9nIzwKTafL7fSWxPhKjwXwnsB5Jj+FBcUWXoY921nByy0BDKHFXw7H/ImCfBTg7PDSEeb0h568BW/V3zMYye39C/wbQwcgy2t5hoMAFiTnS8Cn/k+f8e6pzAAnJXEIDSQvWtUwwRjQqwTEyEZu0OQ+Y4spYlw7pA= ARC-Authentication-Results: i=2; smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=nvidia.com; spf=fail smtp.mailfrom=nvidia.com; dkim=pass (2048-bit key) header.d=Nvidia.com header.i=@Nvidia.com header.b=kznJITPe; arc=fail smtp.client-ip=40.107.93.88 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=nvidia.com Authentication-Results: smtp.subspace.kernel.org; spf=fail smtp.mailfrom=nvidia.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=Nvidia.com header.i=@Nvidia.com header.b="kznJITPe" ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=f3TwUals4n+PCimQ171+wMrOUfRlnOhTI6lV1eA1soAWvuvId5lT5cIuwRWse3dTUET41gpAYQEICVOzLKs3B9ITNEEHSloI4EUsw7kRWfftvOVcYVioR/vt2v8Lmcaf+YRFg4yklj4/iFqs1Qp5svRiLVLeGvaXmHK63Lx3+scqJlXl8MPUAZ6AglK7/WE9m2TX/ayvjZw631Kr5UDonWGYX5EKEIkiMDpKXYpnykfh0gVvm+1lJdvBTVJ0rsE8yxnMH/zJi6V1jNT9HKs8Yk1YyiMDG8+Thp+H11YnPBi/kITixjiBbP6klcwtaSxoF3LnhT4k16E9JZk8QM2/rQ== 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=ZWpiVbgACLOrPiOuAxNqD9WGk0l68Hmn/vnu07ebOik=; b=FUAxJeL2sDCfNroVnHi2zn7djmgzHgGRPwVDLaKJlOwLj46VGU5ZxMDdKOV8n9+VnqREIKkMIRdEXpyXjjMksU960jXd4tMXRDxRHfnCa+xvbJAR7QfhS5mM3eTL8O19tbY7founj9/zPjoRkoyQ6ucUb+dL5jk7qVyKHFIuEi/RbxWIpjJtPltnJURNuL05P8LaoIKFDtGB8J5h0SZV+pqftOnU6xPgXVOh1SlxiVuFX2liC1OGWHdyZwWY6YjWAOlZuvq8kFFHr6hfS8EuRhetd/63wcro2L7KDVTyHbY0VPShjchDr1RoDYamcfVet5apzmsviAhXSi04nd8w2g== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 216.228.117.161) smtp.rcpttodomain=vger.kernel.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=ZWpiVbgACLOrPiOuAxNqD9WGk0l68Hmn/vnu07ebOik=; b=kznJITPe0GgW/VU+3L6a3e/GIvdybCXVnc1OgiQTe+BeuymwGMHUotKZtXg0L/uHuGpI6bgdGOBfyDCaAvHjQfcLWgsl1g0uSljRQcUt1HVBofvhFJs76FtUsozLlTB34eTaa4e2rHGkecL0ks1WRXhypaxOLEP+RCw6ZwZ6cAQWljViL+d9p1xjR0c3M0wFkkpaavimwPKHJKgbMHWHAbCGnj9BaEkzKfFYmsAW9zXxGGsCsiSBXuBdEJOpMcx/RC4VlwRHT/lK+qVBaIXjrz/J7ZX0D0cDmgWxNSRmIfBI3wotzG1DHR2o2XDGEWv7qOyZyd9Ji6YjUUFoOOqxow== Received: from BN9PR03CA0884.namprd03.prod.outlook.com (2603:10b6:408:13c::19) by CYYPR12MB8704.namprd12.prod.outlook.com (2603:10b6:930:c2::19) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7741.34; Mon, 8 Jul 2024 05:56:27 +0000 Received: from BN3PEPF0000B070.namprd21.prod.outlook.com (2603:10b6:408:13c:cafe::15) by BN9PR03CA0884.outlook.office365.com (2603:10b6:408:13c::19) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7741.35 via Frontend Transport; Mon, 8 Jul 2024 05:56:27 +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 BN3PEPF0000B070.mail.protection.outlook.com (10.167.243.75) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7762.1 via Frontend Transport; Mon, 8 Jul 2024 05:56:26 +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; Sun, 7 Jul 2024 22:56:13 -0700 Received: from nps-server-23.mtl.labs.mlnx (10.126.231.35) by rnnvmail201.nvidia.com (10.129.68.8) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.1544.4; Sun, 7 Jul 2024 22:56:09 -0700 From: Shay Drory To: , , , , , , CC: , , , , , Shay Drory , "Simon Horman" , Parav Pandit Subject: [PATCH net-next v10 1/2] driver core: auxiliary bus: show auxiliary device IRQs Date: Mon, 8 Jul 2024 08:55:36 +0300 Message-ID: <20240708055537.1014744-2-shayd@nvidia.com> X-Mailer: git-send-email 2.38.1 In-Reply-To: <20240708055537.1014744-1-shayd@nvidia.com> References: <20240708055537.1014744-1-shayd@nvidia.com> Precedence: bulk X-Mailing-List: linux-rdma@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-ClientProxiedBy: rnnvmail203.nvidia.com (10.129.68.9) To rnnvmail201.nvidia.com (10.129.68.8) X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: BN3PEPF0000B070:EE_|CYYPR12MB8704:EE_ X-MS-Office365-Filtering-Correlation-Id: 995b1312-e368-42d0-fff6-08dc9f12b4c6 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|1800799024|36860700013|7416014|376014|82310400026; X-Microsoft-Antispam-Message-Info: 80fEmUR2nNFNxbqzg35dGCd+LTVOnOwQIqjIpHnywZmO6YtT0mD+md3erxkiBHHG16H08zYbNalCD9ww6WlXss0LtlqkELvSFfEzUJBPBQFk++pOIWEa759+bIgXUrLvHSWlvnqvOCpJWzeiJ4W4xtgmo0Kj8QH2ET4pH8j6+cILYjq4GjzfALXQF3gBcfMjf5H8L7FEbGIWk83lALtfdv8DZJb8AUtLsRBD9szCGVzyshgvg+bi1yyYExdphSq9kZ0AWHAa0q1qLqdYfDYvUKHMm+rmIavwEOviOzmXDwfkDIJUi1+B4Hmf5QuJmbsdnEDPZxKI++1788D1cinIEaIlAmQm20SZPrMgJLYRPAyOD04c1fusjKHothwg4TCZV7Vg8LqYtlMZE91FaQ7HGU8383dtOP+UII2Z4IGVd8cJpCDRkI3wSnWkbi48J9AmcXcYQaL8zoHV4dtv3EL6oF7B+LsTR0rEhdSrIJzArPc6rXVIgfKIQQWgXsqRmHBQZbaPfVTBTkkyBfqU/sO0ZM/3Cxjw959yYjb3pUK446WBFjyFxPxg0S8NO+IInwOjX8YJfl+rDEwsXLtpvjjBKQMXqo96cmxV0VnfUp8HdV9ylK6xvP/v28FBdt4vj9Nr2AYuylHZxizv1nALC87emJbsXrFzDaxGoQMDLOqo1MHSSexqbaxoccDQwn0RIAAt9wC5ItIh8S29/eXjqaNl2kChpph55WCS0TRWFlwHx1tDvfQbTZJYaVejS8kFBoNSzrOYuiwLm8QwSPIVD6QghUTwMKXrzZBVn8e+DaNKieCWNZbgEHBX5O7f1IyeJRk12zsod9gBsoRaTzjMfvUKr6DOwaGMPR+Yk2rUAKwwuaqNC3vbJAEYmTmkaGbOEaAvj+8mQ7A7yBQ5fzLQJ3Hwx5TaUxOnPTfONdegFUElvU7HSI/M2ReOjxiTlHjpkIk95dM5vEeVfWXS7Ms/EHp1PZ2cs39+hrq/R/w75o76o7i6sxbFc/3rhg3hadWLVWAWyTbisuwJBd9bNKgVAZ/KRsievgm9h00m5qpST/RjlZizTeQeA+MHBJckZu05Syf6V1JSr+sFWTqCasQJ0fgbnuUToDRLChauItf1qlJ6sJWTY8FZk0W0MsaFf5/HzN8fvoyHyiodWaNDiXlneWtQXZiOxezmanmIEqXoz8+Hek8rdJK+hAClphvt8Zp7ADtY/RnLeRoS4xtcQMuAdn7vxqQbKnTp9vV9JAvlL9YrA0nlI/t0eCu3FXafonp7g6d6xD5QLK08I12wL9+LrwBRIlof6xvU5xd+2nKSgpcEJBOhWYFLL9lwEoJIb9FBmCL+UfvG2Tnp21Nu9oZJGsBzVEEAC4rxAnGAMp2YB2NZoiYBLBnksLS6+AejwHrWXX2Z0zyCYq9s/aJAIY7FDRhYz93Syaqk8RePpgdUmDUceSduiwFMCtCBJlORd8Qnmb9q 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)(36860700013)(7416014)(376014)(82310400026);DIR:OUT;SFP:1101; X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 08 Jul 2024 05:56:26.8904 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 995b1312-e368-42d0-fff6-08dc9f12b4c6 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: BN3PEPF0000B070.namprd21.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: CYYPR12MB8704 PCI subfunctions (SF) are anchored on the auxiliary bus. PCI physical and virtual functions are anchored on the PCI bus. The irq information of each such function is visible to users via sysfs directory "msi_irqs" containing files for each irq entry. However, for PCI SFs such information is unavailable. Due to this users have no visibility on IRQs used by the SFs. Secondly, an SF can be multi function device supporting rdma, netdevice and more. Without irq information at the bus level, the user is unable to view or use the affinity of the SF IRQs. Hence to match to the equivalent PCI PFs and VFs, add "irqs" directory, for supporting auxiliary devices, containing file for each irq entry. For example: $ ls /sys/bus/auxiliary/devices/mlx5_core.sf.1/irqs/ 50 51 52 53 54 55 56 57 58 Cc: Simon Horman Reviewed-by: Parav Pandit Signed-off-by: Shay Drory Reviewed-by: Greg Kroah-Hartman --- v9-v10: - remove Przemek RB - add name field to auxiliary_irq_info (Greg and Przemek) - handle bogus IRQ in auxiliary_device_sysfs_irq_remove (Greg) v8-v9: - add Przemek RB - use guard() in auxiliary_irq_dir_prepare (Paolo) v7-v8: - use cleanup.h for info and name fields (Greg) - correct error flow in auxiliary_irq_dir_prepare (Przemek) - add documentation for new fields of auxiliary_device (Simon) v6-v7: - dynamically creating irqs directory when first irq file created (Greg) - removed irqs flag and simplified the dev_add() API (Greg) - move sysfs related new code to a new auxiliary_sysfs.c file (Greg) v5-v6: - removed concept of shared and exclusive and hence global xarray (Greg) v4-v5: - restore global mutex and replace refcount_t with simple integer (Greg) v3->4: - remove global mutex (Przemek) v2->v3: - fix function declaration in case SYSFS isn't defined v1->v2: - move #ifdefs from drivers/base/auxiliary.c to include/linux/auxiliary_bus.h (Greg) - use EXPORT_SYMBOL_GPL instead of EXPORT_SYMBOL (Greg) - Fix kzalloc(ref) to kzalloc(*ref) (Simon) - Add return description in auxiliary_device_sysfs_irq_add() kdoc (Simon) - Fix auxiliary_irq_mode_show doc (kernel test boot) --- Documentation/ABI/testing/sysfs-bus-auxiliary | 9 ++ drivers/base/Makefile | 1 + drivers/base/auxiliary.c | 1 + drivers/base/auxiliary_sysfs.c | 113 ++++++++++++++++++ include/linux/auxiliary_bus.h | 22 ++++ 5 files changed, 146 insertions(+) create mode 100644 Documentation/ABI/testing/sysfs-bus-auxiliary create mode 100644 drivers/base/auxiliary_sysfs.c diff --git a/Documentation/ABI/testing/sysfs-bus-auxiliary b/Documentation/ABI/testing/sysfs-bus-auxiliary new file mode 100644 index 000000000000..cc856079690f --- /dev/null +++ b/Documentation/ABI/testing/sysfs-bus-auxiliary @@ -0,0 +1,9 @@ +What: /sys/bus/auxiliary/devices/.../irqs/ +Date: April, 2024 +Contact: Shay Drory +Description: + The /sys/devices/.../irqs directory contains a variable set of + files, with each file is named as irq number similar to PCI PF + or VF's irq number located in msi_irqs directory. + These irq files are added and removed dynamically when an IRQ + is requested and freed respectively for the PCI SF. diff --git a/drivers/base/Makefile b/drivers/base/Makefile index 3079bfe53d04..7fb21768ca36 100644 --- a/drivers/base/Makefile +++ b/drivers/base/Makefile @@ -16,6 +16,7 @@ obj-$(CONFIG_NUMA) += node.o obj-$(CONFIG_MEMORY_HOTPLUG) += memory.o ifeq ($(CONFIG_SYSFS),y) obj-$(CONFIG_MODULES) += module.o +obj-$(CONFIG_AUXILIARY_BUS) += auxiliary_sysfs.o endif obj-$(CONFIG_SYS_HYPERVISOR) += hypervisor.o obj-$(CONFIG_REGMAP) += regmap/ diff --git a/drivers/base/auxiliary.c b/drivers/base/auxiliary.c index d3a2c40c2f12..55bde375150f 100644 --- a/drivers/base/auxiliary.c +++ b/drivers/base/auxiliary.c @@ -287,6 +287,7 @@ int auxiliary_device_init(struct auxiliary_device *auxdev) dev->bus = &auxiliary_bus_type; device_initialize(&auxdev->dev); + mutex_init(&auxdev->lock); return 0; } EXPORT_SYMBOL_GPL(auxiliary_device_init); diff --git a/drivers/base/auxiliary_sysfs.c b/drivers/base/auxiliary_sysfs.c new file mode 100644 index 000000000000..49095d81d3ca --- /dev/null +++ b/drivers/base/auxiliary_sysfs.c @@ -0,0 +1,113 @@ +// SPDX-License-Identifier: GPL-2.0 +/* + * Copyright (c) 2024, NVIDIA CORPORATION & AFFILIATES + */ + +#include +#include + +#define AUXILIARY_MAX_IRQ_NAME 11 + +struct auxiliary_irq_info { + struct device_attribute sysfs_attr; + char name[AUXILIARY_MAX_IRQ_NAME]; +}; + +static struct attribute *auxiliary_irq_attrs[] = { + NULL +}; + +static const struct attribute_group auxiliary_irqs_group = { + .name = "irqs", + .attrs = auxiliary_irq_attrs, +}; + +static int auxiliary_irq_dir_prepare(struct auxiliary_device *auxdev) +{ + int ret = 0; + + guard(mutex)(&auxdev->lock); + if (auxdev->irq_dir_exists) + return 0; + + ret = devm_device_add_group(&auxdev->dev, &auxiliary_irqs_group); + if (ret) + return ret; + + auxdev->irq_dir_exists = true; + xa_init(&auxdev->irqs); + return 0; +} + +/** + * auxiliary_device_sysfs_irq_add - add a sysfs entry for the given IRQ + * @auxdev: auxiliary bus device to add the sysfs entry. + * @irq: The associated interrupt number. + * + * This function should be called after auxiliary device have successfully + * received the irq. + * The driver is responsible to add a unique irq for the auxiliary device. The + * driver can invoke this function from multiple thread context safely for + * unique irqs of the auxiliary devices. The driver must not invoke this API + * multiple times if the irq is already added previously. + * + * Return: zero on success or an error code on failure. + */ +int auxiliary_device_sysfs_irq_add(struct auxiliary_device *auxdev, int irq) +{ + struct auxiliary_irq_info *info __free(kfree) = NULL; + struct device *dev = &auxdev->dev; + int ret; + + ret = auxiliary_irq_dir_prepare(auxdev); + if (ret) + return ret; + + info = kzalloc(sizeof(*info), GFP_KERNEL); + if (!info) + return -ENOMEM; + + sysfs_attr_init(&info->sysfs_attr.attr); + snprintf(info->name, AUXILIARY_MAX_IRQ_NAME, "%d", irq); + + ret = xa_insert(&auxdev->irqs, irq, info, GFP_KERNEL); + if (ret) + return ret; + + info->sysfs_attr.attr.name = info->name; + ret = sysfs_add_file_to_group(&dev->kobj, &info->sysfs_attr.attr, + auxiliary_irqs_group.name); + if (ret) + goto sysfs_add_err; + + xa_store(&auxdev->irqs, irq, no_free_ptr(info), GFP_KERNEL); + return 0; + +sysfs_add_err: + xa_erase(&auxdev->irqs, irq); + return ret; +} +EXPORT_SYMBOL_GPL(auxiliary_device_sysfs_irq_add); + +/** + * auxiliary_device_sysfs_irq_remove - remove a sysfs entry for the given IRQ + * @auxdev: auxiliary bus device to add the sysfs entry. + * @irq: the IRQ to remove. + * + * This function should be called to remove an IRQ sysfs entry. + * The driver must invoke this API when IRQ is released by the device. + */ +void auxiliary_device_sysfs_irq_remove(struct auxiliary_device *auxdev, int irq) +{ + struct auxiliary_irq_info *info __free(kfree) = xa_load(&auxdev->irqs, irq); + struct device *dev = &auxdev->dev; + + if (!info) { + dev_err(&auxdev->dev, "IRQ %d doesn't exist\n", irq); + return; + } + sysfs_remove_file_from_group(&dev->kobj, &info->sysfs_attr.attr, + auxiliary_irqs_group.name); + xa_erase(&auxdev->irqs, irq); +} +EXPORT_SYMBOL_GPL(auxiliary_device_sysfs_irq_remove); diff --git a/include/linux/auxiliary_bus.h b/include/linux/auxiliary_bus.h index de21d9d24a95..ee738379d5f2 100644 --- a/include/linux/auxiliary_bus.h +++ b/include/linux/auxiliary_bus.h @@ -58,6 +58,9 @@ * in * @name: Match name found by the auxiliary device driver, * @id: unique identitier if multiple devices of the same name are exported, + * @irqs: irqs xarray contains irq indices which are used by the device, + * @lock: Synchronize irq sysfs creation, + * @irq_dir_exists: whether "irqs" directory exists, * * An auxiliary_device represents a part of its parent device's functionality. * It is given a name that, combined with the registering drivers @@ -138,7 +141,10 @@ struct auxiliary_device { struct device dev; const char *name; + struct xarray irqs; + struct mutex lock; /* Synchronize irq sysfs creation */ u32 id; + bool irq_dir_exists; }; /** @@ -212,8 +218,24 @@ int auxiliary_device_init(struct auxiliary_device *auxdev); int __auxiliary_device_add(struct auxiliary_device *auxdev, const char *modname); #define auxiliary_device_add(auxdev) __auxiliary_device_add(auxdev, KBUILD_MODNAME) +#ifdef CONFIG_SYSFS +int auxiliary_device_sysfs_irq_add(struct auxiliary_device *auxdev, int irq); +void auxiliary_device_sysfs_irq_remove(struct auxiliary_device *auxdev, + int irq); +#else /* CONFIG_SYSFS */ +static inline int +auxiliary_device_sysfs_irq_add(struct auxiliary_device *auxdev, int irq) +{ + return 0; +} + +static inline void +auxiliary_device_sysfs_irq_remove(struct auxiliary_device *auxdev, int irq) {} +#endif + static inline void auxiliary_device_uninit(struct auxiliary_device *auxdev) { + mutex_destroy(&auxdev->lock); put_device(&auxdev->dev); } From patchwork Mon Jul 8 05:55:37 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Shay Drori X-Patchwork-Id: 13726175 Received: from NAM10-DM6-obe.outbound.protection.outlook.com (mail-dm6nam10on2040.outbound.protection.outlook.com [40.107.93.40]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id B7DF1156E4; Mon, 8 Jul 2024 05:56:35 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=fail smtp.client-ip=40.107.93.40 ARC-Seal: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1720418197; cv=fail; b=XAE0fZzIdoTVqbEerSrdGWD6MGnXLMHEuU7kuRN9gaIYVZpIrvvpp8V9sW951kI5Lhjyhkzt7RYvPOLPI2kdhMh3ITKZjVaU/AII/47mvIurDvQCbjPczd7JQnMGH0JUGYQ5NXd4g48Lx6stE9hIFyMlJhCHlfKM36KdGxi3/eU= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1720418197; c=relaxed/simple; bh=Lf7bnZQwpbDklWycmIk1Xoo7Yc7NvIfhhCC2EIVnrPg=; h=From:To:CC:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=qTefHo3Xq7Wh41ySJRoJs3P8XJCQqtRjonk6KYqYq0PEIk53XcLkcnLbsbFBvZIcJOjj9XqRYSmO7fSSEyrhb3SwBRaMz+koYDyvkRZMAaZB6Ajnb5CgFKMk1mgB7vre6yoJGmsZ8DNh9oFNPWgRNkOf3bAmGHSpsw+W3d4n4+U= ARC-Authentication-Results: i=2; smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=nvidia.com; spf=fail smtp.mailfrom=nvidia.com; dkim=pass (2048-bit key) header.d=Nvidia.com header.i=@Nvidia.com header.b=YFmi62nQ; arc=fail smtp.client-ip=40.107.93.40 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=nvidia.com Authentication-Results: smtp.subspace.kernel.org; spf=fail smtp.mailfrom=nvidia.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=Nvidia.com header.i=@Nvidia.com header.b="YFmi62nQ" ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=WLBiRF/YQH2ffXvSRH3VvYano+6NTi2dG3Cs8vOFU+DYxLEKuXFqwulPssbTZf+w+YkFkT/qaPSLGUv0+lf/FuzFdG2bZBftApR07o9nkqp7IK2sbud68b0DRJRF3cd+nuE+JIo6+9b6KOd/UHfUCGLwa73dKdCFo5o3zlEeczUwPQp+ZaKnsXbni2NS7oJVorAYVpYc7NUH14BKWpPpApPc6lnlZqjIbEFO4ElWmBVUDNiKvIBVmIbex4qZfsuCjxS61uemqVLFLT7CxKPTH6wbDaZpUxkvsoRTWnveTV6ZDkV3UzD+oVij+27HZxJ/yCIZIbe4MCJGOMu/I41wcw== 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=nwZ+PiTXljCCrA2VLC6SvBqr1GQNrnyuofAGUZmPQFg=; b=LKMpQ4XdoGpzNVakEW7XoOvUgdJlEKT+p9NMvR6IWASgnhdwwzmcBP5wnodNpZx+Fek+xg+AHK0fLD6WM3c5iVxVs3v6bF45zbEVXS2b6eVZXAVredh103F3HMjhAKLOBoYIdrIdd7SMk2ap2KtBsmZiYqFwhbHoc38kMMINo7wkZSE/+lUfcakyEzSYLN8VA2kmuTKDqjPb91HBrN8pxk4YGkCAJC872YSt4k1+5qnfroUvqXUhHyBYw5V7rtmkOTcKS1AG2N02+rQ67jOFWI5WYwLCrbMLmQGGaF8Jyn5op54Ziq38j0ueMpsiyS6F7TR4U35CsM0UBTKgtb1sFQ== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 216.228.117.160) smtp.rcpttodomain=vger.kernel.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=nwZ+PiTXljCCrA2VLC6SvBqr1GQNrnyuofAGUZmPQFg=; b=YFmi62nQzN5ylArcrCG8pSJKd6R9h8a67wIjwelXv+AhGY2+47nVAu+sVquR0v7OQCg//G6kstKFpDuqL2JqDeuFGAhk+ppT4q7DBb5zyppBFDySp6CUzO5/3TrWNb0m/5rCM8xoxvlXvYXrcfgAsSi97Nw+LktuuW0FuIcuqRp5hIHijed4FSMxJSUAc57MIjO9veTTyQ8H2aClvel1mjgQGb7FN0JFsf2hfHR3GUH9prq2pVlUGiJKCHHIQJGdF1vg9RaD+LgXzKrEhF+VbW78Y0uHpg6bV4OrTBbPq0XXhSEBFs1aRVWBXMzCvUbq0qQh1OcnzTzGbfMSC0yBrg== Received: from MN2PR20CA0033.namprd20.prod.outlook.com (2603:10b6:208:e8::46) by CY5PR12MB6648.namprd12.prod.outlook.com (2603:10b6:930:3e::9) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7741.35; Mon, 8 Jul 2024 05:56:32 +0000 Received: from BN3PEPF0000B074.namprd04.prod.outlook.com (2603:10b6:208:e8:cafe::8) by MN2PR20CA0033.outlook.office365.com (2603:10b6:208:e8::46) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7741.34 via Frontend Transport; Mon, 8 Jul 2024 05:56:31 +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 BN3PEPF0000B074.mail.protection.outlook.com (10.167.243.119) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7762.17 via Frontend Transport; Mon, 8 Jul 2024 05:56:31 +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; Sun, 7 Jul 2024 22:56:18 -0700 Received: from nps-server-23.mtl.labs.mlnx (10.126.231.35) by rnnvmail201.nvidia.com (10.129.68.8) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.1544.4; Sun, 7 Jul 2024 22:56:13 -0700 From: Shay Drory To: , , , , , , CC: , , , , , Shay Drory , "Parav Pandit" Subject: [PATCH net-next v10 2/2] net/mlx5: Expose SFs IRQs Date: Mon, 8 Jul 2024 08:55:37 +0300 Message-ID: <20240708055537.1014744-3-shayd@nvidia.com> X-Mailer: git-send-email 2.38.1 In-Reply-To: <20240708055537.1014744-1-shayd@nvidia.com> References: <20240708055537.1014744-1-shayd@nvidia.com> Precedence: bulk X-Mailing-List: linux-rdma@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-ClientProxiedBy: rnnvmail203.nvidia.com (10.129.68.9) To rnnvmail201.nvidia.com (10.129.68.8) X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: BN3PEPF0000B074:EE_|CY5PR12MB6648:EE_ X-MS-Office365-Filtering-Correlation-Id: 4415c5b2-23ac-4669-995b-08dc9f12b7c2 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|1800799024|36860700013|82310400026|7416014|376014; X-Microsoft-Antispam-Message-Info: ulvv7AxYujeyLPu2pdkfLS8JQ++EiKG87Oz1jjQjgbqe/KIZjXY78jgyhSSBpfK8cVfJq+5dt69FONswy2SvBnFRKjZvslxWV6MzwGoATz8cnxxgx8+wKtlVYXTzPX+XDZaYPgL3dzXR3ZLDdebMqTxeMb1ttGFUF7WrOI/lWfVIa4NjWXSv8QRWBssxFFZTB96gd9zsR+h95Pz/M2TYZsM6z8HZ2eHk4pIrtRXECJCOUE2mRrmcp2b/iB8oGTPLdDXc+Ei+SYXQlEXWJAXWmvoNsKFs2MS6ZUn0GGhk3LVaXCQptLH8rqSXal9BRKaPUBOHNLEnQ6uJv4EW6vLtg6OQKOMtkhVtYl7XIFgy9U20tdqVvEy/oR6T9xzv9o5BplVhkujVzUXN83ucKgW4Vm4kPc6KdA6etHXu1breul2Svg5DN8lWJX1NgOHCGJXiLbgK8J0T/F/ziiEAUlokcJb1LRJGp8lC2PsAC9aSR8Uonv7O81X6AMAWtDoyKM7JkqleGPkY0N0ziO3PSa4AKsKHJkN090yS3pcY20sDYrfx7+t3H+HbEOf9UZI4sSQXWPjHQAee57xGOgF5pNHWlAmrGUmmd3buGK+ldcmS2A3NF6fBH3ZfOLGp+twdUq0ZB2QzRep+u7v9H0NbX7j2LR7x5qBIrhwWlIgQadi/EcY8Zhod0HHRewoIzmlE/tyPtuar8I88xKa+LsQrYzPLRa+RgEt/8Gb6+KXmraAiMp08KhjPwAi/RYXJouJv9naFYBjtL5KSsoVG2Laa2HznfDvj7XbSatTvQNX1XxKmZju137U15Lf30YEl1b1J0JWoaUZSgO0oCeY7PY8OfO3BeGclXv1EBqpgkb+iCmv7YFoNp3xwqZeQmnYtJ0MucHFDQYj/7F4wpDmJpA6zj/pHEI72zfTi+Ocb0NqNWevYa8uUEC8Ykk9homQgzsJvmMzvoeC70Z3LgMU/zkim3aSTv8TDUqnkUT9gjJWNr83R/gzFaiV8qZNKSlJtyZhBRA3EUOtIz+IM7F9YXb3RUwEHxwwWSrqxN70L0IstldhVpTGGLd8FOU3ZfKF8MgvZnATs6ooAHJr8AnWEoUJ/MDBFnk/aiv8ZXCrI00Bu35V98wYfmp7dnCh/36bGz7KO/fgGe81T/RmhFZzhkl3bGNC5na8bQgy/r8Fbz0MzeDpree+P1O/vGbhqRaKXA4Jra3aXgWLo3ZFrugInw1cIqHcRSyj/G06qeMHNQUZvvtAWxpfwPhRfaLvzQlVeyPifl4CgojNGqlikr8IhEeQPg4y0Azr7XSvyFuJKwOwH140fc7n2ZYGHYiDVPJnf99H5dgsIoMDDGLr4eUHkxsWS3r8fujKkPBuX8yexyjU5RY9ZCswn5Y7aJrn8TDjZzzl38Wm2GwTCKqWz1xb5k8etnykDBkdaw2XYSq0sqJRwW4WqpGGe7T2/axGDJXAY4XnVCtmP 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)(1800799024)(36860700013)(82310400026)(7416014)(376014);DIR:OUT;SFP:1101; X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 08 Jul 2024 05:56:31.8948 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 4415c5b2-23ac-4669-995b-08dc9f12b7c2 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: BN3PEPF0000B074.namprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: CY5PR12MB6648 Expose the sysfs files for the IRQs that the mlx5 PCI SFs are using. These entries are similar to PCI PFs and VFs in 'msi_irqs' directory. Reviewed-by: Parav Pandit Signed-off-by: Shay Drory --- v8-v9: - add Przemek RB v6->v7: - remove not needed changes to mlx5 sfnum SF sysfs v5->v6: - fail IRQ creation in case auxiliary_device_sysfs_irq_add() failed (Parav and Przemek) v2->v3: - fix mlx5 sfnum SF sysfs --- drivers/net/ethernet/mellanox/mlx5/core/eq.c | 6 +++--- .../ethernet/mellanox/mlx5/core/irq_affinity.c | 18 +++++++++++++++++- .../ethernet/mellanox/mlx5/core/mlx5_core.h | 6 ++++++ .../net/ethernet/mellanox/mlx5/core/mlx5_irq.h | 12 ++++++++---- .../net/ethernet/mellanox/mlx5/core/pci_irq.c | 12 +++++++++--- 5 files changed, 43 insertions(+), 11 deletions(-) diff --git a/drivers/net/ethernet/mellanox/mlx5/core/eq.c b/drivers/net/ethernet/mellanox/mlx5/core/eq.c index ac1565c0c8af..50ed23f9ac6a 100644 --- a/drivers/net/ethernet/mellanox/mlx5/core/eq.c +++ b/drivers/net/ethernet/mellanox/mlx5/core/eq.c @@ -714,7 +714,7 @@ static int create_async_eqs(struct mlx5_core_dev *dev) err1: mlx5_cmd_allowed_opcode(dev, CMD_ALLOWED_OPCODE_ALL); mlx5_eq_notifier_unregister(dev, &table->cq_err_nb); - mlx5_ctrl_irq_release(table->ctrl_irq); + mlx5_ctrl_irq_release(dev, table->ctrl_irq); return err; } @@ -730,7 +730,7 @@ static void destroy_async_eqs(struct mlx5_core_dev *dev) cleanup_async_eq(dev, &table->cmd_eq, "cmd"); mlx5_cmd_allowed_opcode(dev, CMD_ALLOWED_OPCODE_ALL); mlx5_eq_notifier_unregister(dev, &table->cq_err_nb); - mlx5_ctrl_irq_release(table->ctrl_irq); + mlx5_ctrl_irq_release(dev, table->ctrl_irq); } struct mlx5_eq *mlx5_get_async_eq(struct mlx5_core_dev *dev) @@ -918,7 +918,7 @@ static int comp_irq_request_sf(struct mlx5_core_dev *dev, u16 vecidx) af_desc.is_managed = 1; cpumask_copy(&af_desc.mask, cpu_online_mask); cpumask_andnot(&af_desc.mask, &af_desc.mask, &table->used_cpus); - irq = mlx5_irq_affinity_request(pool, &af_desc); + irq = mlx5_irq_affinity_request(dev, pool, &af_desc); if (IS_ERR(irq)) return PTR_ERR(irq); diff --git a/drivers/net/ethernet/mellanox/mlx5/core/irq_affinity.c b/drivers/net/ethernet/mellanox/mlx5/core/irq_affinity.c index 612e666ec263..f7b01b3f0cba 100644 --- a/drivers/net/ethernet/mellanox/mlx5/core/irq_affinity.c +++ b/drivers/net/ethernet/mellanox/mlx5/core/irq_affinity.c @@ -112,15 +112,18 @@ irq_pool_find_least_loaded(struct mlx5_irq_pool *pool, const struct cpumask *req /** * mlx5_irq_affinity_request - request an IRQ according to the given mask. + * @dev: mlx5 core device which is requesting the IRQ. * @pool: IRQ pool to request from. * @af_desc: affinity descriptor for this IRQ. * * This function returns a pointer to IRQ, or ERR_PTR in case of error. */ struct mlx5_irq * -mlx5_irq_affinity_request(struct mlx5_irq_pool *pool, struct irq_affinity_desc *af_desc) +mlx5_irq_affinity_request(struct mlx5_core_dev *dev, struct mlx5_irq_pool *pool, + struct irq_affinity_desc *af_desc) { struct mlx5_irq *least_loaded_irq, *new_irq; + int ret; mutex_lock(&pool->lock); least_loaded_irq = irq_pool_find_least_loaded(pool, &af_desc->mask); @@ -153,6 +156,16 @@ mlx5_irq_affinity_request(struct mlx5_irq_pool *pool, struct irq_affinity_desc * mlx5_irq_read_locked(least_loaded_irq) / MLX5_EQ_REFS_PER_IRQ); unlock: mutex_unlock(&pool->lock); + if (mlx5_irq_pool_is_sf_pool(pool)) { + ret = auxiliary_device_sysfs_irq_add(mlx5_sf_coredev_to_adev(dev), + mlx5_irq_get_irq(least_loaded_irq)); + if (ret) { + mlx5_core_err(dev, "Failed to create sysfs entry for irq %d, ret = %d\n", + mlx5_irq_get_irq(least_loaded_irq), ret); + mlx5_irq_put(least_loaded_irq); + least_loaded_irq = ERR_PTR(ret); + } + } return least_loaded_irq; } @@ -164,6 +177,9 @@ void mlx5_irq_affinity_irq_release(struct mlx5_core_dev *dev, struct mlx5_irq *i cpu = cpumask_first(mlx5_irq_get_affinity_mask(irq)); synchronize_irq(pci_irq_vector(pool->dev->pdev, mlx5_irq_get_index(irq))); + if (mlx5_irq_pool_is_sf_pool(pool)) + auxiliary_device_sysfs_irq_remove(mlx5_sf_coredev_to_adev(dev), + mlx5_irq_get_irq(irq)); if (mlx5_irq_put(irq)) if (pool->irqs_per_cpu) cpu_put(pool, cpu); diff --git a/drivers/net/ethernet/mellanox/mlx5/core/mlx5_core.h b/drivers/net/ethernet/mellanox/mlx5/core/mlx5_core.h index a7fd18888b6e..62c770b0eaa8 100644 --- a/drivers/net/ethernet/mellanox/mlx5/core/mlx5_core.h +++ b/drivers/net/ethernet/mellanox/mlx5/core/mlx5_core.h @@ -320,6 +320,12 @@ static inline bool mlx5_core_is_sf(const struct mlx5_core_dev *dev) return dev->coredev_type == MLX5_COREDEV_SF; } +static inline struct auxiliary_device * +mlx5_sf_coredev_to_adev(struct mlx5_core_dev *mdev) +{ + return container_of(mdev->device, struct auxiliary_device, dev); +} + int mlx5_mdev_init(struct mlx5_core_dev *dev, int profile_idx); void mlx5_mdev_uninit(struct mlx5_core_dev *dev); int mlx5_init_one(struct mlx5_core_dev *dev); diff --git a/drivers/net/ethernet/mellanox/mlx5/core/mlx5_irq.h b/drivers/net/ethernet/mellanox/mlx5/core/mlx5_irq.h index 1088114e905d..0881e961d8b1 100644 --- a/drivers/net/ethernet/mellanox/mlx5/core/mlx5_irq.h +++ b/drivers/net/ethernet/mellanox/mlx5/core/mlx5_irq.h @@ -25,7 +25,7 @@ int mlx5_set_msix_vec_count(struct mlx5_core_dev *dev, int devfn, int mlx5_get_default_msix_vec_count(struct mlx5_core_dev *dev, int num_vfs); struct mlx5_irq *mlx5_ctrl_irq_request(struct mlx5_core_dev *dev); -void mlx5_ctrl_irq_release(struct mlx5_irq *ctrl_irq); +void mlx5_ctrl_irq_release(struct mlx5_core_dev *dev, struct mlx5_irq *ctrl_irq); struct mlx5_irq *mlx5_irq_request(struct mlx5_core_dev *dev, u16 vecidx, struct irq_affinity_desc *af_desc, struct cpu_rmap **rmap); @@ -36,13 +36,15 @@ int mlx5_irq_attach_nb(struct mlx5_irq *irq, struct notifier_block *nb); int mlx5_irq_detach_nb(struct mlx5_irq *irq, struct notifier_block *nb); struct cpumask *mlx5_irq_get_affinity_mask(struct mlx5_irq *irq); int mlx5_irq_get_index(struct mlx5_irq *irq); +int mlx5_irq_get_irq(const struct mlx5_irq *irq); struct mlx5_irq_pool; #ifdef CONFIG_MLX5_SF struct mlx5_irq *mlx5_irq_affinity_irq_request_auto(struct mlx5_core_dev *dev, struct cpumask *used_cpus, u16 vecidx); -struct mlx5_irq *mlx5_irq_affinity_request(struct mlx5_irq_pool *pool, - struct irq_affinity_desc *af_desc); +struct mlx5_irq * +mlx5_irq_affinity_request(struct mlx5_core_dev *dev, struct mlx5_irq_pool *pool, + struct irq_affinity_desc *af_desc); void mlx5_irq_affinity_irq_release(struct mlx5_core_dev *dev, struct mlx5_irq *irq); #else static inline @@ -53,7 +55,8 @@ struct mlx5_irq *mlx5_irq_affinity_irq_request_auto(struct mlx5_core_dev *dev, } static inline struct mlx5_irq * -mlx5_irq_affinity_request(struct mlx5_irq_pool *pool, struct irq_affinity_desc *af_desc) +mlx5_irq_affinity_request(struct mlx5_core_dev *dev, struct mlx5_irq_pool *pool, + struct irq_affinity_desc *af_desc) { return ERR_PTR(-EOPNOTSUPP); } @@ -61,6 +64,7 @@ mlx5_irq_affinity_request(struct mlx5_irq_pool *pool, struct irq_affinity_desc * static inline void mlx5_irq_affinity_irq_release(struct mlx5_core_dev *dev, struct mlx5_irq *irq) { + mlx5_irq_release_vector(irq); } #endif #endif /* __MLX5_IRQ_H__ */ diff --git a/drivers/net/ethernet/mellanox/mlx5/core/pci_irq.c b/drivers/net/ethernet/mellanox/mlx5/core/pci_irq.c index 401d39069680..3a9858111701 100644 --- a/drivers/net/ethernet/mellanox/mlx5/core/pci_irq.c +++ b/drivers/net/ethernet/mellanox/mlx5/core/pci_irq.c @@ -367,6 +367,11 @@ struct cpumask *mlx5_irq_get_affinity_mask(struct mlx5_irq *irq) return irq->mask; } +int mlx5_irq_get_irq(const struct mlx5_irq *irq) +{ + return irq->map.virq; +} + int mlx5_irq_get_index(struct mlx5_irq *irq) { return irq->map.index; @@ -440,11 +445,12 @@ static void _mlx5_irq_release(struct mlx5_irq *irq) /** * mlx5_ctrl_irq_release - release a ctrl IRQ back to the system. + * @dev: mlx5 device that releasing the IRQ. * @ctrl_irq: ctrl IRQ to be released. */ -void mlx5_ctrl_irq_release(struct mlx5_irq *ctrl_irq) +void mlx5_ctrl_irq_release(struct mlx5_core_dev *dev, struct mlx5_irq *ctrl_irq) { - _mlx5_irq_release(ctrl_irq); + mlx5_irq_affinity_irq_release(dev, ctrl_irq); } /** @@ -473,7 +479,7 @@ struct mlx5_irq *mlx5_ctrl_irq_request(struct mlx5_core_dev *dev) /* Allocate the IRQ in index 0. The vector was already allocated */ irq = irq_pool_request_vector(pool, 0, &af_desc, NULL); } else { - irq = mlx5_irq_affinity_request(pool, &af_desc); + irq = mlx5_irq_affinity_request(dev, pool, &af_desc); } return irq;