X-Git-Url: http://git.lttng.org/?a=blobdiff_plain;f=include%2Finstrumentation%2Fevents%2Fblock.h;h=d0d69672d29632b5cca9e66860eb85e2b03fa156;hb=fa79b21cf0128a6c5fc1714b91abb81522e36835;hp=ba51fe2c3737cb1d6f2f0d06eee1abfb7715bb43;hpb=3441e48eaf89229d8d76c13495d2c6cebad2fc51;p=lttng-modules.git diff --git a/include/instrumentation/events/block.h b/include/instrumentation/events/block.h index ba51fe2c..d0d69672 100644 --- a/include/instrumentation/events/block.h +++ b/include/instrumentation/events/block.h @@ -266,6 +266,31 @@ LTTNG_TRACEPOINT_EVENT_INSTANCE(block_rq_with_error, block_rq_abort, ) #endif +#if (LINUX_VERSION_CODE >= KERNEL_VERSION(5,11,0)) +/** + * block_rq_requeue - place block IO request back on a queue + * @rq: block IO operation request + * + * The block operation request @rq is being placed back into queue + * @q. For some reason the request was not completed and needs to be + * put back in the queue. + */ +LTTNG_TRACEPOINT_EVENT(block_rq_requeue, + + TP_PROTO(struct request *rq), + + TP_ARGS(rq), + + TP_FIELDS( + ctf_integer(dev_t, dev, + rq->rq_disk ? disk_devt(rq->rq_disk) : 0) + ctf_integer(sector_t, sector, blk_rq_trace_sector(rq)) + ctf_integer(unsigned int, nr_sector, blk_rq_trace_nr_sectors(rq)) + blk_rwbs_ctf_integer(unsigned int, rwbs, + lttng_req_op(rq), lttng_req_rw(rq), blk_rq_bytes(rq)) + ) +) +#elif (LINUX_VERSION_CODE >= KERNEL_VERSION(4,12,0)) /** * block_rq_requeue - place block IO request back on a queue * @q: queue holding operation @@ -275,7 +300,6 @@ LTTNG_TRACEPOINT_EVENT_INSTANCE(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. */ -#if (LINUX_VERSION_CODE >= KERNEL_VERSION(4,12,0)) LTTNG_TRACEPOINT_EVENT(block_rq_requeue, TP_PROTO(struct request_queue *q, struct request *rq), @@ -434,7 +458,26 @@ LTTNG_TRACEPOINT_EVENT_INSTANCE(block_rq_with_error, block_rq_complete, #endif /* #else #if (LINUX_VERSION_CODE >= KERNEL_VERSION(3,15,0)) */ -#if (LINUX_VERSION_CODE >= KERNEL_VERSION(4,12,0)) +#if (LINUX_VERSION_CODE >= KERNEL_VERSION(5,11,0)) +LTTNG_TRACEPOINT_EVENT_CLASS(block_rq, + + TP_PROTO(struct request *rq), + + TP_ARGS(rq), + + TP_FIELDS( + ctf_integer(dev_t, dev, + rq->rq_disk ? disk_devt(rq->rq_disk) : 0) + ctf_integer(sector_t, sector, blk_rq_trace_sector(rq)) + ctf_integer(unsigned int, nr_sector, blk_rq_trace_nr_sectors(rq)) + ctf_integer(unsigned int, bytes, blk_rq_bytes(rq)) + ctf_integer(pid_t, tid, current->pid) + blk_rwbs_ctf_integer(unsigned int, rwbs, + lttng_req_op(rq), lttng_req_rw(rq), blk_rq_bytes(rq)) + ctf_array_text(char, comm, current->comm, TASK_COMM_LEN) + ) +) +#elif (LINUX_VERSION_CODE >= KERNEL_VERSION(4,12,0)) LTTNG_TRACEPOINT_EVENT_CLASS(block_rq, TP_PROTO(struct request_queue *q, struct request *rq), @@ -550,6 +593,23 @@ LTTNG_TRACEPOINT_EVENT_CLASS_CODE(block_rq, ) #endif /* #else #if (LINUX_VERSION_CODE >= KERNEL_VERSION(4,11,0)) */ +#if (LINUX_VERSION_CODE >= KERNEL_VERSION(5,11,0)) +/** + * block_rq_insert - insert block operation request into queue + * @rq: block IO operation request + * + * Called immediately before block operation request @rq is inserted + * into queue @q. The fields in the operation request @rq struct can + * be examined to determine which device and sectors the pending + * operation would access. + */ +LTTNG_TRACEPOINT_EVENT_INSTANCE(block_rq, block_rq_insert, + + TP_PROTO(struct request *rq), + + TP_ARGS(rq) +) +#else /** * block_rq_insert - insert block operation request into queue * @q: target queue @@ -566,7 +626,23 @@ LTTNG_TRACEPOINT_EVENT_INSTANCE(block_rq, block_rq_insert, TP_ARGS(q, rq) ) +#endif +#if (LINUX_VERSION_CODE >= KERNEL_VERSION(5,11,0)) +/** + * block_rq_issue - issue pending block IO request operation to device driver + * @rq: block IO operation operation request + * + * Called when block operation request @rq from queue @q is sent to a + * device driver for processing. + */ +LTTNG_TRACEPOINT_EVENT_INSTANCE(block_rq, block_rq_issue, + + TP_PROTO(struct request *rq), + + TP_ARGS(rq) +) +#else /** * block_rq_issue - issue pending block IO request operation to device driver * @q: queue holding operation @@ -581,48 +657,38 @@ LTTNG_TRACEPOINT_EVENT_INSTANCE(block_rq, block_rq_issue, TP_ARGS(q, rq) ) +#endif +#if (LINUX_VERSION_CODE >= KERNEL_VERSION(5,11,0)) /** - * block_bio_bounce - used bounce buffer when processing block operation - * @q: queue holding the block operation - * @bio: block operation + * block_rq_merge - merge request with another one in the elevator + * @rq: block IO operation operation request * - * A bounce buffer was used to handle the block operation @bio in @q. - * This occurs when hardware limitations prevent a direct transfer of - * data between the @bio data memory area and the IO device. Use of a - * bounce buffer requires extra copying of data and decreases - * performance. + * Called when block operation request @rq from queue @q is merged to another + * request queued in the elevator. */ -LTTNG_TRACEPOINT_EVENT(block_bio_bounce, +LTTNG_TRACEPOINT_EVENT_INSTANCE(block_rq, block_rq_merge, - TP_PROTO(struct request_queue *q, struct bio *bio), + TP_PROTO(struct request *rq), - TP_ARGS(q, bio), - - TP_FIELDS( -#if (LINUX_VERSION_CODE >= KERNEL_VERSION(4,14,0)) - ctf_integer(dev_t, dev, bio_dev(bio)) -#else - ctf_integer(dev_t, dev, bio->bi_bdev ? bio->bi_bdev->bd_dev : 0) -#endif -#if (LINUX_VERSION_CODE >= KERNEL_VERSION(3,14,0)) - ctf_integer(sector_t, sector, bio->bi_iter.bi_sector) - ctf_integer(unsigned int, nr_sector, bio_sectors(bio)) - blk_rwbs_ctf_integer(unsigned int, rwbs, - lttng_bio_op(bio), lttng_bio_rw(bio), - bio->bi_iter.bi_size) -#else /* #if (LINUX_VERSION_CODE >= KERNEL_VERSION(3,14,0)) */ - ctf_integer(sector_t, sector, bio->bi_sector) - ctf_integer(unsigned int, nr_sector, bio->bi_size >> 9) - blk_rwbs_ctf_integer(unsigned int, rwbs, - lttng_bio_op(bio), lttng_bio_rw(bio), - bio->bi_size) -#endif /* #else #if (LINUX_VERSION_CODE >= KERNEL_VERSION(3,14,0)) */ - ctf_integer(pid_t, tid, current->pid) - ctf_array_text(char, comm, current->comm, TASK_COMM_LEN) - ) + TP_ARGS(rq) ) +#elif (LINUX_VERSION_CODE >= KERNEL_VERSION(5,9,0)) +/** + * block_rq_merge - merge request with another one in the elevator + * @q: queue holding operation + * @rq: block IO operation operation request + * + * Called when block operation request @rq from queue @q is merged to another + * request queued in the elevator. + */ +LTTNG_TRACEPOINT_EVENT_INSTANCE(block_rq, block_rq_merge, + TP_PROTO(struct request_queue *q, struct request *rq), + + TP_ARGS(q, rq) +) +#endif #if (LINUX_VERSION_CODE >= KERNEL_VERSION(5,8,0)) /** @@ -729,7 +795,25 @@ LTTNG_TRACEPOINT_EVENT(block_bio_complete, ) #endif -#if (LINUX_VERSION_CODE >= KERNEL_VERSION(3,9,0)) +#if (LINUX_VERSION_CODE >= KERNEL_VERSION(5,11,0)) +LTTNG_TRACEPOINT_EVENT_CLASS(block_bio, + + TP_PROTO(struct bio *bio), + + TP_ARGS(bio), + + TP_FIELDS( + ctf_integer(dev_t, dev, bio_dev(bio)) + ctf_integer(sector_t, sector, bio->bi_iter.bi_sector) + ctf_integer(unsigned int, nr_sector, bio_sectors(bio)) + blk_rwbs_ctf_integer(unsigned int, rwbs, + lttng_bio_op(bio), lttng_bio_rw(bio), + bio->bi_iter.bi_size) + ctf_integer(pid_t, tid, current->pid) + ctf_array_text(char, comm, current->comm, TASK_COMM_LEN) + ) +) +#elif (LINUX_VERSION_CODE >= KERNEL_VERSION(4,14,0)) LTTNG_TRACEPOINT_EVENT_CLASS(block_bio_merge, TP_PROTO(struct request_queue *q, struct request *rq, struct bio *bio), @@ -737,31 +821,184 @@ LTTNG_TRACEPOINT_EVENT_CLASS(block_bio_merge, TP_ARGS(q, rq, bio), TP_FIELDS( -#if (LINUX_VERSION_CODE >= KERNEL_VERSION(4,14,0)) ctf_integer(dev_t, dev, bio_dev(bio)) -#else + ctf_integer(sector_t, sector, bio->bi_iter.bi_sector) + ctf_integer(unsigned int, nr_sector, bio_sectors(bio)) + blk_rwbs_ctf_integer(unsigned int, rwbs, + lttng_bio_op(bio), lttng_bio_rw(bio), + bio->bi_iter.bi_size) + ctf_integer(pid_t, tid, current->pid) + ctf_array_text(char, comm, current->comm, TASK_COMM_LEN) + ) +) +#elif (LINUX_VERSION_CODE >= KERNEL_VERSION(3,14,0)) +LTTNG_TRACEPOINT_EVENT_CLASS(block_bio_merge, + + TP_PROTO(struct request_queue *q, struct request *rq, struct bio *bio), + + TP_ARGS(q, rq, bio), + + TP_FIELDS( ctf_integer(dev_t, dev, bio->bi_bdev->bd_dev) -#endif -#if (LINUX_VERSION_CODE >= KERNEL_VERSION(3,14,0)) ctf_integer(sector_t, sector, bio->bi_iter.bi_sector) ctf_integer(unsigned int, nr_sector, bio_sectors(bio)) blk_rwbs_ctf_integer(unsigned int, rwbs, lttng_bio_op(bio), lttng_bio_rw(bio), bio->bi_iter.bi_size) -#else /* #if (LINUX_VERSION_CODE >= KERNEL_VERSION(3,14,0)) */ + ctf_integer(pid_t, tid, current->pid) + ctf_array_text(char, comm, current->comm, TASK_COMM_LEN) + ) +) +#elif (LINUX_VERSION_CODE >= KERNEL_VERSION(3,9,0)) +LTTNG_TRACEPOINT_EVENT_CLASS(block_bio_merge, + + TP_PROTO(struct request_queue *q, struct request *rq, struct bio *bio), + + TP_ARGS(q, rq, bio), + + TP_FIELDS( + ctf_integer(dev_t, dev, bio->bi_bdev->bd_dev) ctf_integer(sector_t, sector, bio->bi_sector) ctf_integer(unsigned int, nr_sector, bio->bi_size >> 9) blk_rwbs_ctf_integer(unsigned int, rwbs, lttng_bio_op(bio), lttng_bio_rw(bio), bio->bi_size) -#endif /* #else #if (LINUX_VERSION_CODE >= KERNEL_VERSION(3,14,0)) */ ctf_integer(pid_t, tid, current->pid) ctf_array_text(char, comm, current->comm, TASK_COMM_LEN) ) ) +#endif + + + +#if (LINUX_VERSION_CODE >= KERNEL_VERSION(5,11,0)) +/** + * block_bio_bounce - used bounce buffer when processing block operation + * @bio: block operation + * + * A bounce buffer was used to handle the block operation @bio in @q. + * This occurs when hardware limitations prevent a direct transfer of + * data between the @bio data memory area and the IO device. Use of a + * bounce buffer requires extra copying of data and decreases + * performance. + */ +LTTNG_TRACEPOINT_EVENT_INSTANCE(block_bio, block_bio_bounce, + + TP_PROTO(struct bio *bio), + TP_ARGS(bio) +) +#elif (LINUX_VERSION_CODE >= KERNEL_VERSION(4,14,0)) +/** + * block_bio_bounce - used bounce buffer when processing block operation + * @q: queue holding the block operation + * @bio: block operation + * + * A bounce buffer was used to handle the block operation @bio in @q. + * This occurs when hardware limitations prevent a direct transfer of + * data between the @bio data memory area and the IO device. Use of a + * bounce buffer requires extra copying of data and decreases + * performance. + */ +LTTNG_TRACEPOINT_EVENT(block_bio_bounce, + + TP_PROTO(struct request_queue *q, struct bio *bio), + + TP_ARGS(q, bio), + + TP_FIELDS( + ctf_integer(dev_t, dev, bio_dev(bio)) + ctf_integer(sector_t, sector, bio->bi_iter.bi_sector) + ctf_integer(unsigned int, nr_sector, bio_sectors(bio)) + blk_rwbs_ctf_integer(unsigned int, rwbs, + lttng_bio_op(bio), lttng_bio_rw(bio), + bio->bi_iter.bi_size) + ctf_integer(pid_t, tid, current->pid) + ctf_array_text(char, comm, current->comm, TASK_COMM_LEN) + ) +) +#elif (LINUX_VERSION_CODE >= KERNEL_VERSION(3,14,0)) +LTTNG_TRACEPOINT_EVENT(block_bio_bounce, + + TP_PROTO(struct request_queue *q, struct bio *bio), + + TP_ARGS(q, bio), + + TP_FIELDS( + ctf_integer(dev_t, dev, bio->bi_bdev ? bio->bi_bdev->bd_dev : 0) + ctf_integer(sector_t, sector, bio->bi_iter.bi_sector) + ctf_integer(unsigned int, nr_sector, bio_sectors(bio)) + blk_rwbs_ctf_integer(unsigned int, rwbs, + lttng_bio_op(bio), lttng_bio_rw(bio), + bio->bi_iter.bi_size) + ctf_integer(pid_t, tid, current->pid) + ctf_array_text(char, comm, current->comm, TASK_COMM_LEN) + ) +) +#else +LTTNG_TRACEPOINT_EVENT(block_bio_bounce, + + TP_PROTO(struct request_queue *q, struct bio *bio), + + TP_ARGS(q, bio), + + TP_FIELDS( + ctf_integer(dev_t, dev, bio->bi_bdev ? bio->bi_bdev->bd_dev : 0) + ctf_integer(sector_t, sector, bio->bi_sector) + ctf_integer(unsigned int, nr_sector, bio->bi_size >> 9) + blk_rwbs_ctf_integer(unsigned int, rwbs, + lttng_bio_op(bio), lttng_bio_rw(bio), + bio->bi_size) + ctf_integer(pid_t, tid, current->pid) + ctf_array_text(char, comm, current->comm, TASK_COMM_LEN) + ) +) +#endif + + +#if (LINUX_VERSION_CODE >= KERNEL_VERSION(5,11,0)) +/** + * block_bio_backmerge - merging block operation to the end of an existing operation + * @bio: new block operation to merge + * + * Merging block request @bio to the end of an existing block request. + */ +LTTNG_TRACEPOINT_EVENT_INSTANCE(block_bio, block_bio_backmerge, + + TP_PROTO(struct bio *bio), + + TP_ARGS(bio) +) + +/** + * block_bio_frontmerge - merging block operation to the beginning of an existing operation + * @bio: new block operation to merge + * + * Merging block IO operation @bio to the beginning of an existing block request. + */ +LTTNG_TRACEPOINT_EVENT_INSTANCE(block_bio, block_bio_frontmerge, + + TP_PROTO(struct bio *bio), + + TP_ARGS(bio) +) + +/** + * block_bio_queue - putting new block IO operation in queue + * @bio: new block operation + * + * About to place the block IO operation @bio into queue @q. + */ +LTTNG_TRACEPOINT_EVENT_INSTANCE(block_bio, block_bio_queue, + + TP_PROTO(struct bio *bio), + + TP_ARGS(bio) +) +#elif (LINUX_VERSION_CODE >= KERNEL_VERSION(3,9,0)) /** * block_bio_backmerge - merging block operation to the end of an existing operation * @q: queue holding operation + * @rq: request bio is being merged into * @bio: new block operation to merge * * Merging block request @bio to the end of an existing block request @@ -777,6 +1014,7 @@ LTTNG_TRACEPOINT_EVENT_INSTANCE(block_bio_merge, block_bio_backmerge, /** * block_bio_frontmerge - merging block operation to the beginning of an existing operation * @q: queue holding operation + * @rq: request bio is being merged into * @bio: new block operation to merge * * Merging block IO operation @bio to the beginning of an existing block @@ -887,6 +1125,20 @@ LTTNG_TRACEPOINT_EVENT_INSTANCE(block_bio, block_bio_queue, ) #endif /* #else #if (LINUX_VERSION_CODE >= KERNEL_VERSION(3,9,0)) */ +#if (LINUX_VERSION_CODE >= KERNEL_VERSION(5,11,0)) +/** + * block_getrq - get a free request entry in queue for block IO operations + * @bio: pending block IO operation (can be %NULL) + * + * A request struct has been allocated to handle the block IO operation @bio. + */ +LTTNG_TRACEPOINT_EVENT_INSTANCE(block_bio, block_getrq, + + TP_PROTO(struct bio *bio), + + TP_ARGS(bio) +) +#else LTTNG_TRACEPOINT_EVENT_CLASS(block_get_rq, TP_PROTO(struct request_queue *q, struct bio *bio, int rw), @@ -954,6 +1206,7 @@ LTTNG_TRACEPOINT_EVENT_INSTANCE(block_get_rq, block_sleeprq, TP_ARGS(q, bio, rw) ) +#endif /** * block_plug - keep operations requests in request queue @@ -1084,6 +1337,34 @@ LTTNG_TRACEPOINT_EVENT(block_bio_remap, ) ) +#if (LINUX_VERSION_CODE >= KERNEL_VERSION(5,11,0)) +/** + * block_rq_remap - map request for a block operation request + * @rq: block IO operation request + * @dev: device for the operation + * @from: original sector for the operation + * + * The block operation request @rq in @q has been remapped. The block + * operation request @rq holds the current information and @from hold + * the original sector. + */ +LTTNG_TRACEPOINT_EVENT(block_rq_remap, + + TP_PROTO(struct request *rq, dev_t dev, sector_t from), + + TP_ARGS(rq, dev, from), + + TP_FIELDS( + ctf_integer(dev_t, dev, disk_devt(rq->rq_disk)) + ctf_integer(sector_t, sector, blk_rq_pos(rq)) + ctf_integer(unsigned int, nr_sector, blk_rq_sectors(rq)) + ctf_integer(dev_t, old_dev, dev) + ctf_integer(sector_t, old_sector, from) + blk_rwbs_ctf_integer(unsigned int, rwbs, + lttng_req_op(rq), lttng_req_rw(rq), blk_rq_bytes(rq)) + ) +) +#else /** * block_rq_remap - map request for a block operation request * @q: queue holding the operation @@ -1112,6 +1393,7 @@ LTTNG_TRACEPOINT_EVENT(block_rq_remap, lttng_req_op(rq), lttng_req_rw(rq), blk_rq_bytes(rq)) ) ) +#endif #undef __print_rwbs_flags #undef blk_fill_rwbs