Skip to content

Commit d54a531

Browse files
weiny2djbw
weiny2
authored and
djbw
committed
cxl/mem: Trace General Media Event Record
CXL rev 3.0 section 8.2.9.2.1.1 defines the General Media Event Record. Determine if the event read is a general media record and if so trace the record as a General Media Event Record. Reviewed-by: Dan Williams <dan.j.williams@intel.com> Reviewed-by: Davidlohr Bueso <dave@stgolabs.net> Reviewed-by: Jonathan Cameron <Jonathan.Cameron@huawei.com> Signed-off-by: Ira Weiny <ira.weiny@intel.com> Link: https://lore.kernel.org/r/20221216-cxl-ev-log-v7-3-2316a5c8f7d8@intel.com Signed-off-by: Dan Williams <dan.j.williams@intel.com>
1 parent a49aa81 commit d54a531

3 files changed

Lines changed: 170 additions & 2 deletions

File tree

‎drivers/cxl/core/mbox.c‎

Lines changed: 27 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -718,6 +718,31 @@ int cxl_enumerate_cmds(struct cxl_dev_state *cxlds)
718718
}
719719
EXPORT_SYMBOL_NS_GPL(cxl_enumerate_cmds, CXL);
720720

721+
/*
722+
* General Media Event Record
723+
* CXL rev 3.0 Section 8.2.9.2.1.1; Table 8-43
724+
*/
725+
static const uuid_t gen_media_event_uuid =
726+
UUID_INIT(0xfbcd0a77, 0xc260, 0x417f,
727+
0x85, 0xa9, 0x08, 0x8b, 0x16, 0x21, 0xeb, 0xa6);
728+
729+
static void cxl_event_trace_record(const struct device *dev,
730+
enum cxl_event_log_type type,
731+
struct cxl_event_record_raw *record)
732+
{
733+
uuid_t *id = &record->hdr.id;
734+
735+
if (uuid_equal(id, &gen_media_event_uuid)) {
736+
struct cxl_event_gen_media *rec =
737+
(struct cxl_event_gen_media *)record;
738+
739+
trace_cxl_general_media(dev, type, rec);
740+
} else {
741+
/* For unknown record types print just the header */
742+
trace_cxl_generic_event(dev, type, record);
743+
}
744+
}
745+
721746
static int cxl_clear_event_record(struct cxl_dev_state *cxlds,
722747
enum cxl_event_log_type log,
723748
struct cxl_get_event_payload *get_pl)
@@ -821,8 +846,8 @@ static void cxl_mem_get_records_log(struct cxl_dev_state *cxlds,
821846
break;
822847

823848
for (i = 0; i < nr_rec; i++)
824-
trace_cxl_generic_event(cxlds->dev, type,
825-
&payload->records[i]);
849+
cxl_event_trace_record(cxlds->dev, type,
850+
&payload->records[i]);
826851

827852
if (payload->flags & CXL_GET_EVENT_FLAG_OVERFLOW)
828853
trace_cxl_overflow(cxlds->dev, type, payload);

‎drivers/cxl/core/trace.h‎

Lines changed: 124 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -222,6 +222,130 @@ TRACE_EVENT(cxl_generic_event,
222222
__print_hex(__entry->data, CXL_EVENT_RECORD_DATA_LENGTH))
223223
);
224224

