moonjuice/kernel_arpi
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

ANDROID: arm64: add vendor hooks for kernel fault cases

Browse Source 
Add hooks to gather data of kernel fault and summarize it with
other information.

Bug: 222638752

Signed-off-by: Sangmoon Kim <sangmoon.kim@samsung.com>
Change-Id: I7d6a66837f2e896a413bd8d878f26928669d96e6
This commit is contained in:
Sangmoon Kim
2021-01-19 21:23:13 +09:00
parent 2232e3fc85
commit 61d7b6c741
3 changed files with 43 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
arch/arm64/mm/fault.c
View File

@@ -42,6 +42,8 @@
#include <asm/tlbflush.h> #include <asm/tlbflush.h>
#include <asm/traps.h> #include <asm/traps.h>
#include <trace/hooks/fault.h>
struct fault_info { struct fault_info {
int (*fn)(unsigned long far, unsigned int esr, int (*fn)(unsigned long far, unsigned int esr,
struct pt_regs *regs); struct pt_regs *regs);
@@ -297,6 +299,7 @@ static void die_kernel_fault(const char *msg, unsigned long addr,
pr_alert("Unable to handle kernel %s at virtual address %016lx\n", msg, pr_alert("Unable to handle kernel %s at virtual address %016lx\n", msg,
addr); addr);
trace_android_rvh_die_kernel_fault(msg, addr, esr, regs);
mem_abort_decode(esr); mem_abort_decode(esr);
show_pte(addr); show_pte(addr);
@@ -720,6 +723,7 @@ static int do_sea(unsigned long far, unsigned int esr, struct pt_regs *regs)
*/ */
siaddr = untagged_addr(far); siaddr = untagged_addr(far);
} }
trace_android_rvh_do_sea(siaddr, esr, regs);
arm64_notify_die(inf->name, regs, inf->sig, inf->code, siaddr, esr); arm64_notify_die(inf->name, regs, inf->sig, inf->code, siaddr, esr);
return 0; return 0;
@@ -815,6 +819,7 @@ void do_mem_abort(unsigned long far, unsigned int esr, struct pt_regs *regs)
if (!user_mode(regs)) { if (!user_mode(regs)) {
pr_alert("Unhandled fault at 0x%016lx\n", addr); pr_alert("Unhandled fault at 0x%016lx\n", addr);
trace_android_rvh_do_mem_abort(addr, esr, regs);
mem_abort_decode(esr); mem_abort_decode(esr);
show_pte(addr); show_pte(addr);
} }
@@ -830,6 +835,8 @@ NOKPROBE_SYMBOL(do_mem_abort);
void do_sp_pc_abort(unsigned long addr, unsigned int esr, struct pt_regs *regs) void do_sp_pc_abort(unsigned long addr, unsigned int esr, struct pt_regs *regs)
{ {
trace_android_rvh_do_sp_pc_abort(addr, esr, regs);
arm64_notify_die("SP/PC alignment exception", regs, SIGBUS, BUS_ADRALN, arm64_notify_die("SP/PC alignment exception", regs, SIGBUS, BUS_ADRALN,
addr, esr); addr, esr);
} }

5
drivers/android/vendor_hooks.c
View File

@@ -48,6 +48,7 @@
#include <trace/hooks/bug.h> #include <trace/hooks/bug.h>
#include <trace/hooks/softlockup.h> #include <trace/hooks/softlockup.h>
#include <trace/hooks/power.h> #include <trace/hooks/power.h>
#include <trace/hooks/fault.h>
/* /*
* Export tracepoints that act as a bare tracehook (ie: have no trace event * Export tracepoints that act as a bare tracehook (ie: have no trace event
@@ -232,3 +233,7 @@ EXPORT_TRACEPOINT_SYMBOL_GPL(android_rvh_report_bug);
EXPORT_TRACEPOINT_SYMBOL_GPL(android_vh_watchdog_timer_softlockup); EXPORT_TRACEPOINT_SYMBOL_GPL(android_vh_watchdog_timer_softlockup);
EXPORT_TRACEPOINT_SYMBOL_GPL(android_vh_try_to_freeze_todo); EXPORT_TRACEPOINT_SYMBOL_GPL(android_vh_try_to_freeze_todo);
EXPORT_TRACEPOINT_SYMBOL_GPL(android_vh_try_to_freeze_todo_unfrozen); EXPORT_TRACEPOINT_SYMBOL_GPL(android_vh_try_to_freeze_todo_unfrozen);
EXPORT_TRACEPOINT_SYMBOL_GPL(android_rvh_die_kernel_fault);
EXPORT_TRACEPOINT_SYMBOL_GPL(android_rvh_do_sea);
EXPORT_TRACEPOINT_SYMBOL_GPL(android_rvh_do_mem_abort);
EXPORT_TRACEPOINT_SYMBOL_GPL(android_rvh_do_sp_pc_abort);

31
include/trace/hooks/fault.h Normal file
View File

@@ -0,0 +1,31 @@
/* 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 <linux/tracepoint.h>
#include <trace/hooks/vendor_hooks.h>
struct pt_regs;
DECLARE_RESTRICTED_HOOK(android_rvh_die_kernel_fault,
TP_PROTO(const char *msg, unsigned long addr, unsigned int esr, struct pt_regs *regs),
TP_ARGS(msg, addr, esr, regs), 1);
DECLARE_RESTRICTED_HOOK(android_rvh_do_sea,
TP_PROTO(unsigned long addr, unsigned int esr, struct pt_regs *regs),
TP_ARGS(addr, esr, regs), 1);
DECLARE_RESTRICTED_HOOK(android_rvh_do_mem_abort,
TP_PROTO(unsigned long addr, unsigned int esr, struct pt_regs *regs),
TP_ARGS(addr, esr, regs), 1);
DECLARE_RESTRICTED_HOOK(android_rvh_do_sp_pc_abort,
TP_PROTO(unsigned long addr, unsigned int esr, struct pt_regs *regs),
TP_ARGS(addr, esr, regs),
TP_CONDITION(!user_mode(regs)));
#endif /* _TRACE_HOOK_FAULT_H */
/* This part must be outside protection */
#include <trace/define_trace.h>