summaryrefslogtreecommitdiffstats
path: root/block/blk-mq.c
diff options
context:
space:
mode:
authorJens Axboe <axboe@fb.com>2016-09-21 18:12:13 +0200
committerJens Axboe <axboe@fb.com>2016-09-22 22:28:38 +0200
commit1b792f2f92784c00db2e6431496e437855d6f12a (patch)
tree50c049a9056d96ebaf176d6a339f655282ff9098 /block/blk-mq.c
parentblk-mq: remove non-blocking pass in blk_mq_map_request (diff)
downloadlinux-1b792f2f92784c00db2e6431496e437855d6f12a.tar.xz
linux-1b792f2f92784c00db2e6431496e437855d6f12a.zip
blk-mq: add flag for drivers wanting blocking ->queue_rq()
If a driver sets BLK_MQ_F_BLOCKING, it is allowed to block in its ->queue_rq() handler. For that case, blk-mq ensures that we always calls it from a safe context. Signed-off-by: Jens Axboe <axboe@fb.com> Tested-by: Josef Bacik <jbacik@fb.com>
Diffstat (limited to 'block/blk-mq.c')
-rw-r--r--block/blk-mq.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/block/blk-mq.c b/block/blk-mq.c
index 80d483864247..e9ebe9864cc4 100644
--- a/block/blk-mq.c
+++ b/block/blk-mq.c
@@ -908,7 +908,7 @@ void blk_mq_run_hw_queue(struct blk_mq_hw_ctx *hctx, bool async)
!blk_mq_hw_queue_mapped(hctx)))
return;
- if (!async) {
+ if (!async && !(hctx->flags & BLK_MQ_F_BLOCKING)) {
int cpu = get_cpu();
if (cpumask_test_cpu(cpu, hctx->cpumask)) {
__blk_mq_run_hw_queue(hctx);