Currently driver only trace cxl events, poison injection on cxl memdev
is silent. OS needs to be notified then it could handle poison range
in time. Per CXL spec, the device error event could be signaled through
FW-First and OS-First methods.
So, add poison event handler in OS-First method:
- qemu:
- CXL device report POISON event to OS by MSI by sending GMER after
injecting a poison record
- CXL driver
a. read the POISON event through GMER; <-- this patch
b. get POISON list;
c. translate DPA to HPA;
d. construct a mce instance, then call mce_log() to queue this mce
instance;
Signed-off-by: Shiyang Ruan <ruansy.f...@fujitsu.com>
---
drivers/cxl/core/mbox.c | 42 ++++++++++++++++++++++++++++-------------
drivers/cxl/cxlmem.h | 8 ++++----
drivers/cxl/pci.c | 4 ++--
3 files changed, 35 insertions(+), 19 deletions(-)
diff --git a/drivers/cxl/core/mbox.c b/drivers/cxl/core/mbox.c
index e1c67159acc4..fa65a98ada16 100644
--- a/drivers/cxl/core/mbox.c
+++ b/drivers/cxl/core/mbox.c
@@ -838,25 +838,41 @@ int cxl_enumerate_cmds(struct cxl_memdev_state *mds)
}
EXPORT_SYMBOL_NS_GPL(cxl_enumerate_cmds, CXL);
-void cxl_event_trace_record(const struct cxl_memdev *cxlmd,
- enum cxl_event_log_type type,
- enum cxl_event_type event_type,
- const uuid_t *uuid, union cxl_event *evt)
+static void cxl_event_handle_poison(struct cxl_memdev *cxlmd,
+ struct cxl_event_gen_media *rec)
{
- if (event_type == CXL_CPER_EVENT_GEN_MEDIA)
+ u64 phys_addr = rec->phys_addr & CXL_DPA_MASK, len;
+
+ if (rec->phys_addr & CXL_DPA_VOLATILE)
+ len = resource_size(&cxlmd->cxlds->ram_res) - phys_addr;
+ else
+ len = resource_size(&cxlmd->cxlds->dpa_res) - phys_addr;
+
+ cxl_mem_get_poison(cxlmd, phys_addr, len, NULL, true);
+}
+
+void cxl_event_handle_record(struct cxl_memdev *cxlmd,
+ enum cxl_event_log_type type,
+ enum cxl_event_type event_type,
+ const uuid_t *uuid, union cxl_event *evt)
+{
+ if (event_type == CXL_CPER_EVENT_GEN_MEDIA) {
trace_cxl_general_media(cxlmd, type, &evt->gen_media);
- else if (event_type == CXL_CPER_EVENT_DRAM)
+ /* handle poison event */
+ if (type == CXL_EVENT_TYPE_FAIL)
+ cxl_event_handle_poison(cxlmd, &evt->gen_media);
+ } else if (event_type == CXL_CPER_EVENT_DRAM)
trace_cxl_dram(cxlmd, type, &evt->dram);
else if (event_type == CXL_CPER_EVENT_MEM_MODULE)
trace_cxl_memory_module(cxlmd, type, &evt->mem_module);
else
trace_cxl_generic_event(cxlmd, type, uuid, &evt->generic);
}
-EXPORT_SYMBOL_NS_GPL(cxl_event_trace_record, CXL);
+EXPORT_SYMBOL_NS_GPL(cxl_event_handle_record, CXL);
-static void __cxl_event_trace_record(const struct cxl_memdev *cxlmd,
- enum cxl_event_log_type type,
- struct cxl_event_record_raw *record)
+static void __cxl_event_handle_record(struct cxl_memdev *cxlmd,
+ enum cxl_event_log_type type,
+ struct cxl_event_record_raw *record)
{
enum cxl_event_type ev_type = CXL_CPER_EVENT_GENERIC;
const uuid_t *uuid = &record->id;
@@ -868,7 +884,7 @@ static void __cxl_event_trace_record(const struct
cxl_memdev *cxlmd,
else if (uuid_equal(uuid, &CXL_EVENT_MEM_MODULE_UUID))
ev_type = CXL_CPER_EVENT_MEM_MODULE;
- cxl_event_trace_record(cxlmd, type, ev_type, uuid, &record->event);
+ cxl_event_handle_record(cxlmd, type, ev_type, uuid, &record->event);
}
static int cxl_clear_event_record(struct cxl_memdev_state *mds,
@@ -979,8 +995,8 @@ static void cxl_mem_get_records_log(struct cxl_memdev_state
*mds,
break;
for (i = 0; i < nr_rec; i++)
- __cxl_event_trace_record(cxlmd, type,
- &payload->records[i]);
+ __cxl_event_handle_record(cxlmd, type,
+ &payload->records[i]);
if (payload->flags & CXL_GET_EVENT_FLAG_OVERFLOW)
trace_cxl_overflow(cxlmd, type, payload);
diff --git a/drivers/cxl/cxlmem.h b/drivers/cxl/cxlmem.h
index f0877f055f53..1e9e3b9c11d1 100644
--- a/drivers/cxl/cxlmem.h
+++ b/drivers/cxl/cxlmem.h
@@ -824,10 +824,10 @@ void set_exclusive_cxl_commands(struct cxl_memdev_state
*mds,
void clear_exclusive_cxl_commands(struct cxl_memdev_state *mds,
unsigned long *cmds);
void cxl_mem_get_event_records(struct cxl_memdev_state *mds, u32 status);
-void cxl_event_trace_record(const struct cxl_memdev *cxlmd,
- enum cxl_event_log_type type,
- enum cxl_event_type event_type,
- const uuid_t *uuid, union cxl_event *evt);
+void cxl_event_handle_record(struct cxl_memdev *cxlmd,
+ enum cxl_event_log_type type,
+ enum cxl_event_type event_type,
+ const uuid_t *uuid, union cxl_event *evt);
int cxl_set_timestamp(struct cxl_memdev_state *mds);
int cxl_poison_state_init(struct cxl_memdev_state *mds);
int cxl_mem_get_poison(struct cxl_memdev *cxlmd, u64 offset, u64 len,
diff --git a/drivers/cxl/pci.c b/drivers/cxl/pci.c
index 233e7c42c161..29a5e641decd 100644
--- a/drivers/cxl/pci.c
+++ b/drivers/cxl/pci.c
@@ -1003,8 +1003,8 @@ static void cxl_cper_event_call(enum cxl_event_type
ev_type,
hdr_flags = get_unaligned_le24(rec->event.generic.hdr.flags);
log_type = FIELD_GET(CXL_EVENT_HDR_FLAGS_REC_SEVERITY, hdr_flags);
- cxl_event_trace_record(cxlds->cxlmd, log_type, ev_type,
- &uuid_null, &rec->event);
+ cxl_event_handle_record(cxlds->cxlmd, log_type, ev_type,
+ &uuid_null, &rec->event);
}
static int __init cxl_pci_driver_init(void)
--
2.34.1
