X-Git-Url: http://git.liburcu.org/?a=blobdiff_plain;f=instrumentation%2Fevents%2Flttng-module%2Fblock.h;h=9dd47eddce5d0b340b04cdfa817ddd07ec13b08f;hb=23634515e7271c8c8594ad87a6685232d4eff297;hp=6526d3db93e059c649518ca99cd97136a47b2d3d;hpb=7feabe53ccf316430ceb10986e718a638bd584c1;p=lttng-modules.git diff --git a/instrumentation/events/lttng-module/block.h b/instrumentation/events/lttng-module/block.h index 6526d3db..9dd47edd 100644 --- a/instrumentation/events/lttng-module/block.h +++ b/instrumentation/events/lttng-module/block.h @@ -1,3 +1,4 @@ +/* SPDX-License-Identifier: GPL-2.0 */ #undef TRACE_SYSTEM #define TRACE_SYSTEM block @@ -33,7 +34,30 @@ enum { #endif /* _TRACE_BLOCK_DEF_ */ -#if (LINUX_VERSION_CODE >= KERNEL_VERSION(4,8,0)) +LTTNG_TRACEPOINT_ENUM(block_rq_type, + TP_ENUM_VALUES( + ctf_enum_value("RWBS_FLAG_WRITE", RWBS_FLAG_WRITE) + ctf_enum_value("RWBS_FLAG_DISCARD", RWBS_FLAG_DISCARD) + ctf_enum_value("RWBS_FLAG_READ", RWBS_FLAG_READ) + ctf_enum_value("RWBS_FLAG_RAHEAD", RWBS_FLAG_RAHEAD) + ctf_enum_value("RWBS_FLAG_BARRIER", RWBS_FLAG_BARRIER) + ctf_enum_value("RWBS_FLAG_SYNC", RWBS_FLAG_SYNC) + ctf_enum_value("RWBS_FLAG_META", RWBS_FLAG_META) + ctf_enum_value("RWBS_FLAG_SECURE", RWBS_FLAG_SECURE) + ctf_enum_value("RWBS_FLAG_FLUSH", RWBS_FLAG_FLUSH) + ctf_enum_value("RWBS_FLAG_FUA", RWBS_FLAG_FUA) + ctf_enum_value("RWBS_FLAG_PREFLUSH", RWBS_FLAG_PREFLUSH) + ) +) + +#if (LINUX_VERSION_CODE >= KERNEL_VERSION(4,8,0) || \ + LTTNG_SLE_KERNEL_RANGE(4,4,73,5,0,0, 4,4,73,6,0,0) || \ + LTTNG_SLE_KERNEL_RANGE(4,4,82,6,0,0, 4,4,82,7,0,0) || \ + LTTNG_SLE_KERNEL_RANGE(4,4,92,6,0,0, 4,4,92,7,0,0) || \ + LTTNG_SLE_KERNEL_RANGE(4,4,103,6,0,0, 4,4,103,7,0,0) || \ + LTTNG_SLE_KERNEL_RANGE(4,4,114,94,0,0, 4,4,114,95,0,0) || \ + LTTNG_SLE_KERNEL_RANGE(4,4,120,94,0,0, 4,4,120,95,0,0) || \ + LTTNG_SLE_KERNEL_RANGE(4,4,126,94,0,0, 4,5,0,0,0,0)) #define lttng_req_op(rq) req_op(rq) #define lttng_req_rw(rq) ((rq)->cmd_flags) @@ -41,7 +65,7 @@ enum { #define lttng_bio_rw(bio) ((bio)->bi_opf) #define blk_rwbs_ctf_integer(type, rwbs, op, rw, bytes) \ - ctf_integer(type, rwbs, \ + ctf_enum(block_rq_type, type, rwbs, \ (((op) == REQ_OP_WRITE || (op) == REQ_OP_WRITE_SAME) ? RWBS_FLAG_WRITE : \ ( (op) == REQ_OP_DISCARD ? RWBS_FLAG_DISCARD : \ ( (op) == REQ_OP_SECURE_ERASE ? (RWBS_FLAG_DISCARD | RWBS_FLAG_SECURE) : \ @@ -62,7 +86,7 @@ enum { #define lttng_bio_rw(bio) ((bio)->bi_rw) #define blk_rwbs_ctf_integer(type, rwbs, op, rw, bytes) \ - ctf_integer(type, rwbs, ((rw) & WRITE ? RWBS_FLAG_WRITE : \ + ctf_enum(block_rq_type, type, rwbs, ((rw) & WRITE ? RWBS_FLAG_WRITE : \ ( (rw) & REQ_DISCARD ? RWBS_FLAG_DISCARD : \ ( (bytes) ? RWBS_FLAG_READ : \ ( 0 )))) \ @@ -73,24 +97,7 @@ enum { | ((rw) & REQ_FLUSH ? RWBS_FLAG_FLUSH : 0) \ | ((rw) & REQ_FUA ? RWBS_FLAG_FUA : 0)) -#elif (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,37)) - -#define lttng_req_op(rq) -#define lttng_req_rw(rq) ((rq)->cmd_flags) -#define lttng_bio_op(bio) -#define lttng_bio_rw(bio) ((bio)->bi_rw) - -#define blk_rwbs_ctf_integer(type, rwbs, op, rw, bytes) \ - ctf_integer(type, rwbs, ((rw) & WRITE ? RWBS_FLAG_WRITE : \ - ( (rw) & REQ_DISCARD ? RWBS_FLAG_DISCARD : \ - ( (bytes) ? RWBS_FLAG_READ : \ - ( 0 )))) \ - | ((rw) & REQ_RAHEAD ? RWBS_FLAG_RAHEAD : 0) \ - | ((rw) & REQ_SYNC ? RWBS_FLAG_SYNC : 0) \ - | ((rw) & REQ_META ? RWBS_FLAG_META : 0) \ - | ((rw) & REQ_SECURE ? RWBS_FLAG_SECURE : 0)) - -#elif (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,36)) +#else #define lttng_req_op(rq) #define lttng_req_rw(rq) ((rq)->cmd_flags) @@ -98,33 +105,15 @@ enum { #define lttng_bio_rw(bio) ((bio)->bi_rw) #define blk_rwbs_ctf_integer(type, rwbs, op, rw, bytes) \ - ctf_integer(type, rwbs, ((rw) & WRITE ? RWBS_FLAG_WRITE : \ + ctf_enum(block_rq_type, type, rwbs, ((rw) & WRITE ? RWBS_FLAG_WRITE : \ ( (rw) & REQ_DISCARD ? RWBS_FLAG_DISCARD : \ ( (bytes) ? RWBS_FLAG_READ : \ ( 0 )))) \ | ((rw) & REQ_RAHEAD ? RWBS_FLAG_RAHEAD : 0) \ - | ((rw) & REQ_HARDBARRIER ? RWBS_FLAG_BARRIER : 0) \ | ((rw) & REQ_SYNC ? RWBS_FLAG_SYNC : 0) \ | ((rw) & REQ_META ? RWBS_FLAG_META : 0) \ | ((rw) & REQ_SECURE ? RWBS_FLAG_SECURE : 0)) -#else - -#define lttng_req_op(rq) -#define lttng_req_rw(rq) ((rq)->cmd_flags) -#define lttng_bio_op(bio) -#define lttng_bio_rw(bio) ((bio)->bi_rw) - -#define blk_rwbs_ctf_integer(type, rwbs, op, rw, bytes) \ - ctf_integer(type, rwbs, ((rw) & WRITE ? RWBS_FLAG_WRITE : \ - ( (rw) & (1 << BIO_RW_DISCARD) ? RWBS_FLAG_DISCARD : \ - ( (bytes) ? RWBS_FLAG_READ : \ - ( 0 )))) \ - | ((rw) & (1 << BIO_RW_AHEAD) ? RWBS_FLAG_RAHEAD : 0) \ - | ((rw) & (1 << BIO_RW_SYNCIO) ? RWBS_FLAG_SYNC : 0) \ - | ((rw) & (1 << BIO_RW_META) ? RWBS_FLAG_META : 0) \ - | ((rw) & (1 << BIO_RW_BARRIER) ? RWBS_FLAG_BARRIER : 0)) - #endif #if (LINUX_VERSION_CODE >= KERNEL_VERSION(3,9,0)) @@ -645,15 +634,9 @@ LTTNG_TRACEPOINT_EVENT(block_bio_bounce, */ 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), TP_ARGS(q, bio, error), -#else - TP_PROTO(struct request_queue *q, struct bio *bio), - - TP_ARGS(q, bio), -#endif TP_FIELDS( #if (LINUX_VERSION_CODE >= KERNEL_VERSION(4,14,0)) @@ -671,11 +654,7 @@ LTTNG_TRACEPOINT_EVENT(block_bio_complete, #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) -#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,38)) ctf_integer(int, error, error) -#else - ctf_integer(int, error, 0) -#endif 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)) */ @@ -848,7 +827,7 @@ LTTNG_TRACEPOINT_EVENT_CLASS(block_get_rq, TP_FIELDS( #if (LINUX_VERSION_CODE >= KERNEL_VERSION(4,14,0)) - ctf_integer(dev_t, dev, bio_dev(bio)) + ctf_integer(dev_t, dev, bio ? bio_dev(bio) : 0) #else ctf_integer(dev_t, dev, bio ? bio->bi_bdev->bd_dev : 0) #endif @@ -877,7 +856,7 @@ LTTNG_TRACEPOINT_EVENT_CLASS(block_get_rq, /** * block_getrq - get a free request entry in queue for block IO operations * @q: queue for operations - * @bio: pending block IO operation + * @bio: pending block IO operation (can be %NULL) * @rw: low bit indicates a read (%0) or a write (%1) * * A request struct for queue @q has been allocated to handle the @@ -893,7 +872,7 @@ LTTNG_TRACEPOINT_EVENT_INSTANCE(block_get_rq, block_getrq, /** * block_sleeprq - waiting to get a free request entry in queue for block IO operation * @q: queue for operation - * @bio: pending block IO operation + * @bio: pending block IO operation (can be %NULL) * @rw: low bit indicates a read (%0) or a write (%1) * * In the case where a request struct cannot be provided for queue @q @@ -930,43 +909,17 @@ LTTNG_TRACEPOINT_EVENT(block_plug, 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), TP_ARGS(q, depth, explicit), -#else - TP_PROTO(struct request_queue *q), - - TP_ARGS(q), -#endif TP_FIELDS( -#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,39)) ctf_integer(int, nr_rq, depth) -#else - ctf_integer(int, nr_rq, q->rq.count[READ] + q->rq.count[WRITE]) -#endif ctf_integer(pid_t, tid, current->pid) ctf_array_text(char, comm, current->comm, TASK_COMM_LEN) ) ) -#if (LINUX_VERSION_CODE < KERNEL_VERSION(2,6,39)) -/** - * block_unplug_timer - timed release of operations requests in queue to device driver - * @q: request queue to unplug - * - * Unplug the request queue @q because a timer expired and allow block - * operation requests to be sent to the device driver. - */ -LTTNG_TRACEPOINT_EVENT_INSTANCE(block_unplug, block_unplug_timer, - - TP_PROTO(struct request_queue *q), - - TP_ARGS(q) -) -#endif - /** * block_unplug - release of operations requests in request queue * @q: request queue to unplug @@ -976,21 +929,11 @@ LTTNG_TRACEPOINT_EVENT_INSTANCE(block_unplug, block_unplug_timer, * Unplug request queue @q because device driver is scheduled to work * on elements in the request queue. */ -#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,39)) LTTNG_TRACEPOINT_EVENT_INSTANCE(block_unplug, block_unplug, -#else -LTTNG_TRACEPOINT_EVENT_INSTANCE(block_unplug, block_unplug_io, -#endif -#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,39)) TP_PROTO(struct request_queue *q, unsigned int depth, bool explicit), TP_ARGS(q, depth, explicit) -#else - TP_PROTO(struct request_queue *q), - - TP_ARGS(q) -#endif ) /** @@ -1043,11 +986,7 @@ LTTNG_TRACEPOINT_EVENT(block_split, * An operation for a logical device has been mapped to the * raw block device. */ -#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,38)) LTTNG_TRACEPOINT_EVENT(block_bio_remap, -#else -LTTNG_TRACEPOINT_EVENT(block_remap, -#endif TP_PROTO(struct request_queue *q, struct bio *bio, dev_t dev, sector_t from), @@ -1077,7 +1016,6 @@ LTTNG_TRACEPOINT_EVENT(block_remap, ) ) -#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,32)) /** * block_rq_remap - map request for a block operation request * @q: queue holding the operation @@ -1106,7 +1044,6 @@ 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