blk-mq: Directly schedule q->timeout_work when aborting a request
authorTejun Heo <tj@kernel.org>
Mon, 2 Apr 2018 22:04:58 +0000 (15:04 -0700)
committerJens Axboe <axboe@kernel.dk>
Mon, 2 Apr 2018 22:36:13 +0000 (16:36 -0600)
commitbc6d65e6dc89c3b7ff78e4ad797117c122ffde8e
treefb7c3531987037525580b4f6bed58233cc273b4e
parenta5040c2d8dd732252609cde84ee3cdd6f1b1f927
blk-mq: Directly schedule q->timeout_work when aborting a request

Request abortion is performed by overriding deadline to now and
scheduling timeout handling immediately.  For the latter part, the
code was using mod_timer(timeout, 0) which can't guarantee that the
timer runs afterwards.  Let's schedule the underlying work item
directly instead.

This fixes the hangs during probing reported by Sitsofe but it isn't
yet clear to me how the failure can happen reliably if it's just the
above described race condition.

Signed-off-by: Tejun Heo <tj@kernel.org>
Reported-by: Sitsofe Wheeler <sitsofe@gmail.com>
Reported-by: Meelis Roos <mroos@linux.ee>
Fixes: 358f70da49d7 ("blk-mq: make blk_abort_request() trigger timeout path")
Cc: stable@vger.kernel.org # v4.16
Link: http://lkml.kernel.org/r/CALjAwxh-PVYFnYFCJpGOja+m5SzZ8Sa4J7ohxdK=r8NyOF-EMA@mail.gmail.com
Link: http://lkml.kernel.org/r/alpine.LRH.2.21.1802261049140.4893@math.ut.ee
Signed-off-by: Jens Axboe <axboe@kernel.dk>
block/blk-timeout.c