X-Git-Url: http://git.liburcu.org/?a=blobdiff_plain;f=instrumentation%2Fevents%2Flttng-module%2Fscsi.h;h=0a864d1a7474b0259fce3ba856e7ba89b3250ace;hb=c44d891dafadd9fb9668959c82534cd67ea381a8;hp=c23c4f2d5c18596cbf240633288c95fc98f1a1b3;hpb=f127e61ee231d002fb9a7803643a157e06f6d2e2;p=lttng-modules.git diff --git a/instrumentation/events/lttng-module/scsi.h b/instrumentation/events/lttng-module/scsi.h index c23c4f2d..0a864d1a 100644 --- a/instrumentation/events/lttng-module/scsi.h +++ b/instrumentation/events/lttng-module/scsi.h @@ -1,22 +1,20 @@ +/* SPDX-License-Identifier: GPL-2.0-only */ #undef TRACE_SYSTEM #define TRACE_SYSTEM scsi #if !defined(LTTNG_TRACE_SCSI_H) || defined(TRACE_HEADER_MULTI_READ) #define LTTNG_TRACE_SCSI_H -#include "../../../probes/lttng-tracepoint-event.h" +#include #include #include #include -#include #ifndef _TRACE_SCSI_DEF #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), \ @@ -101,116 +99,15 @@ scsi_opcode_name(WRITE_16), \ scsi_opcode_name(VERIFY_16), \ scsi_opcode_name(WRITE_SAME_16), \ + scsi_opcode_name(ZBC_OUT), \ + scsi_opcode_name(ZBC_IN), \ 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(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), \ - 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)) - -#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, \ @@ -290,7 +187,6 @@ 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, \ @@ -301,7 +197,6 @@ 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) @@ -322,9 +217,7 @@ LTTNG_TRACEPOINT_EVENT(scsi_dispatch_cmd_start, 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)) -#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,39)) ctf_integer(unsigned char, prot_op, scsi_get_prot_op(cmd)) -#endif ctf_sequence_hex(unsigned char, cmnd, cmd->cmnd, u32, cmd->cmd_len) ) ) @@ -345,9 +238,7 @@ LTTNG_TRACEPOINT_EVENT(scsi_dispatch_cmd_error, 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)) -#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,39)) ctf_integer(unsigned char, prot_op, scsi_get_prot_op(cmd)) -#endif ctf_sequence_hex(unsigned char, cmnd, cmd->cmnd, u32, cmd->cmd_len) ) ) @@ -368,9 +259,7 @@ LTTNG_TRACEPOINT_EVENT_CLASS(scsi_cmd_done_timeout_template, 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)) -#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,39)) ctf_integer(unsigned char, prot_op, scsi_get_prot_op(cmd)) -#endif ctf_sequence_hex(unsigned char, cmnd, cmd->cmnd, u32, cmd->cmd_len) ) ) @@ -397,4 +286,4 @@ LTTNG_TRACEPOINT_EVENT(scsi_eh_wakeup, #endif /* LTTNG_TRACE_SCSI_H */ /* This part must be outside protection */ -#include "../../../probes/define_trace.h" +#include