Signed-off-by: Chaitanya Kulkarni <chaitanya.kulkarni@xxxxxxx> --- kernel/trace/blktrace.c | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/kernel/trace/blktrace.c b/kernel/trace/blktrace.c index 6da8d1c185ee..ffae6abfa606 100644 --- a/kernel/trace/blktrace.c +++ b/kernel/trace/blktrace.c @@ -1514,9 +1514,11 @@ static void blk_add_trace_unplug(void *ignore, struct request_queue *q, unsigned int depth, bool explicit) { struct blk_trace *bt; + struct blk_trace_ext *bte; rcu_read_lock(); bt = rcu_dereference(q->blk_trace); + bte = rcu_dereference(q->blk_trace_ext); if (bt) { __be64 rpdu = cpu_to_be64(depth); u32 what; @@ -1527,6 +1529,16 @@ static void blk_add_trace_unplug(void *ignore, struct request_queue *q, what = BLK_TA_UNPLUG_TIMER; __blk_add_trace(bt, 0, 0, 0, 0, what, 0, sizeof(rpdu), &rpdu, 0); + } else if (bte) { + __be64 rpdu = cpu_to_be64(depth); + u64 what; + + if (explicit) + what = BLK_TA_UNPLUG_IO_EXT; + else + what = BLK_TA_UNPLUG_TIMER_EXT; + __blk_add_trace_ext(bte, 0, 0, 0, 0, what, 0, sizeof(rpdu), + &rpdu, 0, 0); } rcu_read_unlock(); } -- 2.22.1