diff options
| author | Tejun Heo <tj@kernel.org> | 2018-01-09 08:29:47 -0800 |
|---|---|---|
| committer | Jens Axboe <axboe@kernel.dk> | 2018-01-09 09:31:15 -0700 |
| commit | 5197c05e16b49885cc9086f1676455371e821b0e (patch) | |
| tree | e151f60f04634a0035ca31835ad93cf11830ef62 /block/blk-mq.c | |
| parent | 04ced159cec863f9bc27015d6b970bb13cfa6176 (diff) | |
| download | lwn-5197c05e16b49885cc9086f1676455371e821b0e.tar.gz lwn-5197c05e16b49885cc9086f1676455371e821b0e.zip | |
blk-mq: protect completion path with RCU
Currently, blk-mq protects only the issue path with RCU. This patch
puts the completion path under the same RCU protection. This will be
used to synchronize issue/completion against timeout by later patches,
which will also add the comments.
Signed-off-by: Tejun Heo <tj@kernel.org>
Signed-off-by: Jens Axboe <axboe@kernel.dk>
Diffstat (limited to 'block/blk-mq.c')
| -rw-r--r-- | block/blk-mq.c | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/block/blk-mq.c b/block/blk-mq.c index bd7c47eb2923..f5e57c80a82b 100644 --- a/block/blk-mq.c +++ b/block/blk-mq.c @@ -584,11 +584,16 @@ static void hctx_lock(struct blk_mq_hw_ctx *hctx, int *srcu_idx) void blk_mq_complete_request(struct request *rq) { struct request_queue *q = rq->q; + struct blk_mq_hw_ctx *hctx = blk_mq_map_queue(q, rq->mq_ctx->cpu); + int srcu_idx; if (unlikely(blk_should_fake_timeout(q))) return; + + hctx_lock(hctx, &srcu_idx); if (!blk_mark_rq_complete(rq)) __blk_mq_complete_request(rq); + hctx_unlock(hctx, srcu_idx); } EXPORT_SYMBOL(blk_mq_complete_request); |