* [PATCH for-next 1/1] null_blk: force complete for timeout request
@ 2020-05-29 17:31 Dongli Zhang
2020-05-29 17:42 ` Jens Axboe
0 siblings, 1 reply; 2+ messages in thread
From: Dongli Zhang @ 2020-05-29 17:31 UTC (permalink / raw)
To: linux-block; +Cc: axboe, linux-kernel
The commit 7b11eab041da ("blk-mq: blk-mq: provide forced completion
method") exports new API to force a request to complete without error
injection.
There should be no error injection when completing a request by timeout
handler.
Otherwise, the below would hang because timeout handler is failed.
echo 100 > /sys/kernel/debug/fail_io_timeout/probability
echo 1000 > /sys/kernel/debug/fail_io_timeout/times
echo 1 > /sys/block/nullb0/io-timeout-fail
dd if=/dev/zero of=/dev/nullb0 bs=512 count=1 oflag=direct
With this patch, the timeout handler is able to complete the IO.
Signed-off-by: Dongli Zhang <dongli.zhang@oracle.com>
---
drivers/block/null_blk_main.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/drivers/block/null_blk_main.c b/drivers/block/null_blk_main.c
index 6126f771ae99..87b31f9ca362 100644
--- a/drivers/block/null_blk_main.c
+++ b/drivers/block/null_blk_main.c
@@ -1423,7 +1423,7 @@ static bool should_requeue_request(struct request *rq)
static enum blk_eh_timer_return null_timeout_rq(struct request *rq, bool res)
{
pr_info("rq %p timed out\n", rq);
- blk_mq_complete_request(rq);
+ blk_mq_force_complete_rq(rq);
return BLK_EH_DONE;
}
--
2.17.1
^ permalink raw reply [flat|nested] 2+ messages in thread
* Re: [PATCH for-next 1/1] null_blk: force complete for timeout request
2020-05-29 17:31 [PATCH for-next 1/1] null_blk: force complete for timeout request Dongli Zhang
@ 2020-05-29 17:42 ` Jens Axboe
0 siblings, 0 replies; 2+ messages in thread
From: Jens Axboe @ 2020-05-29 17:42 UTC (permalink / raw)
To: Dongli Zhang, linux-block; +Cc: linux-kernel
On 5/29/20 11:31 AM, Dongli Zhang wrote:
> The commit 7b11eab041da ("blk-mq: blk-mq: provide forced completion
> method") exports new API to force a request to complete without error
> injection.
>
> There should be no error injection when completing a request by timeout
> handler.
>
> Otherwise, the below would hang because timeout handler is failed.
>
> echo 100 > /sys/kernel/debug/fail_io_timeout/probability
> echo 1000 > /sys/kernel/debug/fail_io_timeout/times
> echo 1 > /sys/block/nullb0/io-timeout-fail
> dd if=/dev/zero of=/dev/nullb0 bs=512 count=1 oflag=direct
>
> With this patch, the timeout handler is able to complete the IO.
Applied, thanks.
--
Jens Axboe
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2020-05-29 17:42 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2020-05-29 17:31 [PATCH for-next 1/1] null_blk: force complete for timeout request Dongli Zhang
2020-05-29 17:42 ` Jens Axboe
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
Powered by JetHome