diff options
author | Tasos Sahanidis <tasos@tasossah.com> | 2021-09-03 09:47:58 +0300 |
---|---|---|
committer | Jens Axboe <axboe@kernel.dk> | 2021-12-03 06:32:40 -0700 |
commit | fb48febce7e30baed94dd791e19521abd2c3fd83 (patch) | |
tree | 3512350a55415769b353cef01bdaa54dcf07c2a0 /drivers/block | |
parent | 2bfdbe8b7ebd17b5331071071a910fbabc64b436 (diff) | |
download | linux-stable-fb48febce7e30baed94dd791e19521abd2c3fd83.tar.gz linux-stable-fb48febce7e30baed94dd791e19521abd2c3fd83.tar.bz2 linux-stable-fb48febce7e30baed94dd791e19521abd2c3fd83.zip |
floppy: Fix hang in watchdog when disk is ejected
When the watchdog detects a disk change, it calls cancel_activity(),
which in turn tries to cancel the fd_timer delayed work.
In the above scenario, fd_timer_fn is set to fd_watchdog(), meaning
it is trying to cancel its own work.
This results in a hang as cancel_delayed_work_sync() is waiting for the
watchdog (itself) to return, which never happens.
This can be reproduced relatively consistently by attempting to read a
broken floppy, and ejecting it while IO is being attempted and retried.
To resolve this, this patch calls cancel_delayed_work() instead, which
cancels the work without waiting for the watchdog to return and finish.
Before this regression was introduced, the code in this section used
del_timer(), and not del_timer_sync() to delete the watchdog timer.
Link: https://lore.kernel.org/r/399e486c-6540-db27-76aa-7a271b061f76@tasossah.com
Fixes: 070ad7e793dc ("floppy: convert to delayed work and single-thread wq")
Signed-off-by: Tasos Sahanidis <tasos@tasossah.com>
Signed-off-by: Denis Efremov <efremov@linux.com>
Signed-off-by: Jens Axboe <axboe@kernel.dk>
Diffstat (limited to 'drivers/block')
-rw-r--r-- | drivers/block/floppy.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/block/floppy.c b/drivers/block/floppy.c index 0c638de25023..f0e36c18f349 100644 --- a/drivers/block/floppy.c +++ b/drivers/block/floppy.c @@ -1015,7 +1015,7 @@ static DECLARE_DELAYED_WORK(fd_timer, fd_timer_workfn); static void cancel_activity(void) { do_floppy = NULL; - cancel_delayed_work_sync(&fd_timer); + cancel_delayed_work(&fd_timer); cancel_work_sync(&floppy_work); } |