| Message ID | 20220901123630.1098433-1-david@protonic.nl (mailing list archive) |
|---|---|
| State | Accepted |
| Commit | 9c9c9da7aa108e6bf952c18289527a5234e4fc59 |
| Headers | show |
| Series | spi: spi.c: Fix queue hang if previous transfer failed | expand |
On Thu, 1 Sep 2022 14:36:30 +0200, David Jander wrote: > The queue worker always needs to be kicked one final time after a transfer > is done in order to transition to idle (ctlr->busy = false). > > Commit 69fa95905d40 ("spi: Ensure the io_mutex is held until > spi_finalize_current_message()") moved this code into > __spi_pump_messages(), but it was executed only if the transfer was > successful. This condition check causes ctlr-busy to stay true in case of > a failed transfer. > This in turn causes that no new work is ever scheduled to the work queue. > > [...] Applied to https://git.kernel.org/pub/scm/linux/kernel/git/broonie/spi.git for-next Thanks! [1/1] spi: spi.c: Fix queue hang if previous transfer failed commit: 9c9c9da7aa108e6bf952c18289527a5234e4fc59 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
diff --git a/drivers/spi/spi.c b/drivers/spi/spi.c index 83da8862b8f2..7355f4ac4e33 100644 --- a/drivers/spi/spi.c +++ b/drivers/spi/spi.c @@ -1727,8 +1727,7 @@ static void __spi_pump_messages(struct spi_controller *ctlr, bool in_kthread) spin_unlock_irqrestore(&ctlr->queue_lock, flags); ret = __spi_pump_transfer_message(ctlr, msg, was_busy); - if (!ret) - kthread_queue_work(ctlr->kworker, &ctlr->pump_messages); + kthread_queue_work(ctlr->kworker, &ctlr->pump_messages); ctlr->cur_msg = NULL; ctlr->fallback = false;
The queue worker always needs to be kicked one final time after a transfer is done in order to transition to idle (ctlr->busy = false). Commit 69fa95905d40 ("spi: Ensure the io_mutex is held until spi_finalize_current_message()") moved this code into __spi_pump_messages(), but it was executed only if the transfer was successful. This condition check causes ctlr-busy to stay true in case of a failed transfer. This in turn causes that no new work is ever scheduled to the work queue. Fixes: 69fa95905d40 ("spi: Ensure the io_mutex is held until spi_finalize_current_message()") Reported-by: Vincent Whitchurch <vincent.whitchurch@axis.com> Signed-off-by: David Jander <david@protonic.nl> --- drivers/spi/spi.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-)