From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail.linuxfoundation.org ([140.211.169.12]:47877 "EHLO mail.linuxfoundation.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754648AbbLDCQt (ORCPT ); Thu, 3 Dec 2015 21:16:49 -0500 Date: Thu, 3 Dec 2015 18:16:41 -0800 From: Andrew Morton To: Ben Hutchings Cc: chenjie6@huawei.com, lizefan@huawei.com, mhocko@suse.com, rientjes@google.com, stable@vger.kernel.org, Mark Brown Subject: Re: + oom-kill-init-lead-panic.patch added to -mm tree Message-Id: <20151203181641.eba5fbd7.akpm@linux-foundation.org> In-Reply-To: <1449194840.30642.74.camel@decadent.org.uk> References: <565f79a9.1NfOWPRm9h+Yra1D%akpm@linux-foundation.org> <1449194840.30642.74.camel@decadent.org.uk> Mime-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit Sender: stable-owner@vger.kernel.org List-ID: On Fri, 04 Dec 2015 02:07:20 +0000 Ben Hutchings wrote: > On Wed, 2015-12-02 at 15:07 -0800, akpm@linux-foundation.org wrote: > > The patch titled > > Subject: mm/oom_kill.c: avoid killing init > > has been added to the -mm tree. Its filename is > > oom-kill-init-lead-panic.patch > [...] > > --- a/mm/oom_kill.c~oom-kill-init-lead-panic > > +++ a/mm/oom_kill.c > > @@ -608,6 +608,8 @@ void oom_kill_process(struct oom_control > > continue; > > if (unlikely(p->flags & PF_KTHREAD)) > > continue; > > + if (!is_global_init(p)) > > + continue; > [...] > > It looks like this has been forward-ported from an earlier version, > where the conditions were written as: > > if (A && B && ....) > do_send_sig_info(...); > > Since they are now written as 'if (!A) continue', the '!' needs to be > dropped from this one. > argh, crap, yes, thanks. And I just injected this into linux-next. Mark, could you please add this? From: Andrew Morton Subject: oom-kill-init-lead-panic-fix fix inverted test, per Ben Cc: Chen Jie Cc: David Rientjes Cc: Li Zefan Cc: Michal Hocko Cc: Mark Brown Cc: Ben Hutchings Signed-off-by: Andrew Morton --- mm/oom_kill.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff -puN mm/oom_kill.c~oom-kill-init-lead-panic-fix mm/oom_kill.c --- a/mm/oom_kill.c~oom-kill-init-lead-panic-fix +++ a/mm/oom_kill.c @@ -608,7 +608,7 @@ void oom_kill_process(struct oom_control continue; if (unlikely(p->flags & PF_KTHREAD)) continue; - if (!is_global_init(p)) + if (is_global_init(p)) continue; if (p->signal->oom_score_adj == OOM_SCORE_ADJ_MIN) continue; _