lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

block: trace event block fix unassigned field

Browse Source 
The "error" field in block_bio_complete is not assigned, leaving the memory area
uninitialized (keeping garbage data). Pass an additional tracepoint argument to
this event to initialize this field.

Signed-off-by: Jeff Moyer <jmoyer@redhat.com>
Signed-off-by: Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
CC: Steven Rostedt <rostedt@goodmis.org>
CC: Frederic Weisbecker <fweisbec@gmail.com>
CC: Ingo Molnar <mingo@elte.hu>
CC: Thomas Gleixner <tglx@linutronix.de>
CC: Li Zefan <lizf@cn.fujitsu.com>
CC: Alan.Brunelle@hp.com
Signed-off-by: Jens Axboe <jaxboe@fusionio.com>
This commit is contained in:
Jeff Moyer
2011-01-06 20:41:42 +01:00
committed by Jens Axboe
parent 6c23a9681c
commit b7908c1035
2 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
drivers/md/dm.c
View File

@@ -630,7 +630,7 @@ static void dec_pending(struct dm_io *io, int error)
queue_io(md, bio); queue_io(md, bio);
} else { } else {
/* done with normal IO or empty flush */ /* done with normal IO or empty flush */
trace_block_bio_complete(md->queue, bio); trace_block_bio_complete(md->queue, bio, io_error);
bio_endio(bio, io_error); bio_endio(bio, io_error);
} }
} }

6
include/trace/events/block.h
View File

@@ -206,15 +206,16 @@ TRACE_EVENT(block_bio_bounce,
* block_bio_complete - completed all work on the block operation * block_bio_complete - completed all work on the block operation
* @q: queue holding the block operation * @q: queue holding the block operation
* @bio: block operation completed * @bio: block operation completed
* @error: io error value
* *
* This tracepoint indicates there is no further work to do on this * This tracepoint indicates there is no further work to do on this
* block IO operation @bio. * block IO operation @bio.
*/ */
TRACE_EVENT(block_bio_complete, TRACE_EVENT(block_bio_complete,
TP_PROTO(struct request_queue *q, struct bio *bio), TP_PROTO(struct request_queue *q, struct bio *bio, int error),
TP_ARGS(q, bio), TP_ARGS(q, bio, error),
TP_STRUCT__entry( TP_STRUCT__entry(
__field( dev_t, dev ) __field( dev_t, dev )
@@ -228,6 +229,7 @@ TRACE_EVENT(block_bio_complete,
__entry->dev = bio->bi_bdev->bd_dev; __entry->dev = bio->bi_bdev->bd_dev;
__entry->sector = bio->bi_sector; __entry->sector = bio->bi_sector;
__entry->nr_sector = bio->bi_size >> 9; __entry->nr_sector = bio->bi_size >> 9;
__entry->error = error;
blk_fill_rwbs(__entry->rwbs, bio->bi_rw, bio->bi_size); blk_fill_rwbs(__entry->rwbs, bio->bi_rw, bio->bi_size);
), ),