1 #undef TRACE_SYSTEM 1 #undef TRACE_SYSTEM
2 #define TRACE_SYSTEM iscsi 2 #define TRACE_SYSTEM iscsi
3 3
4 #if !defined(_TRACE_ISCSI_H) || defined(TRACE_ 4 #if !defined(_TRACE_ISCSI_H) || defined(TRACE_HEADER_MULTI_READ)
5 #define _TRACE_ISCSI_H 5 #define _TRACE_ISCSI_H
6 6
7 #include <linux/tracepoint.h> 7 #include <linux/tracepoint.h>
8 8
9 /* max debug message length */ 9 /* max debug message length */
10 #define ISCSI_MSG_MAX 256 10 #define ISCSI_MSG_MAX 256
11 11
12 /* 12 /*
13 * Declare tracepoint helper function. 13 * Declare tracepoint helper function.
14 */ 14 */
15 void iscsi_dbg_trace(void (*trace)(struct devi 15 void iscsi_dbg_trace(void (*trace)(struct device *dev, struct va_format *),
16 struct device *dev, const 16 struct device *dev, const char *fmt, ...);
17 17
18 /* 18 /*
19 * Declare event class for iscsi debug message 19 * Declare event class for iscsi debug messages.
20 */ 20 */
21 DECLARE_EVENT_CLASS(iscsi_log_msg, 21 DECLARE_EVENT_CLASS(iscsi_log_msg,
22 22
23 TP_PROTO(struct device *dev, struct va 23 TP_PROTO(struct device *dev, struct va_format *vaf),
24 24
25 TP_ARGS(dev, vaf), 25 TP_ARGS(dev, vaf),
26 26
27 TP_STRUCT__entry( 27 TP_STRUCT__entry(
28 __string(dname, dev_na 28 __string(dname, dev_name(dev) )
29 __vstring(msg, vaf->f !! 29 __dynamic_array(char, msg, ISCSI_MSG_MAX )
30 ), 30 ),
31 31
32 TP_fast_assign( 32 TP_fast_assign(
33 __assign_str(dname); !! 33 __assign_str(dname, dev_name(dev));
34 __assign_vstr(msg, vaf->fmt, v !! 34 vsnprintf(__get_str(msg), ISCSI_MSG_MAX, vaf->fmt, *vaf->va);
35 ), 35 ),
36 36
37 TP_printk("%s: %s",__get_str(dname), 37 TP_printk("%s: %s",__get_str(dname), __get_str(msg)
38 ) 38 )
39 ); 39 );
40 40
41 /* 41 /*
42 * Define event to capture iscsi connection de 42 * Define event to capture iscsi connection debug messages.
43 */ 43 */
44 DEFINE_EVENT(iscsi_log_msg, iscsi_dbg_conn, 44 DEFINE_EVENT(iscsi_log_msg, iscsi_dbg_conn,
45 TP_PROTO(struct device *dev, struct va 45 TP_PROTO(struct device *dev, struct va_format *vaf),
46 46
47 TP_ARGS(dev, vaf) 47 TP_ARGS(dev, vaf)
48 ); 48 );
49 49
50 /* 50 /*
51 * Define event to capture iscsi session debug 51 * Define event to capture iscsi session debug messages.
52 */ 52 */
53 DEFINE_EVENT(iscsi_log_msg, iscsi_dbg_session, 53 DEFINE_EVENT(iscsi_log_msg, iscsi_dbg_session,
54 TP_PROTO(struct device *dev, struct va 54 TP_PROTO(struct device *dev, struct va_format *vaf),
55 55
56 TP_ARGS(dev, vaf) 56 TP_ARGS(dev, vaf)
57 ); 57 );
58 58
59 /* 59 /*
60 * Define event to capture iscsi error handlin 60 * Define event to capture iscsi error handling debug messages.
61 */ 61 */
62 DEFINE_EVENT(iscsi_log_msg, iscsi_dbg_eh, 62 DEFINE_EVENT(iscsi_log_msg, iscsi_dbg_eh,
63 TP_PROTO(struct device *dev, struct va 63 TP_PROTO(struct device *dev, struct va_format *vaf),
64 64
65 TP_ARGS(dev, vaf) 65 TP_ARGS(dev, vaf)
66 ); 66 );
67 67
68 /* 68 /*
69 * Define event to capture iscsi tcp debug mes 69 * Define event to capture iscsi tcp debug messages.
70 */ 70 */
71 DEFINE_EVENT(iscsi_log_msg, iscsi_dbg_tcp, 71 DEFINE_EVENT(iscsi_log_msg, iscsi_dbg_tcp,
72 TP_PROTO(struct device *dev, struct va 72 TP_PROTO(struct device *dev, struct va_format *vaf),
73 73
74 TP_ARGS(dev, vaf) 74 TP_ARGS(dev, vaf)
75 ); 75 );
76 76
77 /* 77 /*
78 * Define event to capture iscsi sw tcp debug 78 * Define event to capture iscsi sw tcp debug messages.
79 */ 79 */
80 DEFINE_EVENT(iscsi_log_msg, iscsi_dbg_sw_tcp, 80 DEFINE_EVENT(iscsi_log_msg, iscsi_dbg_sw_tcp,
81 TP_PROTO(struct device *dev, struct va 81 TP_PROTO(struct device *dev, struct va_format *vaf),
82 82
83 TP_ARGS(dev, vaf) 83 TP_ARGS(dev, vaf)
84 ); 84 );
85 85
86 /* 86 /*
87 * Define event to capture iscsi transport ses 87 * Define event to capture iscsi transport session debug messages.
88 */ 88 */
89 DEFINE_EVENT(iscsi_log_msg, iscsi_dbg_trans_se 89 DEFINE_EVENT(iscsi_log_msg, iscsi_dbg_trans_session,
90 TP_PROTO(struct device *dev, struct va 90 TP_PROTO(struct device *dev, struct va_format *vaf),
91 91
92 TP_ARGS(dev, vaf) 92 TP_ARGS(dev, vaf)
93 ); 93 );
94 94
95 /* 95 /*
96 * Define event to capture iscsi transport con 96 * Define event to capture iscsi transport connection debug messages.
97 */ 97 */
98 DEFINE_EVENT(iscsi_log_msg, iscsi_dbg_trans_co 98 DEFINE_EVENT(iscsi_log_msg, iscsi_dbg_trans_conn,
99 TP_PROTO(struct device *dev, struct va 99 TP_PROTO(struct device *dev, struct va_format *vaf),
100 100
101 TP_ARGS(dev, vaf) 101 TP_ARGS(dev, vaf)
102 ); 102 );
103 103
104 #endif /* _TRACE_ISCSI_H */ 104 #endif /* _TRACE_ISCSI_H */
105 105
106 /* This part must be outside protection */ 106 /* This part must be outside protection */
107 #include <trace/define_trace.h> 107 #include <trace/define_trace.h>
108 108
Linux® is a registered trademark of Linus Torvalds in the United States and other countries.
TOMOYO® is a registered trademark of NTT DATA CORPORATION.