Update kernel probes to more detailed match to kernel versions

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

diff --git a/instrumentation/events/lttng-module/scsi.h b/instrumentation/events/lttng-module/scsi.h
index 27362f8dff785325b9ec799cfb5a39f1ac8ca2f3..15f0c702b674dcd86c48644fab452daaffefdd0d 100644 (file)
--- a/instrumentation/events/lttng-module/scsi.h
+++ b/instrumentation/events/lttng-module/scsi.h
@@ -8,6 +8,7 @@
 #include <scsi/scsi_host.h>
 #include <linux/tracepoint.h>
 #include <linux/trace_seq.h>
+#include <linux/version.h>
 
 #ifndef _TRACE_SCSI_DEF
 #define _TRACE_SCSI_DEF
@@ -187,6 +188,7 @@
                scsi_statusbyte_name(SAM_STAT_ACA_ACTIVE),      \
                scsi_statusbyte_name(SAM_STAT_TASK_ABORTED))
 
+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,39))
 #define scsi_prot_op_name(result)      { result, #result }
 #define show_prot_op_name(val)                                 \
        __print_symbolic(val,                                   \
@@ -197,6 +199,7 @@
                scsi_prot_op_name(SCSI_PROT_WRITE_INSERT),      \
                scsi_prot_op_name(SCSI_PROT_READ_PASS),         \
                scsi_prot_op_name(SCSI_PROT_WRITE_PASS))
+#endif
 
 const char *scsi_trace_parse_cdb(struct trace_seq*, unsigned char*, int);
 #define __parse_cdb(cdb, len) scsi_trace_parse_cdb(p, cdb, len)
@@ -217,28 +220,39 @@ TRACE_EVENT(scsi_dispatch_cmd_start,
                __field( unsigned int,  cmd_len )
                __field( unsigned int,  data_sglen )
                __field( unsigned int,  prot_sglen )
+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,39))
                __field( unsigned char, prot_op )
+#endif
                __dynamic_array_hex(unsigned char,      cmnd, cmd->cmd_len)
        ),
 
        TP_fast_assign(
-               tp_assign(host_no, cmd->device->host->host_no);
-               tp_assign(channel, cmd->device->channel);
-               tp_assign(id, cmd->device->id);
-               tp_assign(lun, cmd->device->lun);
-               tp_assign(opcode, cmd->cmnd[0]);
-               tp_assign(cmd_len, cmd->cmd_len);
-               tp_assign(data_sglen, scsi_sg_count(cmd));
-               tp_assign(prot_sglen, scsi_prot_sg_count(cmd));
-               tp_assign(prot_op, scsi_get_prot_op(cmd));
-               tp_memcpy_dyn(cmnd, cmd->cmnd);
+               tp_assign(host_no, cmd->device->host->host_no)
+               tp_assign(channel, cmd->device->channel)
+               tp_assign(id, cmd->device->id)
+               tp_assign(lun, cmd->device->lun)
+               tp_assign(opcode, cmd->cmnd[0])
+               tp_assign(cmd_len, cmd->cmd_len)
+               tp_assign(data_sglen, scsi_sg_count(cmd))
+               tp_assign(prot_sglen, scsi_prot_sg_count(cmd))
+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,39))
+               tp_assign(prot_op, scsi_get_prot_op(cmd))
+#endif
+               tp_memcpy_dyn(cmnd, cmd->cmnd)
        ),
 
+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,39))
        TP_printk("host_no=%u channel=%u id=%u lun=%u data_sgl=%u prot_sgl=%u" \
                  " prot_op=%s cmnd=(%s %s raw=%s)",
+#else
+       TP_printk("host_no=%u channel=%u id=%u lun=%u data_sgl=%u prot_sgl=%u" \
+                 " cmnd=(%s %s raw=%s)",
+#endif
                  __entry->host_no, __entry->channel, __entry->id,
                  __entry->lun, __entry->data_sglen, __entry->prot_sglen,
+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,39))
                  show_prot_op_name(__entry->prot_op),
+#endif
                  show_opcode_name(__entry->opcode),
                  __parse_cdb(__get_dynamic_array(cmnd), __entry->cmd_len),
                  __print_hex(__get_dynamic_array(cmnd), __entry->cmd_len))
@@ -260,29 +274,40 @@ TRACE_EVENT(scsi_dispatch_cmd_error,
                __field( unsigned int,  cmd_len )
                __field( unsigned int,  data_sglen )
                __field( unsigned int,  prot_sglen )
+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,39))
                __field( unsigned char, prot_op )
