Fix: correct typo in kernel version number

[lttng-modules.git] / instrumentation / events / lttng-module / block.h

diff --git a/instrumentation/events/lttng-module/block.h b/instrumentation/events/lttng-module/block.h
index a75bb637de4b76ac8e0fb36477d4a7a372f7009e..ad0a3639df6ae3c378e1d8345318430f2890deaf 100644 (file)
--- a/instrumentation/events/lttng-module/block.h
+++ b/instrumentation/events/lttng-module/block.h
@@ -221,6 +221,61 @@ DEFINE_EVENT(block_rq_with_error, block_rq_requeue,
        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))
+
+/**
+ * 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.
+ */
+TRACE_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
@@ -239,6 +294,8 @@ DEFINE_EVENT(block_rq_with_error, block_rq_complete,
        TP_ARGS(q, rq)
 )
 
+#endif /* #else #if (LINUX_VERSION_CODE >= KERNEL_VERSION(3,15,0)) */
+
 DECLARE_EVENT_CLASS(block_rq,
 
        TP_PROTO(struct request_queue *q, struct request *rq),
@@ -251,6 +308,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) ?
@@ -269,16 +327,17 @@ DECLARE_EVENT_CLASS(block_rq,
                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)
 )
 
 /**
@@ -335,6 +394,7 @@ 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   )
        ),
 
@@ -346,6 +406,7 @@ TRACE_EVENT(block_bio_bounce,
                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)
@@ -353,14 +414,15 @@ TRACE_EVENT(block_bio_bounce,
                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)
 )
 
 /**
@@ -431,6 +493,7 @@ DECLARE_EVENT_CLASS(block_bio_merge,
                __field( sector_t,      sector                  )
                __field( unsigned int,  nr_sector               )
                __field( unsigned int,  rwbs                    )
+               __field( pid_t,         tid                     )
                __array_text( char,             comm,   TASK_COMM_LEN   )
        ),
 
@@ -441,20 +504,22 @@ DECLARE_EVENT_CLASS(block_bio_merge,
                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)
 )
 
 /**
@@ -504,8 +569,9 @@ TRACE_EVENT(block_bio_queue,
                __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(
@@ -515,19 +581,21 @@ TRACE_EVENT(block_bio_queue,
                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,
@@ -541,6 +609,7 @@ DECLARE_EVENT_CLASS(block_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   )
        ),
 
@@ -550,13 +619,14 @@ DECLARE_EVENT_CLASS(block_bio,
                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)
 )
 
 /**
@@ -615,6 +685,7 @@ 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   )
         ),
 
@@ -626,6 +697,7 @@ DECLARE_EVENT_CLASS(block_get_rq,
                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)
@@ -633,14 +705,15 @@ DECLARE_EVENT_CLASS(block_get_rq,
                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)
 )
 
 /**
@@ -692,14 +765,16 @@ TRACE_EVENT(block_plug,
        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,
@@ -716,6 +791,7 @@ DECLARE_EVENT_CLASS(block_unplug,
 
        TP_STRUCT__entry(
                __field( int,           nr_rq                   )
+               __field( pid_t,         tid                     )
                __array_text( char,             comm,   TASK_COMM_LEN   )
        ),
 
@@ -726,9 +802,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))
@@ -796,6 +874,7 @@ 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   )
        ),
 
@@ -806,21 +885,23 @@ TRACE_EVENT(block_split,
                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_iter.bi_size)
+               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)
 )
 
 /**