Introduce auxiliary bus IRQs sysfs
Subsystems (6)
v3 cover 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. Sometimes, the PCI SF auxiliary devices share the IRQ with other SFs, a detail that is also not available to the users. Consequently, this <irq_num> file indicates whether the IRQ is 'exclusive' or 'shared'.
This 'irqs' directory extenstion is optional, i.e. only for PCI SFs the sysfs irq information is optionally exposed.
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
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
---v2->v3:
- addressed comments from Parav and Przemek in patch #1.
- fixed a bug in patch #2.v1->v2:
- addressed comments from Greg, Simon H and kernel test boot in patch #1.
Shay Drory (2):
driver core: auxiliary bus: show auxiliary device IRQs net/mlx5: Expose SFs IRQs
Documentation/ABI/testing/sysfs-bus-auxiliary | 14 ++ drivers/base/auxiliary.c | 170 +++++++++++++++++- drivers/net/ethernet/mellanox/mlx5/core/eq.c | 6 +- .../mellanox/mlx5/core/irq_affinity.c | 15 +- .../ethernet/mellanox/mlx5/core/mlx5_core.h | 6 + .../ethernet/mellanox/mlx5/core/mlx5_irq.h | 12 +- .../net/ethernet/mellanox/mlx5/core/pci_irq.c | 12 +- .../ethernet/mellanox/mlx5/core/sf/dev/dev.c | 2 +- include/linux/auxiliary_bus.h | 15 +- 9 files changed, 237 insertions(+), 15 deletions(-) create mode 100644 Documentation/ABI/testing/sysfs-bus-auxiliary
Signature · 1 line
2.38.1
PATCH v3 1/2 driver core: auxiliary bus: show auxiliary device IRQs
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
---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 | 171 +++++++++++++++++- include/linux/auxiliary_bus.h | 24 ++- 3 files changed, 206 insertions(+), 3 deletions(-) create mode 100644 Documentation/ABI/testing/sysfs-bus-auxiliary
Documentation/ABI/testing/sysfs-bus-auxiliary new file +14 -0
@@ -0,0 +1,14 @@ +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. + +What: /sys/bus/auxiliary/devices/.../irqs/<N> +Date: April, 2024 +Contact: Shay Drory <[email protected]> +Description: + auxiliary devices can share IRQs. This attribute indicates if + the irq is shared with other SFs or exclusively used by the SF.
drivers/base/auxiliary.c +170 -1
195 lines not on this page · raw message
include/linux/auxiliary_bus.h +22 -2
@@ -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) {
Signature · 1 line
2.38.1
Re: [PATCH net-next v3 1/2] driver core: auxiliary bus: show auxiliary device IRQs
Quoted 69 lines · Shay Drory
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 exclusiveReviewed-by Parav Pandit <[email protected]>Signed-off-by Shay Drory <[email protected]>---
v2->v3:
- fix function declaration in case SYSFS isn't defined (Parav)
- convertauxdev->groupsarray withauxiliary_irqs_groups(Przemek)v1->v2:
- move #ifdefs fromdrivers/base/auxiliary.ctoinclude/linux/auxiliary_bus.h(Greg)
- useEXPORT_SYMBOL_GPLinstead ofEXPORT_SYMBOL(Greg)
- Fix kzalloc(ref) tokzalloc(*ref)(Simon)
- Add return description inauxiliary_device_sysfs_irq_add()kdoc (Simon)
- Fixauxiliary_irq_mode_showdoc (kernel test boot)--- Documentation/ABI/testing/sysfs-bus-auxiliary | 14 ++ drivers/base/auxiliary.c | 171 +++++++++++++++++- include/linux/auxiliary_bus.h | 24 ++- 3 files changed, 206 insertions(+), 3 deletions(-)create mode 100644
Documentation/ABI/testing/sysfs-bus-auxiliaryDocumentation/ABI/testing/sysfs-bus-auxiliary new file +14
-0@@ -0,0 +1,14 @@ +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. + +What: /sys/bus/auxiliary/devices/.../irqs/<N> +Date: April, 2024 +Contact: Shay Drory <[email protected]> +Description: + auxiliary devices can share IRQs. This attribute indicates if + the irq is shared with other SFs or exclusively used by the SF.drivers/base/auxiliary.c +0
-0
drivers/base/auxiliary.c line 165
Quoted 8 lines
drivers/base/auxiliary.c +5
-0@@ -158,6 +158,169 @@* }; */ +#ifdef CONFIG_SYSFS +/* Xarray of irqs to determine if irq is exclusive or shared. */ +static DEFINE_XARRAY (irqs); +/* Protects insertions into the irtqs xarray. */ +static DEFINE_MUTEX (irqs_lock);
sorry for not catching it earlier, you don't need a separate lock, xarray provides one, please see below [1], [2]
Quoted 20 lines
drivers/base/auxiliary.c +20
-0+ +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 +}; +
drivers/base/auxiliary.c line 195
Quoted 10 lines
drivers/base/auxiliary.c +10
-0+/* 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 )
I didn't checked if it is possible with current implementation, but please imagine a scenario where user open()'s sysfs file, then triggers operation to remove irq (to call auxiliary_irq_destroy()), and only then read()'s sysfs contents, what results in nullptr dereference (xa_load() returning NULL). Splitting the code into two if statements would resolve this issue.
Quoted 14 lines
drivers/base/auxiliary.c +14
-0+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);
drivers/base/auxiliary.c line 219
Quoted 10 lines
drivers/base/auxiliary.c +10
-0+ } +xa_unlock (&irqs); +} + +static int auxiliary_irq_create (int irq) +{ +refcount_t *ref; +int ret =0 ; + +mutex_lock (&irqs_lock);
[1] xa_lock() instead ...
drivers/base/auxiliary.c line 222
Quoted 3 lines
drivers/base/auxiliary.c +3
-0+ ref =xa_load (&irqs, irq); +if (ref &&refcount_inc_not_zero (ref)) + goto out;
&& refcount_inc_not_zero() here means: leak memory and wreak havoc on saturation, instead the logic should be:
if (ref) {
refcount_inc(ref);
goto out;
}anyway allocating under a lock taken is not the best idea in general, although xarray API somehow encourages this - alternative is to preallocate and free when not used, or some lock dance that will be easy to get wrong - and that's the raison d'etre of xa_reserve() :)
drivers/base/auxiliary.c line 231
Quoted 9 lines
drivers/base/auxiliary.c +9
-0+ + ref =kzalloc (sizeof (*ref),GFP_KERNEL ); +if (!ref) { + ret = -ENOMEM ; + goto out; + } + +refcount_set (ref,1 ); + ret =xa_insert (&irqs, irq, ref,GFP_KERNEL );
[2] ... then __xa_insert() here
Quoted 173 lines
drivers/base/auxiliary.c +99
-1+if (ret) +kfree (ref); + +out: +mutex_unlock (&irqs_lock); + 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 +458,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 +474,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 +490,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)include/linux/auxiliary_bus.h +22
-2@@ -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) {
Re: [PATCH net-next v3 1/2] driver core: auxiliary bus: show auxiliary device IRQs
Quoted 120 lines · Przemek Kitszel
External email: Use caution opening links or attachments
Quoted 73 lines · Shay Drory
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 exclusiveReviewed-by Parav Pandit <[email protected]>Signed-off-by Shay Drory <[email protected]>---
v2->v3:
- fix function declaration in case SYSFS isn't defined (Parav)
- convertauxdev->groupsarray withauxiliary_irqs_groups(Przemek)v1->v2:
- move #ifdefs fromdrivers/base/auxiliary.ctoinclude/linux/auxiliary_bus.h(Greg)
- useEXPORT_SYMBOL_GPLinstead ofEXPORT_SYMBOL(Greg)
- Fix kzalloc(ref) tokzalloc(*ref)(Simon)
- Add return description inauxiliary_device_sysfs_irq_add()kdoc (Simon)
- Fixauxiliary_irq_mode_showdoc (kernel test boot)
---
Documentation/ABI/testing/sysfs-bus-auxiliary| 14 ++ drivers/base/auxiliary.c | 171 +++++++++++++++++- include/linux/auxiliary_bus.h | 24 ++-3 files changed, 206 insertions(+), 3 deletions(-)create mode 100644
Documentation/ABI/testing/sysfs-bus-auxiliaryDocumentation/ABI/testing/sysfs-bus-auxiliary new file +5
-0@@ -0,0 +1,14 @@ +What: /sys/bus/auxiliary/devices/.../irqs/ +Date: April, 2024 +Contact: Shay Drory <[email protected]> +Description: + The /sys/devices/.../irqs directory contains a variableset of
+ files, with each file is named as irq number similar to PCI PF
+ or VF's irq number located inmsi_irqsdirectory.Documentation/ABI/testing/sysfs-bus-auxiliary new file +6
-0+ +What: /sys/bus/auxiliary/devices/.../irqs/<N> +Date: April, 2024 +Contact: Shay Drory <[email protected]> +Description: + auxiliary devices can share IRQs. This attributeindicates if
+ the irq is shared with other SFs or exclusively used by the SF.drivers/base/auxiliary.c +0
-0drivers/base/auxiliary.c line 165
Quoted 8 lines
drivers/base/auxiliary.c +5
-0@@ -158,6 +158,169 @@* }; */ +#ifdef CONFIG_SYSFS +/* Xarray of irqs to determine if irq is exclusive or shared. */ +static DEFINE_XARRAY (irqs); +/* Protects insertions into the irtqs xarray. */ +static DEFINE_MUTEX (irqs_lock);sorry for not catching it earlier, you don't need a separate lock, xarray provides one, please see below [1], [2]
Quoted 31 lines
drivers/base/auxiliary.c +21
-0+ +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.
+ */
+staticssize_tauxiliary_irq_mode_show(struct device *dev, + structdevice_attribute*attr, char *buf)drivers/base/auxiliary.c +4
-0+{ + struct auxiliary_irq_info *info = + container_of(attr, struct auxiliary_irq_info, sysfs_attr); +
Quoted 8 lines
Quoted 1 line
+ if (
refcount_read(xa_load(&irqs, info->irq))> 1)I didn't checked if it is possible with current implementation, but please imagine a scenario where user open()'s sysfs file, then triggers operation to remove irq (to call
auxiliary_irq_destroy()), and only then read()'s sysfs contents, what results in nullptr dereference (xa_load()returning NULL). Splitting the code into two if statements would resolve this issue.
the first function in auxiliary_irq_destroy() is removing the sysfs. I don't see how after that user can read() the sysfs...
Quoted 39 lines
Quoted 15 lines
+ return
sysfs_emit(buf, "%s\n", "shared"); + else
+ returnsysfs_emit(buf, "%s\n", "exclusive");drivers/base/auxiliary.c +11
-0+} + +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);drivers/base/auxiliary.c line 219
Quoted 10 lines
drivers/base/auxiliary.c +10
-0+ } + xa_unlock(&irqs); +} + +static int auxiliary_irq_create (int irq) +{ + refcount_t *ref; + int ret = 0; + + mutex_lock(&irqs_lock);[1]
xa_lock()instead ...Quoted 3 lines
+ ref =
xa_load(&irqs, irq);
+ if (ref &&refcount_inc_not_zero(ref))
+ goto out;
&& refcount_inc_not_zero()here means: leak memory and wreak havoc on saturation, instead the logic should be:
if (ref) {
refcount_inc(ref);
goto out;
}
Quoted 6 lines
anyway allocating under a lock taken is not the best idea in general, although xarray API somehow encourages this -
alternative is to
preallocate and free when not used, or some lock dance that will be easy to get wrong - and that's the raison d'etre ofxa_reserve():)
I don't understand what you picture here?xa_reserve() can drop the lock while allocating the xa_entry, so how it will help?
Quoted 12 lines
drivers/base/auxiliary.c line 231
Quoted 10 lines
drivers/base/auxiliary.c +9
-0+ + ref = kzalloc(sizeof(*ref), GFP_KERNEL); + if (!ref) { + ret = -ENOMEM; + goto out; + } + + refcount_set(ref, 1); + ret = xa_insert(&irqs, irq, ref, GFP_KERNEL);[2] ... then
__xa_insert()here
__xa_insert() can drop the lock as well...
Quoted 189 lines
Quoted 188 lines
+ if (ret)
+ kfree(ref);drivers/base/auxiliary.c +12
-0+ +out: + mutex_unlock(&irqs_lock); + 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.
+ */
+intauxiliary_device_sysfs_irq_add(struct auxiliary_device *auxdev, int irq)drivers/base/auxiliary.c +50
-0+{ + 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.
+ */
+voidauxiliary_device_sysfs_irq_remove(struct auxiliary_device *auxdev, int irq)drivers/base/auxiliary.c +17
-0+{ + 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 structauxiliary_device_id*id, const structauxiliary_device*auxdev) {drivers/base/auxiliary.c +3
-1@@ -295,6 +458,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 +474,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;drivers/base/auxiliary.c +4
-0@@ -325,6 +490,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)
include/linux/auxiliary_bus.h +3
-2@@ -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, constchar *modname,
+ boolirqs_sysfs_enable); +#defineauxiliary_device_add(auxdev)__auxiliary_device_add(auxdev, KBUILD_MODNAME, false)include/linux/auxiliary_bus.h +5
-0+#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);
include/linux/auxiliary_bus.h +11
-0+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) {}
+#endifstatic inline void
auxiliary_device_uninit(struct auxiliary_device *auxdev){
Re: [PATCH net-next v3 1/2] driver core: auxiliary bus: show auxiliary device IRQs
please not that v4+ is already being discussed
Quoted 1 line · Shay Drori
On 08/05/2024 12:34, Przemek Kitszel wrote:
// ...
Quoted 21 lines
Quoted 12 lines
Quoted 12 lines
(quoted diff) +2
-0+ +/* Auxiliary devices can share IRQs. Expose to user whether theprovided IRQ is
+ * shared or exclusive.
+ */
+staticssize_tauxiliary_irq_mode_show(struct device *dev, + structdevice_attribute*attr, char *buf)drivers/base/auxiliary.c +4
-0+{ + struct auxiliary_irq_info *info = + container_of(attr, struct auxiliary_irq_info, sysfs_attr); +Quoted 8 lines
Quoted 1 line
+ if (
refcount_read(xa_load(&irqs, info->irq))> 1)I didn't checked if it is possible with current implementation, but please imagine a scenario where user open()'s sysfs file, then triggers operation to remove irq (to call
auxiliary_irq_destroy()), and only then read()'s sysfs contents, what results in nullptr dereference (xa_load()returning NULL). Splitting the code into two if statements would resolve this issue.
Quoted 2 lines
the first function in
auxiliary_irq_destroy()is removing the sysfs. I don't see how after that user canread()the sysfs...
Let me illustrate, but with my running kernel instead of your series:
# strace cat /sys/class/net/enp0s31f6/duplex 2>&1 | grep -e open -e read yields (among others): openat(AT_FDCWD, "/sys/class/net/enp0s31f6/duplex", O_RDONLY) = 3 read(3, "full\n", 131072) = 5
And now imagine that other, concurrent user app or any HW event triggers this IRQ removal (resulting with xarray entry removed (!), likely sysfs attr refcount dropped to 0 [A], so new open()s will be declined, but that is irrelevant).
My assumption is that, until close()d, user is free to call read() on fd received from openat(), but it's possible that xa_load() would return NULL (because of [A] above).
Quoted 33 lines
Quoted 33 lines
Quoted 16 lines
+ return
sysfs_emit(buf, "%s\n", "shared"); + else
+ returnsysfs_emit(buf, "%s\n", "exclusive");drivers/base/auxiliary.c +11
-0+} + +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);drivers/base/auxiliary.c line 219
Quoted 10 lines
drivers/base/auxiliary.c +10
-0+ } + xa_unlock(&irqs); +} + +static int auxiliary_irq_create (int irq) +{ + refcount_t *ref; + int ret = 0; + + mutex_lock(&irqs_lock);[1]
xa_lock()instead ...Quoted 3 lines
+ ref =
xa_load(&irqs, irq);
+ if (ref &&refcount_inc_not_zero(ref))
+ goto out;
Quoted 7 lines
Quoted 7 lines
&& refcount_inc_not_zero()here means: leak memory and wreak havoc on saturation, instead the logic should be:
if (ref) {
refcount_inc(ref);
goto out;
}
<digression>
Quoted 8 lines
Quoted 6 lines
anyway allocating under a lock taken is not the best idea in general, although xarray API somehow encourages this -
alternative is to
preallocate and free when not used, or some lock dance that will be easy to get wrong - and that's the raison d'etre ofxa_reserve():)I don't understand what you picture here?
Here I was digressing, sorry for not marking it clearly as that. IMO xarray API need an extension to make this and similar use case easier to code right. I will CC you ofc.
</digression>
Quoted 15 lines
xa_reserve()can drop the lock while allocating thexa_entry, so how it will help?Quoted 12 lines
drivers/base/auxiliary.c line 231
Quoted 10 lines
drivers/base/auxiliary.c +9
-0+ + ref = kzalloc(sizeof(*ref), GFP_KERNEL); + if (!ref) { + ret = -ENOMEM; + goto out; + } + + refcount_set(ref, 1); + ret = xa_insert(&irqs, irq, ref, GFP_KERNEL);[2] ... then
__xa_insert()here
Quoted 1 line
__xa_insert()can drop the lock as well...
Thank you for pointing it to me.
Let's move future discussion on this series to your newer submissions.
// ...
Re: [PATCH net-next v3 1/2] driver core: auxiliary bus: show auxiliary device IRQs
Quoted 123 lines · Przemek Kitszel
External email: Use caution opening links or attachments
please not that v4+ is already being discussed
Quoted 1 line · Shay Drori
On 08/05/2024 12:34, Przemek Kitszel wrote:
// ...
Quoted 22 lines
Quoted 13 lines
Quoted 13 lines
(quoted diff) +2
-0+ +/* Auxiliary devices can share IRQs. Expose to user whether theprovided IRQ is
+ * shared or exclusive.
+ */
+staticssize_tauxiliary_irq_mode_show(struct device *dev, + structdevice_attribute*attr, char *buf)
+{
+ structauxiliary_irq_info*info =
+container_of(attr, struct auxiliary_irq_info, sysfs_attr);
+Quoted 8 lines
Quoted 1 line
+ if (
refcount_read(xa_load(&irqs, info->irq))> 1)I didn't checked if it is possible with current implementation, but please imagine a scenario where user open()'s sysfs file, then triggers operation to remove irq (to call
auxiliary_irq_destroy()), and only then read()'s sysfs contents, what results in nullptr dereference (xa_load()returning NULL). Splitting the code into two if statements would resolve this issue.Quoted 2 lines
the first function in
auxiliary_irq_destroy()is removing the sysfs. I don't see how after that user canread()the sysfs...Let me illustrate, but with my running kernel instead of your series:
# strace cat /sys/class/net/enp0s31f6/duplex 2>&1 | grep -e open -e read yields (among others): openat(AT_FDCWD, "/sys/class/net/enp0s31f6/duplex", O_RDONLY) = 3 read(3, "full\n", 131072) = 5And now imagine that other, concurrent user app or any HW event triggers this IRQ removal (resulting with xarray entry removed (!), likely sysfs attr refcount dropped to 0 [A], so new open()s will be declined, but that is irrelevant).
My assumption is that, until close()d, user is free to callread()on fd received fromopenat(), but it's possible thatxa_load()would return NULL (because of [A] above).Quoted 33 lines
Quoted 33 lines
Quoted 16 lines
+ return
sysfs_emit(buf, "%s\n", "shared"); + else
+ returnsysfs_emit(buf, "%s\n", "exclusive");drivers/base/auxiliary.c +11
-0+} + +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);drivers/base/auxiliary.c line 219
Quoted 10 lines
drivers/base/auxiliary.c +10
-0+ } + xa_unlock(&irqs); +} + +static int auxiliary_irq_create (int irq) +{ + refcount_t *ref; + int ret = 0; + + mutex_lock(&irqs_lock);[1]
xa_lock()instead ...Quoted 3 lines
+ ref =
xa_load(&irqs, irq);
+ if (ref &&refcount_inc_not_zero(ref))
+ goto out;Quoted 7 lines
Quoted 7 lines
&& refcount_inc_not_zero()here means: leak memory and wreak havoc on saturation, instead the logic should be:
if (ref) {
refcount_inc(ref);
goto out;
}<digression>
Quoted 8 lines
Quoted 6 lines
anyway allocating under a lock taken is not the best idea in general, although xarray API somehow encourages this -
alternative is to
preallocate and free when not used, or some lock dance that will be easy to get wrong - and that's the raison d'etre ofxa_reserve():)I don't understand what you picture here?
Here I was digressing, sorry for not marking it clearly as that. IMO xarray API need an extension to make this and similar use case easier to code right. I will CC you ofc.
</digression>Quoted 16 lines
xa_reserve()can drop the lock while allocating thexa_entry, so how it will help?Quoted 12 lines
drivers/base/auxiliary.c line 231
Quoted 10 lines
drivers/base/auxiliary.c +9
-0+ + ref = kzalloc(sizeof(*ref), GFP_KERNEL); + if (!ref) { + ret = -ENOMEM; + goto out; + } + + refcount_set(ref, 1); + ret = xa_insert(&irqs, irq, ref, GFP_KERNEL);[2] ... then
__xa_insert()here
Quoted 5 lines
Quoted 1 line
__xa_insert()can drop the lock as well...Thank you for pointing it to me.
Let's move future discussion on this series to your newer submissions.
thanks for the quick reviews :)
lets continue in the v4 series.
Quoted 2 lines
// ...
PATCH v3 2/2 net/mlx5: Expose SFs IRQs
In reply to Shay DroryExpose 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.
---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(-)
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 +14 -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);
@@ -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);
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
@@ -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;
drivers/net/ethernet/mellanox/mlx5/core/sf/dev/dev.c +7 -9
@@ -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",
Signature · 1 line
2.38.1