#if !defined(LTTNG_TRACE_BLOCK_H) || defined(TRACE_HEADER_MULTI_READ)
#define LTTNG_TRACE_BLOCK_H
-#include "../../../probes/lttng-tracepoint-event.h"
+#include <probes/lttng-tracepoint-event.h>
#include <linux/blktrace_api.h>
#include <linux/blkdev.h>
#include <linux/trace_seq.h>
#include <linux/version.h>
+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(4,11,0))
+#include <scsi/scsi_request.h>
+#endif /* (LINUX_VERSION_CODE >= KERNEL_VERSION(4,11,0)) */
+
#ifndef _TRACE_BLOCK_DEF_
#define _TRACE_BLOCK_DEF_
RWBS_FLAG_SECURE = (1 << 7),
RWBS_FLAG_FLUSH = (1 << 8),
RWBS_FLAG_FUA = (1 << 9),
+ RWBS_FLAG_PREFLUSH = (1 << 10),
};
#endif /* _TRACE_BLOCK_DEF_ */
-#if (LINUX_VERSION_CODE >= KERNEL_VERSION(3,1,0))
-#define blk_rwbs_ctf_integer(type, rwbs, rw, bytes) \
+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(4,14,0))
+#define lttng_bio_dev(bio) bio_dev(bio)
+#else
+#define lttng_bio_dev(bio) ((bio)->bi_bdev ? (bio)->bi_bdev->bd_dev : 0)
+#endif
+
+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(4,8,0))
+
+#define lttng_req_op(rq) req_op(rq)
+#define lttng_req_rw(rq) ((rq)->cmd_flags)
+#define lttng_bio_op(bio) bio_op(bio)
+#define lttng_bio_rw(bio) ((bio)->bi_opf)
+
+#define blk_rwbs_ctf_integer(type, rwbs, op, rw, bytes) \
+ ctf_integer(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) : \
+ ( (op) == REQ_OP_FLUSH ? RWBS_FLAG_FLUSH : \
+ ( (op) == REQ_OP_READ ? 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_PREFLUSH ? RWBS_FLAG_PREFLUSH : 0) \
+ | ((rw) & REQ_FUA ? RWBS_FLAG_FUA : 0))
+
+#elif (LINUX_VERSION_CODE >= KERNEL_VERSION(3,1,0))
+
+#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 : \
#elif (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,37))
-#define blk_rwbs_ctf_integer(type, rwbs, rw, bytes) \
+#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 : \
#elif (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,36))
-#define blk_rwbs_ctf_integer(type, rwbs, rw, bytes) \
+#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 : \
#else
-#define blk_rwbs_ctf_integer(type, rwbs, rw, bytes) \
+#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 : \
)
#endif
+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(4,12,0))
+/* block_rq_with_error event class removed in kernel 4.12 */
+#elif (LINUX_VERSION_CODE >= KERNEL_VERSION(4,11,0))
LTTNG_TRACEPOINT_EVENT_CLASS_CODE(block_rq_with_error,
TP_PROTO(struct request_queue *q, struct request *rq),
),
TP_code_pre(
+ if (blk_rq_is_scsi(rq)) {
+ struct scsi_request *scsi_rq = scsi_req(rq);
+ tp_locvar->sector = 0;
+ tp_locvar->nr_sector = 0;
+ tp_locvar->cmd = scsi_rq->cmd;
+ tp_locvar->cmd_len = scsi_rq->cmd_len;
+ } else {
+ tp_locvar->sector = blk_rq_pos(rq);
+ tp_locvar->nr_sector = blk_rq_sectors(rq);
+ tp_locvar->cmd = NULL;
+ tp_locvar->cmd_len = 0;
+ }
+ ),
+
+ TP_FIELDS(
+ ctf_integer(dev_t, dev,
+ rq->rq_disk ? disk_devt(rq->rq_disk) : 0)
+ ctf_integer(sector_t, sector, tp_locvar->sector)
+ ctf_integer(unsigned int, nr_sector, tp_locvar->nr_sector)
+ ctf_integer(int, errors, rq->errors)
+ blk_rwbs_ctf_integer(unsigned int, rwbs,
+ lttng_req_op(rq), lttng_req_rw(rq), blk_rq_bytes(rq))
+ ctf_sequence_hex(unsigned char, cmd,
+ tp_locvar->cmd, size_t, tp_locvar->cmd_len)
+ ),
+
+ TP_code_post()
+)
+#else /* #if (LINUX_VERSION_CODE >= KERNEL_VERSION(4,11,0)) */
+LTTNG_TRACEPOINT_EVENT_CLASS_CODE(block_rq_with_error,
+
+ TP_PROTO(struct request_queue *q, struct request *rq),
+
+ TP_ARGS(q, rq),
+
+ TP_locvar(
+ sector_t sector;
+ unsigned int nr_sector;
+ unsigned char *cmd;
+ size_t cmd_len;
+ ),
+
+ TP_code_pre(
+
if (rq->cmd_type == REQ_TYPE_BLOCK_PC) {
tp_locvar->sector = 0;
tp_locvar->nr_sector = 0;
ctf_integer(unsigned int, nr_sector, tp_locvar->nr_sector)
ctf_integer(int, errors, rq->errors)
blk_rwbs_ctf_integer(unsigned int, rwbs,
- rq->cmd_flags, blk_rq_bytes(rq))
+ lttng_req_op(rq), lttng_req_rw(rq), blk_rq_bytes(rq))
ctf_sequence_hex(unsigned char, cmd,
tp_locvar->cmd, size_t, tp_locvar->cmd_len)
),
TP_code_post()
)
+#endif /* #else #if (LINUX_VERSION_CODE >= KERNEL_VERSION(4,11,0)) */
+#if (LINUX_VERSION_CODE < KERNEL_VERSION(4,12,0))
/**
* block_rq_abort - abort block operation request
* @q: queue containing the block operation request
TP_ARGS(q, rq)
)
+#endif
/**
* block_rq_requeue - place block IO request back on a queue
* @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),
+
+ TP_ARGS(q, 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))
+ )
+)
+#else
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,28, 3,14,0,0) \
- || LTTNG_RHEL_KERNEL_RANGE(3,10,0,7,1, 3,11,0,0,0))
+#endif
/**
* block_rq_complete - block IO operation completed by device driver
* do for the request. If @rq->bio is non-NULL then there is
* additional work required to complete the request.
*/
+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(4,12,0))
+LTTNG_TRACEPOINT_EVENT(block_rq_complete,
+
+ TP_PROTO(struct request *rq, int error, unsigned int nr_bytes),
+
+ TP_ARGS(rq, error, nr_bytes),
+
+ TP_FIELDS(
+ ctf_integer(dev_t, dev,
+ rq->rq_disk ? disk_devt(rq->rq_disk) : 0)
+ ctf_integer(sector_t, sector, blk_rq_pos(rq))
+ ctf_integer(unsigned int, nr_sector, nr_bytes >> 9)
+ ctf_integer(int, error, error)
+ blk_rwbs_ctf_integer(unsigned int, rwbs,
+ lttng_req_op(rq), lttng_req_rw(rq), nr_bytes)
+ )
+)
+#elif (LINUX_VERSION_CODE >= KERNEL_VERSION(4,11,0))
+LTTNG_TRACEPOINT_EVENT_CODE(block_rq_complete,
+
+ TP_PROTO(struct request_queue *q, struct request *rq,
+ unsigned int nr_bytes),
+
+ TP_ARGS(q, rq, nr_bytes),
+
+ TP_locvar(
+ unsigned char *cmd;
+ size_t cmd_len;
+ ),
+
+ TP_code_pre(
+ if (blk_rq_is_scsi(rq)) {
+ struct scsi_request *scsi_rq = scsi_req(rq);
+ tp_locvar->cmd = scsi_rq->cmd;
+ tp_locvar->cmd_len = scsi_rq->cmd_len;
+ } else {
+ tp_locvar->cmd = NULL;
+ tp_locvar->cmd_len = 0;
+ }
+ ),
+
+ TP_FIELDS(
+ ctf_integer(dev_t, dev,
+ rq->rq_disk ? disk_devt(rq->rq_disk) : 0)
+ ctf_integer(sector_t, sector, blk_rq_pos(rq))
+ ctf_integer(unsigned int, nr_sector, nr_bytes >> 9)
+ ctf_integer(int, errors, rq->errors)
+ blk_rwbs_ctf_integer(unsigned int, rwbs,
+ lttng_req_op(rq), lttng_req_rw(rq), nr_bytes)
+ ctf_sequence_hex(unsigned char, cmd,
+ tp_locvar->cmd, size_t, tp_locvar->cmd_len)
+ ),
+
+ TP_code_post()
+)
+#elif (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,28, 3,14,0,0) \
+ || LTTNG_RHEL_KERNEL_RANGE(3,10,0,229,0,0, 3,11,0,0,0,0))
+
LTTNG_TRACEPOINT_EVENT_CODE(block_rq_complete,
TP_PROTO(struct request_queue *q, struct request *rq,
ctf_integer(unsigned int, nr_sector, nr_bytes >> 9)
ctf_integer(int, errors, rq->errors)
blk_rwbs_ctf_integer(unsigned int, rwbs,
- rq->cmd_flags, nr_bytes)
+ lttng_req_op(rq), lttng_req_rw(rq), nr_bytes)
ctf_sequence_hex(unsigned char, cmd,
tp_locvar->cmd, size_t, tp_locvar->cmd_len)
),
#endif /* #else #if (LINUX_VERSION_CODE >= KERNEL_VERSION(3,15,0)) */
+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(4,12,0))
+LTTNG_TRACEPOINT_EVENT_CLASS(block_rq,
+
+ TP_PROTO(struct request_queue *q, struct request *rq),
+
+ TP_ARGS(q, 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,11,0))
+LTTNG_TRACEPOINT_EVENT_CLASS_CODE(block_rq,
+
+ TP_PROTO(struct request_queue *q, struct request *rq),
+
+ TP_ARGS(q, rq),
+
+ TP_locvar(
+ sector_t sector;
+ unsigned int nr_sector;
+ unsigned int bytes;
+ unsigned char *cmd;
+ size_t cmd_len;
+ ),
+
+ TP_code_pre(
+ if (blk_rq_is_scsi(rq)) {
+ struct scsi_request *scsi_rq = scsi_req(rq);
+ tp_locvar->sector = 0;
+ tp_locvar->nr_sector = 0;
+ tp_locvar->bytes = scsi_rq->resid_len;
+ tp_locvar->cmd = scsi_rq->cmd;
+ tp_locvar->cmd_len = scsi_rq->cmd_len;
+ } else {
+ tp_locvar->sector = blk_rq_pos(rq);
+ tp_locvar->nr_sector = blk_rq_sectors(rq);
+ tp_locvar->bytes = 0;
+ tp_locvar->cmd = NULL;
+ tp_locvar->cmd_len = 0;
+ }
+ ),
+
+ TP_FIELDS(
+ ctf_integer(dev_t, dev,
+ rq->rq_disk ? disk_devt(rq->rq_disk) : 0)
+ ctf_integer(sector_t, sector, tp_locvar->sector)
+ ctf_integer(unsigned int, nr_sector, tp_locvar->nr_sector)
+ ctf_integer(unsigned int, bytes, tp_locvar->bytes)
+ 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_sequence_hex(unsigned char, cmd,
+ tp_locvar->cmd, size_t, tp_locvar->cmd_len)
+ ctf_array_text(char, comm, current->comm, TASK_COMM_LEN)
+ ),
+
+ TP_code_post()
+)
+#else /* #if (LINUX_VERSION_CODE >= KERNEL_VERSION(4,11,0)) */
LTTNG_TRACEPOINT_EVENT_CLASS_CODE(block_rq,
TP_PROTO(struct request_queue *q, struct request *rq),
ctf_integer(unsigned int, bytes, tp_locvar->bytes)
ctf_integer(pid_t, tid, current->pid)
blk_rwbs_ctf_integer(unsigned int, rwbs,
- rq->cmd_flags, blk_rq_bytes(rq))
+ lttng_req_op(rq), lttng_req_rw(rq), blk_rq_bytes(rq))
ctf_sequence_hex(unsigned char, cmd,
tp_locvar->cmd, size_t, tp_locvar->cmd_len)
ctf_array_text(char, comm, current->comm, TASK_COMM_LEN)
TP_code_post()
)
+#endif /* #else #if (LINUX_VERSION_CODE >= KERNEL_VERSION(4,11,0)) */
/**
* block_rq_insert - insert block operation request into queue
TP_ARGS(q, bio),
TP_FIELDS(
- ctf_integer(dev_t, dev, bio->bi_bdev ? bio->bi_bdev->bd_dev : 0)
+ ctf_integer(dev_t, dev, lttng_bio_dev(bio))
#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,
- bio->bi_rw, bio->bi_iter.bi_size)
+ 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,
- bio->bi_rw, bio->bi_size)
+ 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
TP_FIELDS(
- ctf_integer(dev_t, dev, bio->bi_bdev->bd_dev)
+ ctf_integer(dev_t, dev, lttng_bio_dev(bio))
#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))
ctf_integer(int, error, error)
blk_rwbs_ctf_integer(unsigned int, rwbs,
- bio->bi_rw, bio->bi_iter.bi_size)
+ 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)
ctf_integer(int, error, 0)
#endif
blk_rwbs_ctf_integer(unsigned int, rwbs,
- bio->bi_rw, bio->bi_size)
+ lttng_bio_op(bio), lttng_bio_rw(bio), bio->bi_size)
#endif /* #else #if (LINUX_VERSION_CODE >= KERNEL_VERSION(3,14,0)) */
)
)
TP_ARGS(q, rq, bio),
TP_FIELDS(
- ctf_integer(dev_t, dev, bio->bi_bdev->bd_dev)
+ ctf_integer(dev_t, dev, lttng_bio_dev(bio))
#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,
- bio->bi_rw, bio->bi_iter.bi_size)
+ 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,
- bio->bi_rw, bio->bi_size)
+ 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(q, bio),
TP_FIELDS(
- ctf_integer(dev_t, dev, bio->bi_bdev->bd_dev)
+ ctf_integer(dev_t, dev, lttng_bio_dev(bio))
#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,
- bio->bi_rw, bio->bi_iter.bi_size)
+ 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,
- bio->bi_rw, bio->bi_size)
+ 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(q, bio),
TP_FIELDS(
- ctf_integer(dev_t, dev, bio->bi_bdev ? bio->bi_bdev->bd_dev : 0)
+ ctf_integer(dev_t, dev, lttng_bio_dev(bio))
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,
- bio->bi_rw, bio->bi_size)
+ 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)
)
TP_ARGS(q, bio, rw),
TP_FIELDS(
- ctf_integer(dev_t, dev, bio ? bio->bi_bdev->bd_dev : 0)
+ ctf_integer(dev_t, dev, lttng_bio_dev(bio))
#if (LINUX_VERSION_CODE >= KERNEL_VERSION(3,14,0))
ctf_integer(sector_t, sector, bio ? bio->bi_iter.bi_sector : 0)
ctf_integer(unsigned int, nr_sector,
bio ? bio_sectors(bio) : 0)
blk_rwbs_ctf_integer(unsigned int, rwbs,
- bio ? bio->bi_rw : 0,
+ bio ? lttng_bio_op(bio) : 0,
+ bio ? lttng_bio_rw(bio) : 0,
bio ? bio->bi_iter.bi_size : 0)
#else /* #if (LINUX_VERSION_CODE >= KERNEL_VERSION(3,14,0)) */
ctf_integer(sector_t, sector, bio ? bio->bi_sector : 0)
ctf_integer(unsigned int, nr_sector,
bio ? bio->bi_size >> 9 : 0)
blk_rwbs_ctf_integer(unsigned int, rwbs,
- bio ? bio->bi_rw : 0,
+ bio ? lttng_bio_op(bio) : 0,
+ bio ? lttng_bio_rw(bio) : 0,
bio ? bio->bi_size : 0)
#endif /* #else #if (LINUX_VERSION_CODE >= KERNEL_VERSION(3,14,0)) */
ctf_integer(pid_t, tid, current->pid)
TP_ARGS(q, bio, new_sector),
TP_FIELDS(
- ctf_integer(dev_t, dev, bio->bi_bdev->bd_dev)
+ ctf_integer(dev_t, dev, lttng_bio_dev(bio))
#if (LINUX_VERSION_CODE >= KERNEL_VERSION(3,14,0))
ctf_integer(sector_t, sector, bio->bi_iter.bi_sector)
blk_rwbs_ctf_integer(unsigned int, rwbs,
- bio->bi_rw, bio->bi_iter.bi_size)
+ 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)
blk_rwbs_ctf_integer(unsigned int, rwbs,
- bio->bi_rw, bio->bi_size)
+ lttng_bio_op(bio), lttng_bio_rw(bio), bio->bi_size)
#endif /* #else #if (LINUX_VERSION_CODE >= KERNEL_VERSION(3,14,0)) */
ctf_integer(sector_t, new_sector, new_sector)
ctf_integer(pid_t, tid, current->pid)
TP_ARGS(q, bio, dev, from),
TP_FIELDS(
- ctf_integer(dev_t, dev, bio->bi_bdev->bd_dev)
+ ctf_integer(dev_t, dev, lttng_bio_dev(bio))
#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,
- bio->bi_rw, bio->bi_iter.bi_size)
+ 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,
- bio->bi_rw, bio->bi_size)
+ lttng_bio_op(bio), lttng_bio_rw(bio), bio->bi_size)
#endif /* #else #if (LINUX_VERSION_CODE >= KERNEL_VERSION(3,14,0)) */
ctf_integer(dev_t, old_dev, dev)
ctf_integer(sector_t, old_sector, from)
ctf_integer(dev_t, old_dev, dev)
ctf_integer(sector_t, old_sector, from)
blk_rwbs_ctf_integer(unsigned int, rwbs,
- rq->cmd_flags, blk_rq_bytes(rq))
+ lttng_req_op(rq), lttng_req_rw(rq), blk_rq_bytes(rq))
)
)
#endif
#endif /* LTTNG_TRACE_BLOCK_H */
/* This part must be outside protection */
-#include "../../../probes/define_trace.h"
-
+#include <probes/define_trace.h>
projects / lttng-modules.git / blobdiff