summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorYufen Yu <yuyufen@huawei.com>2019-03-26 21:19:25 +0800
committerJens Axboe <axboe@kernel.dk>2019-04-02 08:57:05 -0600
commitff3b74b8e1675c802e09157a56c97ca38a659b9d (patch)
tree2bcf6917ee428014a7645dc806e51a34ffbc79e4
parentb9a1ff504b9492ad6beb7d5606e0e3365d4d8499 (diff)
downloadlinux-ff3b74b8e1675c802e09157a56c97ca38a659b9d.tar.gz
linux-ff3b74b8e1675c802e09157a56c97ca38a659b9d.tar.bz2
linux-ff3b74b8e1675c802e09157a56c97ca38a659b9d.zip
blk-mq: add trace block plug and unplug for multiple queues
For now, we just trace plug for single queue device or drivers provide .commit_rqs, and have not trace plug for multiple queues device. But, unplug events will be recorded when call blk_mq_flush_plug_list(). Then, trace events will be asymmetrical, just have unplug and without plug. This patch add trace plug and unplug for multiple queues device in blk_mq_make_request(). After that, we can accurately trace plug and unplug for multiple queues. Reviewed-by: Christoph Hellwig <hch@lst.de> Signed-off-by: Yufen Yu <yuyufen@huawei.com> Signed-off-by: Jens Axboe <axboe@kernel.dk>
-rw-r--r--block/blk-mq.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/block/blk-mq.c b/block/blk-mq.c
index f3b0d33bdf88..22074a1e37cd 100644
--- a/block/blk-mq.c
+++ b/block/blk-mq.c
@@ -2003,11 +2003,13 @@ static blk_qc_t blk_mq_make_request(struct request_queue *q, struct bio *bio)
plug->rq_count--;
}
blk_add_rq_to_plug(plug, rq);
+ trace_block_plug(q);
blk_mq_put_ctx(data.ctx);
if (same_queue_rq) {
data.hctx = same_queue_rq->mq_hctx;
+ trace_block_unplug(q, 1, true);
blk_mq_try_issue_directly(data.hctx, same_queue_rq,
&cookie, false, true);
}