block: add calls to split trace point
PATCH 1/1 block: add calls to split trace point
There is a split tracepoint that is supposed to be called before splitting a bio, and it was actually called in bio_split function until commit 4b1faf931650d4a35b2a ("block: Kill bio_pair_split()"). But now, no one reports splits, so this patch adds calls to trace_block_split back right before bio_split.
--- block/blk-merge.c | 5 +++++ 1 file changed, 5 insertions(+)
block/blk-merge.c +5 -0
@@ -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,
@@ -49,6 +51,7 @@ static struct bio *blk_bio_discard_split(struct request_queue *q,if (split_sectors > tmp) split_sectors -= tmp; +trace_block_split (q, bio, bio->bi_iter.bi_sector + split_sectors);return bio_split (bio, split_sectors,GFP_NOIO , bs); }
@@ -65,6 +68,7 @@ static struct bio *blk_bio_write_same_split(struct request_queue *q,if (bio_sectors (bio) <= q->limits.max_write_same_sectors)return NULL ; +trace_block_split (q, bio, bio->bi_iter.bi_sector);return bio_split (bio, q->limits.max_write_same_sectors,GFP_NOIO , bs); }
@@ -117,6 +121,7 @@ new_segment:return NULL ; split: *segs = nsegs; +trace_block_split (q, bio, bio->bi_iter.bi_sector + sectors);return bio_split (bio, sectors,GFP_NOIO , bs); }
Signature · 1 line
1.9.1
Looks good,
Hi Jens,
i would like to check status of the patch, will the patch be applied?
Jens Axboe
maintainerQuoted 4 lines · Mike Krinkin
Hi Jens,
i would like to check status of the patch, will the patch be applied?
Why aren't you just putting the split trace call into blk_queue_split()?
Signature · 1 line
Jens Axboe
Quoted 7 lines · Jens Axboe
Quoted 4 lines · Mike Krinkin
Hi Jens,
i would like to check status of the patch, will the patch be applied?
Why aren't you just putting the split trace call into
blk_queue_split()?
Do you mean after split? Something like this:
if (split) {
/* there isn't chance to merge the splitted 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;
}block_split trace event docs says that it expects "bio being split", i understood it as "bio before split". But scarcely someone depends on this behaviour, so i'll resend the patch, is it ok?
PATCH 1/1 block: add call to split trace point
In reply to Mike KrinkinThere 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.
--- block/blk-merge.c | 3 +++ 1 file changed, 3 insertions(+)
block/blk-merge.c +3 -0
@@ -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,
@@ -143,6 +145,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; }
Signature · 1 line
1.9.1
Jens Axboe
maintainerRe: [PATCH] block: add call to split trace point
Quoted 5 lines · Mike Krinkin
There is a split tracepoint that is supposed to be called when bio is splitted, and it was called in
bio_splitfunction until commit4b1faf931650d4a35b2a("block: Killbio_pair_split()"). But now, no one reports splits, so this patch adds call totrace_block_splitback inblk_queue_splitright after split.
Looks good, queued up for 4.5.
Signature · 1 line
Jens Axboe