From 91af50bc097f60cecd36dcdd47193291ae8467c5 Mon Sep 17 00:00:00 2001 From: Sangmoon Kim Date: Tue, 19 Jan 2021 21:23:13 +0900 Subject: [PATCH] ANDROID: arm64: add vendor hooks for kernel fault cases Add hooks to gather data of kernel fault and summarize it with other information. Bug: 222638752 Bug: 375562078 Signed-off-by: Sangmoon Kim Change-Id: I7d6a66837f2e896a413bd8d878f26928669d96e6 (cherry picked from commit 61d7b6c74146bc73ba1f316f8043ac1c0effb0e9) --- arch/arm64/mm/fault.c | 3 +++ drivers/android/vendor_hooks.c | 2 ++ include/trace/hooks/fault.h | 18 ++++++++++++++++++ 3 files changed, 23 insertions(+) create mode 100644 include/trace/hooks/fault.h diff --git a/arch/arm64/mm/fault.c b/arch/arm64/mm/fault.c index 8b281cf308b3..1ca51225f511 100644 --- a/arch/arm64/mm/fault.c +++ b/arch/arm64/mm/fault.c @@ -44,6 +44,8 @@ #include #include +#include + struct fault_info { int (*fn)(unsigned long far, unsigned long esr, struct pt_regs *regs); @@ -786,6 +788,7 @@ static int do_sea(unsigned long far, unsigned long esr, struct pt_regs *regs) */ siaddr = untagged_addr(far); } + trace_android_rvh_do_sea(siaddr, esr, regs); arm64_notify_die(inf->name, regs, inf->sig, inf->code, siaddr, esr); return 0; diff --git a/drivers/android/vendor_hooks.c b/drivers/android/vendor_hooks.c index a108d00a2035..3984d252fbfb 100644 --- a/drivers/android/vendor_hooks.c +++ b/drivers/android/vendor_hooks.c @@ -39,6 +39,7 @@ #include #include #include +#include /* * Export tracepoints that act as a bare tracehook (ie: have no trace event @@ -114,3 +115,4 @@ EXPORT_TRACEPOINT_SYMBOL_GPL(android_vh_look_around); EXPORT_TRACEPOINT_SYMBOL_GPL(android_vh_look_around_migrate_folio); EXPORT_TRACEPOINT_SYMBOL_GPL(android_vh_test_clear_look_around_ref); EXPORT_TRACEPOINT_SYMBOL_GPL(android_rvh_arm64_serror_panic); +EXPORT_TRACEPOINT_SYMBOL_GPL(android_rvh_do_sea); diff --git a/include/trace/hooks/fault.h b/include/trace/hooks/fault.h new file mode 100644 index 000000000000..e3d885d72eea --- /dev/null +++ b/include/trace/hooks/fault.h @@ -0,0 +1,18 @@ +/* SPDX-License-Identifier: GPL-2.0 */ +#undef TRACE_SYSTEM +#define TRACE_SYSTEM fault +#define TRACE_INCLUDE_PATH trace/hooks + +#if !defined(_TRACE_HOOK_FAULT_H) || defined(TRACE_HEADER_MULTI_READ) +#define _TRACE_HOOK_FAULT_H + +#include + +struct pt_regs; +DECLARE_RESTRICTED_HOOK(android_rvh_do_sea, + TP_PROTO(unsigned long addr, unsigned long esr, struct pt_regs *regs), + TP_ARGS(addr, esr, regs), 1); + +#endif /* _TRACE_HOOK_FAULT_H */ +/* This part must be outside protection */ +#include