spi: fix possible deadlock between internal bus locks and bus_lock_flag
Subsystems (2)
PATCH v2 1/1 spi: fix possible deadlock between internal bus locks and bus_lock_flag
External users may use spi_bus_lock to get exclusive access. This will also grab the bus_lock_mutex and may therefore result in a deadlock if __spi_pump_messages also tries to get the mutex.
Therefore adapt spi_pump_messages as well as spi_sync to preset the bus_locked parameter according to the master->bus_lock_flag.
---
changes in v2:
- move the second check from __spi_pump_messages to its calling functions spi_pump_messages and __spi_sync as suggested by Vignesh
drivers/spi/spi.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/spi/spi.c +2 -2
@@ -1209,7 +1209,7 @@ static void spi_pump_messages(struct kthread_work *work)struct spi_master *master = container_of(work, struct spi_master, pump_messages); -__spi_pump_messages (master, true, false); +__spi_pump_messages (master, true, master->bus_lock_flag); }static int spi_init_queue (struct spi_master *master)
@@ -2853,7 +2853,7 @@ static int __spi_sync(struct spi_device *spi, struct spi_message *message,*/ int spi_sync (struct spi_device *spi,struct spi_message *message) { -return __spi_sync (spi, message,0 ); +return __spi_sync (spi, message, spi->master->bus_lock_flag); }EXPORT_SYMBOL_GPL (spi_sync);
Signature · 7 lines
2.6.4 -- To unsubscribe from this list: send the line "unsubscribe linux-spi" in the body of a message to [email protected] More majordomo info at http://vger.kernel.org/majordomo-info.html
Quoted 31 lines · Heiko Stübner
External users may use
spi_bus_lockto get exclusive access. This will also grab thebus_lock_mutexand may therefore result in a deadlock if__spi_pump_messagesalso tries to get the mutex.Therefore adapt
spi_pump_messagesas well asspi_syncto preset thebus_lockedparameter according to themaster->bus_lock_flag.Fixes 49023d2e4ead ("spi: core: Fix deadlock when sending messages")Signed-off-by Heiko Stuebner <[email protected]>---
changes in v2:
- move the second check from__spi_pump_messagesto its calling functionsspi_pump_messagesand__spi_syncas suggested by Vigneshdrivers/spi/spi.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)drivers/spi/spi.c +1
-1@@ -1209,7 +1209,7 @@ static void spi_pump_messages(struct kthread_work *work)struct spi_master *master = container_of(work, struct spi_master, pump_messages); -__spi_pump_messages (master, true, false); +__spi_pump_messages (master, true, master->bus_lock_flag); }static int spi_init_queue (struct spi_master *master)
drivers/spi/spi.c static int __spi_sync(struct spi_device *spi, struct spi_message *message, · line 2858
Quoted 7 lines
drivers/spi/spi.c +1
-1@@ -2853,7 +2853,7 @@ static int __spi_sync(struct spi_device *spi, struct spi_message *message,*/ int spi_sync (struct spi_device *spi,struct spi_message *message) { -return __spi_sync (spi, message,0 ); +return __spi_sync (spi, message, spi->master->bus_lock_flag); }EXPORT_SYMBOL_GPL (spi_sync);
Thanks for the report and fixing this!
Jon
-----------------------------------------------------------------------------------
This email message is for the sole use of the intended recipient(s) and may contain confidential information. Any unauthorized review, use, disclosure or distribution is prohibited. If you are not the intended recipient, please contact the sender by reply email and destroy all copies of the original message.
-----------------------------------------------------------------------------------
--
To unsubscribe from this list: send the line "unsubscribe linux-spi" in the body of a message to [email protected] More majordomo info at http://vger.kernel.org/majordomo-info.html
Applied "spi: fix possible deadlock between internal bus locks and bus_lock_flag" to the spi tree
In reply to Heiko StübnerThe patch
spi: fix possible deadlock between internal bus locks and bus_lock_flag
has been applied to the spi tree at
git://git.kernel.org/pub/scm/linux/kernel/git/broonie/spi.git
All being well this means that it will be integrated into the linux-next tree (usually sometime in the next 24 hours) and sent to Linus during the next merge window (or sooner if it is a bug fix), however if problems are discovered then the patch may be dropped or reverted.
You may get further e-mails resulting from automated or manual testing and review of the tree, please engage with people reporting problems and send followup patches addressing any issues that are reported if needed.
If any updates are required or you are submitting further changes they should be sent as incremental updates against current git, existing patches will not be replaced.
Please add any relevant lists and maintainers to the CCs when replying to this mail.
Thanks,
Mark
Quoted 1 line
From
24c8cd1b081286fd34340f0e1fc68a774a5a775fMon Sep 17 00:00:00 2001
From: =?UTF-8?q?Heiko=20St=C3=BCbner?= <[email protected]>
Date: Fri, 18 Mar 2016 11:15:11 +0100
Subject: [PATCH] spi: fix possible deadlock between internal bus locks and
bus_lock_flag
External users may use spi_bus_lock to get exclusive access. This will also grab the bus_lock_mutex and may therefore result in a deadlock if __spi_pump_messages also tries to get the mutex.
Therefore adapt spi_pump_messages as well as spi_sync to preset the bus_locked parameter according to the master->bus_lock_flag.
--- drivers/spi/spi.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/spi/spi.c +2 -2
@@ -1209,7 +1209,7 @@ static void spi_pump_messages(struct kthread_work *work)struct spi_master *master = container_of(work, struct spi_master, pump_messages); -__spi_pump_messages (master, true, false); +__spi_pump_messages (master, true, master->bus_lock_flag); }static int spi_init_queue (struct spi_master *master)
@@ -2853,7 +2853,7 @@ static int __spi_sync(struct spi_device *spi, struct spi_message *message,*/ int spi_sync (struct spi_device *spi,struct spi_message *message) { -return __spi_sync (spi, message,0 ); +return __spi_sync (spi, message, spi->master->bus_lock_flag); }EXPORT_SYMBOL_GPL (spi_sync);
Signature · 6 lines
2.7.0 -- To unsubscribe from this list: send the line "unsubscribe linux-spi" in the body of a message to [email protected] More majordomo info at http://vger.kernel.org/majordomo-info.html
Quoted 9 lines · Heiko Stübner
External users may use
spi_bus_lockto get exclusive access. This will also grab thebus_lock_mutexand may therefore result in a deadlock if__spi_pump_messagesalso tries to get the mutex.Therefore adapt
spi_pump_messagesas well asspi_syncto preset thebus_lockedparameter according to themaster->bus_lock_flag.Fixes 49023d2e4ead ("spi: core: Fix deadlock when sending messages")Signed-off-by Heiko Stuebner <[email protected]>
Tested on rk3288-veyron-jerry and verified that it fixes the boot failure I reported.
Kevin
--
To unsubscribe from this list: send the line "unsubscribe linux-spi" in the body of a message to [email protected] More majordomo info at http://vger.kernel.org/majordomo-info.html