projects / lttng-modules.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
Fix: update block instrumentation to compile on 4.8 kernels
[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 445406e0738419e8a57b5ba44881ec87b6f0e6bd..4373edf349ec4bf6ba05b5d0b80fea689d148259 100644 (file)
--- a/instrumentation/events/lttng-module/block.h
+++ b/instrumentation/events/lttng-module/block.h
@@ -4,7 +4,7 @@
 #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>
@@ -24,13 +24,40 @@ enum {
        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))
+#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 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 :                          \
@@ -44,7 +71,12 @@ enum {
 
 #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 :                          \
@@ -56,7 +88,12 @@ enum {
 
 #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 :                          \
@@ -69,7 +106,12 @@ enum {
 
 #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 :                          \
@@ -135,7 +177,7 @@ LTTNG_TRACEPOINT_EVENT_CLASS_CODE(block_rq_with_error,
                size_t cmd_len;
        ),
 
-       TP_code(
+       TP_code_pre(
                if (rq->cmd_type == REQ_TYPE_BLOCK_PC) {
                        tp_locvar->sector = 0;
                        tp_locvar->nr_sector = 0;
@@ -156,10 +198,12 @@ LTTNG_TRACEPOINT_EVENT_CLASS_CODE(block_rq_with_error,
                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()
 )
 
 /**
@@ -200,7 +244,8 @@ LTTNG_TRACEPOINT_EVENT_INSTANCE(block_rq_with_error, block_rq_requeue,
        || 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_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))
 
 /**
  * block_rq_complete - block IO operation completed by device driver
@@ -226,7 +271,7 @@ LTTNG_TRACEPOINT_EVENT_CODE(block_rq_complete,
                size_t cmd_len;
        ),
 
-       TP_code(
+       TP_code_pre(
                if (rq->cmd_type == REQ_TYPE_BLOCK_PC) {
                        tp_locvar->cmd = rq->cmd;
                        tp_locvar->cmd_len = rq->cmd_len;
@@ -243,10 +288,12 @@ LTTNG_TRACEPOINT_EVENT_CODE(block_rq_complete,
                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)
-       )
+       ),
+
+       TP_code_post()
 )
 
 #else /* #if (LINUX_VERSION_CODE >= KERNEL_VERSION(3,15,0)) */
@@ -285,7 +332,7 @@ LTTNG_TRACEPOINT_EVENT_CLASS_CODE(block_rq,
                size_t cmd_len;
        ),
 
-       TP_code(
+       TP_code_pre(
                if (rq->cmd_type == REQ_TYPE_BLOCK_PC) {
                        tp_locvar->sector = 0;
                        tp_locvar->nr_sector = 0;
@@ -309,11 +356,13 @@ LTTNG_TRACEPOINT_EVENT_CLASS_CODE(block_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()
 )
 
 /**
@@ -371,12 +420,14 @@ LTTNG_TRACEPOINT_EVENT(block_bio_bounce,
                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)
@@ -411,7 +462,8 @@ LTTNG_TRACEPOINT_EVENT(block_bio_complete,
                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)
@@ -421,7 +473,7 @@ LTTNG_TRACEPOINT_EVENT(block_bio_complete,
                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)) */
        )
 )
@@ -439,12 +491,13 @@ LTTNG_TRACEPOINT_EVENT_CLASS(block_bio_merge,
                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)
@@ -500,12 +553,13 @@ LTTNG_TRACEPOINT_EVENT(block_bio_queue,
                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)
@@ -523,7 +577,7 @@ LTTNG_TRACEPOINT_EVENT_CLASS(block_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)
        )
@@ -587,14 +641,16 @@ LTTNG_TRACEPOINT_EVENT_CLASS(block_get_rq,
                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)
@@ -744,11 +800,12 @@ LTTNG_TRACEPOINT_EVENT(block_split,
 #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)
@@ -783,12 +840,13 @@ LTTNG_TRACEPOINT_EVENT(block_remap,
                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)
@@ -821,7 +879,7 @@ LTTNG_TRACEPOINT_EVENT(block_rq_remap,
                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
@@ -832,5 +890,4 @@ LTTNG_TRACEPOINT_EVENT(block_rq_remap,
 #endif /* LTTNG_TRACE_BLOCK_H */
 
 /* This part must be outside protection */
-#include "../../../probes/define_trace.h"
-
+#include <probes/define_trace.h>
LTTng 2.0/0.x modules
This page took 0.027181 seconds and 4 git commands to generate.