From: Ruidong Tian <tianruidong@linux.alibaba.com>
To: catalin.marinas@arm.com, will@kernel.org, lpieralisi@kernel.org,
guohanjun@huawei.com, sudeep.holla@arm.com,
xueshuai@linux.alibaba.com, baolin.wang@linux.alibaba.com,
linux-kernel@vger.kernel.org, linux-acpi@vger.kernel.org,
linux-arm-kernel@lists.infradead.org, rafael@kernel.org,
lenb@kernel.org, tony.luck@intel.com, bp@alien8.de,
yazen.ghannam@amd.com
Cc: tianruidong@linux.alibaba.com,
Tyler Baicar <baicar@os.amperecomputing.com>
Subject: [PATCH v3 5/5] trace, ras: add ARM RAS extension trace event
Date: Wed, 15 Jan 2025 16:42:28 +0800 [thread overview]
Message-ID: <20250115084228.107573-6-tianruidong@linux.alibaba.com> (raw)
In-Reply-To: <20250115084228.107573-1-tianruidong@linux.alibaba.com>
Add a trace event for hardware errors reported by the ARMv8
RAS extension registers.
Signed-off-by: Tyler Baicar <baicar@os.amperecomputing.com>
Signed-off-by: Ruidong Tian <tianruidong@linux.alibaba.com>
---
drivers/acpi/arm64/aest.c | 2 +
drivers/ras/aest/aest-core.c | 6 +++
drivers/ras/ras.c | 3 ++
include/ras/ras_event.h | 71 ++++++++++++++++++++++++++++++++++++
4 files changed, 82 insertions(+)
diff --git a/drivers/acpi/arm64/aest.c b/drivers/acpi/arm64/aest.c
index 312ddd5c15f5..adc12174f4e0 100644
--- a/drivers/acpi/arm64/aest.c
+++ b/drivers/acpi/arm64/aest.c
@@ -11,6 +11,8 @@
#include "init.h"
+#include <ras/ras_event.h>
+
#undef pr_fmt
#define pr_fmt(fmt) "ACPI AEST: " fmt
diff --git a/drivers/ras/aest/aest-core.c b/drivers/ras/aest/aest-core.c
index 0530880ded3e..e72df9a79b96 100644
--- a/drivers/ras/aest/aest-core.c
+++ b/drivers/ras/aest/aest-core.c
@@ -13,6 +13,8 @@
#include <linux/genalloc.h>
#include <linux/ras.h>
+#include <ras/ras_event.h>
+
#include "aest.h"
DEFINE_PER_CPU(struct aest_device, percpu_adev);
@@ -90,6 +92,10 @@ static void aest_print(struct aest_event *event)
pr_err("%s ERR%dMISC3: 0x%llx\n", pfx_seq, index,
regs->err_misc[3]);
}
+
+ trace_arm_ras_ext_event(event->type, event->id0, event->id1,
+ event->index, event->hid, &event->regs,
+ event->vendor_data, event->vendor_data_size);
}
static void aest_handle_memory_failure(u64 addr)
diff --git a/drivers/ras/ras.c b/drivers/ras/ras.c
index e5f23a8279c2..2a5a440e4c29 100644
--- a/drivers/ras/ras.c
+++ b/drivers/ras/ras.c
@@ -72,6 +72,9 @@ EXPORT_TRACEPOINT_SYMBOL_GPL(extlog_mem_event);
EXPORT_TRACEPOINT_SYMBOL_GPL(mc_event);
EXPORT_TRACEPOINT_SYMBOL_GPL(non_standard_event);
EXPORT_TRACEPOINT_SYMBOL_GPL(arm_event);
+#ifdef CONFIG_ARM64_RAS_EXTN
+EXPORT_TRACEPOINT_SYMBOL_GPL(arm_ras_ext_event);
+#endif
static int __init parse_ras_param(char *str)
{
diff --git a/include/ras/ras_event.h b/include/ras/ras_event.h
index e5f7ee0864e7..119e8c4e6d20 100644
--- a/include/ras/ras_event.h
+++ b/include/ras/ras_event.h
@@ -338,6 +338,77 @@ TRACE_EVENT(aer_event,
"Not available")
);
+/*
+ * ARM RAS Extension Events Report
+ *
+ * This event is generated when an error reported by the ARM RAS extension
+ * hardware is detected.
+ */
+
+#ifdef CONFIG_ARM64_RAS_EXTN
+#include <asm/ras.h>
+TRACE_EVENT(arm_ras_ext_event,
+
+ TP_PROTO(const u8 type,
+ const u32 id0,
+ const u32 id1,
+ const u32 index,
+ char *hid,
+ struct ras_ext_regs *regs,
+ const u8 *data,
+ const u32 len),
+
+ TP_ARGS(type, id0, id1, index, hid, regs, data, len),
+
+ TP_STRUCT__entry(
+ __field(u8, type)
+ __field(u32, id0)
+ __field(u32, id1)
+ __field(u32, index)
+ __field(char *, hid)
+ __field(u64, err_fr)
+ __field(u64, err_ctlr)
+ __field(u64, err_status)
+ __field(u64, err_addr)
+ __field(u64, err_misc0)
+ __field(u64, err_misc1)
+ __field(u64, err_misc2)
+ __field(u64, err_misc3)
+ __field(u32, len)
+ __dynamic_array(u8, buf, len)
+ ),
+
+ TP_fast_assign(
+ __entry->type = type;
+ __entry->id0 = id0;
+ __entry->id1 = id1;
+ __entry->index = index;
+ __entry->hid = hid;
+ __entry->err_fr = regs->err_fr;
+ __entry->err_ctlr = regs->err_ctlr;
+ __entry->err_status = regs->err_status;
+ __entry->err_addr = regs->err_addr;
+ __entry->err_misc0 = regs->err_misc[0];
+ __entry->err_misc1 = regs->err_misc[1];
+ __entry->err_misc2 = regs->err_misc[2];
+ __entry->err_misc3 = regs->err_misc[3];
+ __entry->len = len;
+ memcpy(__get_dynamic_array(buf), data, len);
+ ),
+
+ TP_printk("type: %d; id0: %d; id1: %d; index: %d; hid: %s; "
+ "ERR_FR: %llx; ERR_CTLR: %llx; ERR_STATUS: %llx; "
+ "ERR_ADDR: %llx; ERR_MISC0: %llx; ERR_MISC1: %llx; "
+ "ERR_MISC2: %llx; ERR_MISC3: %llx; data len:%d; raw data:%s",
+ __entry->type, __entry->id0, __entry->id1, __entry->index,
+ __entry->hid, __entry->err_fr, __entry->err_ctlr,
+ __entry->err_status, __entry->err_addr, __entry->err_misc0,
+ __entry->err_misc1, __entry->err_misc2, __entry->err_misc3,
+ __entry->len,
+ __print_hex(__get_dynamic_array(buf), __entry->len))
+);
+#endif
+
/*
* memory-failure recovery action result event
*
--
2.33.1
next prev parent reply other threads:[~2025-01-15 8:43 UTC|newest]
Thread overview: 16+ messages / expand[flat|nested] mbox.gz Atom feed top
2025-01-15 8:42 [PATCH v3 0/5] ARM Error Source Table V2 Support Ruidong Tian
2025-01-15 8:42 ` [PATCH v3 1/5] ACPI/RAS/AEST: Initial AEST driver Ruidong Tian
2025-01-17 10:50 ` Tomohiro Misono (Fujitsu)
2025-02-06 8:32 ` Ruidong Tian
2025-02-14 9:14 ` Tomohiro Misono (Fujitsu)
2025-02-19 20:49 ` Borislav Petkov
2025-01-15 8:42 ` [PATCH v3 2/5] RAS/AEST: Introduce AEST driver sysfs interface Ruidong Tian
2025-01-18 2:37 ` kernel test robot
2025-02-19 20:55 ` Borislav Petkov
2025-01-15 8:42 ` [PATCH v3 3/5] RAS/AEST: Introduce AEST inject interface to test AEST driver Ruidong Tian
2025-01-17 7:07 ` kernel test robot
2025-01-15 8:42 ` [PATCH v3 4/5] RAS/ATL: Unified ATL interface for ARM64 and AMD Ruidong Tian
2025-01-17 6:14 ` kernel test robot
2025-02-19 21:00 ` Borislav Petkov
2025-01-15 8:42 ` Ruidong Tian [this message]
2025-02-19 20:30 ` [PATCH v3 0/5] ARM Error Source Table V2 Support Borislav Petkov
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20250115084228.107573-6-tianruidong@linux.alibaba.com \
--to=tianruidong@linux.alibaba.com \
--cc=baicar@os.amperecomputing.com \
--cc=baolin.wang@linux.alibaba.com \
--cc=bp@alien8.de \
--cc=catalin.marinas@arm.com \
--cc=guohanjun@huawei.com \
--cc=lenb@kernel.org \
--cc=linux-acpi@vger.kernel.org \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-kernel@vger.kernel.org \
--cc=lpieralisi@kernel.org \
--cc=rafael@kernel.org \
--cc=sudeep.holla@arm.com \
--cc=tony.luck@intel.com \
--cc=will@kernel.org \
--cc=xueshuai@linux.alibaba.com \
--cc=yazen.ghannam@amd.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®