Fix: update scsi instrumentation for 3.19+ kernels
[lttng-modules.git] / instrumentation / events / lttng-module / scsi.h
index 15f0c702b674dcd86c48644fab452daaffefdd0d..05991e79981a39c2b8039d7b65afdbcbb5a25a60 100644 (file)
@@ -1,12 +1,12 @@
 #undef TRACE_SYSTEM
 #define TRACE_SYSTEM scsi
 
-#if !defined(_TRACE_SCSI_H) || defined(TRACE_HEADER_MULTI_READ)
-#define _TRACE_SCSI_H
+#if !defined(LTTNG_TRACE_SCSI_H) || defined(TRACE_HEADER_MULTI_READ)
+#define LTTNG_TRACE_SCSI_H
 
+#include "../../../probes/lttng-tracepoint-event.h"
 #include <scsi/scsi_cmnd.h>
 #include <scsi/scsi_host.h>
-#include <linux/tracepoint.h>
 #include <linux/trace_seq.h>
 #include <linux/version.h>
 
 #define _TRACE_SCSI_DEF
 
 #define scsi_opcode_name(opcode)       { opcode, #opcode }
+
+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(3,19,0))
+
+#define show_opcode_name(val)                                  \
+       __print_symbolic(val,                                   \
+               scsi_opcode_name(TEST_UNIT_READY),              \
+               scsi_opcode_name(REZERO_UNIT),                  \
+               scsi_opcode_name(REQUEST_SENSE),                \
+               scsi_opcode_name(FORMAT_UNIT),                  \
+               scsi_opcode_name(READ_BLOCK_LIMITS),            \
+               scsi_opcode_name(REASSIGN_BLOCKS),              \
+               scsi_opcode_name(INITIALIZE_ELEMENT_STATUS),    \
+               scsi_opcode_name(READ_6),                       \
+               scsi_opcode_name(WRITE_6),                      \
+               scsi_opcode_name(SEEK_6),                       \
+               scsi_opcode_name(READ_REVERSE),                 \
+               scsi_opcode_name(WRITE_FILEMARKS),              \
+               scsi_opcode_name(SPACE),                        \
+               scsi_opcode_name(INQUIRY),                      \
+               scsi_opcode_name(RECOVER_BUFFERED_DATA),        \
+               scsi_opcode_name(MODE_SELECT),                  \
+               scsi_opcode_name(RESERVE),                      \
+               scsi_opcode_name(RELEASE),                      \
+               scsi_opcode_name(COPY),                         \
+               scsi_opcode_name(ERASE),                        \
+               scsi_opcode_name(MODE_SENSE),                   \
+               scsi_opcode_name(START_STOP),                   \
+               scsi_opcode_name(RECEIVE_DIAGNOSTIC),           \
+               scsi_opcode_name(SEND_DIAGNOSTIC),              \
+               scsi_opcode_name(ALLOW_MEDIUM_REMOVAL),         \
+               scsi_opcode_name(SET_WINDOW),                   \
+               scsi_opcode_name(READ_CAPACITY),                \
+               scsi_opcode_name(READ_10),                      \
+               scsi_opcode_name(WRITE_10),                     \
+               scsi_opcode_name(SEEK_10),                      \
+               scsi_opcode_name(POSITION_TO_ELEMENT),          \
+               scsi_opcode_name(WRITE_VERIFY),                 \
+               scsi_opcode_name(VERIFY),                       \
+               scsi_opcode_name(SEARCH_HIGH),                  \
+               scsi_opcode_name(SEARCH_EQUAL),                 \
+               scsi_opcode_name(SEARCH_LOW),                   \
+               scsi_opcode_name(SET_LIMITS),                   \
+               scsi_opcode_name(PRE_FETCH),                    \
+               scsi_opcode_name(READ_POSITION),                \
+               scsi_opcode_name(SYNCHRONIZE_CACHE),            \
+               scsi_opcode_name(LOCK_UNLOCK_CACHE),            \
+               scsi_opcode_name(READ_DEFECT_DATA),             \
+               scsi_opcode_name(MEDIUM_SCAN),                  \
+               scsi_opcode_name(COMPARE),                      \
+               scsi_opcode_name(COPY_VERIFY),                  \
+               scsi_opcode_name(WRITE_BUFFER),                 \
+               scsi_opcode_name(READ_BUFFER),                  \
+               scsi_opcode_name(UPDATE_BLOCK),                 \
+               scsi_opcode_name(READ_LONG),                    \
+               scsi_opcode_name(WRITE_LONG),                   \
+               scsi_opcode_name(CHANGE_DEFINITION),            \
+               scsi_opcode_name(WRITE_SAME),                   \
+               scsi_opcode_name(UNMAP),                        \
+               scsi_opcode_name(READ_TOC),                     \
+               scsi_opcode_name(LOG_SELECT),                   \
+               scsi_opcode_name(LOG_SENSE),                    \
+               scsi_opcode_name(XDWRITEREAD_10),               \
+               scsi_opcode_name(MODE_SELECT_10),               \
+               scsi_opcode_name(RESERVE_10),                   \
+               scsi_opcode_name(RELEASE_10),                   \
+               scsi_opcode_name(MODE_SENSE_10),                \
+               scsi_opcode_name(PERSISTENT_RESERVE_IN),        \
+               scsi_opcode_name(PERSISTENT_RESERVE_OUT),       \
+               scsi_opcode_name(VARIABLE_LENGTH_CMD),          \
+               scsi_opcode_name(REPORT_LUNS),                  \
+               scsi_opcode_name(MAINTENANCE_IN),               \
+               scsi_opcode_name(MAINTENANCE_OUT),              \
+               scsi_opcode_name(MOVE_MEDIUM),                  \
+               scsi_opcode_name(EXCHANGE_MEDIUM),              \
+               scsi_opcode_name(READ_12),                      \
+               scsi_opcode_name(WRITE_12),                     \
+               scsi_opcode_name(WRITE_VERIFY_12),              \
+               scsi_opcode_name(SEARCH_HIGH_12),               \
+               scsi_opcode_name(SEARCH_EQUAL_12),              \
+               scsi_opcode_name(SEARCH_LOW_12),                \
+               scsi_opcode_name(READ_ELEMENT_STATUS),          \
+               scsi_opcode_name(SEND_VOLUME_TAG),              \
+               scsi_opcode_name(WRITE_LONG_2),                 \
+               scsi_opcode_name(READ_16),                      \
+               scsi_opcode_name(WRITE_16),                     \
+               scsi_opcode_name(VERIFY_16),                    \
+               scsi_opcode_name(WRITE_SAME_16),                \
+               scsi_opcode_name(SERVICE_ACTION_IN_16),         \
+               scsi_opcode_name(SAI_READ_CAPACITY_16),         \
+               scsi_opcode_name(SAI_GET_LBA_STATUS),           \
+               scsi_opcode_name(MI_REPORT_TARGET_PGS),         \
+               scsi_opcode_name(MO_SET_TARGET_PGS),            \
+               scsi_opcode_name(READ_32),                      \
+               scsi_opcode_name(WRITE_32),                     \
+               scsi_opcode_name(WRITE_SAME_32),                \
+               scsi_opcode_name(ATA_16),                       \
+               scsi_opcode_name(ATA_12))
+
+#else /* #if (LINUX_VERSION_CODE >= KERNEL_VERSION(3,19,0)) */
+
 #define show_opcode_name(val)                                  \
        __print_symbolic(val,                                   \
                scsi_opcode_name(TEST_UNIT_READY),              \
                scsi_opcode_name(ATA_16),                       \
                scsi_opcode_name(ATA_12))
 
