ARC __builtin_trap handling
cover ARC __builtin_trap handling
Vineet Gupta (2):
ARC: handle gcc generated __builtin_trap()
ARC: handle gcc generated __builtin_trap for older compiler
arch/arc/kernel/traps.c | 14 ++++++++++++++ arch/arc/kernel/troubleshoot.c | 3 +++ 2 files changed, 17 insertions(+)
Signature · 1 line
2.7.4
PATCH 1/2 ARC: handle gcc generated __builtin_trap()
gcc toggle -fisolate-erroneous-paths-dereference (default at -O2 onwards) isolates faulty code paths such as null pointer access, divide by zero etc by emitting __builtin_trap()
Newer ARC gcc generates TRAP_S 5 instruction correspondingly which this patch handles. If user mode, the task is terminated with a SEGV, for kernel mode die() called after register and stack dump.
--- arch/arc/kernel/traps.c | 6 ++++++ arch/arc/kernel/troubleshoot.c | 3 +++ 2 files changed, 9 insertions(+)
arch/arc/kernel/traps.c +6 -0
@@ -83,6 +83,7 @@ DO_ERROR_INFO(SIGILL, "Illegal Insn (or Seq)", insterror_is_error, ILL_ILLOPC) DO_ERROR_INFO(SIGBUS, "Invalid Mem Access", __weak do_memory_error, BUS_ADRERR) DO_ERROR_INFO(SIGTRAP, "Breakpoint Set", trap_is_brkpt, TRAP_BRKPT) DO_ERROR_INFO(SIGBUS, "Misaligned Access", do_misaligned_error, BUS_ADRALN) +DO_ERROR_INFO (SIGSEGV ,"gcc generated __builtin_trap" , do_trap5_error,0 )/* * Entry Point for Misaligned Data access Exception, for emulating in software
@@ -115,6 +116,8 @@ void do_machine_check_fault(unsigned long address, struct pt_regs *regs)* Thus TRAP_S <n> can be used for specific purpose * -1 used for software breakpointing (gdb) * -2 used by kprobes +* -5 __builtin_trap() generated by gcc (2018.03 onwards) for toggle such as +* -fno-isolate-erroneous-paths-dereference */ void do_non_swi_trap (unsigned long address,struct pt_regs *regs) {
@@ -134,6 +137,9 @@ void do_non_swi_trap(unsigned long address, struct pt_regs *regs)kgdb_trap (regs);break ; +case 5 : +do_trap5_error (address, regs); +break ;default :break ; }
arch/arc/kernel/troubleshoot.c +3 -0
@@ -163,6 +163,9 @@ static void show_ecr_verbose(struct pt_regs *regs) else pr_cont("Bus Error, check PRM\n");#endif + }else if (vec ==ECR_V_TRAP ) { +if (regs->ecr_param ==5 ) +pr_cont ("gcc generated __builtin_trap\n" ); }else {pr_cont ("Check Programmer's Manual\n" ); }
Signature · 1 line
2.7.4
PATCH 2/2 ARC: handle gcc generated __builtin_trap for older compiler
In reply to Vineet GuptaARC gcc prior to GNU 2018.03 release didn't have a target specific __builtin_trap() implementation, generating default abort() call.
Implement the abort() call - emulating what newer gcc does for the same, as suggested by Arnd.
--- arch/arc/kernel/traps.c | 9 +++++++++ 1 file changed, 9 insertions(+)
arch/arc/kernel/traps.c +9 -0
@@ -161,3 +161,12 @@ void do_insterror_or_kprobe(unsigned long address, struct pt_regs *regs)insterror_is_error (address, regs); } + +/* +* abort() call generated by older gcc for __builtin_trap() +*/ +void abort (void ) +{ + __asm__ __volatile__("trap_s 5\n" ); +} +EXPORT_SYMBOL (abort);
Signature · 1 line
2.7.4
Re: [PATCH 2/2] ARC: handle gcc generated __builtin_trap for older compiler
Quoted 7 lines · Vineet Gupta
ARC gcc prior to GNU 2018.03 release didn't have a target specific
__builtin_trap()implementation, generating defaultabort()call.Implement the
abort()call - emulating what newer gcc does for the same, as suggested by Arnd.Signed-off-by Vineet Gupta <vgupta at synopsys.com>