Skip to content

Commit

Permalink
arch/tile: fix up some minor trap handling issues
Browse files Browse the repository at this point in the history
We now respond to MEM_ERROR traps (e.g. an atomic instruction to
non-cacheable memory) with a SIGBUS.

We also no longer generate a console crash message if a user
process die due to a SIGTRAP.

Signed-off-by: Chris Metcalf <cmetcalf@tilera.com>
  • Loading branch information
Chris Metcalf committed Apr 2, 2012
1 parent e172353 commit a714fff
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 3 deletions.
2 changes: 1 addition & 1 deletion arch/tile/kernel/intvec_64.S
Original file line number Diff line number Diff line change
Expand Up @@ -1178,7 +1178,7 @@ STD_ENTRY(fill_ra_stack)
#define do_hardwall_trap bad_intr
#endif

int_hand INT_MEM_ERROR, MEM_ERROR, bad_intr
int_hand INT_MEM_ERROR, MEM_ERROR, do_trap
int_hand INT_SINGLE_STEP_3, SINGLE_STEP_3, bad_intr
#if CONFIG_KERNEL_PL == 2
int_hand INT_SINGLE_STEP_2, SINGLE_STEP_2, gx_singlestep_handle
Expand Down
9 changes: 7 additions & 2 deletions arch/tile/kernel/traps.c
Original file line number Diff line number Diff line change
Expand Up @@ -200,7 +200,7 @@ void __kprobes do_trap(struct pt_regs *regs, int fault_num,
{
siginfo_t info = { 0 };
int signo, code;
unsigned long address;
unsigned long address = 0;
bundle_bits instr;

/* Re-enable interrupts. */
Expand All @@ -223,6 +223,10 @@ void __kprobes do_trap(struct pt_regs *regs, int fault_num,
}

switch (fault_num) {
case INT_MEM_ERROR:
signo = SIGBUS;
code = BUS_OBJERR;
break;
case INT_ILL:
if (copy_from_user(&instr, (void __user *)regs->pc,
sizeof(instr))) {
Expand Down Expand Up @@ -312,7 +316,8 @@ void __kprobes do_trap(struct pt_regs *regs, int fault_num,
info.si_addr = (void __user *)address;
if (signo == SIGILL)
info.si_trapno = fault_num;
trace_unhandled_signal("trap", regs, address, signo);
if (signo != SIGTRAP)
trace_unhandled_signal("trap", regs, address, signo);
force_sig_info(signo, &info, current);
}

Expand Down

0 comments on commit a714fff

Please sign in to comment.