gpio: timberdale: Fix potential deadlock on &tgpio->lock
PATCH 1/1 gpio: timberdale: Fix potential deadlock on &tgpio->lock
As timbgpio_irq_enable()/timbgpio_irq_disable() callback could be executed under irq context, it could introduce double locks on &tgpio->lock if it preempts other execution units requiring the same locks.
timbgpio_gpio_set()
--> timbgpio_update_bit()
--> spin_lock(&tgpio->lock)
<interrupt>
--> timbgpio_irq_disable()
--> spin_lock_irqsave(&tgpio->lock)
This flaw was found by an experimental static analysis tool I am developing for irq-related deadlock.
To prevent the potential deadlock, the patch uses spin_lock_irqsave() on &tgpio->lock inside timbgpio_gpio_set() to prevent the possible deadlock scenario.
--- drivers/gpio/gpio-timberdale.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-)
drivers/gpio/gpio-timberdale.c +3 -2
@@ -43,9 +43,10 @@ static int timbgpio_update_bit(struct gpio_chip *gpio, unsigned index, unsigned offset, bool enabled) {struct timbgpio *tgpio =gpiochip_get_data (gpio); +unsigned long flags;u32 reg; -spin_lock (&tgpio->lock); +spin_lock_irqsave (&tgpio->lock, flags); reg =ioread32 (tgpio->membase + offset);if (enabled)
@@ -54,7 +55,7 @@ static int timbgpio_update_bit(struct gpio_chip *gpio, unsigned index, reg &= ~(1 << index);iowrite32 (reg, tgpio->membase + offset); -spin_unlock (&tgpio->lock); +spin_unlock_irqrestore (&tgpio->lock, flags);return 0 ; }
Signature · 1 line
2.17.1
Quoted 12 lines · Chengfeng Ye
As timbgpio_irq_enable()/timbgpio_irq_disable() callback could be executed under irq context, it could introduce double locks on
&tgpio->lockif it preempts other execution units requiring the same locks.
timbgpio_gpio_set()
-->timbgpio_update_bit()
-->spin_lock(&tgpio->lock)
<interrupt>
-->timbgpio_irq_disable()
-->spin_lock_irqsave(&tgpio->lock)
Quoted 6 lines
This flaw was found by an experimental static analysis tool I am developing for irq-related deadlock.
To prevent the potential deadlock, the patch uses
spin_lock_irqsave()on&tgpio->lockinsidetimbgpio_gpio_set()to prevent the possible deadlock scenario.
Okay, makes sense.
Question to the users of this hardware if they ever want to have this IRQ chip in the RT environment. In that case the locking type needs to be raw.
Signature · 2 lines
With Best Regards, Andy Shevchenko
Bartosz Golaszewski
AppliedQuoted 51 lines · Chengfeng Ye
As timbgpio_irq_enable()/timbgpio_irq_disable() callback could be executed under irq context, it could introduce double locks on
&tgpio->lockif it preempts other execution units requiring the same locks.
timbgpio_gpio_set()
-->timbgpio_update_bit()
-->spin_lock(&tgpio->lock)
<interrupt>
-->timbgpio_irq_disable()
-->spin_lock_irqsave(&tgpio->lock)This flaw was found by an experimental static analysis tool I am developing for irq-related deadlock.
To prevent the potential deadlock, the patch uses
spin_lock_irqsave()on&tgpio->lockinsidetimbgpio_gpio_set()to prevent the possible deadlock scenario.Signed-off-by Chengfeng Ye <[email protected]>--- drivers/gpio/gpio-timberdale.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-)drivers/gpio/gpio-timberdale.c +3
-3@@ -43,9 +43,10 @@ static int timbgpio_update_bit(struct gpio_chip *gpio, unsigned index, unsigned offset, bool enabled) {struct timbgpio *tgpio =gpiochip_get_data (gpio); +unsigned long flags;u32 reg; -spin_lock (&tgpio->lock); +spin_lock_irqsave (&tgpio->lock, flags); reg =ioread32 (tgpio->membase + offset);if (enabled)@@ -54,7 +55,7 @@ static int timbgpio_update_bit(struct gpio_chip *gpio, unsigned index, reg &= ~(1 << index);iowrite32 (reg, tgpio->membase + offset); -spin_unlock (&tgpio->lock); +spin_unlock_irqrestore (&tgpio->lock, flags);return 0 ; } --
Quoted 2 lines
2.17.1
Applied, thanks!
Bart
Thanks much for the review!
Best,
Chengfeng