diff options
| author | Khalid Aziz <khalid.aziz@oracle.com> | 2018-02-21 18:15:53 +0100 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2018-03-18 15:38:48 +0100 |
| commit | b9fa03656b049d2db61c60233d5cde272ade0ac8 (patch) | |
| tree | 3c24aa4630b4a19f347a4237ff419de4c77a3004 | |
| parent | sparc64: Add support for ADI (Application Data Integrity) (diff) | |
| download | linux-b9fa03656b049d2db61c60233d5cde272ade0ac8.tar.xz linux-b9fa03656b049d2db61c60233d5cde272ade0ac8.zip | |
sparc64: Update signal delivery to use new helper functions
Commit f8ec66014ffd ("signal: Add send_sig_fault and force_sig_fault")
added new helper functions to streamline signal delivery. This patch
updates signal delivery for new/updated handlers for ADI related
exceptions to use the helper function.
Signed-off-by: Khalid Aziz <khalid.aziz@oracle.com>
Cc: Khalid Aziz <khalid@gonehiking.org>
Acked-by: "Eric W. Biederman" <ebiederm@xmission.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
| -rw-r--r-- | arch/sparc/kernel/traps_64.c | 38 |
1 files changed, 9 insertions, 29 deletions
diff --git a/arch/sparc/kernel/traps_64.c b/arch/sparc/kernel/traps_64.c index f36a40217f6c..462a21abd105 100644 --- a/arch/sparc/kernel/traps_64.c +++ b/arch/sparc/kernel/traps_64.c @@ -362,7 +362,6 @@ void sun4v_data_access_exception(struct pt_regs *regs, unsigned long addr, unsig { unsigned short type = (type_ctx >> 16); unsigned short ctx = (type_ctx & 0xffff); - siginfo_t info; if (notify_die(DIE_TRAP, "data access exception", regs, 0, 0x8, SIGTRAP) == NOTIFY_STOP) @@ -406,24 +405,18 @@ void sun4v_data_access_exception(struct pt_regs *regs, unsigned long addr, unsig * kerbel by HV as data access exception with fault type set to * HV_FAULT_TYPE_INV_ASI. */ - info.si_errno = 0; - info.si_addr = (void __user *) addr; - info.si_trapno = 0; switch (type) { case HV_FAULT_TYPE_INV_ASI: - info.si_signo = SIGILL; - info.si_code = ILL_ILLADR; - force_sig_info(SIGILL, &info, current); + force_sig_fault(SIGILL, ILL_ILLADR, (void __user *)addr, 0, + current); break; case HV_FAULT_TYPE_MCD_DIS: - info.si_signo = SIGSEGV; - info.si_code = SEGV_ACCADI; - force_sig_info(SIGSEGV, &info, current); + force_sig_fault(SIGSEGV, SEGV_ACCADI, (void __user *)addr, 0, + current); break; default: - info.si_signo = SIGSEGV; - info.si_code = SEGV_MAPERR; - force_sig_info(SIGSEGV, &info, current); + force_sig_fault(SIGSEGV, SEGV_MAPERR, (void __user *)addr, 0, + current); break; } } @@ -2073,8 +2066,6 @@ static void sun4v_log_error(struct pt_regs *regs, struct sun4v_error_entry *ent, */ void do_mcd_err(struct pt_regs *regs, struct sun4v_error_entry ent) { - siginfo_t info; - if (notify_die(DIE_TRAP, "MCD error", regs, 0, 0x34, SIGSEGV) == NOTIFY_STOP) return; @@ -2110,12 +2101,8 @@ void do_mcd_err(struct pt_regs *regs, struct sun4v_error_entry ent) /* Send SIGSEGV to the userspace process with the right signal * code */ - info.si_signo = SIGSEGV; - info.si_errno = 0; - info.si_code = SEGV_ADIDERR; - info.si_addr = (void __user *)ent.err_raddr; - info.si_trapno = 0; - force_sig_info(SIGSEGV, &info, current); + force_sig_fault(SIGSEGV, SEGV_ADIDERR, (void __user *)ent.err_raddr, + 0, current); } /* We run with %pil set to PIL_NORMAL_MAX and PSTATE_IE enabled in %pstate. @@ -2748,8 +2735,6 @@ void sun4v_do_mna(struct pt_regs *regs, unsigned long addr, unsigned long type_c void sun4v_mem_corrupt_detect_precise(struct pt_regs *regs, unsigned long addr, unsigned long context) { - siginfo_t info; - if (notify_die(DIE_TRAP, "memory corruption precise exception", regs, 0, 0x8, SIGSEGV) == NOTIFY_STOP) return; @@ -2784,12 +2769,7 @@ void sun4v_mem_corrupt_detect_precise(struct pt_regs *regs, unsigned long addr, regs->tpc &= 0xffffffff; regs->tnpc &= 0xffffffff; } - info.si_signo = SIGSEGV; - info.si_code = SEGV_ADIPERR; - info.si_errno = 0; - info.si_addr = (void __user *) addr; - info.si_trapno = 0; - force_sig_info(SIGSEGV, &info, current); + force_sig_fault(SIGSEGV, SEGV_ADIPERR, (void __user *)addr, 0, current); } void do_privop(struct pt_regs *regs) |