instrumentation: scsi: remove compatibility code
[lttng-modules.git] / instrumentation / events / lttng-module / scsi.h
index 27362f8dff785325b9ec799cfb5a39f1ac8ca2f3..0a864d1a7474b0259fce3ba856e7ba89b3250ace 100644 (file)
@@ -1,18 +1,20 @@
+/* SPDX-License-Identifier: GPL-2.0-only */
 #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>
 
 #ifndef _TRACE_SCSI_DEF
 #define _TRACE_SCSI_DEF
 
 #define scsi_opcode_name(opcode)       { opcode, #opcode }
+
 #define show_opcode_name(val)                                  \
        __print_symbolic(val,                                   \
                scsi_opcode_name(TEST_UNIT_READY),              \
                scsi_opcode_name(WRITE_16),                     \
                scsi_opcode_name(VERIFY_16),                    \
                scsi_opcode_name(WRITE_SAME_16),                \
-               scsi_opcode_name(SERVICE_ACTION_IN),            \
-               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(ZBC_OUT),                      \
+               scsi_opcode_name(ZBC_IN),                       \
+               scsi_opcode_name(SERVICE_ACTION_IN_16),         \
                scsi_opcode_name(READ_32),                      \
                scsi_opcode_name(WRITE_32),                     \
                scsi_opcode_name(WRITE_SAME_32),                \
@@ -202,168 +202,88 @@ 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),
 
        TP_ARGS(cmd),
 
-       TP_STRUCT__entry(
-               __field( unsigned int,  host_no )
-               __field( unsigned int,  channel )
-               __field( unsigned int,  id      )
-               __field( unsigned int,  lun     )
-               __field( unsigned int,  opcode  )
-               __field( unsigned int,  cmd_len )
-               __field( unsigned int,  data_sglen )
-               __field( unsigned int,  prot_sglen )
-               __field( unsigned char, prot_op )
-               __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_printk("host_no=%u channel=%u id=%u lun=%u data_sgl=%u prot_sgl=%u" \
-                 " prot_op=%s cmnd=(%s %s raw=%s)",
-                 __entry->host_no, __entry->channel, __entry->id,
-                 __entry->lun, __entry->data_sglen, __entry->prot_sglen,
-                 show_prot_op_name(__entry->prot_op),
-                 show_opcode_name(__entry->opcode),
-                 __parse_cdb(__get_dynamic_array(cmnd), __entry->cmd_len),
-                 __print_hex(__get_dynamic_array(cmnd), __entry->cmd_len))
+       TP_FIELDS(
+               ctf_integer(unsigned int, host_no, cmd->device->host->host_no)
+               ctf_integer(unsigned int, channel, cmd->device->channel)
+               ctf_integer(unsigned int, id, cmd->device->id)
+               ctf_integer(unsigned int, lun, cmd->device->lun)
+               ctf_integer(unsigned int, opcode, cmd->cmnd[0])
+               ctf_integer(unsigned int, cmd_len, cmd->cmd_len)
+               ctf_integer(unsigned int, data_sglen, scsi_sg_count(cmd))
+               ctf_integer(unsigned int, prot_sglen, scsi_prot_sg_count(cmd))
+               ctf_integer(unsigned char, prot_op, scsi_get_prot_op(cmd))
+               ctf_sequence_hex(unsigned char, cmnd, cmd->cmnd, u32, cmd->cmd_len)
+       )
 )
 
