X-Git-Url: http://git.lttng.org./?a=blobdiff_plain;f=instrumentation%2Fevents%2Flttng-module%2Fblock.h;h=a75bb637de4b76ac8e0fb36477d4a7a372f7009e;hb=54c4c2e32771791ed5e84e2f8c100339bde7b77e;hp=16043a01294df83c88f96fd01534fc879abfce37;hpb=058e913a70cb9b1807f66e6d73ece72643fa3082;p=lttng-modules.git diff --git a/instrumentation/events/lttng-module/block.h b/instrumentation/events/lttng-module/block.h index 16043a01..a75bb637 100644 --- a/instrumentation/events/lttng-module/block.h +++ b/instrumentation/events/lttng-module/block.h @@ -98,6 +98,58 @@ enum { #endif +#if (LINUX_VERSION_CODE >= KERNEL_VERSION(3,9,0)) +DECLARE_EVENT_CLASS(block_buffer, + + TP_PROTO(struct buffer_head *bh), + + TP_ARGS(bh), + + TP_STRUCT__entry ( + __field( dev_t, dev ) + __field( sector_t, sector ) + __field( size_t, size ) + ), + + TP_fast_assign( + tp_assign(dev, bh->b_bdev->bd_dev) + tp_assign(sector, bh->b_blocknr) + tp_assign(size, bh->b_size) + ), + + TP_printk("%d,%d sector=%llu size=%zu", + MAJOR(__entry->dev), MINOR(__entry->dev), + (unsigned long long)__entry->sector, __entry->size + ) +) + +/** + * block_touch_buffer - mark a buffer accessed + * @bh: buffer_head being touched + * + * Called from touch_buffer(). + */ +DEFINE_EVENT(block_buffer, block_touch_buffer, + + TP_PROTO(struct buffer_head *bh), + + TP_ARGS(bh) +) + +/** + * block_dirty_buffer - mark a buffer dirty + * @bh: buffer_head being dirtied + * + * Called from mark_buffer_dirty(). + */ +DEFINE_EVENT(block_buffer, block_dirty_buffer, + + TP_PROTO(struct buffer_head *bh), + + TP_ARGS(bh) +) +#endif + DECLARE_EVENT_CLASS(block_rq_with_error, TP_PROTO(struct request_queue *q, struct request *rq), @@ -124,7 +176,7 @@ DECLARE_EVENT_CLASS(block_rq_with_error, tp_assign(errors, rq->errors) blk_fill_rwbs(rwbs, rq->cmd_flags, blk_rq_bytes(rq)) tp_memcpy_dyn(cmd, (rq->cmd_type == REQ_TYPE_BLOCK_PC) ? - rq->cmd : NULL); + rq->cmd : NULL) ), TP_printk("%d,%d %s (%s) %llu + %u [%d]", @@ -215,7 +267,7 @@ DECLARE_EVENT_CLASS(block_rq, blk_rq_bytes(rq) : 0) blk_fill_rwbs(rwbs, rq->cmd_flags, blk_rq_bytes(rq)) tp_memcpy_dyn(cmd, (rq->cmd_type == REQ_TYPE_BLOCK_PC) ? - rq->cmd : NULL); + rq->cmd : NULL) tp_memcpy(comm, current->comm, TASK_COMM_LEN) ), @@ -287,12 +339,21 @@ TRACE_EVENT(block_bio_bounce, ), TP_fast_assign( +#if (LINUX_VERSION_CODE >= KERNEL_VERSION(3,14,0)) + tp_assign(dev, bio->bi_bdev ? + bio->bi_bdev->bd_dev : 0) + tp_assign(sector, bio->bi_iter.bi_sector) + tp_assign(nr_sector, bio_sectors(bio)) + blk_fill_rwbs(rwbs, bio->bi_rw, bio->bi_iter.bi_size) + tp_memcpy(comm, current->comm, TASK_COMM_LEN) +#else /* #if (LINUX_VERSION_CODE >= KERNEL_VERSION(3,14,0)) */ tp_assign(dev, bio->bi_bdev ? bio->bi_bdev->bd_dev : 0) tp_assign(sector, bio->bi_sector) tp_assign(nr_sector, bio->bi_size >> 9) blk_fill_rwbs(rwbs, bio->bi_rw, bio->bi_size) tp_memcpy(comm, current->comm, TASK_COMM_LEN) +#endif /* #else #if (LINUX_VERSION_CODE >= KERNEL_VERSION(3,14,0)) */ ), TP_printk("%d,%d %s %llu + %u [%s]", @@ -332,6 +393,13 @@ TRACE_EVENT(block_bio_complete, ), TP_fast_assign( +#if (LINUX_VERSION_CODE >= KERNEL_VERSION(3,14,0)) + tp_assign(dev, bio->bi_bdev->bd_dev) + tp_assign(sector, bio->bi_iter.bi_sector) + tp_assign(nr_sector, bio_sectors(bio)) + tp_assign(error, error) + blk_fill_rwbs(rwbs, bio->bi_rw, bio->bi_iter.bi_size) +#else /* #if (LINUX_VERSION_CODE >= KERNEL_VERSION(3,14,0)) */ tp_assign(dev, bio->bi_bdev->bd_dev) tp_assign(sector, bio->bi_sector) tp_assign(nr_sector, bio->bi_size >> 9) @@ -341,6 +409,7 @@ TRACE_EVENT(block_bio_complete, tp_assign(error, 0) #endif blk_fill_rwbs(rwbs, bio->bi_rw, bio->bi_size) +#endif /* #else #if (LINUX_VERSION_CODE >= KERNEL_VERSION(3,14,0)) */ ), TP_printk("%d,%d %s %llu + %u [%d]", @@ -350,6 +419,117 @@ TRACE_EVENT(block_bio_complete, __entry->nr_sector, __entry->error) ) +#if (LINUX_VERSION_CODE >= KERNEL_VERSION(3,9,0)) +DECLARE_EVENT_CLASS(block_bio_merge, + + TP_PROTO(struct request_queue *q, struct request *rq, struct bio *bio), + + TP_ARGS(q, rq, bio), + + TP_STRUCT__entry( + __field( dev_t, dev ) + __field( sector_t, sector ) + __field( unsigned int, nr_sector ) + __field( unsigned int, rwbs ) + __array_text( char, comm, TASK_COMM_LEN ) + ), + + TP_fast_assign( +#if (LINUX_VERSION_CODE >= KERNEL_VERSION(3,14,0)) + tp_assign(dev, bio->bi_bdev->bd_dev) + tp_assign(sector, bio->bi_iter.bi_sector) + tp_assign(nr_sector, bio_sectors(bio)) + blk_fill_rwbs(rwbs, bio->bi_rw, bio->bi_iter.bi_size) + tp_memcpy(comm, current->comm, TASK_COMM_LEN) +#else /* #if (LINUX_VERSION_CODE >= KERNEL_VERSION(3,14,0)) */ + tp_assign(dev, bio->bi_bdev->bd_dev) + tp_assign(sector, bio->bi_sector) + tp_assign(nr_sector, bio->bi_size >> 9) + blk_fill_rwbs(rwbs, bio->bi_rw, bio->bi_size) + tp_memcpy(comm, current->comm, TASK_COMM_LEN) +#endif /* #else #if (LINUX_VERSION_CODE >= KERNEL_VERSION(3,14,0)) */ + ), + + TP_printk("%d,%d %s %llu + %u [%s]", + MAJOR(__entry->dev), MINOR(__entry->dev), + __print_rwbs_flags(__entry->rwbs), + (unsigned long long)__entry->sector, + __entry->nr_sector, __entry->comm) +) + +/** + * block_bio_backmerge - merging block operation to the end of an existing operation + * @q: queue holding operation + * @bio: new block operation to merge + * + * Merging block request @bio to the end of an existing block request + * in queue @q. + */ +DEFINE_EVENT(block_bio_merge, block_bio_backmerge, + + TP_PROTO(struct request_queue *q, struct request *rq, struct bio *bio), + + TP_ARGS(q, rq, bio) +) + +/** + * block_bio_frontmerge - merging block operation to the beginning of an existing operation + * @q: queue holding operation + * @bio: new block operation to merge + * + * Merging block IO operation @bio to the beginning of an existing block + * operation in queue @q. + */ +DEFINE_EVENT(block_bio_merge, block_bio_frontmerge, + + TP_PROTO(struct request_queue *q, struct request *rq, struct bio *bio), + + TP_ARGS(q, rq, bio) +) + +/** + * block_bio_queue - putting new block IO operation in queue + * @q: queue holding operation + * @bio: new block operation + * + * About to place the block IO operation @bio into queue @q. + */ +TRACE_EVENT(block_bio_queue, + + TP_PROTO(struct request_queue *q, struct bio *bio), + + TP_ARGS(q, bio), + + TP_STRUCT__entry( + __field( dev_t, dev ) + __field( sector_t, sector ) + __field( unsigned int, nr_sector ) + __array( char, rwbs, RWBS_LEN ) + __array( char, comm, TASK_COMM_LEN ) + ), + + TP_fast_assign( +#if (LINUX_VERSION_CODE >= KERNEL_VERSION(3,14,0)) + tp_assign(dev, bio->bi_bdev->bd_dev) + tp_assign(sector, bio->bi_iter.bi_sector) + tp_assign(nr_sector, bio_sectors(bio)) + blk_fill_rwbs(rwbs, bio->bi_rw, bio->bi_iter.bi_size) + tp_memcpy(comm, current->comm, TASK_COMM_LEN) +#else /* #if (LINUX_VERSION_CODE >= KERNEL_VERSION(3,14,0)) */ + tp_assign(dev, bio->bi_bdev->bd_dev) + tp_assign(sector, bio->bi_sector) + tp_assign(nr_sector, bio->bi_size >> 9) + blk_fill_rwbs(rwbs, bio->bi_rw, bio->bi_size) + tp_memcpy(comm, current->comm, TASK_COMM_LEN) +#endif /* #else #if (LINUX_VERSION_CODE >= KERNEL_VERSION(3,14,0)) */ + ), + + TP_printk("%d,%d %s %llu + %u [%s]", + MAJOR(__entry->dev), MINOR(__entry->dev), __entry->rwbs, + (unsigned long long)__entry->sector, + __entry->nr_sector, __entry->comm) +) +#else DECLARE_EVENT_CLASS(block_bio, TP_PROTO(struct request_queue *q, struct bio *bio), @@ -389,15 +569,9 @@ DECLARE_EVENT_CLASS(block_bio, */ DEFINE_EVENT(block_bio, block_bio_backmerge, -#if (LINUX_VERSION_CODE >= KERNEL_VERSION(3,9,0)) - TP_PROTO(struct request_queue *q, struct request *rq, struct bio *bio), - - TP_ARGS(q, rq, bio) -#else TP_PROTO(struct request_queue *q, struct bio *bio), TP_ARGS(q, bio) -#endif ) /** @@ -410,15 +584,9 @@ DEFINE_EVENT(block_bio, block_bio_backmerge, */ DEFINE_EVENT(block_bio, block_bio_frontmerge, -#if (LINUX_VERSION_CODE >= KERNEL_VERSION(3,9,0)) - TP_PROTO(struct request_queue *q, struct request *rq, struct bio *bio), - - TP_ARGS(q, rq, bio) -#else TP_PROTO(struct request_queue *q, struct bio *bio), TP_ARGS(q, bio) -#endif ) /** @@ -434,6 +602,7 @@ DEFINE_EVENT(block_bio, block_bio_queue, TP_ARGS(q, bio) ) +#endif DECLARE_EVENT_CLASS(block_get_rq, @@ -450,12 +619,21 @@ DECLARE_EVENT_CLASS(block_get_rq, ), TP_fast_assign( +#if (LINUX_VERSION_CODE >= KERNEL_VERSION(3,14,0)) + tp_assign(dev, bio ? bio->bi_bdev->bd_dev : 0) + tp_assign(sector, bio ? bio->bi_iter.bi_sector : 0) + tp_assign(nr_sector, bio ? bio_sectors(bio) : 0) + blk_fill_rwbs(rwbs, bio ? bio->bi_rw : 0, + bio ? bio_sectors(bio) : 0) + tp_memcpy(comm, current->comm, TASK_COMM_LEN) +#else /* #if (LINUX_VERSION_CODE >= KERNEL_VERSION(3,14,0)) */ tp_assign(dev, bio ? bio->bi_bdev->bd_dev : 0) tp_assign(sector, bio ? bio->bi_sector : 0) tp_assign(nr_sector, bio ? bio->bi_size >> 9 : 0) blk_fill_rwbs(rwbs, bio ? bio->bi_rw : 0, bio ? bio->bi_size >> 9 : 0) tp_memcpy(comm, current->comm, TASK_COMM_LEN) +#endif /* #else #if (LINUX_VERSION_CODE >= KERNEL_VERSION(3,14,0)) */ ), TP_printk("%d,%d %s %llu + %u [%s]", @@ -622,11 +800,19 @@ TRACE_EVENT(block_split, ), TP_fast_assign( +#if (LINUX_VERSION_CODE >= KERNEL_VERSION(3,14,0)) + tp_assign(dev, bio->bi_bdev->bd_dev) + tp_assign(sector, bio->bi_iter.bi_sector) + tp_assign(new_sector, new_sector) + blk_fill_rwbs(rwbs, bio->bi_rw, bio->bi_iter.bi_size) + tp_memcpy(comm, current->comm, TASK_COMM_LEN) +#else /* #if (LINUX_VERSION_CODE >= KERNEL_VERSION(3,14,0)) */ tp_assign(dev, bio->bi_bdev->bd_dev) tp_assign(sector, bio->bi_sector) tp_assign(new_sector, new_sector) - blk_fill_rwbs(rwbs, bio->bi_rw, bio->bi_size) + blk_fill_rwbs(rwbs, bio->bi_rw, bio->bi_iter.bi_size) tp_memcpy(comm, current->comm, TASK_COMM_LEN) +#endif /* #else #if (LINUX_VERSION_CODE >= KERNEL_VERSION(3,14,0)) */ ), TP_printk("%d,%d %s %llu / %llu [%s]", @@ -668,12 +854,21 @@ TRACE_EVENT(block_remap, ), TP_fast_assign( +#if (LINUX_VERSION_CODE >= KERNEL_VERSION(3,14,0)) + tp_assign(dev, bio->bi_bdev->bd_dev) + tp_assign(sector, bio->bi_iter.bi_sector) + tp_assign(nr_sector, bio_sectors(bio)) + tp_assign(old_dev, dev) + tp_assign(old_sector, from) + blk_fill_rwbs(rwbs, bio->bi_rw, bio->bi_iter.bi_size) +#else /* #if (LINUX_VERSION_CODE >= KERNEL_VERSION(3,14,0)) */ tp_assign(dev, bio->bi_bdev->bd_dev) tp_assign(sector, bio->bi_sector) tp_assign(nr_sector, bio->bi_size >> 9) tp_assign(old_dev, dev) tp_assign(old_sector, from) blk_fill_rwbs(rwbs, bio->bi_rw, bio->bi_size) +#endif /* #else #if (LINUX_VERSION_CODE >= KERNEL_VERSION(3,14,0)) */ ), TP_printk("%d,%d %s %llu + %u <- (%d,%d) %llu",