225+
/*
226+
* Physical Address field masks
227+
*
228+
* General Media Event Record
229+
* CXL rev 3.0 Section 8.2.9.2.1.1; Table 8-43
230+
*
231+
* DRAM Event Record
232+
* CXL rev 3.0 section 8.2.9.2.1.2; Table 8-44
233+
*/
234+
#define CXL_DPA_FLAGS_MASK 0x3F
235+
#define CXL_DPA_MASK (~CXL_DPA_FLAGS_MASK)
236+
237+
#define CXL_DPA_VOLATILE BIT(0)
238+
#define CXL_DPA_NOT_REPAIRABLE BIT(1)
239+
#define show_dpa_flags(flags) __print_flags(flags, "|", \
240+
{ CXL_DPA_VOLATILE, "VOLATILE" }, \
241+
{ CXL_DPA_NOT_REPAIRABLE, "NOT_REPAIRABLE" } \
242+
)
243+
244+
/*
245+
* General Media Event Record - GMER
246+
* CXL rev 3.0 Section 8.2.9.2.1.1; Table 8-43
247+
*/
248+
#define CXL_GMER_EVT_DESC_UNCORECTABLE_EVENT BIT(0)
249+
#define CXL_GMER_EVT_DESC_THRESHOLD_EVENT BIT(1)
250+
#define CXL_GMER_EVT_DESC_POISON_LIST_OVERFLOW BIT(2)
251+
#define show_event_desc_flags(flags) __print_flags(flags, "|", \
252+
{ CXL_GMER_EVT_DESC_UNCORECTABLE_EVENT, "UNCORRECTABLE_EVENT" }, \
253+
{ CXL_GMER_EVT_DESC_THRESHOLD_EVENT, "THRESHOLD_EVENT" }, \
254+
{ CXL_GMER_EVT_DESC_POISON_LIST_OVERFLOW, "POISON_LIST_OVERFLOW" } \
255+
)
256+
257+
#define CXL_GMER_MEM_EVT_TYPE_ECC_ERROR 0x00
258+
#define CXL_GMER_MEM_EVT_TYPE_INV_ADDR 0x01
259+
#define CXL_GMER_MEM_EVT_TYPE_DATA_PATH_ERROR 0x02
260+
#define show_mem_event_type(type) __print_symbolic(type, \
261+
{ CXL_GMER_MEM_EVT_TYPE_ECC_ERROR, "ECC Error" }, \
262+
{ CXL_GMER_MEM_EVT_TYPE_INV_ADDR, "Invalid Address" }, \
263+
{ CXL_GMER_MEM_EVT_TYPE_DATA_PATH_ERROR, "Data Path Error" } \
264+
)
265+
266+
#define CXL_GMER_TRANS_UNKNOWN 0x00
267+
#define CXL_GMER_TRANS_HOST_READ 0x01
268+
#define CXL_GMER_TRANS_HOST_WRITE 0x02
269+
#define CXL_GMER_TRANS_HOST_SCAN_MEDIA 0x03
270+
#define CXL_GMER_TRANS_HOST_INJECT_POISON 0x04
271+
#define CXL_GMER_TRANS_INTERNAL_MEDIA_SCRUB 0x05
272+
#define CXL_GMER_TRANS_INTERNAL_MEDIA_MANAGEMENT 0x06
273+
#define show_trans_type(type) __print_symbolic(type, \
274+
{ CXL_GMER_TRANS_UNKNOWN, "Unknown" }, \
275+
{ CXL_GMER_TRANS_HOST_READ, "Host Read" }, \
276+
{ CXL_GMER_TRANS_HOST_WRITE, "Host Write" }, \
277+
{ CXL_GMER_TRANS_HOST_SCAN_MEDIA, "Host Scan Media" }, \
278+
{ CXL_GMER_TRANS_HOST_INJECT_POISON, "Host Inject Poison" }, \
279+
{ CXL_GMER_TRANS_INTERNAL_MEDIA_SCRUB, "Internal Media Scrub" }, \
280+
{ CXL_GMER_TRANS_INTERNAL_MEDIA_MANAGEMENT, "Internal Media Management" } \
281+
)
282+
283+
#define CXL_GMER_VALID_CHANNEL BIT(0)
284+
#define CXL_GMER_VALID_RANK BIT(1)
285+
#define CXL_GMER_VALID_DEVICE BIT(2)
286+
#define CXL_GMER_VALID_COMPONENT BIT(3)
287+
#define show_valid_flags(flags) __print_flags(flags, "|", \
288+
{ CXL_GMER_VALID_CHANNEL, "CHANNEL" }, \
289+
{ CXL_GMER_VALID_RANK, "RANK" }, \
290+
{ CXL_GMER_VALID_DEVICE, "DEVICE" }, \
291+
{ CXL_GMER_VALID_COMPONENT, "COMPONENT" } \
292+
)
293+
294+
TRACE_EVENT(cxl_general_media,
295+
296+
TP_PROTO(const struct device *dev, enum cxl_event_log_type log,
297+
struct cxl_event_gen_media *rec),
298+
299+
TP_ARGS(dev, log, rec),
300+
301+
TP_STRUCT__entry(
302+
CXL_EVT_TP_entry
303+
/* General Media */
304+
__field(u64, dpa)
305+
__field(u8, descriptor)
306+
__field(u8, type)
307+
__field(u8, transaction_type)
308+
__field(u8, channel)
309+
__field(u32, device)
310+
__array(u8, comp_id, CXL_EVENT_GEN_MED_COMP_ID_SIZE)
311+
__field(u16, validity_flags)
312+
/* Following are out of order to pack trace record */
313+
__field(u8, rank)
314+
__field(u8, dpa_flags)
315+
),
316+
317+
TP_fast_assign(
318+
CXL_EVT_TP_fast_assign(dev, log, rec->hdr);
319+
320+
/* General Media */
321+
__entry->dpa = le64_to_cpu(rec->phys_addr);
322+
__entry->dpa_flags = __entry->dpa & CXL_DPA_FLAGS_MASK;
323+
/* Mask after flags have been parsed */
324+
__entry->dpa &= CXL_DPA_MASK;
325+
__entry->descriptor = rec->descriptor;
326+
__entry->type = rec->type;
327+
__entry->transaction_type = rec->transaction_type;
328+
__entry->channel = rec->channel;
329+
__entry->rank = rec->rank;
330+
__entry->device = get_unaligned_le24(rec->device);
331+
memcpy(__entry->comp_id, &rec->component_id,
332+
CXL_EVENT_GEN_MED_COMP_ID_SIZE);
333+
__entry->validity_flags = get_unaligned_le16(&rec->validity_flags);
334+
),
335+
336+
CXL_EVT_TP_printk("dpa=%llx dpa_flags='%s' " \
337+
"descriptor='%s' type='%s' transaction_type='%s' channel=%u rank=%u " \
338+
"device=%x comp_id=%s validity_flags='%s'",
339+
__entry->dpa, show_dpa_flags(__entry->dpa_flags),
340+
show_event_desc_flags(__entry->descriptor),
341+
show_mem_event_type(__entry->type),
342+
show_trans_type(__entry->transaction_type),
343+
__entry->channel, __entry->rank, __entry->device,
344+
__print_hex(__entry->comp_id, CXL_EVENT_GEN_MED_COMP_ID_SIZE),
345+
show_valid_flags(__entry->validity_flags)
346+
)
347+
);
348+
225349
#endif /* _CXL_EVENTS_H */
226350

227351
#define TRACE_INCLUDE_FILE trace

‎drivers/cxl/cxlmem.h‎

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -444,6 +444,25 @@ struct cxl_mbox_clear_event_payload {
444444
} __packed;
445445
#define CXL_CLEAR_EVENT_MAX_HANDLES U8_MAX
446446

447+
/*
448+
* General Media Event Record
449+
* CXL rev 3.0 Section 8.2.9.2.1.1; Table 8-43
450+
*/
451+
#define CXL_EVENT_GEN_MED_COMP_ID_SIZE 0x10
452+
struct cxl_event_gen_media {
453+
struct cxl_event_record_hdr hdr;
454+
__le64 phys_addr;
455+
u8 descriptor;
456+
u8 type;
457+
u8 transaction_type;
458+
u8 validity_flags[2];
459+
u8 channel;
460+
u8 rank;
461+
u8 device[3];
462+
u8 component_id[CXL_EVENT_GEN_MED_COMP_ID_SIZE];
463+
u8 reserved[46];
464+
} __packed;
465+
447466
struct cxl_mbox_get_partition_info {
448467
__le64 active_volatile_cap;
449468
__le64 active_persistent_cap;

0 commit comments

Comments
 (0)