From: Mike Krinkin <krinkin.m.u@gmail.com>
Date: Thu, 3 Dec 2015 14:32:30 +0000 (+0300)
Subject: block: add call to split trace point
X-Git-Tag: v4.14-rc1~3979^2~2
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=cda22646adaa453519fac28222f20b0d73aa8562;p=platform%2Fkernel%2Flinux-rpi.git

block: add call to split trace point

There is a split tracepoint that is supposed to be called when
bio is splitted, and it was called in bio_split function until
commit 4b1faf931650d4a35b2a ("block: Kill bio_pair_split()").
But now, no one reports splits, so this patch adds call to
trace_block_split back in blk_queue_split right after split.

Signed-off-by: Mike Krinkin <krinkin.m.u@gmail.com>
Signed-off-by: Jens Axboe <axboe@fb.com>
---

diff --git a/block/blk-merge.c b/block/blk-merge.c
index 41a55ba..0e5643a 100644
--- a/block/blk-merge.c
+++ b/block/blk-merge.c
@@ -7,6 +7,8 @@
 #include <linux/blkdev.h>
 #include <linux/scatterlist.h>
 
+#include <trace/events/block.h>
+
 #include "blk.h"
 
 static struct bio *blk_bio_discard_split(struct request_queue *q,
@@ -159,6 +161,7 @@ void blk_queue_split(struct request_queue *q, struct bio **bio,
 		split->bi_rw |= REQ_NOMERGE;
 
 		bio_chain(split, *bio);
+		trace_block_split(q, split, (*bio)->bi_iter.bi_sector);
 		generic_make_request(*bio);
 		*bio = split;
 	}