@@ -51,12 +51,14 @@ TRACE_EVENT(cxl_aer_uncorrectable_error,
5151 TP_ARGS (cxlmd , status , fe , hl ),
5252 TP_STRUCT__entry (
5353 __string (memdev , dev_name (& cxlmd -> dev ))
54+ __string (host , dev_name (cxlmd -> dev .parent ))
5455 __field (u32 , status )
5556 __field (u32 , first_error )
5657 __array (u32 , header_log , CXL_HEADERLOG_SIZE_U32 )
5758 ),
5859 TP_fast_assign (
5960 __assign_str (memdev , dev_name (& cxlmd -> dev ));
61+ __assign_str (host , dev_name (cxlmd -> dev .parent ));
6062 __entry -> status = status ;
6163 __entry -> first_error = fe ;
6264 /*
@@ -65,8 +67,8 @@ TRACE_EVENT(cxl_aer_uncorrectable_error,
6567 */
6668 memcpy (__entry -> header_log , hl , CXL_HEADERLOG_SIZE );
6769 ),
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 ),
7072 show_uc_errs (__entry -> status ),
7173 show_uc_errs (__entry -> first_error )
7274 )
@@ -95,14 +97,17 @@ TRACE_EVENT(cxl_aer_correctable_error,
9597 TP_ARGS (cxlmd , status ),
9698 TP_STRUCT__entry (
9799 __string (memdev , dev_name (& cxlmd -> dev ))
100+ __string (host , dev_name (cxlmd -> dev .parent ))
98101 __field (u32 , status )
99102 ),
100103 TP_fast_assign (
101104 __assign_str (memdev , dev_name (& cxlmd -> dev ));
105+ __assign_str (host , dev_name (cxlmd -> dev .parent ));
102106 __entry -> status = status ;
103107 ),
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 )
106111 )
107112);
108113
@@ -122,6 +127,7 @@ TRACE_EVENT(cxl_overflow,
122127
123128 TP_STRUCT__entry (
124129 __string (memdev , dev_name (& cxlmd -> dev ))
130+ __string (host , dev_name (cxlmd -> dev .parent ))
125131 __field (int , log )
126132 __field (u64 , first_ts )
127133 __field (u64 , last_ts )
@@ -130,15 +136,17 @@ TRACE_EVENT(cxl_overflow,
130136
131137 TP_fast_assign (
132138 __assign_str (memdev , dev_name (& cxlmd -> dev ));
139+ __assign_str (host , dev_name (cxlmd -> dev .parent ));
133140 __entry -> log = log ;
134141 __entry -> count = le16_to_cpu (payload -> overflow_err_count );
135142 __entry -> first_ts = le64_to_cpu (payload -> first_overflow_timestamp );
136143 __entry -> last_ts = le64_to_cpu (payload -> last_overflow_timestamp );
137144 ),
138145
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 )
142150
143151);
144152
@@ -171,6 +179,7 @@ TRACE_EVENT(cxl_overflow,
171179 */
172180#define CXL_EVT_TP_entry \
173181 __string(memdev, dev_name(&cxlmd->dev)) \
182+ __string(host, dev_name(cxlmd->dev.parent)) \
174183 __field(int, log) \
175184 __field_struct(uuid_t, hdr_uuid) \
176185 __field(u32, hdr_flags) \
@@ -182,6 +191,7 @@ TRACE_EVENT(cxl_overflow,
182191
183192#define CXL_EVT_TP_fast_assign (cxlmd , l , hdr ) \
184193 __assign_str(memdev, dev_name(&(cxlmd)->dev)); \
194+ __assign_str(host, dev_name((cxlmd)->dev.parent)); \
185195 __entry->log = (l); \
186196 memcpy(&__entry->hdr_uuid, &(hdr).id, sizeof(uuid_t)); \
187197 __entry->hdr_length = (hdr).length; \
@@ -192,10 +202,11 @@ TRACE_EVENT(cxl_overflow,
192202 __entry->hdr_maint_op_class = (hdr).maint_op_class
193203
194204#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" \
197207 " : " 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), \
199210 __entry->hdr_timestamp, &__entry->hdr_uuid, __entry->hdr_length,\
200211 show_hdr_flags(__entry->hdr_flags), __entry->hdr_handle, \
201212 __entry->hdr_related_handle, __entry->hdr_maint_op_class, \
0 commit comments