cxl/trace: Add TRACE support for CXL media-error records

CXL devices may support the retrieval of a device poison list.
Add a new trace event that the CXL subsystem may use to log
the media-error records returned in the poison list.

Log each media-error record as a cxl_poison trace event of
type 'List'.

Signed-off-by: Alison Schofield <alison.schofield@intel.com>
Reviewed-by: Jonathan Cameron <Jonathan.Cameron@huawei.com>
Reviewed-by: Ira Weiny <ira.weiny@intel.com>
Link: https://lore.kernel.org/r/de6196f5269483d886ab1834744f82d27189a666.1681838291.git.alison.schofield@intel.com
Tested-by: Jonathan Cameron <Jonathan.Cameron@huawei.com>
Signed-off-by: Dan Williams <dan.j.williams@intel.com>

diff --git a/drivers/cxl/core/core.h b/drivers/cxl/core/core.h
index cde475e13216ed870b805b08627adee31b8c5a2c..e888e293943ed68ab6d3bb377d24dc90e64c6f06 100644 (file)
--- a/drivers/cxl/core/core.h
+++ b/drivers/cxl/core/core.h
@@ -64,4 +64,8 @@ int cxl_memdev_init(void);
 void cxl_memdev_exit(void);
 void cxl_mbox_init(void);
 
+enum cxl_poison_trace_type {
+       CXL_POISON_TRACE_LIST,
+};
+
 #endif /* __CXL_CORE_H__ */

diff --git a/drivers/cxl/core/mbox.c b/drivers/cxl/core/mbox.c
index 05ff50ee8489fc53e0e7af95d7414a201b419330..2daeeedb16e1bd18dd099aa7c09ece82ae9c8cdc 100644 (file)
--- a/drivers/cxl/core/mbox.c
+++ b/drivers/cxl/core/mbox.c
@@ -1190,7 +1190,10 @@ int cxl_mem_get_poison(struct cxl_memdev *cxlmd, u64 offset, u64 len,
                if (rc)
                        break;
 
-               /* TODO TRACE the media error records */
+               for (int i = 0; i < le16_to_cpu(po->count); i++)
+                       trace_cxl_poison(cxlmd, cxlr, &po->record[i],
+                                        po->flags, po->overflow_ts,
+                                        CXL_POISON_TRACE_LIST);
 
                /* Protect against an uncleared _FLAG_MORE */
                nr_records = nr_records + le16_to_cpu(po->count);

diff --git a/drivers/cxl/core/trace.h b/drivers/cxl/core/trace.h
index 9b8d3d997834a58899ef7b7a68e5a0ee23dc14e4..17c24baaf7402eb7d4e04ab8fdada9466ea890a1 100644 (file)
--- a/drivers/cxl/core/trace.h
+++ b/drivers/cxl/core/trace.h
@@ -7,10 +7,12 @@
 #define _CXL_EVENTS_H
 
 #include <linux/tracepoint.h>
+#include <linux/pci.h>
 #include <asm-generic/unaligned.h>
 
 #include <cxl.h>
 #include <cxlmem.h>
+#include "core.h"
 
 #define CXL_RAS_UC_CACHE_DATA_PARITY   BIT(0)
 #define CXL_RAS_UC_CACHE_ADDR_PARITY   BIT(1)
@@ -600,6 +602,98 @@ TRACE_EVENT(cxl_memory_module,
        )
 );
 
