null_blk: force complete for timeout request
PATCH 1/1 null_blk: force complete for timeout request
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.
--- drivers/block/null_blk_main.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/block/null_blk_main.c +1 -1
@@ -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 ; }
Signature · 1 line
2.17.1
Quoted 7 lines · Dongli Zhang
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.
Quoted 8 lines
Otherwise, the below would hang because timeout handler is failed.
echo 100 >
/sys/kernel/debug/fail_io_timeout/probabilityecho 1000 >/sys/kernel/debug/fail_io_timeout/timesecho 1 >/sys/block/nullb0/io-timeout-fail
dd if=/dev/zero of=/dev/nullb0 bs=512 count=1 oflag=directWith this patch, the timeout handler is able to complete the IO.
Applied, thanks.
Signature · 1 line
Jens Axboe