diff options
Diffstat (limited to 'include/trace')
| -rw-r--r-- | include/trace/events/bkl.h | 61 | ||||
| -rw-r--r-- | include/trace/events/mce.h | 8 | ||||
| -rw-r--r-- | include/trace/events/module.h | 5 | ||||
| -rw-r--r-- | include/trace/events/scsi.h | 28 | ||||
| -rw-r--r-- | include/trace/events/skb.h | 4 |
5 files changed, 32 insertions, 74 deletions
diff --git a/include/trace/events/bkl.h b/include/trace/events/bkl.h deleted file mode 100644 index 1af72dc24278..000000000000 --- a/include/trace/events/bkl.h +++ /dev/null | |||
| @@ -1,61 +0,0 @@ | |||
| 1 | #undef TRACE_SYSTEM | ||
| 2 | #define TRACE_SYSTEM bkl | ||
| 3 | |||
| 4 | #if !defined(_TRACE_BKL_H) || defined(TRACE_HEADER_MULTI_READ) | ||
| 5 | #define _TRACE_BKL_H | ||
| 6 | |||
| 7 | #include <linux/tracepoint.h> | ||
| 8 | |||
| 9 | TRACE_EVENT(lock_kernel, | ||
| 10 | |||
| 11 | TP_PROTO(const char *func, const char *file, int line), | ||
| 12 | |||
| 13 | TP_ARGS(func, file, line), | ||
| 14 | |||
| 15 | TP_STRUCT__entry( | ||
| 16 | __field( int, depth ) | ||
| 17 | __field_ext( const char *, func, FILTER_PTR_STRING ) | ||
| 18 | __field_ext( const char *, file, FILTER_PTR_STRING ) | ||
| 19 | __field( int, line ) | ||
| 20 | ), | ||
| 21 | |||
| 22 | TP_fast_assign( | ||
| 23 | /* We want to record the lock_depth after lock is acquired */ | ||
| 24 | __entry->depth = current->lock_depth + 1; | ||
| 25 | __entry->func = func; | ||
| 26 | __entry->file = file; | ||
| 27 | __entry->line = line; | ||
| 28 | ), | ||
| 29 | |||
| 30 | TP_printk("depth=%d file:line=%s:%d func=%s()", __entry->depth, | ||
| 31 | __entry->file, __entry->line, __entry->func) | ||
| 32 | ); | ||
| 33 | |||
| 34 | TRACE_EVENT(unlock_kernel, | ||
| 35 | |||
| 36 | TP_PROTO(const char *func, const char *file, int line), | ||
| 37 | |||
| 38 | TP_ARGS(func, file, line), | ||
| 39 | |||
| 40 | TP_STRUCT__entry( | ||
| 41 | __field(int, depth ) | ||
| 42 | __field(const char *, func ) | ||
| 43 | __field(const char *, file ) | ||
| 44 | __field(int, line ) | ||
| 45 | ), | ||
| 46 | |||
| 47 | TP_fast_assign( | ||
| 48 | __entry->depth = current->lock_depth; | ||
| 49 | __entry->func = func; | ||
| 50 | __entry->file = file; | ||
| 51 | __entry->line = line; | ||
| 52 | ), | ||
| 53 | |||
| 54 | TP_printk("depth=%d file:line=%s:%d func=%s()", __entry->depth, | ||
| 55 | __entry->file, __entry->line, __entry->func) | ||
| 56 | ); | ||
| 57 | |||
| 58 | #endif /* _TRACE_BKL_H */ | ||
| 59 | |||
| 60 | /* This part must be outside protection */ | ||
| 61 | #include <trace/define_trace.h> | ||
diff --git a/include/trace/events/mce.h b/include/trace/events/mce.h index 7eee77895cb3..4cbbcef6baa8 100644 --- a/include/trace/events/mce.h +++ b/include/trace/events/mce.h | |||
| @@ -17,36 +17,36 @@ TRACE_EVENT(mce_record, | |||
| 17 | TP_STRUCT__entry( | 17 | TP_STRUCT__entry( |
| 18 | __field( u64, mcgcap ) | 18 | __field( u64, mcgcap ) |
| 19 | __field( u64, mcgstatus ) | 19 | __field( u64, mcgstatus ) |
| 20 | __field( u8, bank ) | ||
| 21 | __field( u64, status ) | 20 | __field( u64, status ) |
| 22 | __field( u64, addr ) | 21 | __field( u64, addr ) |
| 23 | __field( u64, misc ) | 22 | __field( u64, misc ) |
| 24 | __field( u64, ip ) | 23 | __field( u64, ip ) |
| 25 | __field( u8, cs ) | ||
| 26 | __field( u64, tsc ) | 24 | __field( u64, tsc ) |
| 27 | __field( u64, walltime ) | 25 | __field( u64, walltime ) |
| 28 | __field( u32, cpu ) | 26 | __field( u32, cpu ) |
| 29 | __field( u32, cpuid ) | 27 | __field( u32, cpuid ) |
| 30 | __field( u32, apicid ) | 28 | __field( u32, apicid ) |
| 31 | __field( u32, socketid ) | 29 | __field( u32, socketid ) |
| 30 | __field( u8, cs ) | ||
| 31 | __field( u8, bank ) | ||
| 32 | __field( u8, cpuvendor ) | 32 | __field( u8, cpuvendor ) |
| 33 | ), | 33 | ), |
| 34 | 34 | ||
| 35 | TP_fast_assign( | 35 | TP_fast_assign( |
| 36 | __entry->mcgcap = m->mcgcap; | 36 | __entry->mcgcap = m->mcgcap; |
| 37 | __entry->mcgstatus = m->mcgstatus; | 37 | __entry->mcgstatus = m->mcgstatus; |
| 38 | __entry->bank = m->bank; | ||
| 39 | __entry->status = m->status; | 38 | __entry->status = m->status; |
| 40 | __entry->addr = m->addr; | 39 | __entry->addr = m->addr; |
| 41 | __entry->misc = m->misc; | 40 | __entry->misc = m->misc; |
| 42 | __entry->ip = m->ip; | 41 | __entry->ip = m->ip; |
| 43 | __entry->cs = m->cs; | ||
| 44 | __entry->tsc = m->tsc; | 42 | __entry->tsc = m->tsc; |
| 45 | __entry->walltime = m->time; | 43 | __entry->walltime = m->time; |
| 46 | __entry->cpu = m->extcpu; | 44 | __entry->cpu = m->extcpu; |
| 47 | __entry->cpuid = m->cpuid; | 45 | __entry->cpuid = m->cpuid; |
| 48 | __entry->apicid = m->apicid; | 46 | __entry->apicid = m->apicid; |
| 49 | __entry->socketid = m->socketid; | 47 | __entry->socketid = m->socketid; |
| 48 | __entry->cs = m->cs; | ||
| 49 | __entry->bank = m->bank; | ||
| 50 | __entry->cpuvendor = m->cpuvendor; | 50 | __entry->cpuvendor = m->cpuvendor; |
| 51 | ), | 51 | ), |
| 52 | 52 | ||
diff --git a/include/trace/events/module.h b/include/trace/events/module.h index c6bae36547e5..21a546d27c0c 100644 --- a/include/trace/events/module.h +++ b/include/trace/events/module.h | |||
| @@ -108,14 +108,14 @@ TRACE_EVENT(module_request, | |||
| 108 | TP_ARGS(name, wait, ip), | 108 | TP_ARGS(name, wait, ip), |
| 109 | 109 | ||
| 110 | TP_STRUCT__entry( | 110 | TP_STRUCT__entry( |
| 111 | __field( bool, wait ) | ||
| 112 | __field( unsigned long, ip ) | 111 | __field( unsigned long, ip ) |
| 112 | __field( bool, wait ) | ||
| 113 | __string( name, name ) | 113 | __string( name, name ) |
| 114 | ), | 114 | ), |
| 115 | 115 | ||
| 116 | TP_fast_assign( | 116 | TP_fast_assign( |
| 117 | __entry->wait = wait; | ||
| 118 | __entry->ip = ip; | 117 | __entry->ip = ip; |
| 118 | __entry->wait = wait; | ||
| 119 | __assign_str(name, name); | 119 | __assign_str(name, name); |
| 120 | ), | 120 | ), |
| 121 | 121 | ||
| @@ -129,4 +129,3 @@ TRACE_EVENT(module_request, | |||
| 129 | 129 | ||
| 130 | /* This part must be outside protection */ | 130 | /* This part must be outside protection */ |
| 131 | #include <trace/define_trace.h> | 131 | #include <trace/define_trace.h> |
| 132 | |||
diff --git a/include/trace/events/scsi.h b/include/trace/events/scsi.h index 25fbefdf2f2e..db6c93510f74 100644 --- a/include/trace/events/scsi.h +++ b/include/trace/events/scsi.h | |||
| @@ -184,6 +184,17 @@ | |||
| 184 | scsi_statusbyte_name(SAM_STAT_ACA_ACTIVE), \ | 184 | scsi_statusbyte_name(SAM_STAT_ACA_ACTIVE), \ |
| 185 | scsi_statusbyte_name(SAM_STAT_TASK_ABORTED)) | 185 | scsi_statusbyte_name(SAM_STAT_TASK_ABORTED)) |
| 186 | 186 | ||
| 187 | #define scsi_prot_op_name(result) { result, #result } | ||
| 188 | #define show_prot_op_name(val) \ | ||
| 189 | __print_symbolic(val, \ | ||
| 190 | scsi_prot_op_name(SCSI_PROT_NORMAL), \ | ||
| 191 | scsi_prot_op_name(SCSI_PROT_READ_INSERT), \ | ||
| 192 | scsi_prot_op_name(SCSI_PROT_WRITE_STRIP), \ | ||
| 193 | scsi_prot_op_name(SCSI_PROT_READ_STRIP), \ | ||
| 194 | scsi_prot_op_name(SCSI_PROT_WRITE_INSERT), \ | ||
| 195 | scsi_prot_op_name(SCSI_PROT_READ_PASS), \ | ||
| 196 | scsi_prot_op_name(SCSI_PROT_WRITE_PASS)) | ||
| 197 | |||
| 187 | const char *scsi_trace_parse_cdb(struct trace_seq*, unsigned char*, int); | 198 | const char *scsi_trace_parse_cdb(struct trace_seq*, unsigned char*, int); |
| 188 | #define __parse_cdb(cdb, len) scsi_trace_parse_cdb(p, cdb, len) | 199 | #define __parse_cdb(cdb, len) scsi_trace_parse_cdb(p, cdb, len) |
| 189 | 200 | ||
| @@ -202,6 +213,7 @@ TRACE_EVENT(scsi_dispatch_cmd_start, | |||
| 202 | __field( unsigned int, cmd_len ) | 213 | __field( unsigned int, cmd_len ) |
| 203 | __field( unsigned int, data_sglen ) | 214 | __field( unsigned int, data_sglen ) |
| 204 | __field( unsigned int, prot_sglen ) | 215 | __field( unsigned int, prot_sglen ) |
| 216 | __field( unsigned char, prot_op ) | ||
| 205 | __dynamic_array(unsigned char, cmnd, cmd->cmd_len) | 217 | __dynamic_array(unsigned char, cmnd, cmd->cmd_len) |
| 206 | ), | 218 | ), |
| 207 | 219 | ||
| @@ -214,13 +226,15 @@ TRACE_EVENT(scsi_dispatch_cmd_start, | |||
| 214 | __entry->cmd_len = cmd->cmd_len; | 226 | __entry->cmd_len = cmd->cmd_len; |
| 215 | __entry->data_sglen = scsi_sg_count(cmd); | 227 | __entry->data_sglen = scsi_sg_count(cmd); |
| 216 | __entry->prot_sglen = scsi_prot_sg_count(cmd); | 228 | __entry->prot_sglen = scsi_prot_sg_count(cmd); |
| 229 | __entry->prot_op = scsi_get_prot_op(cmd); | ||
| 217 | memcpy(__get_dynamic_array(cmnd), cmd->cmnd, cmd->cmd_len); | 230 | memcpy(__get_dynamic_array(cmnd), cmd->cmnd, cmd->cmd_len); |
| 218 | ), | 231 | ), |
| 219 | 232 | ||
| 220 | TP_printk("host_no=%u channel=%u id=%u lun=%u data_sgl=%u prot_sgl=%u" \ | 233 | TP_printk("host_no=%u channel=%u id=%u lun=%u data_sgl=%u prot_sgl=%u" \ |
| 221 | " cmnd=(%s %s raw=%s)", | 234 | " prot_op=%s cmnd=(%s %s raw=%s)", |
| 222 | __entry->host_no, __entry->channel, __entry->id, | 235 | __entry->host_no, __entry->channel, __entry->id, |
| 223 | __entry->lun, __entry->data_sglen, __entry->prot_sglen, | 236 | __entry->lun, __entry->data_sglen, __entry->prot_sglen, |
| 237 | show_prot_op_name(__entry->prot_op), | ||
| 224 | show_opcode_name(__entry->opcode), | 238 | show_opcode_name(__entry->opcode), |
| 225 | __parse_cdb(__get_dynamic_array(cmnd), __entry->cmd_len), | 239 | __parse_cdb(__get_dynamic_array(cmnd), __entry->cmd_len), |
| 226 | __print_hex(__get_dynamic_array(cmnd), __entry->cmd_len)) | 240 | __print_hex(__get_dynamic_array(cmnd), __entry->cmd_len)) |
| @@ -242,6 +256,7 @@ TRACE_EVENT(scsi_dispatch_cmd_error, | |||
| 242 | __field( unsigned int, cmd_len ) | 256 | __field( unsigned int, cmd_len ) |
| 243 | __field( unsigned int, data_sglen ) | 257 | __field( unsigned int, data_sglen ) |
| 244 | __field( unsigned int, prot_sglen ) | 258 | __field( unsigned int, prot_sglen ) |
| 259 | __field( unsigned char, prot_op ) | ||
| 245 | __dynamic_array(unsigned char, cmnd, cmd->cmd_len) | 260 | __dynamic_array(unsigned char, cmnd, cmd->cmd_len) |
| 246 | ), | 261 | ), |
| 247 | 262 | ||
| @@ -255,13 +270,15 @@ TRACE_EVENT(scsi_dispatch_cmd_error, | |||
| 255 | __entry->cmd_len = cmd->cmd_len; | 270 | __entry->cmd_len = cmd->cmd_len; |
| 256 | __entry->data_sglen = scsi_sg_count(cmd); | 271 | __entry->data_sglen = scsi_sg_count(cmd); |
| 257 | __entry->prot_sglen = scsi_prot_sg_count(cmd); | 272 | __entry->prot_sglen = scsi_prot_sg_count(cmd); |
| 273 | __entry->prot_op = scsi_get_prot_op(cmd); | ||
| 258 | memcpy(__get_dynamic_array(cmnd), cmd->cmnd, cmd->cmd_len); | 274 | memcpy(__get_dynamic_array(cmnd), cmd->cmnd, cmd->cmd_len); |
| 259 | ), | 275 | ), |
| 260 | 276 | ||
| 261 | TP_printk("host_no=%u channel=%u id=%u lun=%u data_sgl=%u prot_sgl=%u" \ | 277 | TP_printk("host_no=%u channel=%u id=%u lun=%u data_sgl=%u prot_sgl=%u" \ |
| 262 | " cmnd=(%s %s raw=%s) rtn=%d", | 278 | " prot_op=%s cmnd=(%s %s raw=%s) rtn=%d", |
| 263 | __entry->host_no, __entry->channel, __entry->id, | 279 | __entry->host_no, __entry->channel, __entry->id, |
| 264 | __entry->lun, __entry->data_sglen, __entry->prot_sglen, | 280 | __entry->lun, __entry->data_sglen, __entry->prot_sglen, |
| 281 | show_prot_op_name(__entry->prot_op), | ||
| 265 | show_opcode_name(__entry->opcode), | 282 | show_opcode_name(__entry->opcode), |
| 266 | __parse_cdb(__get_dynamic_array(cmnd), __entry->cmd_len), | 283 | __parse_cdb(__get_dynamic_array(cmnd), __entry->cmd_len), |
| 267 | __print_hex(__get_dynamic_array(cmnd), __entry->cmd_len), | 284 | __print_hex(__get_dynamic_array(cmnd), __entry->cmd_len), |
| @@ -284,6 +301,7 @@ DECLARE_EVENT_CLASS(scsi_cmd_done_timeout_template, | |||
| 284 | __field( unsigned int, cmd_len ) | 301 | __field( unsigned int, cmd_len ) |
| 285 | __field( unsigned int, data_sglen ) | 302 | __field( unsigned int, data_sglen ) |
| 286 | __field( unsigned int, prot_sglen ) | 303 | __field( unsigned int, prot_sglen ) |
| 304 | __field( unsigned char, prot_op ) | ||
| 287 | __dynamic_array(unsigned char, cmnd, cmd->cmd_len) | 305 | __dynamic_array(unsigned char, cmnd, cmd->cmd_len) |
| 288 | ), | 306 | ), |
| 289 | 307 | ||
| @@ -297,14 +315,16 @@ DECLARE_EVENT_CLASS(scsi_cmd_done_timeout_template, | |||
| 297 | __entry->cmd_len = cmd->cmd_len; | 315 | __entry->cmd_len = cmd->cmd_len; |
| 298 | __entry->data_sglen = scsi_sg_count(cmd); | 316 | __entry->data_sglen = scsi_sg_count(cmd); |
| 299 | __entry->prot_sglen = scsi_prot_sg_count(cmd); | 317 | __entry->prot_sglen = scsi_prot_sg_count(cmd); |
| 318 | __entry->prot_op = scsi_get_prot_op(cmd); | ||
| 300 | memcpy(__get_dynamic_array(cmnd), cmd->cmnd, cmd->cmd_len); | 319 | memcpy(__get_dynamic_array(cmnd), cmd->cmnd, cmd->cmd_len); |
| 301 | ), | 320 | ), |
| 302 | 321 | ||
| 303 | TP_printk("host_no=%u channel=%u id=%u lun=%u data_sgl=%u " \ | 322 | TP_printk("host_no=%u channel=%u id=%u lun=%u data_sgl=%u " \ |
| 304 | "prot_sgl=%u cmnd=(%s %s raw=%s) result=(driver=%s host=%s " \ | 323 | "prot_sgl=%u prot_op=%s cmnd=(%s %s raw=%s) result=(driver=" \ |
| 305 | "message=%s status=%s)", | 324 | "%s host=%s message=%s status=%s)", |
| 306 | __entry->host_no, __entry->channel, __entry->id, | 325 | __entry->host_no, __entry->channel, __entry->id, |
| 307 | __entry->lun, __entry->data_sglen, __entry->prot_sglen, | 326 | __entry->lun, __entry->data_sglen, __entry->prot_sglen, |
| 327 | show_prot_op_name(__entry->prot_op), | ||
| 308 | show_opcode_name(__entry->opcode), | 328 | show_opcode_name(__entry->opcode), |
| 309 | __parse_cdb(__get_dynamic_array(cmnd), __entry->cmd_len), | 329 | __parse_cdb(__get_dynamic_array(cmnd), __entry->cmd_len), |
| 310 | __print_hex(__get_dynamic_array(cmnd), __entry->cmd_len), | 330 | __print_hex(__get_dynamic_array(cmnd), __entry->cmd_len), |
diff --git a/include/trace/events/skb.h b/include/trace/events/skb.h index f10293c41b1e..0c68ae22da22 100644 --- a/include/trace/events/skb.h +++ b/include/trace/events/skb.h | |||
| @@ -19,14 +19,14 @@ TRACE_EVENT(kfree_skb, | |||
| 19 | 19 | ||
| 20 | TP_STRUCT__entry( | 20 | TP_STRUCT__entry( |
| 21 | __field( void *, skbaddr ) | 21 | __field( void *, skbaddr ) |
| 22 | __field( unsigned short, protocol ) | ||
| 23 | __field( void *, location ) | 22 | __field( void *, location ) |
| 23 | __field( unsigned short, protocol ) | ||
| 24 | ), | 24 | ), |
| 25 | 25 | ||
| 26 | TP_fast_assign( | 26 | TP_fast_assign( |
| 27 | __entry->skbaddr = skb; | 27 | __entry->skbaddr = skb; |
| 28 | __entry->protocol = ntohs(skb->protocol); | ||
| 29 | __entry->location = location; | 28 | __entry->location = location; |
| 29 | __entry->protocol = ntohs(skb->protocol); | ||
| 30 | ), | 30 | ), |
| 31 | 31 | ||
| 32 | TP_printk("skbaddr=%p protocol=%u location=%p", | 32 | TP_printk("skbaddr=%p protocol=%u location=%p", |
