X-Git-Url: http://git.liburcu.org/?a=blobdiff_plain;f=instrumentation%2Fevents%2Flttng-module%2Fblock.h;h=424fbc14908ea512c1f684c359666a526d2f1d96;hb=9779f35afd1fd15816270983418683c99905973a;hp=6782cbbef08c53a37a33534ed2a393c0d2067400;hpb=1bc491fcc45224300df6ac10a1c5745aa299b6ab;p=lttng-modules.git diff --git a/instrumentation/events/lttng-module/block.h b/instrumentation/events/lttng-module/block.h index 6782cbbe..424fbc14 100644 --- a/instrumentation/events/lttng-module/block.h +++ b/instrumentation/events/lttng-module/block.h @@ -1,12 +1,12 @@ #undef TRACE_SYSTEM #define TRACE_SYSTEM block -#if !defined(_TRACE_BLOCK_H) || defined(TRACE_HEADER_MULTI_READ) -#define _TRACE_BLOCK_H +#if !defined(LTTNG_TRACE_BLOCK_H) || defined(TRACE_HEADER_MULTI_READ) +#define LTTNG_TRACE_BLOCK_H +#include "../../../probes/lttng-tracepoint-event.h" #include #include -#include #include #include @@ -98,7 +98,59 @@ enum { #endif -DECLARE_EVENT_CLASS(block_rq_with_error, +#if (LINUX_VERSION_CODE >= KERNEL_VERSION(3,9,0)) +LTTNG_TRACEPOINT_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(). + */ +LTTNG_TRACEPOINT_EVENT_INSTANCE(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(). + */ +LTTNG_TRACEPOINT_EVENT_INSTANCE(block_buffer, block_dirty_buffer, + + TP_PROTO(struct buffer_head *bh), + + TP_ARGS(bh) +) +#endif + +LTTNG_TRACEPOINT_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]", @@ -146,7 +198,7 @@ DECLARE_EVENT_CLASS(block_rq_with_error, * can be examined to determine which device and sectors the pending * operation would access. */ -DEFINE_EVENT(block_rq_with_error, block_rq_abort, +LTTNG_TRACEPOINT_EVENT_INSTANCE(block_rq_with_error, block_rq_abort, TP_PROTO(struct request_queue *q, struct request *rq), @@ -162,13 +214,70 @@ DEFINE_EVENT(block_rq_with_error, block_rq_abort, * @q. For some reason the request was not completed and needs to be * put back in the queue. */ -DEFINE_EVENT(block_rq_with_error, block_rq_requeue, +LTTNG_TRACEPOINT_EVENT_INSTANCE(block_rq_with_error, block_rq_requeue, TP_PROTO(struct request_queue *q, struct request *rq), TP_ARGS(q, rq) ) +#if (LINUX_VERSION_CODE >= KERNEL_VERSION(3,14,5) \ + || LTTNG_KERNEL_RANGE(3,12,21, 3,13,0) \ + || LTTNG_KERNEL_RANGE(3,10,41, 3,11,0) \ + || LTTNG_KERNEL_RANGE(3,4,91, 3,5,0) \ + || LTTNG_KERNEL_RANGE(3,2,58, 3,3,0) \ + || LTTNG_UBUNTU_KERNEL_RANGE(3,13,11,31, 3,14,0,0) \ + || LTTNG_RHEL_KERNEL_RANGE(3,10,0,7,1, 3,11,0,0,0)) + +/** + * block_rq_complete - block IO operation completed by device driver + * @q: queue containing the block operation request + * @rq: block operations request + * @nr_bytes: number of completed bytes + * + * The block_rq_complete tracepoint event indicates that some portion + * of operation request has been completed by the device driver. If + * the @rq->bio is %NULL, then there is absolutely no additional work to + * do for the request. If @rq->bio is non-NULL then there is + * additional work required to complete the request. + */ +LTTNG_TRACEPOINT_EVENT(block_rq_complete, + + TP_PROTO(struct request_queue *q, struct request *rq, + unsigned int nr_bytes), + + TP_ARGS(q, rq, nr_bytes), + + TP_STRUCT__entry( + __field( dev_t, dev ) + __field( sector_t, sector ) + __field( unsigned int, nr_sector ) + __field( int, errors ) + __field( unsigned int, rwbs ) + __dynamic_array_hex( unsigned char, cmd, + (rq->cmd_type == REQ_TYPE_BLOCK_PC) ? + rq->cmd_len : 0) + ), + + TP_fast_assign( + tp_assign(dev, rq->rq_disk ? disk_devt(rq->rq_disk) : 0) + tp_assign(sector, blk_rq_pos(rq)) + tp_assign(nr_sector, nr_bytes >> 9) + tp_assign(errors, rq->errors) + blk_fill_rwbs(rwbs, rq->cmd_flags, nr_bytes) + tp_memcpy_dyn(cmd, (rq->cmd_type == REQ_TYPE_BLOCK_PC) ? + rq->cmd : NULL) + ), + + TP_printk("%d,%d %s (%s) %llu + %u [%d]", + MAJOR(__entry->dev), MINOR(__entry->dev), + __entry->rwbs, __get_str(cmd), + (unsigned long long)__entry->sector, + __entry->nr_sector, __entry->errors) +) + +#else /* #if (LINUX_VERSION_CODE >= KERNEL_VERSION(3,15,0)) */ + /** * block_rq_complete - block IO operation completed by device driver * @q: queue containing the block operation request @@ -180,14 +289,16 @@ DEFINE_EVENT(block_rq_with_error, block_rq_requeue, * do for the request. If @rq->bio is non-NULL then there is * additional work required to complete the request. */ -DEFINE_EVENT(block_rq_with_error, block_rq_complete, +LTTNG_TRACEPOINT_EVENT_INSTANCE(block_rq_with_error, block_rq_complete, TP_PROTO(struct request_queue *q, struct request *rq), TP_ARGS(q, rq) ) -DECLARE_EVENT_CLASS(block_rq, +#endif /* #else #if (LINUX_VERSION_CODE >= KERNEL_VERSION(3,15,0)) */ + +LTTNG_TRACEPOINT_EVENT_CLASS(block_rq, TP_PROTO(struct request_queue *q, struct request *rq), @@ -199,6 +310,7 @@ DECLARE_EVENT_CLASS(block_rq, __field( unsigned int, nr_sector ) __field( unsigned int, bytes ) __field( unsigned int, rwbs ) + __field( pid_t, tid ) __array_text( char, comm, TASK_COMM_LEN ) __dynamic_array_hex( unsigned char, cmd, (rq->cmd_type == REQ_TYPE_BLOCK_PC) ? @@ -215,18 +327,19 @@ 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) + tp_assign(tid, current->pid) ), - TP_printk("%d,%d %s %u (%s) %llu + %u [%s]", + TP_printk("%d,%d %s %u (%s) %llu + %u [%s] %d", MAJOR(__entry->dev), MINOR(__entry->dev), __print_rwbs_flags(__entry->rwbs), __entry->bytes, __blk_dump_cmd(__get_dynamic_array(cmd), __get_dynamic_array_len(cmd)), (unsigned long long)__entry->sector, - __entry->nr_sector, __entry->comm) + __entry->nr_sector, __entry->comm, __entry->tid) ) /** @@ -239,7 +352,7 @@ DECLARE_EVENT_CLASS(block_rq, * be examined to determine which device and sectors the pending * operation would access. */ -DEFINE_EVENT(block_rq, block_rq_insert, +LTTNG_TRACEPOINT_EVENT_INSTANCE(block_rq, block_rq_insert, TP_PROTO(struct request_queue *q, struct request *rq), @@ -254,7 +367,7 @@ DEFINE_EVENT(block_rq, block_rq_insert, * Called when block operation request @rq from queue @q is sent to a * device driver for processing. */ -DEFINE_EVENT(block_rq, block_rq_issue, +LTTNG_TRACEPOINT_EVENT_INSTANCE(block_rq, block_rq_issue, TP_PROTO(struct request_queue *q, struct request *rq), @@ -272,7 +385,7 @@ DEFINE_EVENT(block_rq, block_rq_issue, * bounce buffer requires extra copying of data and decreases * performance. */ -TRACE_EVENT(block_bio_bounce, +LTTNG_TRACEPOINT_EVENT(block_bio_bounce, TP_PROTO(struct request_queue *q, struct bio *bio), @@ -283,23 +396,35 @@ TRACE_EVENT(block_bio_bounce, __field( sector_t, sector ) __field( unsigned int, nr_sector ) __field( unsigned int, rwbs ) + __field( pid_t, tid ) __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 ? + 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) + tp_assign(tid, current->pid) +#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) + tp_assign(tid, current->pid) +#endif /* #else #if (LINUX_VERSION_CODE >= KERNEL_VERSION(3,14,0)) */ ), - TP_printk("%d,%d %s %llu + %u [%s]", + TP_printk("%d,%d %s %llu + %u [%s] %d", MAJOR(__entry->dev), MINOR(__entry->dev), __print_rwbs_flags(__entry->rwbs), (unsigned long long)__entry->sector, - __entry->nr_sector, __entry->comm) + __entry->nr_sector, __entry->comm, __entry->tid) ) /** @@ -311,7 +436,7 @@ TRACE_EVENT(block_bio_bounce, * This tracepoint indicates there is no further work to do on this * block IO operation @bio. */ -TRACE_EVENT(block_bio_complete, +LTTNG_TRACEPOINT_EVENT(block_bio_complete, #if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,38)) TP_PROTO(struct request_queue *q, struct bio *bio, int error), @@ -332,6 +457,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 +473,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,33 +483,45 @@ TRACE_EVENT(block_bio_complete, __entry->nr_sector, __entry->error) ) -DECLARE_EVENT_CLASS(block_bio, +#if (LINUX_VERSION_CODE >= KERNEL_VERSION(3,9,0)) +LTTNG_TRACEPOINT_EVENT_CLASS(block_bio_merge, - TP_PROTO(struct request_queue *q, struct bio *bio), + TP_PROTO(struct request_queue *q, struct request *rq, struct bio *bio), - TP_ARGS(q, 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 ) + __field( pid_t, tid ) __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) + tp_assign(tid, current->pid) +#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) + tp_assign(tid, current->pid) +#endif /* #else #if (LINUX_VERSION_CODE >= KERNEL_VERSION(3,14,0)) */ ), - TP_printk("%d,%d %s %llu + %u [%s]", + TP_printk("%d,%d %s %llu + %u [%s] %d", MAJOR(__entry->dev), MINOR(__entry->dev), __print_rwbs_flags(__entry->rwbs), (unsigned long long)__entry->sector, - __entry->nr_sector, __entry->comm) + __entry->nr_sector, __entry->comm, __entry->tid) ) /** @@ -387,17 +532,11 @@ DECLARE_EVENT_CLASS(block_bio, * Merging block request @bio to the end of an existing block request * in queue @q. */ -DEFINE_EVENT(block_bio, block_bio_backmerge, +LTTNG_TRACEPOINT_EVENT_INSTANCE(block_bio_merge, 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 ) /** @@ -408,17 +547,118 @@ DEFINE_EVENT(block_bio, block_bio_backmerge, * Merging block IO operation @bio to the beginning of an existing block * operation in queue @q. */ -DEFINE_EVENT(block_bio, block_bio_frontmerge, +LTTNG_TRACEPOINT_EVENT_INSTANCE(block_bio_merge, 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) +) + +/** + * 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. + */ +LTTNG_TRACEPOINT_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 ) + __field( unsigned int, rwbs ) + __field( pid_t, tid ) + __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) + tp_assign(tid, current->pid) +#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) + tp_assign(tid, current->pid) +#endif /* #else #if (LINUX_VERSION_CODE >= KERNEL_VERSION(3,14,0)) */ + ), + + TP_printk("%d,%d %s %llu + %u [%s] %d", + MAJOR(__entry->dev), MINOR(__entry->dev), __entry->rwbs, + (unsigned long long)__entry->sector, + __entry->nr_sector, __entry->comm, __entry->tid) +) #else +LTTNG_TRACEPOINT_EVENT_CLASS(block_bio, + + 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 ) + __field( unsigned int, rwbs ) + __field( pid_t, tid ) + __array_text( char, comm, TASK_COMM_LEN ) + ), + + TP_fast_assign( + 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) + tp_assign(tid, current->pid) + ), + + TP_printk("%d,%d %s %llu + %u [%s] %d", + MAJOR(__entry->dev), MINOR(__entry->dev), + __print_rwbs_flags(__entry->rwbs), + (unsigned long long)__entry->sector, + __entry->nr_sector, __entry->comm, __entry->tid) +) + +/** + * 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. + */ +LTTNG_TRACEPOINT_EVENT_INSTANCE(block_bio, block_bio_backmerge, + + TP_PROTO(struct request_queue *q, struct bio *bio), + + TP_ARGS(q, 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. + */ +LTTNG_TRACEPOINT_EVENT_INSTANCE(block_bio, block_bio_frontmerge, + TP_PROTO(struct request_queue *q, struct bio *bio), TP_ARGS(q, bio) -#endif ) /** @@ -428,14 +668,15 @@ DEFINE_EVENT(block_bio, block_bio_frontmerge, * * About to place the block IO operation @bio into queue @q. */ -DEFINE_EVENT(block_bio, block_bio_queue, +LTTNG_TRACEPOINT_EVENT_INSTANCE(block_bio, block_bio_queue, TP_PROTO(struct request_queue *q, struct bio *bio), TP_ARGS(q, bio) ) +#endif -DECLARE_EVENT_CLASS(block_get_rq, +LTTNG_TRACEPOINT_EVENT_CLASS(block_get_rq, TP_PROTO(struct request_queue *q, struct bio *bio, int rw), @@ -446,23 +687,35 @@ DECLARE_EVENT_CLASS(block_get_rq, __field( sector_t, sector ) __field( unsigned int, nr_sector ) __field( unsigned int, rwbs ) + __field( pid_t, tid ) __array_text( char, comm, TASK_COMM_LEN ) ), 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) + tp_assign(tid, current->pid) +#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) + tp_assign(tid, current->pid) +#endif /* #else #if (LINUX_VERSION_CODE >= KERNEL_VERSION(3,14,0)) */ ), - TP_printk("%d,%d %s %llu + %u [%s]", + TP_printk("%d,%d %s %llu + %u [%s] %d", MAJOR(__entry->dev), MINOR(__entry->dev), __print_rwbs_flags(__entry->rwbs), (unsigned long long)__entry->sector, - __entry->nr_sector, __entry->comm) + __entry->nr_sector, __entry->comm, __entry->tid) ) /** @@ -474,7 +727,7 @@ DECLARE_EVENT_CLASS(block_get_rq, * A request struct for queue @q has been allocated to handle the * block IO operation @bio. */ -DEFINE_EVENT(block_get_rq, block_getrq, +LTTNG_TRACEPOINT_EVENT_INSTANCE(block_get_rq, block_getrq, TP_PROTO(struct request_queue *q, struct bio *bio, int rw), @@ -492,7 +745,7 @@ DEFINE_EVENT(block_get_rq, block_getrq, * available. This tracepoint event is generated each time the * process goes to sleep waiting for request struct become available. */ -DEFINE_EVENT(block_get_rq, block_sleeprq, +LTTNG_TRACEPOINT_EVENT_INSTANCE(block_get_rq, block_sleeprq, TP_PROTO(struct request_queue *q, struct bio *bio, int rw), @@ -507,24 +760,26 @@ DEFINE_EVENT(block_get_rq, block_sleeprq, * to be sent to the device driver. Instead, accumulate requests in * the queue to improve throughput performance of the block device. */ -TRACE_EVENT(block_plug, +LTTNG_TRACEPOINT_EVENT(block_plug, TP_PROTO(struct request_queue *q), TP_ARGS(q), TP_STRUCT__entry( + __field( pid_t, tid ) __array_text( char, comm, TASK_COMM_LEN ) ), TP_fast_assign( tp_memcpy(comm, current->comm, TASK_COMM_LEN) + tp_assign(tid, current->pid) ), - TP_printk("[%s]", __entry->comm) + TP_printk("[%s] %d", __entry->comm, __entry->tid) ) -DECLARE_EVENT_CLASS(block_unplug, +LTTNG_TRACEPOINT_EVENT_CLASS(block_unplug, #if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,39)) TP_PROTO(struct request_queue *q, unsigned int depth, bool explicit), @@ -538,6 +793,7 @@ DECLARE_EVENT_CLASS(block_unplug, TP_STRUCT__entry( __field( int, nr_rq ) + __field( pid_t, tid ) __array_text( char, comm, TASK_COMM_LEN ) ), @@ -548,9 +804,11 @@ DECLARE_EVENT_CLASS(block_unplug, tp_assign(nr_rq, q->rq.count[READ] + q->rq.count[WRITE]) #endif tp_memcpy(comm, current->comm, TASK_COMM_LEN) + tp_assign(tid, current->pid) ), - TP_printk("[%s] %d", __entry->comm, __entry->nr_rq) + TP_printk("[%s] %d %d", __entry->comm, , __entry->tid, + __entry->nr_rq) ) #if (LINUX_VERSION_CODE < KERNEL_VERSION(2,6,39)) @@ -561,7 +819,7 @@ DECLARE_EVENT_CLASS(block_unplug, * Unplug the request queue @q because a timer expired and allow block * operation requests to be sent to the device driver. */ -DEFINE_EVENT(block_unplug, block_unplug_timer, +LTTNG_TRACEPOINT_EVENT_INSTANCE(block_unplug, block_unplug_timer, TP_PROTO(struct request_queue *q), @@ -579,9 +837,9 @@ DEFINE_EVENT(block_unplug, block_unplug_timer, * on elements in the request queue. */ #if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,39)) -DEFINE_EVENT(block_unplug, block_unplug, +LTTNG_TRACEPOINT_EVENT_INSTANCE(block_unplug, block_unplug, #else -DEFINE_EVENT(block_unplug, block_unplug_io, +LTTNG_TRACEPOINT_EVENT_INSTANCE(block_unplug, block_unplug_io, #endif #if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,39)) @@ -606,7 +864,7 @@ DEFINE_EVENT(block_unplug, block_unplug_io, * @new_sector. This split may be required due to hardware limitation * such as operation crossing device boundaries in a RAID system. */ -TRACE_EVENT(block_split, +LTTNG_TRACEPOINT_EVENT(block_split, TP_PROTO(struct request_queue *q, struct bio *bio, unsigned int new_sector), @@ -618,23 +876,34 @@ TRACE_EVENT(block_split, __field( sector_t, sector ) __field( sector_t, new_sector ) __field( unsigned int, rwbs ) + __field( pid_t, tid ) __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(new_sector, new_sector) + blk_fill_rwbs(rwbs, bio->bi_rw, bio->bi_iter.bi_size) + tp_memcpy(comm, current->comm, TASK_COMM_LEN) + tp_assign(tid, current->pid) +#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) tp_memcpy(comm, current->comm, TASK_COMM_LEN) + tp_assign(tid, current->pid) +#endif /* #else #if (LINUX_VERSION_CODE >= KERNEL_VERSION(3,14,0)) */ ), - TP_printk("%d,%d %s %llu / %llu [%s]", + TP_printk("%d,%d %s %llu / %llu [%s] %d", MAJOR(__entry->dev), MINOR(__entry->dev), __print_rwbs_flags(__entry->rwbs), (unsigned long long)__entry->sector, (unsigned long long)__entry->new_sector, - __entry->comm) + __entry->comm, __entry->tid) ) /** @@ -648,9 +917,9 @@ TRACE_EVENT(block_split, * raw block device. */ #if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,38)) -TRACE_EVENT(block_bio_remap, +LTTNG_TRACEPOINT_EVENT(block_bio_remap, #else -TRACE_EVENT(block_remap, +LTTNG_TRACEPOINT_EVENT(block_remap, #endif TP_PROTO(struct request_queue *q, struct bio *bio, dev_t dev, @@ -668,12 +937,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", @@ -697,7 +975,7 @@ TRACE_EVENT(block_remap, * operation request @rq holds the current information and @from hold * the original sector. */ -TRACE_EVENT(block_rq_remap, +LTTNG_TRACEPOINT_EVENT(block_rq_remap, TP_PROTO(struct request_queue *q, struct request *rq, dev_t dev, sector_t from), @@ -735,7 +1013,7 @@ TRACE_EVENT(block_rq_remap, #undef __print_rwbs_flags #undef blk_fill_rwbs -#endif /* _TRACE_BLOCK_H */ +#endif /* LTTNG_TRACE_BLOCK_H */ /* This part must be outside protection */ #include "../../../probes/define_trace.h"