* [RFC PATCH 17/38] blktrace: update blk_add_trace_bio_frontmerge()
@ 2021-01-26 23:33 Chaitanya Kulkarni
0 siblings, 0 replies; only message in thread
From: Chaitanya Kulkarni @ 2021-01-26 23:33 UTC (permalink / raw)
To: linux-btrace
Signed-off-by: Chaitanya Kulkarni <chaitanya.kulkarni@wdc.com>
---
kernel/trace/blktrace.c | 20 +++++++++++++++++++-
1 file changed, 19 insertions(+), 1 deletion(-)
diff --git a/kernel/trace/blktrace.c b/kernel/trace/blktrace.c
index 1eff4afa4019..8dd41a7592b2 100644
--- a/kernel/trace/blktrace.c
+++ b/kernel/trace/blktrace.c
@@ -1352,7 +1352,25 @@ static void blk_add_trace_bio_backmerge(void *ignore, struct bio *bio)
static void blk_add_trace_bio_frontmerge(void *ignore, struct bio *bio)
{
- blk_add_trace_bio(bio->bi_disk->queue, bio, BLK_TA_FRONTMERGE, 0);
+ u64 ta = 0;
+ struct blk_trace *bt;
+ struct blk_trace_ext *bte;
+
+ rcu_read_lock();
+ bt = rcu_dereference(bio->bi_disk->queue->blk_trace);
+ bte = rcu_dereference(bio->bi_disk->queue->blk_trace_ext);
+ if (likely(!bt) && likely(!bte)) {
+ rcu_read_unlock();
+ return;
+ }
+
+ if (bt) {
+ ta = BLK_TA_FRONTMERGE;
+ } else if (bte) {
+ ta = BLK_TA_FRONTMERGE_EXT;
+ }
+ rcu_read_unlock();
+ blk_add_trace_bio(bio->bi_disk->queue, bio, ta, 0);
}
static void blk_add_trace_bio_queue(void *ignore, struct bio *bio)
--
2.22.1
^ permalink raw reply related [flat|nested] only message in thread
only message in thread, other threads:[~2021-01-26 23:33 UTC | newest]
Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2021-01-26 23:33 [RFC PATCH 17/38] blktrace: update blk_add_trace_bio_frontmerge() Chaitanya Kulkarni
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).