hollalinux
/
linux-sg2042
mirror of https://github.com/sophgo/linux-riscv.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

signal/xtensa: Use force_sig_fault where appropriate 

Filling in struct siginfo before calling force_sig_info a tedious and
error prone process, where once in a great while the wrong fields
are filled out, and siginfo has been inconsistently cleared.

Simplify this process by using the helper force_sig_fault.  Which
takes as a parameters all of the information it needs, ensures
all of the fiddly bits of filling in struct siginfo are done properly
and then calls force_sig_info.

In short about a 5 line reduction in code for every time force_sig_info
is called, which makes the calling function clearer.

Cc: Max Filippov <jcmvbkbc@gmail.com>
Cc: Chris Zankel <chris@zankel.net>
Cc: linux-xtensa@linux-xtensa.org
Acked-by: Max Filippov <jcmvbkbc@gmail.com>
Signed-off-by: "Eric W. Biederman" <ebiederm@xmission.com>
This commit is contained in:
Eric W. Biederman 2018-04-20 09:20:07 -05:00
parent 7de712ccc0
commit 9181010565
2 changed files with 6 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
arch/xtensa/kernel/traps.c
View File

@ -323,8 +323,6 @@ do_illegal_instruction(struct pt_regs *regs)
void void
do_unaligned_user (struct pt_regs *regs) do_unaligned_user (struct pt_regs *regs)
{ {
siginfo_t info;
__die_if_kernel("Unhandled unaligned exception in kernel", __die_if_kernel("Unhandled unaligned exception in kernel",
regs, SIGKILL); regs, SIGKILL);
@ -334,13 +332,7 @@ do_unaligned_user (struct pt_regs *regs)
"(pid = %d, pc = %#010lx)\n", "(pid = %d, pc = %#010lx)\n",
regs->excvaddr, current->comm, regs->excvaddr, current->comm,
task_pid_nr(current), regs->pc); task_pid_nr(current), regs->pc);
clear_siginfo(&info); force_sig_fault(SIGBUS, BUS_ADRALN, (void *) regs->excvaddr, current);
info.si_signo = SIGBUS;
info.si_errno = 0;
info.si_code = BUS_ADRALN;
info.si_addr = (void *) regs->excvaddr;
force_sig_info(SIGBUS, &info, current);
} }
#endif #endif

19
arch/xtensa/mm/fault.c
View File

@ -39,14 +39,13 @@ void do_page_fault(struct pt_regs *regs)
struct mm_struct *mm = current->mm; struct mm_struct *mm = current->mm;
unsigned int exccause = regs->exccause; unsigned int exccause = regs->exccause;
unsigned int address = regs->excvaddr; unsigned int address = regs->excvaddr;
siginfo_t info; int code;
int is_write, is_exec; int is_write, is_exec;
int fault; int fault;
unsigned int flags = FAULT_FLAG_ALLOW_RETRY | FAULT_FLAG_KILLABLE; unsigned int flags = FAULT_FLAG_ALLOW_RETRY | FAULT_FLAG_KILLABLE;
clear_siginfo(&info); code = SEGV_MAPERR;
info.si_code = SEGV_MAPERR;
/* We fault-in kernel-space virtual memory on-demand. The /* We fault-in kernel-space virtual memory on-demand. The
* 'reference' page table is init_mm.pgd. * 'reference' page table is init_mm.pgd.
@ -92,7 +91,7 @@ retry:
*/ */
good_area: good_area:
info.si_code = SEGV_ACCERR; code = SEGV_ACCERR;
if (is_write) { if (is_write) {
if (!(vma->vm_flags & VM_WRITE)) if (!(vma->vm_flags & VM_WRITE))
@ -158,11 +157,7 @@ bad_area:
if (user_mode(regs)) { if (user_mode(regs)) {
current->thread.bad_vaddr = address; current->thread.bad_vaddr = address;
current->thread.error_code = is_write; current->thread.error_code = is_write;
info.si_signo = SIGSEGV; force_sig_fault(SIGSEGV, code, (void *) address, current);
info.si_errno = 0;
/* info.si_code has been set above */
info.si_addr = (void *) address;
force_sig_info(SIGSEGV, &info, current);
return; return;
} }
bad_page_fault(regs, address, SIGSEGV); bad_page_fault(regs, address, SIGSEGV);
@ -187,11 +182,7 @@ do_sigbus:
* or user mode. * or user mode.
*/ */
current->thread.bad_vaddr = address; current->thread.bad_vaddr = address;
info.si_code = SIGBUS; force_sig_fault(SIGBUS, BUS_ADRERR, (void *) address, current);
info.si_errno = 0;
info.si_code = BUS_ADRERR;
info.si_addr = (void *) address;
force_sig_info(SIGBUS, &info, current);
/* Kernel mode? Handle exceptions or die */ /* Kernel mode? Handle exceptions or die */
if (!user_mode(regs)) if (!user_mode(regs))