block: introduce BIO_IN_FLIGHT flag
Subsystems (3)
PATCH 1/2 block: introduce BIO_IN_FLIGHT flag
BIO_IN_FLIGHT flag is used for tracing block I/O completion. This patch fixes tracing bio-based devices - except DM which inserts completion tracepoint explicitly - that could not be traced such event using blktrace.
It won't affect tracing normal (request-based) disk devices and nested bio handling paths.
Signed-off-by Namhyung Kim <[email protected]>
--- block/blk-core.c | 5 +++++ fs/bio.c | 9 +++++++++ include/linux/blk_types.h | 1 + 3 files changed, 15 insertions(+), 0 deletions(-)
block/blk-core.c +5 -0
@@ -162,6 +162,9 @@ static void req_bio_endio(struct request *rq, struct bio *bio,if (unlikely (rq->cmd_flags &REQ_QUIET ))set_bit (BIO_QUIET , &bio->bi_flags); +/* completion event was already reported in blk_update_request */ +clear_bit (BIO_IN_FLIGHT , &bio->bi_flags); + bio->bi_size -= nbytes; bio->bi_sector += (nbytes >>9 );
@@ -1571,6 +1574,8 @@ void generic_make_request(struct bio *bio) do { struct request_queue *q = bdev_get_queue(bio->bi_bdev); + set_bit(BIO_IN_FLIGHT, &bio->bi_flags); + q->make_request_fn(q, bio); bio = bio_list_pop(current->bio_list);
fs/bio.c +9 -0
@@ -1447,6 +1447,15 @@ void bio_endio(struct bio *bio, int error)else if (!test_bit (BIO_UPTODATE , &bio->bi_flags)) error = -EIO ; +if (test_bit (BIO_IN_FLIGHT , &bio->bi_flags)) { +struct request_queue *q =bdev_get_queue (bio->bi_bdev); + +trace_block_bio_complete (q, bio, error); + +/* prevent duplicated completion event report */ +clear_bit (BIO_IN_FLIGHT , &bio->bi_flags); + } +if (bio->bi_end_io) bio->bi_end_io (bio, error); }
include/linux/blk_types.h +1 -0
@@ -98,6 +98,7 @@ struct bio {#define BIO_FS_INTEGRITY 10/* fs owns integrity data, not block layer */ #define BIO_QUIET 11/* Make BIO Quiet */ #define BIO_MAPPED_INTEGRITY 12/* integrity metadata has been remapped */ +#define BIO_IN_FLIGHT 13/* report I/O completion event */ #define bio_flagged (bio, flag) ((bio)->bi_flags & (1 << (flag)))/*
Signature · 1 line
1.7.6
PATCH 2/2 block: don't export block_bio_complete tracepoint
Now bio_endio() contains the tracepoint in it, so we don't need to have it twice in DM. Plus, as the only external user of the tracepoint was the DM, we can unexport the symbol.
Signed-off-by Namhyung Kim <[email protected]>
--- block/blk-core.c | 1 - drivers/md/dm.c | 1 - 2 files changed, 0 insertions(+), 2 deletions(-)
block/blk-core.c +0 -1
@@ -36,7 +36,6 @@EXPORT_TRACEPOINT_SYMBOL_GPL (block_bio_remap);EXPORT_TRACEPOINT_SYMBOL_GPL (block_rq_remap); -EXPORT_TRACEPOINT_SYMBOL_GPL (block_bio_complete);/* * For the allocated request tables
drivers/md/dm.c +0 -1
@@ -636,7 +636,6 @@ static void dec_pending(struct dm_io *io, int error)queue_io (md, bio); }else {/* done with normal IO or empty flush */ -trace_block_bio_complete (md->queue, bio, io_error);bio_endio (bio, io_error); } }
Signature · 1 line
1.7.6