[RFC PATCH 19/39] blktrace: update blk_add_trace_getrq()
STALE2052d
From: Chaitanya Kulkarni <hidden>
Date: 2021-02-25 07:08:25
Also in:
linux-fsdevel
Subsystem:
block layer, the rest, tracing · Maintainers:
Jens Axboe, Linus Torvalds, Steven Rostedt, Masami Hiramatsu
Signed-off-by: Chaitanya Kulkarni <redacted> --- kernel/trace/blktrace.c | 19 ++++++++++++++++++- 1 file changed, 18 insertions(+), 1 deletion(-)
diff --git a/kernel/trace/blktrace.c b/kernel/trace/blktrace.c
index 45327201ebf6..51c10d86aa92 100644
--- a/kernel/trace/blktrace.c
+++ b/kernel/trace/blktrace.c@@ -1394,7 +1394,24 @@ static void blk_add_trace_bio_queue(void *ignore, struct bio *bio) static void blk_add_trace_getrq(void *ignore, struct bio *bio) { - blk_add_trace_bio(bio->bi_bdev->bd_disk->queue, bio, BLK_TA_GETRQ, 0); + u64 ta = 0; + struct blk_trace *bt; + struct blk_trace_ext *bte; + + rcu_read_lock(); + bt = rcu_dereference(bio->bi_bdev->bd_disk->queue->blk_trace); + bte = rcu_dereference(bio->bi_bdev->bd_disk->queue->blk_trace_ext); + if (likely(!bt) && likely(!bte)) { + rcu_read_unlock(); + return; + } + if (bt) { + ta = BLK_TA_GETRQ; + } else if (bte) { + ta = BLK_TA_GETRQ_EXT; + } + rcu_read_unlock(); + blk_add_trace_bio(bio->bi_bdev->bd_disk->queue, bio, ta, 0); } static void blk_add_trace_plug(void *ignore, struct request_queue *q)
--
2.22.1