mirror of
https://github.com/AuxXxilium/linux_dsm_epyc7002.git
synced 2024-11-24 09:30:52 +07:00
signal/memory-failure: Use force_sig_mceerr and send_sig_mceerr
Delegate filling out struct siginfo to functions in kernel/signal.c to simplify the code. Signed-off-by: "Eric W. Biederman" <ebiederm@xmission.com>
This commit is contained in:
parent
83b57531c5
commit
c0f45555b8
@ -181,19 +181,16 @@ EXPORT_SYMBOL_GPL(hwpoison_filter);
|
||||
static int kill_proc(struct task_struct *t, unsigned long addr,
|
||||
unsigned long pfn, struct page *page, int flags)
|
||||
{
|
||||
struct siginfo si;
|
||||
short addr_lsb;
|
||||
int ret;
|
||||
|
||||
pr_err("Memory failure: %#lx: Killing %s:%d due to hardware memory corruption\n",
|
||||
pfn, t->comm, t->pid);
|
||||
si.si_signo = SIGBUS;
|
||||
si.si_errno = 0;
|
||||
si.si_addr = (void *)addr;
|
||||
si.si_addr_lsb = compound_order(compound_head(page)) + PAGE_SHIFT;
|
||||
addr_lsb = compound_order(compound_head(page)) + PAGE_SHIFT;
|
||||
|
||||
if ((flags & MF_ACTION_REQUIRED) && t->mm == current->mm) {
|
||||
si.si_code = BUS_MCEERR_AR;
|
||||
ret = force_sig_info(SIGBUS, &si, current);
|
||||
ret = force_sig_mceerr(BUS_MCEERR_AR, (void __user *)addr,
|
||||
addr_lsb, current);
|
||||
} else {
|
||||
/*
|
||||
* Don't use force here, it's convenient if the signal
|
||||
@ -201,8 +198,8 @@ static int kill_proc(struct task_struct *t, unsigned long addr,
|
||||
* This could cause a loop when the user sets SIGBUS
|
||||
* to SIG_IGN, but hopefully no one will do that?
|
||||
*/
|
||||
si.si_code = BUS_MCEERR_AO;
|
||||
ret = send_sig_info(SIGBUS, &si, t); /* synchronous? */
|
||||
ret = send_sig_mceerr(BUS_MCEERR_AO, (void __user *)addr,
|
||||
addr_lsb, t); /* synchronous? */
|
||||
}
|
||||
if (ret < 0)
|
||||
pr_info("Memory failure: Error sending signal to %s:%d: %d\n",
|
||||
|
Loading…
Reference in New Issue
Block a user