diff options
author | 2013-01-11 13:06:33 -0800 | |
---|---|---|
committer | 2013-01-14 15:00:36 +0100 | |
commit | 3a366e614d0837d9fc23f78cdb1a1186ebc3387f (patch) | |
tree | 5be6ec716687234ac1e6202db62c84ee1d2246be /fs/bio.c | |
parent | Merge branch 'blkcg-cfq-hierarchy' of git://git.kernel.org/pub/scm/linux/kern... (diff) | |
download | linux-3a366e614d0837d9fc23f78cdb1a1186ebc3387f.tar.gz linux-3a366e614d0837d9fc23f78cdb1a1186ebc3387f.tar.bz2 linux-3a366e614d0837d9fc23f78cdb1a1186ebc3387f.zip |
block: add missing block_bio_complete() tracepoint
bio completion didn't kick block_bio_complete TP. Only dm was
explicitly triggering the TP on IO completion. This makes
block_bio_complete TP useless for tracers which want to know about
bios, and all other bio based drivers skip generating blktrace
completion events.
This patch makes all bio completions via bio_endio() generate
block_bio_complete TP.
* Explicit trace_block_bio_complete() invocation removed from dm and
the trace point is unexported.
* @rq dropped from trace_block_bio_complete(). bios may fly around
w/o queue associated. Verifying and accessing the assocaited queue
belongs to TP probes.
* blktrace now gets both request and bio completions. Make it ignore
bio completions if request completion path is happening.
This makes all bio based drivers generate blktrace completion events
properly and makes the block_bio_complete TP actually useful.
v2: With this change, block_bio_complete TP could be invoked on sg
commands which have bio's with %NULL bi_bdev. Update TP
assignment code to check whether bio->bi_bdev is %NULL before
dereferencing.
Signed-off-by: Tejun Heo <tj@kernel.org>
Original-patch-by: Namhyung Kim <namhyung@gmail.com>
Cc: Tejun Heo <tj@kernel.org>
Cc: Steven Rostedt <rostedt@goodmis.org>
Cc: Alasdair Kergon <agk@redhat.com>
Cc: dm-devel@redhat.com
Cc: Neil Brown <neilb@suse.de>
Signed-off-by: Jens Axboe <axboe@kernel.dk>
Diffstat (limited to 'fs/bio.c')
-rw-r--r-- | fs/bio.c | 2 |
1 files changed, 2 insertions, 0 deletions
@@ -1428,6 +1428,8 @@ void bio_endio(struct bio *bio, int error) else if (!test_bit(BIO_UPTODATE, &bio->bi_flags)) error = -EIO; + trace_block_bio_complete(bio, error); + if (bio->bi_end_io) bio->bi_end_io(bio, error); } |