@@ -51,12 +51,14 @@ TRACE_EVENT(cxl_aer_uncorrectable_error,
51
51
TP_ARGS (cxlmd , status , fe , hl ),
52
52
TP_STRUCT__entry (
53
53
__string (memdev , dev_name (& cxlmd -> dev ))
54
+ __string (host , dev_name (cxlmd -> dev .parent ))
54
55
__field (u32 , status )
55
56
__field (u32 , first_error )
56
57
__array (u32 , header_log , CXL_HEADERLOG_SIZE_U32 )
57
58
),
58
59
TP_fast_assign (
59
60
__assign_str (memdev , dev_name (& cxlmd -> dev ));
61
+ __assign_str (host , dev_name (cxlmd -> dev .parent ));
60
62
__entry -> status = status ;
61
63
__entry -> first_error = fe ;
62
64
/*
@@ -65,8 +67,8 @@ TRACE_EVENT(cxl_aer_uncorrectable_error,
65
67
*/
66
68
memcpy (__entry -> header_log , hl , CXL_HEADERLOG_SIZE );
67
69
),
68
- TP_printk ("memdev=%s: status: '%s' first_error: '%s'" ,
69
- __get_str (memdev ),
70
+ TP_printk ("memdev=%s host=%s : status: '%s' first_error: '%s'" ,
71
+ __get_str (memdev ), __get_str ( host ),
70
72
show_uc_errs (__entry -> status ),
71
73
show_uc_errs (__entry -> first_error )
72
74
)
@@ -95,14 +97,17 @@ TRACE_EVENT(cxl_aer_correctable_error,
95
97
TP_ARGS (cxlmd , status ),
96
98
TP_STRUCT__entry (
97
99
__string (memdev , dev_name (& cxlmd -> dev ))
100
+ __string (host , dev_name (cxlmd -> dev .parent ))
98
101
__field (u32 , status )
99
102
),
100
103
TP_fast_assign (
101
104
__assign_str (memdev , dev_name (& cxlmd -> dev ));
105
+ __assign_str (host , dev_name (cxlmd -> dev .parent ));
102
106
__entry -> status = status ;
103
107
),
104
- TP_printk ("memdev=%s: status: '%s'" ,
105
- __get_str (memdev ), show_ce_errs (__entry -> status )
108
+ TP_printk ("memdev=%s host=%s: status: '%s'" ,
109
+ __get_str (memdev ), __get_str (host ),
110
+ show_ce_errs (__entry -> status )
106
111
)
107
112
);
108
113
@@ -122,6 +127,7 @@ TRACE_EVENT(cxl_overflow,
122
127
123
128
TP_STRUCT__entry (
124
129
__string (memdev , dev_name (& cxlmd -> dev ))
130
+ __string (host , dev_name (cxlmd -> dev .parent ))
125
131
__field (int , log )
126
132
__field (u64 , first_ts )
127
133
__field (u64 , last_ts )
@@ -130,15 +136,17 @@ TRACE_EVENT(cxl_overflow,
130
136
131
137
TP_fast_assign (
132
138
__assign_str (memdev , dev_name (& cxlmd -> dev ));
139
+ __assign_str (host , dev_name (cxlmd -> dev .parent ));
133
140
__entry -> log = log ;
134
141
__entry -> count = le16_to_cpu (payload -> overflow_err_count );
135
142
__entry -> first_ts = le64_to_cpu (payload -> first_overflow_timestamp );
136
143
__entry -> last_ts = le64_to_cpu (payload -> last_overflow_timestamp );
137
144
),
138
145
139
- TP_printk ("memdev=%s: log=%s : %u records from %llu to %llu" ,
140
- __get_str (memdev ), cxl_event_log_type_str (__entry -> log ),
141
- __entry -> count , __entry -> first_ts , __entry -> last_ts )
146
+ TP_printk ("memdev=%s host=%s: log=%s : %u records from %llu to %llu" ,
147
+ __get_str (memdev ), __get_str (host ),
148
+ cxl_event_log_type_str (__entry -> log ), __entry -> count ,
149
+ __entry -> first_ts , __entry -> last_ts )
142
150
143
151
);
144
152
@@ -171,6 +179,7 @@ TRACE_EVENT(cxl_overflow,
171
179
*/
172
180
#define CXL_EVT_TP_entry \
173
181
__string(memdev, dev_name(&cxlmd->dev)) \
182
+ __string(host, dev_name(cxlmd->dev.parent)) \
174
183
__field(int, log) \
175
184
__field_struct(uuid_t, hdr_uuid) \
176
185
__field(u32, hdr_flags) \
@@ -182,6 +191,7 @@ TRACE_EVENT(cxl_overflow,
182
191
183
192
#define CXL_EVT_TP_fast_assign (cxlmd , l , hdr ) \
184
193
__assign_str(memdev, dev_name(&(cxlmd)->dev)); \
194
+ __assign_str(host, dev_name((cxlmd)->dev.parent)); \
185
195
__entry->log = (l); \
186
196
memcpy(&__entry->hdr_uuid, &(hdr).id, sizeof(uuid_t)); \
187
197
__entry->hdr_length = (hdr).length; \
@@ -192,10 +202,11 @@ TRACE_EVENT(cxl_overflow,
192
202
__entry->hdr_maint_op_class = (hdr).maint_op_class
193
203
194
204
#define CXL_EVT_TP_printk (fmt , ...) \
195
- TP_printk("memdev=%s log=%s : time=%llu uuid=%pUb len=%d flags='%s' " \
196
- "handle=%x related_handle=%x maint_op_class=%u" \
205
+ TP_printk("memdev=%s host=%s log=%s : time=%llu uuid=%pUb len=%d " \
206
+ "flags='%s' handle=%x related_handle=%x maint_op_class=%u" \
197
207
" : " fmt, \
198
- __get_str(memdev), cxl_event_log_type_str(__entry->log), \
208
+ __get_str(memdev), __get_str(host), \
209
+ cxl_event_log_type_str(__entry->log), \
199
210
__entry->hdr_timestamp, &__entry->hdr_uuid, __entry->hdr_length,\
200
211
show_hdr_flags(__entry->hdr_flags), __entry->hdr_handle, \
201
212
__entry->hdr_related_handle, __entry->hdr_maint_op_class, \
0 commit comments