From patchwork Thu May 9 09:14:10 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Shay Drori X-Patchwork-Id: 13659582 Received: from NAM11-CO1-obe.outbound.protection.outlook.com (mail-co1nam11on2084.outbound.protection.outlook.com [40.107.220.84]) (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 90F5D149C7C; Thu, 9 May 2024 09:14:53 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=fail smtp.client-ip=40.107.220.84 ARC-Seal: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1715246095; cv=fail; b=fUr6g/uD3ahE71MXTQZ1i9kZOYPC2BVUkfBOedz4qLoXe/KL0YGfmDhgnAYWyTxQwEasnVpXeCGF0Haikyd/s7tfK0YM9MJzNLGp1IoUAaoaIffab7U5mYGvkZDZkeH33ErFv0KMkrSgjcJvRACeg0SyHf2XrgOi78PSJIVh+io= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1715246095; c=relaxed/simple; bh=4kM+T1W0NvlE6cZfzph/Sl/FSmwKu7AHJUq4gHLFn0M=; h=From:To:CC:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=TctrU2wiFtMYPpB2zbf/h4ELIT40ykeBvSEn05mZ0x4cEi4N/yjW/fWFTg3eMrhrbvkw+m6O+g6hlSP2YMa6WgHpgb4MvK20wQkVB2E2nTecJyv2Y9rUB9t8kjAz20+TiTT5gxAnJxggs+KZ63ps9wDzFV/UWGkBLaWIPaIUMM0= 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=afYiV43t; arc=fail smtp.client-ip=40.107.220.84 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="afYiV43t" ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=RP0Xgb873Zlvu1ZVTObpnn0D0bCJRHzidKehydUAX4GoA5eDWrBAblpcQ3WPiHFRaksWZPZw88LVmIPC2FXNf8/Y3tL7McWfhENJY/0MFZx+n5rEbISWaJVtOg7xazdbJL5JgO9XvBe4gTjMPg6ESWvFo5LgRTcGzN1Q/xZ6qqcKKSumQ0dJTtsMJRShtshHIFh1HvsO8t4wZ7BtRaHOxlIFuq4m3ecgcvZQ4Kf4PCn4bzgWpiQqTjtIcAHdF7HCJaC/d4Gkn96men+TzNfux9EYMEWdyJuVvDlP7b8Z75WVWDBQ+vnHxjVnIoDdT3fW+j0sd1g3c2tZ37+uhMRyUw== 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=M1VjFCe2p+VFVD1Sc4nFZhfj7H1/X2DpLxisGjil7Rg=; b=EKVKYjfCW22XL7r2QksM532ptFqHvSXzznnx76VUSZbkK3etlzEB3RajU6ANx935mpi188mQlM6ypK9fq9/MvX0UNbk3Loa3S8lIjfv2MtRvP/OpjdvQSpEml15f2pfpYdMDTuabTkOkemtWI9BxvKxNYmjEhYznRy0fi+frq/Tti4hQhu3IS/TWmNmNXBq8E9EFcCB6dLJvZB4BMzVvk8y8bxJVZPw0hJWt6HvYzD+ssLSFrV3HcWPMeAZBTd+i1XhE6alfY1L6iKpgJDcAvdmH/snPng78mcHoQXIjkf8c5vAM1WkVSvxPzhWgmX6IDh1jmW8JYlMMZf/e5DCH+A== 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=M1VjFCe2p+VFVD1Sc4nFZhfj7H1/X2DpLxisGjil7Rg=; b=afYiV43tCCjBg8wJEAQvwvKVT8yGqOCTFuTcdsit3SShTNcHCV4njA2XMtiTxYUlxFuYcmIuIvWwgkLP/Kxt2QtfSxIqqNhfo3jnA8pz1/NxQmwwNQliq4DrrtK1YGVQaMK8pv9c1fUv3xhD+redRo0svFNe9brHQLaFeCJEaI9e/yKAp2ny6WaDz1uY0T0OP5OqfSMW67pcpZQaUe8cAU58hRrz4NIfKkFhn22h7R+2tbH6jI02DtKgydIQCCR+eRRn6Wn1OW+8ysYYikk9JXEF9yLDwHwT1Z8TYVrAnkKaR35/sBt7WuHDH6cd3DrS+xjy2mnq9Bpdx2/LfTooHw== Received: from CH2PR18CA0011.namprd18.prod.outlook.com (2603:10b6:610:4f::21) by PH7PR12MB6907.namprd12.prod.outlook.com (2603:10b6:510:1b9::18) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7544.47; Thu, 9 May 2024 09:14:50 +0000 Received: from CH3PEPF0000000B.namprd04.prod.outlook.com (2603:10b6:610:4f:cafe::36) by CH2PR18CA0011.outlook.office365.com (2603:10b6:610:4f::21) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7544.41 via Frontend Transport; Thu, 9 May 2024 09:14:50 +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 CH3PEPF0000000B.mail.protection.outlook.com (10.167.244.38) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7544.18 via Frontend Transport; Thu, 9 May 2024 09:14:50 +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, 9 May 2024 02:14:38 -0700 Received: from nps-server-23.mtl.labs.mlnx (10.126.230.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; Thu, 9 May 2024 02:14:33 -0700 From: Shay Drory To: , , , , , , CC: , , , , , Shay Drory , "Parav Pandit" Subject: [PATCH net-next v4 1/2] driver core: auxiliary bus: show auxiliary device IRQs Date: Thu, 9 May 2024 12:14:10 +0300 Message-ID: <20240509091411.627775-2-shayd@nvidia.com> X-Mailer: git-send-email 2.38.1 In-Reply-To: <20240509091411.627775-1-shayd@nvidia.com> References: <20240509091411.627775-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: rnnvmail202.nvidia.com (10.129.68.7) To rnnvmail201.nvidia.com (10.129.68.8) X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: CH3PEPF0000000B:EE_|PH7PR12MB6907:EE_ X-MS-Office365-Filtering-Correlation-Id: 997cc52f-ca88-4f6f-2eae-08dc70087ae2 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230031|36860700004|1800799015|376005|7416005|82310400017; X-Microsoft-Antispam-Message-Info: PpBsxqGfRzyLCjkHBU4rRjl1jTGRu5aSxy2Oo57QG1A51Rw3Db0PbyHStA+ijsR+TaUSEMPqY8Lcn80DivU1bIDCDUX8sdDjHfKpWjTrniO5wO8yMXR8JS8FpyePooYbNvKufe5tBR9pe2rlim+uWTwn2vyWzIor787xZuzk2YXLBh6YOQeKNvKLAH0HLNanSOOMfRbwfJKY0xp+Yged5pObLCHA4DZ55RMjkLxFDaWHhoH2KKhwI2/r8TTLwP+xXUKXluAjNTIbko4Ne8HfRL2FFAtkPRNn75tRErDsOQE7DCYdryGu7zi0tu+YAkVtR/5x8sHJY+E64BtzHsDS1qEQJ1NOHOYfLB0aDERlNjKhHPnktHdmH5q2ZSqT4cUvX5vAGZDTo8/dysyt51/Ni6Kom3n2WNhONAOUU2+KQuOuakN8iPBqHa++MqQHH+ngP0qDhklJTNH6rBKxQSBkS+RKLeB3O2h+9efXadoAG42lGFA2jELqROCChPmSaV3Mpe0S9VXbsejWbJxu/22TS53vNrMqqTUH68tCkJM6ueiS+t31XLMw+QPT5oRMkeip92HjMd+Xw6rC0q5E6AyghKxHrkERFsw9FJfYXO20+2q5RVdYwv1OUEhx2Cbj4yU5kNwl2YBZFSDqPCsMri/GDFiCNl4ueKSsnDieLwPlO0eWYv06vuWI9+04QVABT4ZhKbMpbC7kPnzUT8CHGMBsMz1OAZIrKVhZM0vkK+4PDJ4CmunmyorrCQikuYtoT7GlYkClP9L9SNGdk8EyeNvgJQNAaTFST98VjYAL8YyXrpyiI2ECRMVJGFZRrp9tEZnLc8ukCJCXz3LsFBxTq73xKhvBK8RdCKsbz/q1+48NxU23Ziz86FOClwojuFOFQ0HaWhZbD7VzSGktBvDhJ3fp3/f09kjOQ6Ah/0TxiWH9ANxUFvGvsv+DMEokmVsuSYGh3wQe3H7Gi758L726XDjE8XzEvVfspIu62FHVuawqVf5ncH4oD28xU0kgZEmQrs6YTBMcyn9POpZTFrtjdVzD/JP7IxO0761lYHWV+jRqv+rdnhPTnb0QbYss338LZv0ai7GArL4pQqSeaJipcicRRp7u+8qhDfCv6+4tLtcxRELKQU3LbyA3pZ7Chn6bdpNIXMbTbL1DI41tQ88E+pEZ3zhc9jrA2uH7EgTEF5e2NrlemqNmcTiYkkfjOW0VVa9t3ELarzTiutpTSys5AEGAsjNvbQwvzUd9uivXexeCLFZ0iJCKgPloyP63xY8ofoQWZ9PoML46UIE0jeBfFSz+vvFr55Yj4+Ja9cS5HlVfylXEZxWKzCRPOT/HcdflGfNfnTmFTQ9pMeowYcy1sshI14v6Wn+HjtqVMi7z9/0e7l3wZdrmptIOe1IIzBU2Cmt+ 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:(13230031)(36860700004)(1800799015)(376005)(7416005)(82310400017);DIR:OUT;SFP:1101; X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 09 May 2024 09:14:50.1898 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 997cc52f-ca88-4f6f-2eae-08dc70087ae2 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: CH3PEPF0000000B.namprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: PH7PR12MB6907 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 file 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 is a 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. Additionally, the PCI SFs sometimes share the IRQs with peer SFs. This information is also not available to the users. To overcome this limitation, each irq sysfs entry shows if irq is exclusive or shared. For example: $ ls /sys/bus/auxiliary/devices/mlx5_core.sf.1/irqs/ 50 51 52 53 54 55 56 57 58 $ cat /sys/bus/auxiliary/devices/mlx5_core.sf.1/irqs/52 exclusive Reviewed-by: Parav Pandit Signed-off-by: Shay Drory --- v3->4: - remove global mutex (Przemek) v2->v3: - fix function declaration in case SYSFS isn't defined (Parav) - convert auxdev->groups array with auxiliary_irqs_groups (Przemek) 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 | 14 ++ drivers/base/auxiliary.c | 178 +++++++++++++++++- include/linux/auxiliary_bus.h | 24 ++- 3 files changed, 213 insertions(+), 3 deletions(-) create mode 100644 Documentation/ABI/testing/sysfs-bus-auxiliary diff --git a/Documentation/ABI/testing/sysfs-bus-auxiliary b/Documentation/ABI/testing/sysfs-bus-auxiliary new file mode 100644 index 000000000000..3b8299d49d9e --- /dev/null +++ b/Documentation/ABI/testing/sysfs-bus-auxiliary @@ -0,0 +1,14 @@ +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. + +What: /sys/bus/auxiliary/devices/.../irqs/ +Date: April, 2024 +Contact: Shay Drory +Description: + auxiliary devices can share IRQs. This attribute indicates if + the irq is shared with other SFs or exclusively used by the SF. diff --git a/drivers/base/auxiliary.c b/drivers/base/auxiliary.c index d3a2c40c2f12..def02f5f1220 100644 --- a/drivers/base/auxiliary.c +++ b/drivers/base/auxiliary.c @@ -158,6 +158,176 @@ * }; */ +#ifdef CONFIG_SYSFS +/* Xarray of irqs to determine if irq is exclusive or shared. */ +static DEFINE_XARRAY(irqs); + +struct auxiliary_irq_info { + struct device_attribute sysfs_attr; + int irq; +}; + +static struct attribute *auxiliary_irq_attrs[] = { + NULL +}; + +static const struct attribute_group auxiliary_irqs_group = { + .name = "irqs", + .attrs = auxiliary_irq_attrs, +}; + +static const struct attribute_group *auxiliary_irqs_groups[2] = { + &auxiliary_irqs_group, + NULL +}; + +/* Auxiliary devices can share IRQs. Expose to user whether the provided IRQ is + * shared or exclusive. + */ +static ssize_t auxiliary_irq_mode_show(struct device *dev, + struct device_attribute *attr, char *buf) +{ + struct auxiliary_irq_info *info = + container_of(attr, struct auxiliary_irq_info, sysfs_attr); + + if (refcount_read(xa_load(&irqs, info->irq)) > 1) + return sysfs_emit(buf, "%s\n", "shared"); + else + return sysfs_emit(buf, "%s\n", "exclusive"); +} + +static void auxiliary_irq_destroy(int irq) +{ + refcount_t *ref; + + xa_lock(&irqs); + ref = xa_load(&irqs, irq); + if (refcount_dec_and_test(ref)) { + __xa_erase(&irqs, irq); + kfree(ref); + } + xa_unlock(&irqs); +} + +static int auxiliary_irq_create(int irq) +{ + refcount_t *new_ref = kzalloc(sizeof(*new_ref), GFP_KERNEL); + refcount_t *ref; + int ret = 0; + + if (!new_ref) + return -ENOMEM; + + xa_lock(&irqs); + ref = xa_load(&irqs, irq); + if (ref) { + kfree(new_ref); + refcount_inc(ref); + goto out; + } + + refcount_set(new_ref, 1); + ref = __xa_cmpxchg(&irqs, irq, NULL, new_ref, GFP_KERNEL); + if (ref) { + kfree(new_ref); + if (xa_is_err(ref)) { + ret = xa_err(ref); + goto out; + } + + /* Another thread beat us to creating the enrtry. */ + refcount_inc(ref); + } + +out: + xa_unlock(&irqs); + return ret; +} + +/** + * 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 Linux interrupt number. + * + * This function should be called after auxiliary device have successfully + * received the irq. + * + * Return: zero on success or an error code on failure. + */ +int auxiliary_device_sysfs_irq_add(struct auxiliary_device *auxdev, int irq) +{ + struct device *dev = &auxdev->dev; + struct auxiliary_irq_info *info; + int ret; + + ret = auxiliary_irq_create(irq); + if (ret) + return ret; + + info = kzalloc(sizeof(*info), GFP_KERNEL); + if (!info) { + ret = -ENOMEM; + goto info_err; + } + + sysfs_attr_init(&info->sysfs_attr.attr); + info->sysfs_attr.attr.name = kasprintf(GFP_KERNEL, "%d", irq); + if (!info->sysfs_attr.attr.name) { + ret = -ENOMEM; + goto name_err; + } + info->irq = irq; + info->sysfs_attr.attr.mode = 0444; + info->sysfs_attr.show = auxiliary_irq_mode_show; + + ret = xa_insert(&auxdev->irqs, irq, info, GFP_KERNEL); + if (ret) + goto auxdev_xa_err; + + ret = sysfs_add_file_to_group(&dev->kobj, &info->sysfs_attr.attr, + auxiliary_irqs_group.name); + if (ret) + goto sysfs_add_err; + + return 0; + +sysfs_add_err: + xa_erase(&auxdev->irqs, irq); +auxdev_xa_err: + kfree(info->sysfs_attr.attr.name); +name_err: + kfree(info); +info_err: + auxiliary_irq_destroy(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. + */ +void auxiliary_device_sysfs_irq_remove(struct auxiliary_device *auxdev, int irq) +{ + struct auxiliary_irq_info *info = xa_load(&auxdev->irqs, irq); + struct device *dev = &auxdev->dev; + + if (WARN_ON(!info)) + return; + + sysfs_remove_file_from_group(&dev->kobj, &info->sysfs_attr.attr, + auxiliary_irqs_group.name); + xa_erase(&auxdev->irqs, irq); + kfree(info->sysfs_attr.attr.name); + kfree(info); + auxiliary_irq_destroy(irq); +} +EXPORT_SYMBOL_GPL(auxiliary_device_sysfs_irq_remove); +#endif + static const struct auxiliary_device_id *auxiliary_match_id(const struct auxiliary_device_id *id, const struct auxiliary_device *auxdev) { @@ -295,6 +465,7 @@ EXPORT_SYMBOL_GPL(auxiliary_device_init); * __auxiliary_device_add - add an auxiliary bus device * @auxdev: auxiliary bus device to add to the bus * @modname: name of the parent device's driver module + * @irqs_sysfs_enable: whether to enable IRQs sysfs * * This is the third step in the three-step process to register an * auxiliary_device. @@ -310,7 +481,8 @@ EXPORT_SYMBOL_GPL(auxiliary_device_init); * parameter. Only if a user requires a custom name would this version be * called directly. */ -int __auxiliary_device_add(struct auxiliary_device *auxdev, const char *modname) +int __auxiliary_device_add(struct auxiliary_device *auxdev, const char *modname, + bool irqs_sysfs_enable) { struct device *dev = &auxdev->dev; int ret; @@ -325,6 +497,10 @@ int __auxiliary_device_add(struct auxiliary_device *auxdev, const char *modname) dev_err(dev, "auxiliary device dev_set_name failed: %d\n", ret); return ret; } + if (irqs_sysfs_enable) { + dev->groups = auxiliary_irqs_groups; + xa_init(&auxdev->irqs); + } ret = device_add(dev); if (ret) diff --git a/include/linux/auxiliary_bus.h b/include/linux/auxiliary_bus.h index de21d9d24a95..760fadb26620 100644 --- a/include/linux/auxiliary_bus.h +++ b/include/linux/auxiliary_bus.h @@ -58,6 +58,7 @@ * 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, * * An auxiliary_device represents a part of its parent device's functionality. * It is given a name that, combined with the registering drivers @@ -138,6 +139,7 @@ struct auxiliary_device { struct device dev; const char *name; + struct xarray irqs; u32 id; }; @@ -209,8 +211,26 @@ static inline struct auxiliary_driver *to_auxiliary_drv(struct device_driver *dr } 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) +int __auxiliary_device_add(struct auxiliary_device *auxdev, const char *modname, + bool irqs_sysfs_enable); +#define auxiliary_device_add(auxdev) __auxiliary_device_add(auxdev, KBUILD_MODNAME, false) +#define auxiliary_device_add_with_irqs(auxdev) \ + __auxiliary_device_add(auxdev, KBUILD_MODNAME, true) + +#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) { From patchwork Thu May 9 09:14:11 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Shay Drori X-Patchwork-Id: 13659583 Received: from NAM11-DM6-obe.outbound.protection.outlook.com (mail-dm6nam11on2049.outbound.protection.outlook.com [40.107.223.49]) (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 46D7C14A60D; Thu, 9 May 2024 09:14:55 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=fail smtp.client-ip=40.107.223.49 ARC-Seal: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1715246098; cv=fail; b=jGKECSi7usGVe/T4BQxGrVCd/m1wvICBUlUKo/NgBivquaqZFwAJWjQHzIFCZYGdO81xW39e53xkqSF+19NAEHv3JeLiJS6GGhPqbOD5/o9+FKeAsc9G6TEJ00tPS8/mIbbv07xki8OkJ2PJqpkAVRDY5NlclD4DI/SERc6J6cY= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1715246098; c=relaxed/simple; bh=RBvCj79vyynGwsDQGy+kuamZmRQsDItRyv9qMUJ/F48=; h=From:To:CC:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=HR/mC+J5q+MmBYV8b/0fJfFIvScl3CdvBXAPIEfOXKpJJ5nbOij/g9ASIaBjlO6E6cOf+anlsE+8gBi0Uzxjx6ZCVe6JWYCw1aD90iwBV4UIQ00YUIRB3qWUiXgsIC58RALL058b8l6WPbaOVwMH9ndgPgd4EBSJAjkDNi1n6Ho= 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=WEVhY7VV; arc=fail smtp.client-ip=40.107.223.49 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="WEVhY7VV" ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=Q/K5Q7jdvAs0PXkIX6xXTbZJhRt9coViTnISUi5RHRYfwzaYiwU3IMXoBY56tCD5TQYJfyqHLNZ1XXkoHV1JZyeZdGGVHqFjuWwipcCqcRqOI9+1iNssarR9dlVgy3a+fAwNOCCZaxhDiiGjyfuutRmCHU8S4atdrXdvs4wpvjjb41ntY5vIgmzPZLoxUKyl8WLj6hs0bJMzLQ6cJ9dG8WCYYXiJQ2VSpht2IycuUQZW3M0rSFdZmaMk/9JRZqKuJ1fMm4G+1sZtMgmtxBIjRsOjiPPr79ok4feVbr+bpHPaBJ94wyMQWf/Klp91ed036y8ao9GIpVb+/+vuovAtVA== 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=uP+qI0DnNJUSbxU4oLKLfJmVVNSjllEg+OgxlFGriyA=; b=G0ZG5wMbKIlqZhs8YHzda+XCBvrj5GNaeNbQNet7UTn2wjfPXnGOSJTRyob0vfO0i5Ehk3pWngdkh7SLzPA4DHVAnVNWAsDbuMBBUblCoqufvyTBuPkYyiJsGy23vXA8Oox/+kjNtQT8PqCZHbg1iL9dkRlUgZz/0qmszmMMkOlRKjRvSjlRqhxzEm7HbE/lF1BK64ruBC/3LEy+C5NAqqVAHN6oQca/F8nPhsfr/voHWbcnrRbdsF2hkdC/f0g8mH/xHwReA8dP3v3ubFyOPYnTCM2tlFawjQxKpVR9ufibmEaEqctRyZiitIX6FDcOcTVH/Afhk4Noyiyaw7RhBw== 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=uP+qI0DnNJUSbxU4oLKLfJmVVNSjllEg+OgxlFGriyA=; b=WEVhY7VVUuenuEooAsnhmKcXHSmWYXkG5bdjokmBKiBIjszepm6K+M7Sbb+qD50Q9/GrnEkUeSyGa6T/79BFer1zs3bn2tj6czA5/VphMl5tkamUVu82AHNJl2aFCXgl6hgimby9XJXNxJ/HqsDkuXhuAaLxJPHbG6roik/W1i1Xs/OokrtdfeyHfyk1HLxrXOHivDZjWfmpskwPv9pnca8cTgE9KdTjMZkiBMJJ5yVUttNKsXJW6WHhBKYbF+trGfi6FMf9JjCxycOt/kp3d8ouQ4CPR725DOQhfFd2GA5JZTRVKmkl84O63jWnduMV/1p6XHIoEi8l2TdJ2IWzJQ== Received: from CH2PR18CA0002.namprd18.prod.outlook.com (2603:10b6:610:4f::12) by DS0PR12MB8562.namprd12.prod.outlook.com (2603:10b6:8:164::13) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7544.45; Thu, 9 May 2024 09:14:53 +0000 Received: from CH3PEPF0000000B.namprd04.prod.outlook.com (2603:10b6:610:4f:cafe::a1) by CH2PR18CA0002.outlook.office365.com (2603:10b6:610:4f::12) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7544.45 via Frontend Transport; Thu, 9 May 2024 09:14:53 +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 CH3PEPF0000000B.mail.protection.outlook.com (10.167.244.38) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7544.18 via Frontend Transport; Thu, 9 May 2024 09:14:53 +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, 9 May 2024 02:14:42 -0700 Received: from nps-server-23.mtl.labs.mlnx (10.126.230.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; Thu, 9 May 2024 02:14:38 -0700 From: Shay Drory To: , , , , , , CC: , , , , , Shay Drory , "Parav Pandit" Subject: [PATCH net-next v4 2/2] net/mlx5: Expose SFs IRQs Date: Thu, 9 May 2024 12:14:11 +0300 Message-ID: <20240509091411.627775-3-shayd@nvidia.com> X-Mailer: git-send-email 2.38.1 In-Reply-To: <20240509091411.627775-1-shayd@nvidia.com> References: <20240509091411.627775-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: rnnvmail202.nvidia.com (10.129.68.7) To rnnvmail201.nvidia.com (10.129.68.8) X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: CH3PEPF0000000B:EE_|DS0PR12MB8562:EE_ X-MS-Office365-Filtering-Correlation-Id: b57bdaa0-4e5b-4d69-ca7f-08dc70087ca4 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230031|376005|82310400017|7416005|1800799015|36860700004; X-Microsoft-Antispam-Message-Info: TG1X/NJ17mrLpQ3zjs2MB9EiQrvuKQPYm2a+OLwZIsMWjxh05ZL88bcuRGwfF1JRkkoFFztOLP+xtDv1X5tTXYlT/0d6S3n7bpGEgwOesvOHKO2yOx1tpWmClDE1F8rdV7Nre+exOEXX5bFoiua4vcjuXf8n4Y56vX8aNcJMJ6pmoWpCXM5GzVcXmRJPoDsdUgerynJvin33gVB49vUMw4msW9OUlwXfN3JPoMFlyvWyIZdr0atEch8NnZcDJDj4HUqhrmVcJ8nrkN2DJFvXpDQDsrlnPDfGGwLaOrAd/XVfdT5Xu4Nt5WybXibcG5+q4DV6iPz/87tzWxf4FMhm4/1RtA1gApyR3tqKtJp3gFIEMtveyfOkChF6BCSHq4NUr132XAcUP6HCtD1GHSPIQ9D4RN+6b7vLNb9x65Eo6dZjCF6hkd7iYSRtm2ulFC/Fp8ARseqs7iw9kyQiC7iNicTh0OL+HmENcCZ3yBkLoRViCaM+NixrVAt71MlJnNdPe4wP5jrojF2n60EZRoteXwcMCqNDOSNmjZ+iYPvCNr4gULzqPlzvdgcj34r5HLz7bVSLS4i0fc+YTIMG0OxVg1SnfMppyJSrrlS2p5gg7WZ/zw4ZIpPnHU6e1ipOtpxGRrjr1zcRQQTfc1mviEfp3SMHFavLryX7z0Ab2Hu6IxbJxVGcCYe1MfmaYAtFrW8vAlc/IVPuqvUPa3r7SefRMYOMbU+Y8EvLF+eOj0sQiJGWJndWE9Mk7uENKcOU2pMt1BNJUsQXuDe7rHgq7PKvmPNV8gJIkxdT4UBeeiJYD+7c70LVZdqHQKnnKNLv0m8CQGmIYHpnWazI5fjsiZfSJqBZJ1KNbyhvkX5ldVKJUm1EwG9S6DW94q+UTGzKnHERNBe9iU3myrSLEEiz+y96SCh5YI6CHk1owhTx/vqVkPuBenK67WGJuAV4rGY7r08EZyr85kGpKAxKQ9Z2T4aVrV2DaGl8CHKZgklaIktBWurbCV2rKnquB+qGdBfi3JOdS4pHt+qaw1w1Oj1rb/49VmfJu32uZ1utssAGyPp6lNuRMM9vd0bPH26LNjKYOOH3StS+47z6WclistUtG9m5O4BrW4Dm2GGe0sXncQkYF2U2P2o/oys0KrVC2I3RCWGeQomDGkeLjXcApTn4ofaU0x5TH0Z+DY09unlg7ff6y/eYwCViFm0/Lpwa7YdI70D4U2wNkqk7u7ZkwLi+sq3UZ1gIx6SLc5/Cur3HUtAuN3mSOr/AMuhQ26mK/WLPShZD55zqwb6aBR8bGKRyqyWNeFIRBuD5bSISoH/lSGCol9HAnqujHgimSwtHMqs/aKy9X+94wwss3SUYMTy8ubIV7zcZ1MTZb+JmZBg8WeA9Y6I= 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:(13230031)(376005)(82310400017)(7416005)(1800799015)(36860700004);DIR:OUT;SFP:1101; X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 09 May 2024 09:14:53.1429 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: b57bdaa0-4e5b-4d69-ca7f-08dc70087ca4 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: CH3PEPF0000000B.namprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: DS0PR12MB8562 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 --- v2->v3: - fix mlx5 sfnum SF sysfs --- drivers/net/ethernet/mellanox/mlx5/core/eq.c | 6 +++--- .../ethernet/mellanox/mlx5/core/irq_affinity.c | 15 ++++++++++++++- .../net/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 +++++++++--- .../net/ethernet/mellanox/mlx5/core/sf/dev/dev.c | 16 +++++++--------- 6 files changed, 47 insertions(+), 20 deletions(-) diff --git a/drivers/net/ethernet/mellanox/mlx5/core/eq.c b/drivers/net/ethernet/mellanox/mlx5/core/eq.c index 5693986ae656..5661f047702e 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..9803ab0029b8 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); @@ -152,6 +155,13 @@ mlx5_irq_affinity_request(struct mlx5_irq_pool *pool, struct irq_affinity_desc * mlx5_irq_get_index(least_loaded_irq)), pool->name, mlx5_irq_read_locked(least_loaded_irq) / MLX5_EQ_REFS_PER_IRQ); unlock: + 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\n", + mlx5_irq_get_irq(least_loaded_irq)); + } mutex_unlock(&pool->lock); return least_loaded_irq; } @@ -164,6 +174,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 c38342b9f320..e764b720d9b2 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 4dcf995cb1a2..831efde44b2d 100644 --- a/drivers/net/ethernet/mellanox/mlx5/core/pci_irq.c +++ b/drivers/net/ethernet/mellanox/mlx5/core/pci_irq.c @@ -365,6 +365,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; @@ -438,11 +443,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); } /** @@ -471,7 +477,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; diff --git a/drivers/net/ethernet/mellanox/mlx5/core/sf/dev/dev.c b/drivers/net/ethernet/mellanox/mlx5/core/sf/dev/dev.c index 99219ea52c4b..27dfa56c27db 100644 --- a/drivers/net/ethernet/mellanox/mlx5/core/sf/dev/dev.c +++ b/drivers/net/ethernet/mellanox/mlx5/core/sf/dev/dev.c @@ -60,11 +60,6 @@ static const struct attribute_group sf_attr_group = { .attrs = sf_device_attrs, }; -static const struct attribute_group *sf_attr_groups[2] = { - &sf_attr_group, - NULL -}; - static void mlx5_sf_dev_release(struct device *device) { struct auxiliary_device *adev = container_of(device, struct auxiliary_device, dev); @@ -111,7 +106,6 @@ static void mlx5_sf_dev_add(struct mlx5_core_dev *dev, u16 sf_index, u16 fn_id, sf_dev->adev.name = MLX5_SF_DEV_ID_NAME; sf_dev->adev.dev.release = mlx5_sf_dev_release; sf_dev->adev.dev.parent = &pdev->dev; - sf_dev->adev.dev.groups = sf_attr_groups; sf_dev->sfnum = sfnum; sf_dev->parent_mdev = dev; sf_dev->fn_id = fn_id; @@ -127,18 +121,22 @@ static void mlx5_sf_dev_add(struct mlx5_core_dev *dev, u16 sf_index, u16 fn_id, goto add_err; } - err = auxiliary_device_add(&sf_dev->adev); + err = auxiliary_device_add_with_irqs(&sf_dev->adev); if (err) { auxiliary_device_uninit(&sf_dev->adev); goto add_err; } + err = devm_device_add_group(&sf_dev->adev.dev, &sf_attr_group); + if (err) + goto add_group_err; + err = xa_insert(&table->devices, sf_index, sf_dev, GFP_KERNEL); if (err) - goto xa_err; + goto add_group_err; return; -xa_err: +add_group_err: mlx5_sf_dev_remove_aux(dev, sf_dev); add_err: mlx5_core_err(dev, "SF DEV: fail device add for index=%d sfnum=%d err=%d\n",