Signed-off-by: Chaitanya Kulkarni <chaitanya.kulkarni@xxxxxxx>
---
kernel/trace/blktrace.c | 15 +++++++++++++--
1 file changed, 13 insertions(+), 2 deletions(-)
diff --git a/kernel/trace/blktrace.c b/kernel/trace/blktrace.c
index 0ad1f8546495..5aed9b0d0c69 100644
--- a/kernel/trace/blktrace.c
+++ b/kernel/trace/blktrace.c
@@ -1475,18 +1475,29 @@ static void blk_add_trace_split(void *ignore, struct bio *bio, unsigned int pdu)
{
struct request_queue *q = bio->bi_disk->queue;
struct blk_trace *bt;
+ struct blk_trace_ext *bte;
+ __be64 rpdu = cpu_to_be64(pdu);
rcu_read_lock();
bt = rcu_dereference(q->blk_trace);
+ bte = rcu_dereference(q->blk_trace_ext);
+ if (likely(!bt) && likely(!bte)) {
+ rcu_read_unlock();
+ return;
+ }
if (bt) {
- __be64 rpdu = cpu_to_be64(pdu);
-
__blk_add_trace(bt, bio->bi_iter.bi_sector,
bio->bi_iter.bi_size, bio_op(bio), bio->bi_opf,
BLK_TA_SPLIT,
blk_status_to_errno(bio->bi_status),
sizeof(rpdu), &rpdu,
blk_trace_bio_get_cgid(q, bio));
+ } else if (bte) {
+ __blk_add_trace_ext(bte, bio->bi_iter.bi_sector,
+ bio->bi_iter.bi_size, bio_op(bio),
+ bio->bi_opf, BLK_TA_SPLIT_EXT,
+ bio->bi_status, sizeof(rpdu), &rpdu,
+ blk_trace_bio_get_cgid(q, bio), 0);
}
rcu_read_unlock();
}
--
2.22.1
