Introduce auxiliary bus IRQs sysfs
Subsystems (6)
From: Saeed Mahameed <[email protected]>
Hi Jakub and Greg,
Following the review of v10 and Greg's request to send this via netdev. This is a pull request that includes the 2 patches of adding IRQs sysfs to aux dev subsystem based on mlx5-next tree (6.10-rc3).
v10: https://lore.kernel.org/all/2024071041-frosted-stonework-2c60@gregkh/
Please pull and let me know if there's any problem.
The following changes since commit b339e0a39dc37726712b9f0485d78fe4306d1667:
RDMA/mlx5: Add Qcounters req_transport_retries_exceeded/req_rnr_retries_exceeded (2024-06-16 18:53:23 +0300)
are available in the Git repository at:
git://git.kernel.org/pub/scm/linux/kernel/git/mellanox/linux.git tags/aux-sysfs-irqs
for you to fetch changes up to 587aebb80370c9cdea106e5870025ad70114a2ed:
net/mlx5: Expose SFs IRQs (2024-07-11 13:52:16 -0700)
----------------------------------------------------------------
aux-sysfs-irqs
Shay Says:
==========
Introduce auxiliary bus IRQs sysfs
Today, PCI PFs and VFs, which are anchored on the PCI bus, display their IRQ information in the <pci_device>/msi_irqs/<irq_num> sysfs files. PCI subfunctions (SFs) are similar to PFs and VFs and these SFs are anchored on the auxiliary bus. However, these PCI SFs lack such IRQ information on the auxiliary bus, leaving users without visibility into which IRQs are used by the SFs. This absence makes it impossible to debug situations and to understand the source of interrupts/SFs for performance tuning and debug.
Additionally, the SFs are multifunctional devices supporting RDMA, network devices, clocks, and more, similar to their peer PCI PFs and VFs. Therefore, it is desirable to have SFs' IRQ information available at the bus/device level.
To overcome the above limitations, this short series extends the auxiliary bus to display IRQ information in sysfs, similar to that of PFs and VFs.
It adds an 'irqs' directory under the auxiliary device and includes an <irq_num> sysfs file within it.
For example:
$ ls /sys/bus/auxiliary/devices/mlx5_core.sf.1/irqs/ 50 51 52 53 54 55 56 57 58
Patch summary:
patch-1 adds auxiliary bus to support irqs used by auxiliary device patch-2 mlx5 driver using exposing irqs for PCI SF devices via auxiliary
bus
==========
----------------------------------------------------------------
Shay Drory (2):
driver core: auxiliary bus: show auxiliary device IRQs net/mlx5: Expose SFs IRQs
Documentation/ABI/testing/sysfs-bus-auxiliary | 9 ++ drivers/base/Makefile | 1 + drivers/base/auxiliary.c | 1 + drivers/base/auxiliary_sysfs.c | 113 +++++++++++++++++++++ drivers/net/ethernet/mellanox/mlx5/core/eq.c | 6 +- .../net/ethernet/mellanox/mlx5/core/irq_affinity.c | 18 +++- .../net/ethernet/mellanox/mlx5/core/mlx5_core.h | 6 ++ drivers/net/ethernet/mellanox/mlx5/core/mlx5_irq.h | 12 ++- drivers/net/ethernet/mellanox/mlx5/core/pci_irq.c | 12 ++- include/linux/auxiliary_bus.h | 24 +++++ 10 files changed, 191 insertions(+), 11 deletions(-) create mode 100644 Documentation/ABI/testing/sysfs-bus-auxiliary create mode 100644 drivers/base/auxiliary_sysfs.c
PATCH 1/2 driver core: auxiliary bus: show auxiliary device IRQs
From: Shay Drory <[email protected]>
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
---
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 | 24 ++++ 5 files changed, 148 insertions(+) create mode 100644 Documentation/ABI/testing/sysfs-bus-auxiliary create mode 100644 drivers/base/auxiliary_sysfs.c
Documentation/ABI/testing/sysfs-bus-auxiliary new file +9 -0
@@ -0,0 +1,9 @@ +What: /sys/bus/auxiliary/devices/.../irqs/ +Date: April, 2024 +Contact: Shay Drory <[email protected]> +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.
drivers/base/Makefile +1 -0
@@ -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/
drivers/base/auxiliary.c +1 -0
@@ -287,6 +287,7 @@ int auxiliary_device_init(struct auxiliary_device *auxdev) dev->bus = &auxiliary_bus_type;device_initialize (&auxdev->dev); +mutex_init (&auxdev->sysfs.lock);return 0 ; }EXPORT_SYMBOL_GPL (auxiliary_device_init);
drivers/base/auxiliary_sysfs.c new file +113 -0
113 lines not on this page · raw message
include/linux/auxiliary_bus.h +24 -0
@@ -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
@@ -139,6 +142,11 @@ struct auxiliary_device {struct device dev;const char *name;u32 id; +struct { +struct xarray irqs; +struct mutex lock;/* Synchronize irq sysfs creation */ +bool irq_dir_exists; + } sysfs; };/**
@@ -212,8 +220,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->sysfs.lock);put_device (&auxdev->dev); }
Signature · 1 line
2.45.2
PATCH 2/2 net/mlx5: Expose SFs IRQs
In reply to Saeed MahameedFrom: Shay Drory <[email protected]>
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.
---
v8-v9:
- add Przemek RBv6->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(-)
drivers/net/ethernet/mellanox/mlx5/core/eq.c +3 -3
@@ -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);
drivers/net/ethernet/mellanox/mlx5/core/irq_affinity.c +17 -1
@@ -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);
drivers/net/ethernet/mellanox/mlx5/core/mlx5_core.h +6 -0
@@ -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);
drivers/net/ethernet/mellanox/mlx5/core/mlx5_irq.h +8 -4
@@ -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__ */
drivers/net/ethernet/mellanox/mlx5/core/pci_irq.c +9 -3
@@ -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;
Signature · 1 line
2.45.2
Jakub Kicinski
maintainerQuoted 7 lines · On Thu, 11 Jul 2024 14:31:38 -0700 Saeed Mahameed wrote:
Following the review of v10 and Greg's request to send this via netdev. This is a pull request that includes the 2 patches of adding IRQs sysfs to aux dev subsystem based on mlx5-next tree (6.10-rc3).
v10: https://lore.kernel.org/all/2024071041-frosted-stonework-2c60@gregkh/
Please pull and let me know if there's any problem.
Hi Saeed, when I pull this I get:
net/mlx5: Reimplement write combining test
RDMA/mlx5: Add Qcounters req_transport_retries_exceeded/req_rnr_retries_exceeded driver core: auxiliary bus: show auxiliary device IRQs
net/mlx5: Expose SFs IRQs
and the subject says mlx5-next, so please confirm if you want me to pull this or there's another plan..
Quoted 5 lines · Jakub Kicinski
Quoted 4 lines · On Thu, 11 Jul 2024 14:31:38 -0700 Saeed Mahameed wrote:
Following the review of v10 and Greg's request to send this via netdev. This is a pull request that includes the 2 patches of adding IRQs sysfs to aux dev subsystem based on mlx5-next tree (6.10-rc3).
Quoted 8 lines
Quoted 3 lines
v10: https://lore.kernel.org/all/2024071041-frosted-stonework-2c60@gregkh/
Please pull and let me know if there's any problem.
Hi Saeed, when I pull this I get:
net/mlx5: Reimplement write combining test
RDMA/mlx5: Add Qcounters req_transport_retries_exceeded/req_rnr_retries_exceeded
Hi Kuba.
I thought Leon already sent one pull request with those, but maybe I was mistaken, anyway they are needed for RDMA, this is why they are part of mlx5-next.
So yes please pull.
Quoted 5 lines
driver core: auxiliary bus: show auxiliary device IRQs net/mlx5: Expose SFs IRQs
and the subject says mlx5-next, so please confirm if you want me to pull this or there's another plan..
I see how this can be confusing, next time I will remove mlx5-next from inside the brackets :).
Thanks,
Saeed.
This pull request was applied to netdev/net-next.git (main) by Jakub Kicinski <[email protected]>:
Hello:
This pull request was applied to netdev/net-next.git (main) by Jakub Kicinski <[email protected]>:
Quoted 9 lines · On Thu, 11 Jul 2024 14:31:38 -0700 you wrote:
From: Saeed Mahameed <[email protected]>
Hi Jakub and Greg,
Following the review of v10 and Greg's request to send this via netdev. This is a pull request that includes the 2 patches of adding IRQs sysfs to aux dev subsystem based on mlx5-next tree (6.10-rc3).
[...]
Here is the summary with links:
- [GIT,PULL,mlx5-next] Introduce auxiliary bus IRQs sysfs
https://git.kernel.org/netdev/net-next/c/dd3cd3ca691d
- [mlx5-next,2/2] net/mlx5: Expose SFs IRQs
(no matching commit)
You are awesome, thank you!
Signature · 2 lines
Deet-doot-dot, I am a bot. https://korg.docs.kernel.org/patchwork/pwbot.html