cxl/memdev: Trace inject and clear poison as cxl_poison events

The cxl_poison trace event allows users to view the history of poison
list reads. With the addition of inject and clear poison capabilities,
users will expect similar tracing.

Add trace types 'Inject' and 'Clear' to the cxl_poison trace_event and
trace successful operations only.

If the driver finds that the DPA being injected or cleared of poison
is mapped in a region, that region info is included in the cxl_poison
trace event. Region reconfigurations can make this extra info useless
if the debug operations are not carefully managed.

Signed-off-by: Alison Schofield <alison.schofield@intel.com>
Reviewed-by: Jonathan Cameron <Jonathan.Cameron@huawei.com>
Reviewed-by: Dave Jiang <dave.jiang@intel.com>
Link: https://lore.kernel.org/r/e20eb7c3029137b480ece671998c183da0477e2e.1681874357.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 deb5f87d6d0a41ae14e5c1e95e4a49d2045d701b..27f0968449de61437cd413096f3354c623c37c33 100644 (file)
--- a/drivers/cxl/core/core.h
+++ b/drivers/cxl/core/core.h
@@ -71,6 +71,8 @@ void cxl_mbox_init(void);
 
 enum cxl_poison_trace_type {
        CXL_POISON_TRACE_LIST,
+       CXL_POISON_TRACE_INJECT,
+       CXL_POISON_TRACE_CLEAR,
 };
 
 #endif /* __CXL_CORE_H__ */

diff --git a/drivers/cxl/core/memdev.c b/drivers/cxl/core/memdev.c
index 40ce74f5500a442a28840c998fc1df89b266f6d6..057a432672900d913743aa6842c96b508d34683a 100644 (file)
--- a/drivers/cxl/core/memdev.c
+++ b/drivers/cxl/core/memdev.c
@@ -6,6 +6,7 @@
 #include <linux/idr.h>
 #include <linux/pci.h>
 #include <cxlmem.h>
+#include "trace.h"
 #include "core.h"
 
 static DECLARE_RWSEM(cxl_memdev_rwsem);
@@ -232,6 +233,7 @@ int cxl_inject_poison(struct cxl_memdev *cxlmd, u64 dpa)
 {
        struct cxl_dev_state *cxlds = cxlmd->cxlds;
        struct cxl_mbox_inject_poison inject;
+       struct cxl_poison_record record;
        struct cxl_mbox_cmd mbox_cmd;
        struct cxl_region *cxlr;
        int rc;
@@ -262,6 +264,12 @@ int cxl_inject_poison(struct cxl_memdev *cxlmd, u64 dpa)
                dev_warn_once(cxlds->dev,
                              "poison inject dpa:%#llx region: %s\n", dpa,
                              dev_name(&cxlr->dev));
+
+       record = (struct cxl_poison_record) {
+               .address = cpu_to_le64(dpa),
+               .length = cpu_to_le32(1),
+       };
+       trace_cxl_poison(cxlmd, cxlr, &record, 0, 0, CXL_POISON_TRACE_INJECT);
 out:
        up_read(&cxl_dpa_rwsem);
 
@@ -273,6 +281,7 @@ int cxl_clear_poison(struct cxl_memdev *cxlmd, u64 dpa)
 {
        struct cxl_dev_state *cxlds = cxlmd->cxlds;
        struct cxl_mbox_clear_poison clear;
+       struct cxl_poison_record record;
        struct cxl_mbox_cmd mbox_cmd;
        struct cxl_region *cxlr;
        int rc;
@@ -311,6 +320,12 @@ int cxl_clear_poison(struct cxl_memdev *cxlmd, u64 dpa)
        if (cxlr)
                dev_warn_once(cxlds->dev, "poison clear dpa:%#llx region: %s\n",
                              dpa, dev_name(&cxlr->dev));
+
+       record = (struct cxl_poison_record) {
+               .address = cpu_to_le64(dpa),
+               .length = cpu_to_le32(1),
+       };
+       trace_cxl_poison(cxlmd, cxlr, &record, 0, 0, CXL_POISON_TRACE_CLEAR);
 out:
        up_read(&cxl_dpa_rwsem);
 

diff --git a/drivers/cxl/core/trace.h b/drivers/cxl/core/trace.h
index 220cc7e721b88d58c6c6ea34ee7d703596b13efb..a0b5819bc70b3075b37d5452da0ac53efbf382f8 100644 (file)
--- a/drivers/cxl/core/trace.h
+++ b/drivers/cxl/core/trace.h
@@ -602,9 +602,11 @@ TRACE_EVENT(cxl_memory_module,
        )
 );
 
-#define show_poison_trace_type(type)              \
-       __print_symbolic(type,                     \
-       { CXL_POISON_TRACE_LIST,        "List"  })
+#define show_poison_trace_type(type)                   \
+       __print_symbolic(type,                          \
+       { CXL_POISON_TRACE_LIST,        "List"   },     \
+       { CXL_POISON_TRACE_INJECT,      "Inject" },     \
+       { CXL_POISON_TRACE_CLEAR,       "Clear"  })
 
 #define __show_poison_source(source)                          \
        __print_symbolic(source,                              \