mirror of
https://github.com/AuxXxilium/linux_dsm_epyc7002.git
synced 2024-12-17 09:42:13 +07:00
signal/arm64: Only call set_thread_esr once in do_page_fault
This code is truly common between the signal sending cases so share it. Reviewed-by: Catalin Marinas <catalin.marinas@arm.com> Tested-by: Catalin Marinas <catalin.marinas@arm.com> Signed-off-by: Eric W. Biederman <ebiederm@xmission.com>
This commit is contained in:
parent
2d2837fab5
commit
559d8d91a8
@ -564,6 +564,7 @@ static int __kprobes do_page_fault(unsigned long addr, unsigned int esr,
|
||||
}
|
||||
|
||||
inf = esr_to_fault_info(esr);
|
||||
set_thread_esr(addr, esr);
|
||||
if (fault & VM_FAULT_SIGBUS) {
|
||||
/*
|
||||
* We had some memory, but were unable to successfully fix up
|
||||
@ -573,7 +574,6 @@ static int __kprobes do_page_fault(unsigned long addr, unsigned int esr,
|
||||
si.si_signo = SIGBUS;
|
||||
si.si_code = BUS_ADRERR;
|
||||
si.si_addr = (void __user *)addr;
|
||||
set_thread_esr(addr, esr);
|
||||
arm64_force_sig_info(&si, inf->name);
|
||||
} else if (fault & (VM_FAULT_HWPOISON_LARGE | VM_FAULT_HWPOISON)) {
|
||||
unsigned int lsb;
|
||||
@ -587,7 +587,6 @@ static int __kprobes do_page_fault(unsigned long addr, unsigned int esr,
|
||||
si.si_code = BUS_MCEERR_AR;
|
||||
si.si_addr = (void __user *)addr;
|
||||
si.si_addr_lsb = lsb;
|
||||
set_thread_esr(addr, esr);
|
||||
arm64_force_sig_info(&si, inf->name);
|
||||
} else {
|
||||
/*
|
||||
@ -599,7 +598,6 @@ static int __kprobes do_page_fault(unsigned long addr, unsigned int esr,
|
||||
si.si_code = fault == VM_FAULT_BADACCESS ?
|
||||
SEGV_ACCERR : SEGV_MAPERR;
|
||||
si.si_addr = (void __user *)addr;
|
||||
set_thread_esr(addr, esr);
|
||||
arm64_force_sig_info(&si, inf->name);
|
||||
}
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user