summaryrefslogtreecommitdiffstats
path: root/arch
diff options
context:
space:
mode:
authorDongjiu Geng <gengdongjiu@huawei.com>2017-12-13 11:36:47 +0100
committerWill Deacon <will.deacon@arm.com>2017-12-13 10:58:13 +0100
commitfaa75e147b583417273902552c61cf3250a44308 (patch)
tree7301fe6882973bd87f4ea1c4ab9dfab95188bed3 /arch
parentarm64: hw_breakpoint: Use linux/uaccess.h instead of asm/uaccess.h (diff)
downloadlinux-faa75e147b583417273902552c61cf3250a44308.tar.xz
linux-faa75e147b583417273902552c61cf3250a44308.zip
arm64: fault: avoid send SIGBUS two times
do_sea() calls arm64_notify_die() which will always signal user-space. It also returns whether APEI claimed the external abort as a RAS notification. If it returns failure do_mem_abort() will signal user-space too. do_mem_abort() wants to know if we handled the error, we always call arm64_notify_die() so can always return success. Signed-off-by: Dongjiu Geng <gengdongjiu@huawei.com> Reviewed-by: James Morse <james.morse@arm.com> Reviewed-by: Xie XiuQi <xiexiuqi@huawei.com> Signed-off-by: Will Deacon <will.deacon@arm.com>
Diffstat (limited to 'arch')
-rw-r--r--arch/arm64/mm/fault.c5
1 files changed, 2 insertions, 3 deletions
diff --git a/arch/arm64/mm/fault.c b/arch/arm64/mm/fault.c
index 22168cd0dde7..9b7f89df49db 100644
--- a/arch/arm64/mm/fault.c
+++ b/arch/arm64/mm/fault.c
@@ -574,7 +574,6 @@ static int do_sea(unsigned long addr, unsigned int esr, struct pt_regs *regs)
{
struct siginfo info;
const struct fault_info *inf;
- int ret = 0;
inf = esr_to_fault_info(esr);
pr_err("Synchronous External Abort: %s (0x%08x) at 0x%016lx\n",
@@ -589,7 +588,7 @@ static int do_sea(unsigned long addr, unsigned int esr, struct pt_regs *regs)
if (interrupts_enabled(regs))
nmi_enter();
- ret = ghes_notify_sea();
+ ghes_notify_sea();
if (interrupts_enabled(regs))
nmi_exit();
@@ -604,7 +603,7 @@ static int do_sea(unsigned long addr, unsigned int esr, struct pt_regs *regs)
info.si_addr = (void __user *)addr;
arm64_notify_die("", regs, &info, esr);
- return ret;
+ return 0;
}
static const struct fault_info fault_info[] = {