diff options
| author | Jens Axboe <axboe@fb.com> | 2016-09-21 10:12:13 -0600 |
|---|---|---|
| committer | Jens Axboe <axboe@fb.com> | 2016-09-21 10:12:13 -0600 |
| commit | 5c6213a445d5c01f6de34c342102bd77f834a25f (patch) | |
| tree | b7da75577f7f1a150c8695868468c9fba84303fa | |
| parent | d174ea5d95d19b4149ec0f4f1d64a9dcc20eda2e (diff) | |
blk-mq: add flag for drivers wanting blocking ->queue_rq()for-4.9/mq-async-run
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>
| -rw-r--r-- | block/blk-mq.c | 2 | ||||
| -rw-r--r-- | include/linux/blk-mq.h | 1 |
2 files changed, 2 insertions, 1 deletions
diff --git a/block/blk-mq.c b/block/blk-mq.c index c29700010b5c..eae2f12f011f 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); diff --git a/include/linux/blk-mq.h b/include/linux/blk-mq.h index fbcfdf323243..5daa0ef756dd 100644 --- a/include/linux/blk-mq.h +++ b/include/linux/blk-mq.h @@ -155,6 +155,7 @@ enum { BLK_MQ_F_TAG_SHARED = 1 << 1, BLK_MQ_F_SG_MERGE = 1 << 2, BLK_MQ_F_DEFER_ISSUE = 1 << 4, + BLK_MQ_F_BLOCKING = 1 << 5, BLK_MQ_F_ALLOC_POLICY_START_BIT = 8, BLK_MQ_F_ALLOC_POLICY_BITS = 1, |