* [PATCH V2] mm, memory_failure: don't send BUS_MCEERR_AO for action required error
@ 2020-05-30 5:38 Wetp Zhang
2020-05-30 7:08 ` Pankaj Gupta
0 siblings, 1 reply; 3+ messages in thread
From: Wetp Zhang @ 2020-05-30 5:38 UTC (permalink / raw)
To: n-horiguchi, naoya.horiguchi, akpm; +Cc: linux-mm, linux-kernel
Some processes dont't want to be killed early, but in "Action Required"
case, those also may be killed by BUS_MCEERR_AO when sharing memory
with other which is accessing the fail memory.
And sending SIGBUS with BUS_MCEERR_AO for action required error is
strange, so ignore the non-current processes here.
Suggested-by: Naoya Horiguchi <naoya.horiguchi@nec.com>
Signed-off-by: Wetp Zhang <wetp.zy@linux.alibaba.com>
---
mm/memory-failure.c | 15 +++++++++------
1 file changed, 9 insertions(+), 6 deletions(-)
diff --git a/mm/memory-failure.c b/mm/memory-failure.c
index a96364be8ab4..dd3862fcf2e9 100644
--- a/mm/memory-failure.c
+++ b/mm/memory-failure.c
@@ -210,14 +210,17 @@ static int kill_proc(struct to_kill *tk, unsigned long pfn, int flags)
{
struct task_struct *t = tk->tsk;
short addr_lsb = tk->size_shift;
- int ret;
+ int ret = 0;
- pr_err("Memory failure: %#lx: Sending SIGBUS to %s:%d due to hardware memory corruption\n",
- pfn, t->comm, t->pid);
+ if ((t->mm == current->mm) || !(flags & MF_ACTION_REQUIRED))
+ pr_err("Memory failure: %#lx: Sending SIGBUS to %s:%d due to hardware memory corruption\n",
+ pfn, t->comm, t->pid);
- if ((flags & MF_ACTION_REQUIRED) && t->mm == current->mm) {
- ret = force_sig_mceerr(BUS_MCEERR_AR, (void __user *)tk->addr,
- addr_lsb);
+ if (flags & MF_ACTION_REQUIRED) {
+ if (t->mm == current->mm)
+ ret = force_sig_mceerr(BUS_MCEERR_AR,
+ (void __user *)tk->addr, addr_lsb);
+ /* send no signal to non-current processes */
} else {
/*
* Don't use force here, it's convenient if the signal
--
2.14.3 (Apple Git-98)
^ permalink raw reply related [flat|nested] 3+ messages in thread
* Re: [PATCH V2] mm, memory_failure: don't send BUS_MCEERR_AO for action required error
2020-05-30 5:38 [PATCH V2] mm, memory_failure: don't send BUS_MCEERR_AO for action required error Wetp Zhang
@ 2020-05-30 7:08 ` Pankaj Gupta
2020-06-01 3:11 ` HORIGUCHI NAOYA(堀口 直也)
0 siblings, 1 reply; 3+ messages in thread
From: Pankaj Gupta @ 2020-05-30 7:08 UTC (permalink / raw)
To: Wetp Zhang; +Cc: n-horiguchi, naoya.horiguchi, Andrew Morton, Linux MM, LKML
> Some processes dont't want to be killed early, but in "Action Required"
> case, those also may be killed by BUS_MCEERR_AO when sharing memory
> with other which is accessing the fail memory.
> And sending SIGBUS with BUS_MCEERR_AO for action required error is
> strange, so ignore the non-current processes here.
>
> Suggested-by: Naoya Horiguchi <naoya.horiguchi@nec.com>
> Signed-off-by: Wetp Zhang <wetp.zy@linux.alibaba.com>
> ---
> mm/memory-failure.c | 15 +++++++++------
> 1 file changed, 9 insertions(+), 6 deletions(-)
>
> diff --git a/mm/memory-failure.c b/mm/memory-failure.c
> index a96364be8ab4..dd3862fcf2e9 100644
> --- a/mm/memory-failure.c
> +++ b/mm/memory-failure.c
> @@ -210,14 +210,17 @@ static int kill_proc(struct to_kill *tk, unsigned long pfn, int flags)
> {
> struct task_struct *t = tk->tsk;
> short addr_lsb = tk->size_shift;
> - int ret;
> + int ret = 0;
>
> - pr_err("Memory failure: %#lx: Sending SIGBUS to %s:%d due to hardware memory corruption\n",
> - pfn, t->comm, t->pid);
> + if ((t->mm == current->mm) || !(flags & MF_ACTION_REQUIRED))
> + pr_err("Memory failure: %#lx: Sending SIGBUS to %s:%d due to hardware memory corruption\n",
> + pfn, t->comm, t->pid);
Maybe we can generalize the message condition for better readability.
Thought a bit but did not get any other idea.
>
> - if ((flags & MF_ACTION_REQUIRED) && t->mm == current->mm) {
> - ret = force_sig_mceerr(BUS_MCEERR_AR, (void __user *)tk->addr,
> - addr_lsb);
> + if (flags & MF_ACTION_REQUIRED) {
> + if (t->mm == current->mm)
> + ret = force_sig_mceerr(BUS_MCEERR_AR,
> + (void __user *)tk->addr, addr_lsb);
> + /* send no signal to non-current processes */
> } else {
> /*
> * Don't use force here, it's convenient if the signal
> --
Looks good to me.
Acked-by: Pankaj Gupta <pankaj.gupta.linux@gmail.com>
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [PATCH V2] mm, memory_failure: don't send BUS_MCEERR_AO for action required error
2020-05-30 7:08 ` Pankaj Gupta
@ 2020-06-01 3:11 ` HORIGUCHI NAOYA(堀口 直也)
0 siblings, 0 replies; 3+ messages in thread
From: HORIGUCHI NAOYA(堀口 直也) @ 2020-06-01 3:11 UTC (permalink / raw)
To: Pankaj Gupta; +Cc: Wetp Zhang, n-horiguchi, Andrew Morton, Linux MM, LKML
On Sat, May 30, 2020 at 09:08:43AM +0200, Pankaj Gupta wrote:
> > Some processes dont't want to be killed early, but in "Action Required"
> > case, those also may be killed by BUS_MCEERR_AO when sharing memory
> > with other which is accessing the fail memory.
> > And sending SIGBUS with BUS_MCEERR_AO for action required error is
> > strange, so ignore the non-current processes here.
> >
> > Suggested-by: Naoya Horiguchi <naoya.horiguchi@nec.com>
> > Signed-off-by: Wetp Zhang <wetp.zy@linux.alibaba.com>
> > ---
> > mm/memory-failure.c | 15 +++++++++------
> > 1 file changed, 9 insertions(+), 6 deletions(-)
> >
> > diff --git a/mm/memory-failure.c b/mm/memory-failure.c
> > index a96364be8ab4..dd3862fcf2e9 100644
> > --- a/mm/memory-failure.c
> > +++ b/mm/memory-failure.c
> > @@ -210,14 +210,17 @@ static int kill_proc(struct to_kill *tk, unsigned long pfn, int flags)
> > {
> > struct task_struct *t = tk->tsk;
> > short addr_lsb = tk->size_shift;
> > - int ret;
> > + int ret = 0;
> >
> > - pr_err("Memory failure: %#lx: Sending SIGBUS to %s:%d due to hardware memory corruption\n",
> > - pfn, t->comm, t->pid);
> > + if ((t->mm == current->mm) || !(flags & MF_ACTION_REQUIRED))
> > + pr_err("Memory failure: %#lx: Sending SIGBUS to %s:%d due to hardware memory corruption\n",
> > + pfn, t->comm, t->pid);
>
> Maybe we can generalize the message condition for better readability.
> Thought a bit but did not get any other idea.
This odd condition might imply that we could have better fix in
task_early_kill(), but that should come after fixing priority issue of
early-kill flag, so let's go with this fix for now.
> >
> > - if ((flags & MF_ACTION_REQUIRED) && t->mm == current->mm) {
> > - ret = force_sig_mceerr(BUS_MCEERR_AR, (void __user *)tk->addr,
> > - addr_lsb);
> > + if (flags & MF_ACTION_REQUIRED) {
> > + if (t->mm == current->mm)
> > + ret = force_sig_mceerr(BUS_MCEERR_AR,
> > + (void __user *)tk->addr, addr_lsb);
> > + /* send no signal to non-current processes */
> > } else {
> > /*
> > * Don't use force here, it's convenient if the signal
> > --
>
> Looks good to me.
> Acked-by: Pankaj Gupta <pankaj.gupta.linux@gmail.com>
Thanks!
Acked-by: Naoya Horiguchi <naoya.horiguchi@nec.com>
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2020-06-01 3:11 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2020-05-30 5:38 [PATCH V2] mm, memory_failure: don't send BUS_MCEERR_AO for action required error Wetp Zhang
2020-05-30 7:08 ` Pankaj Gupta
2020-06-01 3:11 ` HORIGUCHI NAOYA(堀口 直也)
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).