]> git.ipfire.org Git - thirdparty/linux.git/commitdiff
genirq/irqdesc: Remove double locking in hwirq_show()
authorClaudiu Beznea <claudiu.beznea.uj@bp.renesas.com>
Wed, 21 May 2025 14:25:41 +0000 (17:25 +0300)
committerThomas Gleixner <tglx@linutronix.de>
Wed, 21 May 2025 15:48:23 +0000 (17:48 +0200)
&desc->lock is acquired on 2 consecutive lines in hwirq_show(). This leads
obviously to a deadlock. Drop the raw_spin_lock_irq() and keep guard().

Fixes: 5d964a9f7cd8 ("genirq/irqdesc: Switch to lock guards")
Signed-off-by: Claudiu Beznea <claudiu.beznea.uj@bp.renesas.com>
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Link: https://lore.kernel.org/all/20250521142541.3832130-1-claudiu.beznea.uj@bp.renesas.com
kernel/irq/irqdesc.c

index 6d006a68ff859f42977afd88d8d3d4117ea11053..b64c57b44c20370a9d956f377ee6186dabbc3a47 100644 (file)
@@ -281,7 +281,6 @@ static ssize_t hwirq_show(struct kobject *kobj, struct kobj_attribute *attr, cha
        struct irq_desc *desc = container_of(kobj, struct irq_desc, kobj);
 
        guard(raw_spinlock_irq)(&desc->lock);
-       raw_spin_lock_irq(&desc->lock);
        if (desc->irq_data.domain)
                return sysfs_emit(buf, "%lu\n", desc->irq_data.hwirq);
        return 0;