+#define show_poison_trace_type(type)              \
+       __print_symbolic(type,                     \
+       { CXL_POISON_TRACE_LIST,        "List"  })
+
+#define __show_poison_source(source)                          \
+       __print_symbolic(source,                              \
+               { CXL_POISON_SOURCE_UNKNOWN,   "Unknown"  },  \
+               { CXL_POISON_SOURCE_EXTERNAL,  "External" },  \
+               { CXL_POISON_SOURCE_INTERNAL,  "Internal" },  \
+               { CXL_POISON_SOURCE_INJECTED,  "Injected" },  \
+               { CXL_POISON_SOURCE_VENDOR,    "Vendor"   })
+
+#define show_poison_source(source)                          \
+       (((source > CXL_POISON_SOURCE_INJECTED) &&           \
+        (source != CXL_POISON_SOURCE_VENDOR)) ? "Reserved"  \
+        : __show_poison_source(source))
+
+#define show_poison_flags(flags)                             \
+       __print_flags(flags, "|",                            \
+               { CXL_POISON_FLAG_MORE,      "More"     },   \
+               { CXL_POISON_FLAG_OVERFLOW,  "Overflow"  },  \
+               { CXL_POISON_FLAG_SCANNING,  "Scanning"  })
+
+#define __cxl_poison_addr(record)                                      \
+       (le64_to_cpu(record->address))
+#define cxl_poison_record_dpa(record)                                  \
+       (__cxl_poison_addr(record) & CXL_POISON_START_MASK)
+#define cxl_poison_record_source(record)                               \
+       (__cxl_poison_addr(record)  & CXL_POISON_SOURCE_MASK)
+#define cxl_poison_record_dpa_length(record)                           \
+       (le32_to_cpu(record->length) * CXL_POISON_LEN_MULT)
+#define cxl_poison_overflow(flags, time)                               \
+       (flags & CXL_POISON_FLAG_OVERFLOW ? le64_to_cpu(time) : 0)
+
+TRACE_EVENT(cxl_poison,
+
+       TP_PROTO(struct cxl_memdev *cxlmd, struct cxl_region *region,
+                const struct cxl_poison_record *record, u8 flags,
+                __le64 overflow_ts, enum cxl_poison_trace_type trace_type),
+
+       TP_ARGS(cxlmd, region, record, flags, overflow_ts, trace_type),
+
+       TP_STRUCT__entry(
+               __string(memdev, dev_name(&cxlmd->dev))
+               __string(host, dev_name(cxlmd->dev.parent))
+               __field(u64, serial)
+               __field(u8, trace_type)
+               __string(region, region)
+               __field(u64, overflow_ts)
+               __field(u64, dpa)
+               __field(u32, dpa_length)
+               __array(char, uuid, 16)
+               __field(u8, source)
+               __field(u8, flags)
+           ),
+
+       TP_fast_assign(
+               __assign_str(memdev, dev_name(&cxlmd->dev));
+               __assign_str(host, dev_name(cxlmd->dev.parent));
+               __entry->serial = cxlmd->cxlds->serial;
+               __entry->overflow_ts = cxl_poison_overflow(flags, overflow_ts);
+               __entry->dpa = cxl_poison_record_dpa(record);
+               __entry->dpa_length = cxl_poison_record_dpa_length(record);
+               __entry->source = cxl_poison_record_source(record);
+               __entry->trace_type = trace_type;
+               __entry->flags = flags;
+               if (region) {
+                       __assign_str(region, dev_name(&region->dev));
+                       memcpy(__entry->uuid, &region->params.uuid, 16);
+               } else {
+                       __assign_str(region, "");
+                       memset(__entry->uuid, 0, 16);
+               }
+           ),
+
+       TP_printk("memdev=%s host=%s serial=%lld trace_type=%s region=%s "  \
+               "region_uuid=%pU dpa=0x%llx dpa_length=0x%x source=%s "     \
+               "flags=%s overflow_time=%llu",
+               __get_str(memdev),
+               __get_str(host),
+               __entry->serial,
+               show_poison_trace_type(__entry->trace_type),
+               __get_str(region),
+               __entry->uuid,
+               __entry->dpa,
+               __entry->dpa_length,
+               show_poison_source(__entry->source),
+               show_poison_flags(__entry->flags),
+               __entry->overflow_ts
+       )
+);
+
 #endif /* _CXL_EVENTS_H */
 
 #define TRACE_INCLUDE_FILE trace