On Fri, Jul 27, 2018 at 04:59:34PM +0000, Bart Van Assche wrote: > On Fri, 2018-07-27 at 10:57 -0600, Keith Busch wrote: > > You skip that code if the driver returns BLK_EH_DONT_RESET_TIMER. > > How about applying the following patch on top of this series?
That works for me if you, but it breaks scsi again when scmd_eh_abort_handler completes the command a second time. > diff --git a/block/blk-mq.c b/block/blk-mq.c > index a97ab5ba9d18..aa66535604fd 100644 > --- a/block/blk-mq.c > +++ b/block/blk-mq.c > @@ -854,10 +854,10 @@ static void blk_mq_rq_timed_out(struct request *req, > bool reserved) > * latter case, if blk_mq_complete_request() was called while > * the timeout handler was in progress, ignore that call. > */ > - if (ret == BLK_EH_DONT_RESET_TIMER) > - return; > - WARN_ON_ONCE(ret != BLK_EH_RESET_TIMER); > - blk_mq_add_timer(req); > + if (ret == BLK_EH_RESET_TIMER) > + blk_mq_add_timer(req); > + else > + WARN_ON_ONCE(ret != BLK_EH_DONT_RESET_TIMER); > again: > if (blk_mq_change_rq_state(req, MQ_RQ_TIMED_OUT, MQ_RQ_IN_FLIGHT)) > return; > > Bart.