-TRACE_EVENT(scsi_dispatch_cmd_error,
+LTTNG_TRACEPOINT_EVENT(scsi_dispatch_cmd_error,
 
        TP_PROTO(struct scsi_cmnd *cmd, int rtn),
 
        TP_ARGS(cmd, rtn),
 
-       TP_STRUCT__entry(
-               __field( unsigned int,  host_no )
-               __field( unsigned int,  channel )
-               __field( unsigned int,  id      )
-               __field( unsigned int,  lun     )
-               __field( int,           rtn     )
-               __field( unsigned int,  opcode  )
-               __field( unsigned int,  cmd_len )
-               __field( unsigned int,  data_sglen )
-               __field( unsigned int,  prot_sglen )
-               __field( unsigned char, prot_op )
-               __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_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",
-                 __entry->host_no, __entry->channel, __entry->id,
-                 __entry->lun, __entry->data_sglen, __entry->prot_sglen,
-                 show_prot_op_name(__entry->prot_op),
-                 show_opcode_name(__entry->opcode),
-                 __parse_cdb(__get_dynamic_array(cmnd), __entry->cmd_len),
-                 __print_hex(__get_dynamic_array(cmnd), __entry->cmd_len),
-                 __entry->rtn)
+       TP_FIELDS(
+               ctf_integer(unsigned int, host_no, cmd->device->host->host_no)
+               ctf_integer(unsigned int, channel, cmd->device->channel)
+               ctf_integer(unsigned int, id, cmd->device->id)
+               ctf_integer(unsigned int, lun, cmd->device->lun)
+               ctf_integer(int, rtn, rtn)
+               ctf_integer(unsigned int, opcode, cmd->cmnd[0])
+               ctf_integer(unsigned int, cmd_len, cmd->cmd_len)
+               ctf_integer(unsigned int, data_sglen, scsi_sg_count(cmd))
+               ctf_integer(unsigned int, prot_sglen, scsi_prot_sg_count(cmd))
+               ctf_integer(unsigned char, prot_op, scsi_get_prot_op(cmd))
+               ctf_sequence_hex(unsigned char, cmnd, cmd->cmnd, u32, cmd->cmd_len)
+       )
 )
 
-DECLARE_EVENT_CLASS(scsi_cmd_done_timeout_template,
+LTTNG_TRACEPOINT_EVENT_CLASS(scsi_cmd_done_timeout_template,
 
        TP_PROTO(struct scsi_cmnd *cmd),
 
        TP_ARGS(cmd),
 
-       TP_STRUCT__entry(
-               __field( unsigned int,  host_no )
-               __field( unsigned int,  channel )
-               __field( unsigned int,  id      )
-               __field( unsigned int,  lun     )
-               __field( int,           result  )
-               __field( unsigned int,  opcode  )
-               __field( unsigned int,  cmd_len )
-               __field( unsigned int,  data_sglen )
-               __field( unsigned int,  prot_sglen )
-               __field( unsigned char, prot_op )
-               __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_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)",
-                 __entry->host_no, __entry->channel, __entry->id,
-                 __entry->lun, __entry->data_sglen, __entry->prot_sglen,
-                 show_prot_op_name(__entry->prot_op),
-                 show_opcode_name(__entry->opcode),
-                 __parse_cdb(__get_dynamic_array(cmnd), __entry->cmd_len),
-                 __print_hex(__get_dynamic_array(cmnd), __entry->cmd_len),
-                 show_driverbyte_name(((__entry->result) >> 24) & 0xff),
-                 show_hostbyte_name(((__entry->result) >> 16) & 0xff),
-                 show_msgbyte_name(((__entry->result) >> 8) & 0xff),
-                 show_statusbyte_name(__entry->result & 0xff))
+       TP_FIELDS(
+               ctf_integer(unsigned int, host_no, cmd->device->host->host_no)
+               ctf_integer(unsigned int, channel, cmd->device->channel)
+               ctf_integer(unsigned int, id, cmd->device->id)
+               ctf_integer(unsigned int, lun, cmd->device->lun)
+               ctf_integer(int, result, cmd->result)
+               ctf_integer(unsigned int, opcode, cmd->cmnd[0])
+               ctf_integer(unsigned int, cmd_len, cmd->cmd_len)
+               ctf_integer(unsigned int, data_sglen, scsi_sg_count(cmd))
+               ctf_integer(unsigned int, prot_sglen, scsi_prot_sg_count(cmd))
+               ctf_integer(unsigned char, prot_op, scsi_get_prot_op(cmd))
+               ctf_sequence_hex(unsigned char, cmnd, cmd->cmnd, u32, cmd->cmd_len)
+       )
 )
 
-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),
 
        TP_ARGS(shost),
 
-       TP_STRUCT__entry(
-               __field( unsigned int,  host_no )
-       ),
-
-       TP_fast_assign(
-               tp_assign(host_no, shost->host_no);
-       ),
-
-       TP_printk("host_no=%u", __entry->host_no)
+       TP_FIELDS(
+               ctf_integer(unsigned int, host_no, shost->host_no)
+       )
 )
 
-#endif /*  _TRACE_SCSI_H */
+#endif /*  LTTNG_TRACE_SCSI_H */
 
 /* This part must be outside protection */
-#include "../../../probes/define_trace.h"
+#include <probes/define_trace.h>
This page took 0.03078 seconds and 4 git commands to generate.