+#endif /* #else #if (LINUX_VERSION_CODE >= KERNEL_VERSION(3,19,0)) */
+
 #define scsi_hostbyte_name(result)     { result, #result }
 #define show_hostbyte_name(val)                                        \
        __print_symbolic(val,                                   \
@@ -205,7 +307,7 @@ const char *scsi_trace_parse_cdb(struct trace_seq*, unsigned char*, int);
 #define __parse_cdb(cdb, len) scsi_trace_parse_cdb(p, cdb, len)
 #endif
 
-TRACE_EVENT(scsi_dispatch_cmd_start,
+LTTNG_TRACEPOINT_EVENT(scsi_dispatch_cmd_start,
 
        TP_PROTO(struct scsi_cmnd *cmd),
 
@@ -258,7 +360,7 @@ TRACE_EVENT(scsi_dispatch_cmd_start,
                  __print_hex(__get_dynamic_array(cmnd), __entry->cmd_len))
 )
 
-TRACE_EVENT(scsi_dispatch_cmd_error,
+LTTNG_TRACEPOINT_EVENT(scsi_dispatch_cmd_error,
 
        TP_PROTO(struct scsi_cmnd *cmd, int rtn),
 
@@ -314,7 +416,7 @@ TRACE_EVENT(scsi_dispatch_cmd_error,
                  __entry->rtn)
 )
 
-DECLARE_EVENT_CLASS(scsi_cmd_done_timeout_template,
+LTTNG_TRACEPOINT_EVENT_CLASS(scsi_cmd_done_timeout_template,
 
        TP_PROTO(struct scsi_cmnd *cmd),
 
@@ -375,15 +477,15 @@ DECLARE_EVENT_CLASS(scsi_cmd_done_timeout_template,
                  show_statusbyte_name(__entry->result & 0xff))
 )
 
-DEFINE_EVENT(scsi_cmd_done_timeout_template, scsi_dispatch_cmd_done,
+LTTNG_TRACEPOINT_EVENT_INSTANCE(scsi_cmd_done_timeout_template, scsi_dispatch_cmd_done,
             TP_PROTO(struct scsi_cmnd *cmd),
             TP_ARGS(cmd))
 
-DEFINE_EVENT(scsi_cmd_done_timeout_template, scsi_dispatch_cmd_timeout,
+LTTNG_TRACEPOINT_EVENT_INSTANCE(scsi_cmd_done_timeout_template, scsi_dispatch_cmd_timeout,
             TP_PROTO(struct scsi_cmnd *cmd),
             TP_ARGS(cmd))
 
-TRACE_EVENT(scsi_eh_wakeup,
+LTTNG_TRACEPOINT_EVENT(scsi_eh_wakeup,
 
        TP_PROTO(struct Scsi_Host *shost),
 
@@ -400,7 +502,7 @@ TRACE_EVENT(scsi_eh_wakeup,
        TP_printk("host_no=%u", __entry->host_no)
 )
 
-#endif /*  _TRACE_SCSI_H */
+#endif /*  LTTNG_TRACE_SCSI_H */
 
 /* This part must be outside protection */
 #include "../../../probes/define_trace.h"
This page took 0.027393 seconds and 4 git commands to generate.