genirq/irqdesc: Make sparse happy
cover genirq/irqdesc: Make sparse happy
There is a conditional locking that sparse is not happy about. Fix it by the respective code refactoring and using available annotations.
Andy Shevchenko (2):
genirq/irqdesc: Decrease indentation level in __irq_get_desc_lock() genirq/irqdesc: Balance locking to make sparse happy
kernel/irq/irqdesc.c | 34 +++++++++++++++++++++------------- 1 file changed, 21 insertions(+), 13 deletions(-)
Signature · 1 line
2.47.2
PATCH 1/2 genirq/irqdesc: Decrease indentation level in __irq_get_desc_lock()
There is a conditional that covers all the code for the entire function. Invert it and decrease indentation level. This also helps for further changes to be clearer and tidier.
--- kernel/irq/irqdesc.c | 29 ++++++++++++++++------------- 1 file changed, 16 insertions(+), 13 deletions(-)
kernel/irq/irqdesc.c +16 -13
@@ -900,23 +900,26 @@ struct irq_desc * __irq_get_desc_lock(unsigned int irq, unsigned long *flags, bool bus, unsigned int check) { - struct irq_desc *desc = irq_to_desc(irq); + struct irq_desc *desc; -if (desc) { -if (check & _IRQ_DESC_CHECK) { -if ((check & _IRQ_DESC_PERCPU) && - !irq_settings_is_per_cpu_devid (desc)) -return NULL ; + desc =irq_to_desc (irq); +if (!desc) +return NULL ; -if (!(check & _IRQ_DESC_PERCPU) && -irq_settings_is_per_cpu_devid (desc)) -return NULL ; - } +if (check & _IRQ_DESC_CHECK) { +if ((check & _IRQ_DESC_PERCPU) && + !irq_settings_is_per_cpu_devid (desc)) +return NULL ; -if (bus) -chip_bus_lock (desc); -raw_spin_lock_irqsave (&desc->lock, *flags); +if (!(check & _IRQ_DESC_PERCPU) && +irq_settings_is_per_cpu_devid (desc)) +return NULL ; } + +if (bus) +chip_bus_lock (desc); +raw_spin_lock_irqsave (&desc->lock, *flags); +return desc; }
Signature · 1 line
2.47.2
PATCH 2/2 genirq/irqdesc: Balance locking to make sparse happy
In reply to Andy ShevchenkoSparse is not happy right now about conditional locking and complains:
irqdesc.c:899:17: warning: context imbalance in '__irq_get_desc_lock' - wrong count at exit
Refactor the code and use __acquire() to make it happy. Annotate the function that it acquires the lock in the similar way how __irq_put_desc_unlock() is marked.
--- kernel/irq/irqdesc.c | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-)
kernel/irq/irqdesc.c +8 -3
@@ -899,21 +899,22 @@ unsigned int irq_get_next_irq(unsigned int offset)struct irq_desc *__irq_get_desc_lock (unsigned int irq,unsigned long *flags,bool bus,unsigned int check) + __acquires(&desc->lock) {struct irq_desc *desc; desc =irq_to_desc (irq);if (!desc) -return NULL ; + goto lock;if (check & _IRQ_DESC_CHECK) {if ((check & _IRQ_DESC_PERCPU) && !irq_settings_is_per_cpu_devid (desc)) -return NULL ; + goto lock;if (!(check & _IRQ_DESC_PERCPU) &&irq_settings_is_per_cpu_devid (desc)) -return NULL ; + goto lock; }if (bus)
@@ -921,6 +922,10 @@ __irq_get_desc_lock(unsigned int irq, unsigned long *flags, bool bus,raw_spin_lock_irqsave (&desc->lock, *flags);return desc; + +lock: +__acquire (&desc->lock); +return NULL ; }void __irq_put_desc_unlock (struct irq_desc *desc,unsigned long flags,bool bus)
Signature · 1 line
2.47.2
Re: [PATCH v1 2/2] genirq/irqdesc: Balance locking to make sparse happy
Quoted 8 lines · Andy Shevchenko
Sparse is not happy right now about conditional locking and complains:
irqdesc.c:899:17: warning: context imbalance in '
__irq_get_desc_lock' - wrong count at exitRefactor the code and use
__acquire()to make it happy. Annotate the function that it acquires the lock in the similar way how__irq_put_desc_unlock()is marked.
Oh, scratch this, it basically will diminish the idea for the users.
…
kernel/irq/irqdesc.c unsigned int irq_get_next_irq(unsigned int offset) · line 902
Quoted 3 lines
__irq_get_desc_lock(unsigned int irq, unsigned long *flags, bool bus,
kernel/irq/irqdesc.c +1
-0unsigned int check) + __acquires(&desc->lock)
This is correct annotation, but it doesn't help alone. We need __cond_acquires() to be supported by sparse...
...
It can be still fixed by using macros, but this is not probably what we want. For the reference: d795e38df4b7 ("iio: core: Rework claim and release of direct mode to work with sparse.")
Signature · 2 lines
With Best Regards, Andy Shevchenko
Re: [PATCH v1 2/2] genirq/irqdesc: Balance locking to make sparse happy
Quoted 11 lines · Andy Shevchenko
Quoted 8 lines · Andy Shevchenko
Sparse is not happy right now about conditional locking and complains:
irqdesc.c:899:17: warning: context imbalance in '
__irq_get_desc_lock' - wrong count at exitRefactor the code and use
__acquire()to make it happy. Annotate the function that it acquires the lock in the similar way how__irq_put_desc_unlock()is marked.Oh, scratch this, it basically will diminish the idea for the users.
That said, the first patch is okay, in case you want it.
Signature · 2 lines
With Best Regards, Andy Shevchenko
[tip: irq/core] genirq/irqdesc: Decrease indentation level in __irq_get_desc_lock()
In reply to Andy ShevchenkoThe following commit has been merged into the irq/core branch of tip:
The following commit has been merged into the irq/core branch of tip:
Commit-ID: e5032ead8599affac5d8b816ea3c9d63ebeec6b4 Gitweb: https://git.kernel.org/tip/e5032ead8599affac5d8b816ea3c9d63ebeec6b4 Author: Andy Shevchenko <[email protected]> AuthorDate: Wed, 16 Apr 2025 14:40:33 +03:00 Committer: Thomas Gleixner <[email protected]> CommitterDate: Mon, 05 May 2025 15:24:06 +02:00
genirq/irqdesc: Decrease indentation level in __irq_get_desc_lock()
There is a conditional that covers all the code for the entire function. Invert it and decrease indentation level. This also helps for further changes to be clearer and tidier.
[ tglx: Removed line breaks ]
--- kernel/irq/irqdesc.c | 34 +++++++++++++++++----------------- 1 file changed, 17 insertions(+), 17 deletions(-)
kernel/irq/irqdesc.c +17 -17
@@ -896,27 +896,27 @@ unsigned int irq_get_next_irq(unsigned int offset)return irq_find_at_or_after (offset); } -struct irq_desc * -__irq_get_desc_lock (unsigned int irq,unsigned long *flags,bool bus, -unsigned int check) +struct irq_desc *__irq_get_desc_lock (unsigned int irq,unsigned long *flags,bool bus, +unsigned int check) { -struct irq_desc *desc =irq_to_desc (irq); +struct irq_desc *desc; -if (desc) { -if (check & _IRQ_DESC_CHECK) { -if ((check & _IRQ_DESC_PERCPU) && - !irq_settings_is_per_cpu_devid (desc)) -return NULL ; - -if (!(check & _IRQ_DESC_PERCPU) && -irq_settings_is_per_cpu_devid (desc)) -return NULL ; - } + desc =irq_to_desc (irq); +if (!desc) +return NULL ; + +if (check & _IRQ_DESC_CHECK) { +if ((check & _IRQ_DESC_PERCPU) && !irq_settings_is_per_cpu_devid (desc)) +return NULL ; -if (bus) -chip_bus_lock (desc); -raw_spin_lock_irqsave (&desc->lock, *flags); +if (!(check & _IRQ_DESC_PERCPU) &&irq_settings_is_per_cpu_devid (desc)) +return NULL ; } + +if (bus) +chip_bus_lock (desc); +raw_spin_lock_irqsave (&desc->lock, *flags); +return desc; }