After /dev/mcelog character device deprecated by commit 5de97c9f6d85
("x86/mce: Factor out and deprecate the /dev/mcelog driver"), the
serialized hardware error log, a.k.a MCE record, of previous boot in
persistent storage is not collected via APEI ERST.

Emit the mce_record tracepoint so that it can consumed by the new
generation rasdaemon.

Signed-off-by: Shuai Xue <[email protected]>
---
 drivers/acpi/apei/erst.c | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/drivers/acpi/apei/erst.c b/drivers/acpi/apei/erst.c
index 528ac5eb4871..82f57aaf89ad 100644
--- a/drivers/acpi/apei/erst.c
+++ b/drivers/acpi/apei/erst.c
@@ -26,6 +26,10 @@
 #include <linux/vmalloc.h>
 #include <linux/mm.h> /* kvfree() */
 #include <acpi/apei.h>
+#ifdef CONFIG_X86_MCE
+/* only define CREATE_TRACE_POINTS once */
+#include <trace/events/mce.h>
+#endif
 
 #include "apei-internal.h"
 
@@ -1063,8 +1067,12 @@ static ssize_t erst_reader(struct pstore_record *record)
                record->compressed = true;
        } else if (guid_equal(&rcd->sec_hdr.section_type, 
&CPER_SECTION_TYPE_DMESG))
                record->type = PSTORE_TYPE_DMESG;
-       else if (guid_equal(&rcd->sec_hdr.section_type, &CPER_SECTION_TYPE_MCE))
+       else if (guid_equal(&rcd->sec_hdr.section_type, 
&CPER_SECTION_TYPE_MCE)) {
+#ifdef CONFIG_X86_MCE
+               trace_mce_record((struct mce *)rcd->data);
+#endif
                record->type = PSTORE_TYPE_MCE;
+       }
        else
                record->type = PSTORE_TYPE_MAX;
 
-- 
2.41.0


Reply via email to