+#endif
                __dynamic_array_hex(unsigned char,      cmnd, cmd->cmd_len)
        ),
 
        TP_fast_assign(
-               tp_assign(host_no, cmd->device->host->host_no);
-               tp_assign(channel, cmd->device->channel);
-               tp_assign(id, cmd->device->id);
-               tp_assign(lun, cmd->device->lun);
-               tp_assign(rtn, rtn);
-               tp_assign(opcode, cmd->cmnd[0]);
-               tp_assign(cmd_len, cmd->cmd_len);
-               tp_assign(data_sglen, scsi_sg_count(cmd));
-               tp_assign(prot_sglen, scsi_prot_sg_count(cmd));
-               tp_assign(prot_op, scsi_get_prot_op(cmd));
-               tp_memcpy_dyn(cmnd, cmd->cmnd);
+               tp_assign(host_no, cmd->device->host->host_no)
+               tp_assign(channel, cmd->device->channel)
+               tp_assign(id, cmd->device->id)
+               tp_assign(lun, cmd->device->lun)
+               tp_assign(rtn, rtn)
+               tp_assign(opcode, cmd->cmnd[0])
+               tp_assign(cmd_len, cmd->cmd_len)
+               tp_assign(data_sglen, scsi_sg_count(cmd))
+               tp_assign(prot_sglen, scsi_prot_sg_count(cmd))
+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,39))
+               tp_assign(prot_op, scsi_get_prot_op(cmd))
+#endif
+               tp_memcpy_dyn(cmnd, cmd->cmnd)
        ),
 
+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,39))
        TP_printk("host_no=%u channel=%u id=%u lun=%u data_sgl=%u prot_sgl=%u" \
                  " prot_op=%s cmnd=(%s %s raw=%s) rtn=%d",
+#else
+       TP_printk("host_no=%u channel=%u id=%u lun=%u data_sgl=%u prot_sgl=%u" \
+                 " cmnd=(%s %s raw=%s) rtn=%d",
+#endif
                  __entry->host_no, __entry->channel, __entry->id,
                  __entry->lun, __entry->data_sglen, __entry->prot_sglen,
+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,39))
                  show_prot_op_name(__entry->prot_op),
+#endif
                  show_opcode_name(__entry->opcode),
                  __parse_cdb(__get_dynamic_array(cmnd), __entry->cmd_len),
                  __print_hex(__get_dynamic_array(cmnd), __entry->cmd_len),
@@ -305,30 +330,42 @@ DECLARE_EVENT_CLASS(scsi_cmd_done_timeout_template,
                __field( unsigned int,  cmd_len )
                __field( unsigned int,  data_sglen )
                __field( unsigned int,  prot_sglen )
+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,39))
                __field( unsigned char, prot_op )
+#endif
                __dynamic_array_hex(unsigned char,      cmnd, cmd->cmd_len)
        ),
 
        TP_fast_assign(
-               tp_assign(host_no, cmd->device->host->host_no);
-               tp_assign(channel, cmd->device->channel);
-               tp_assign(id, cmd->device->id);
-               tp_assign(lun, cmd->device->lun);
-               tp_assign(result, cmd->result);
-               tp_assign(opcode, cmd->cmnd[0]);
-               tp_assign(cmd_len, cmd->cmd_len);
-               tp_assign(data_sglen, scsi_sg_count(cmd));
-               tp_assign(prot_sglen, scsi_prot_sg_count(cmd));
-               tp_assign(prot_op, scsi_get_prot_op(cmd));
-               tp_memcpy_dyn(cmnd, cmd->cmnd);
+               tp_assign(host_no, cmd->device->host->host_no)
+               tp_assign(channel, cmd->device->channel)
+               tp_assign(id, cmd->device->id)
+               tp_assign(lun, cmd->device->lun)
+               tp_assign(result, cmd->result)
+               tp_assign(opcode, cmd->cmnd[0])
+               tp_assign(cmd_len, cmd->cmd_len)
+               tp_assign(data_sglen, scsi_sg_count(cmd))
+               tp_assign(prot_sglen, scsi_prot_sg_count(cmd))
+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,39))
+               tp_assign(prot_op, scsi_get_prot_op(cmd))
+#endif
+               tp_memcpy_dyn(cmnd, cmd->cmnd)
        ),
 
+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,39))
        TP_printk("host_no=%u channel=%u id=%u lun=%u data_sgl=%u " \
                  "prot_sgl=%u prot_op=%s cmnd=(%s %s raw=%s) result=(driver=" \
                  "%s host=%s message=%s status=%s)",
+#else
+       TP_printk("host_no=%u channel=%u id=%u lun=%u data_sgl=%u " \
+                 "prot_sgl=%u cmnd=(%s %s raw=%s) result=(driver=%s host=%s " \
+                 "message=%s status=%s)",
+#endif
                  __entry->host_no, __entry->channel, __entry->id,
                  __entry->lun, __entry->data_sglen, __entry->prot_sglen,
+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,39))
                  show_prot_op_name(__entry->prot_op),
+#endif
                  show_opcode_name(__entry->opcode),
                  __parse_cdb(__get_dynamic_array(cmnd), __entry->cmd_len),
                  __print_hex(__get_dynamic_array(cmnd), __entry->cmd_len),
@@ -357,7 +394,7 @@ TRACE_EVENT(scsi_eh_wakeup,
        ),
 
        TP_fast_assign(
-               tp_assign(host_no, shost->host_no);
+               tp_assign(host_no, shost->host_no)
        ),
 
        TP_printk("host_no=%u", __entry->host_no)