#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 <linux/blktrace_api.h>
#include <linux/blkdev.h>
-#include <linux/tracepoint.h>
#include <linux/trace_seq.h>
#include <linux/version.h>
#endif
#if (LINUX_VERSION_CODE >= KERNEL_VERSION(3,9,0))
-DECLARE_EVENT_CLASS(block_buffer,
+LTTNG_TRACEPOINT_EVENT_CLASS(block_buffer,
TP_PROTO(struct buffer_head *bh),
*
* Called from touch_buffer().
*/
-DEFINE_EVENT(block_buffer, block_touch_buffer,
+LTTNG_TRACEPOINT_EVENT_INSTANCE(block_buffer, block_touch_buffer,
TP_PROTO(struct buffer_head *bh),
*
* Called from mark_buffer_dirty().
*/
-DEFINE_EVENT(block_buffer, block_dirty_buffer,
+LTTNG_TRACEPOINT_EVENT_INSTANCE(block_buffer, block_dirty_buffer,
TP_PROTO(struct buffer_head *bh),
)
#endif
-DECLARE_EVENT_CLASS(block_rq_with_error,
+LTTNG_TRACEPOINT_EVENT_CLASS(block_rq_with_error,
TP_PROTO(struct request_queue *q, struct request *rq),
* 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),
* @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,15,0))
+#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
* do for the request. If @rq->bio is non-NULL then there is
* additional work required to complete the request.
*/
-TRACE_EVENT(block_rq_complete,
+LTTNG_TRACEPOINT_EVENT(block_rq_complete,
TP_PROTO(struct request_queue *q, struct request *rq,
unsigned int nr_bytes),
* 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),
#endif /* #else #if (LINUX_VERSION_CODE >= KERNEL_VERSION(3,15,0)) */
-DECLARE_EVENT_CLASS(block_rq,
+LTTNG_TRACEPOINT_EVENT_CLASS(block_rq,
TP_PROTO(struct request_queue *q, struct request *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) ?
tp_memcpy_dyn(cmd, (rq->cmd_type == REQ_TYPE_BLOCK_PC) ?
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)
)
/**
* 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),
* 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),
* 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),
__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_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(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)
)
/**
* 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),
)
#if (LINUX_VERSION_CODE >= KERNEL_VERSION(3,9,0))
-DECLARE_EVENT_CLASS(block_bio_merge,
+LTTNG_TRACEPOINT_EVENT_CLASS(block_bio_merge,
TP_PROTO(struct request_queue *q, struct request *rq, struct bio *bio),
__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_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)
)
/**
* Merging block request @bio to the end of an existing block request
* in queue @q.
*/
-DEFINE_EVENT(block_bio_merge, block_bio_backmerge,
+LTTNG_TRACEPOINT_EVENT_INSTANCE(block_bio_merge, block_bio_backmerge,
TP_PROTO(struct request_queue *q, struct request *rq, struct bio *bio),
* Merging block IO operation @bio to the beginning of an existing block
* operation in queue @q.
*/
-DEFINE_EVENT(block_bio_merge, block_bio_frontmerge,
+LTTNG_TRACEPOINT_EVENT_INSTANCE(block_bio_merge, block_bio_frontmerge,
TP_PROTO(struct request_queue *q, struct request *rq, struct bio *bio),
*
* About to place the block IO operation @bio into queue @q.
*/
-TRACE_EVENT(block_bio_queue,
+LTTNG_TRACEPOINT_EVENT(block_bio_queue,
TP_PROTO(struct request_queue *q, struct bio *bio),
__field( dev_t, dev )
__field( sector_t, sector )
__field( unsigned int, nr_sector )
- __array( char, rwbs, RWBS_LEN )
- __array( char, comm, TASK_COMM_LEN )
+ __field( unsigned int, rwbs )
+ __field( pid_t, tid )
+ __array_text( char, comm, TASK_COMM_LEN )
),
TP_fast_assign(
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), __entry->rwbs,
(unsigned long long)__entry->sector,
- __entry->nr_sector, __entry->comm)
+ __entry->nr_sector, __entry->comm, __entry->tid)
)
#else
-DECLARE_EVENT_CLASS(block_bio,
+LTTNG_TRACEPOINT_EVENT_CLASS(block_bio,
TP_PROTO(struct request_queue *q, struct bio *bio),
__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_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]",
+ 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)
)
/**
* 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, block_bio_backmerge,
TP_PROTO(struct request_queue *q, struct bio *bio),
* 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, block_bio_frontmerge,
TP_PROTO(struct request_queue *q, struct bio *bio),
*
* 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),
)
#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),
__field( sector_t, sector )
__field( unsigned int, nr_sector )
__field( unsigned int, rwbs )
+ __field( pid_t, tid )
__array_text( char, comm, TASK_COMM_LEN )
),
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)
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)
)
/**
* 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),
* 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),
* 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),
TP_STRUCT__entry(
__field( int, nr_rq )
+ __field( pid_t, tid )
__array_text( char, comm, TASK_COMM_LEN )
),
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))
* 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),
* 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))
* @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),
__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_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)
)
/**
* 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,
* 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),
#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"
projects / lttng-modules.git / blobdiff