From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754851Ab1J2I4l (ORCPT ); Sat, 29 Oct 2011 04:56:41 -0400 Received: from cantor2.suse.de ([195.135.220.15]:33931 "EHLO mx2.suse.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752026Ab1J2I4k (ORCPT ); Sat, 29 Oct 2011 04:56:40 -0400 Date: Sat, 29 Oct 2011 10:56:38 +0200 From: Michal Hocko To: akpm@google.com Cc: mm-commits@vger.kernel.org, rientjes@google.com, kamezawa.hiroyu@jp.fujitsu.com, kosaki.motohiro@jp.fujitsu.com, oleg@redhat.com, rjw@sisk.pl, linux-mm@kvack.org, LKML Subject: Re: + oom-thaw-threads-if-oom-killed-thread-is-frozen-before-deferring.patch added to -mm tree Message-ID: <20111029085638.GA6368@tiehlicka.suse.cz> References: <201110102246.p9AMkPVD004527@hpaq11.eem.corp.google.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <201110102246.p9AMkPVD004527@hpaq11.eem.corp.google.com> User-Agent: Mutt/1.5.21 (2010-09-15) Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Sorry for the really late reply. On Mon 10-10-11 15:46:25, akpm@google.com wrote: > From: David Rientjes > Subject: oom: thaw threads if oom killed thread is frozen before deferring > > If a thread has been oom killed and is frozen, thaw it before returning to > the page allocator. Otherwise, it can stay frozen indefinitely and no > memory will be freed. > > Signed-off-by: David Rientjes > Reported-by: Michal Hocko > Cc: Oleg Nesterov > Cc: KOSAKI Motohiro > Cc: KAMEZAWA Hiroyuki > Cc: "Rafael J. Wysocki" > Cc: Michal Hocko > Signed-off-by: Andrew Morton Can we still update the tags? The issue has been reported by Konstantin Khlebnikov and I think that we want SOB from Rafael here (he originally SOB the previous patch which thawed tasks from oom_kill_task). You can also add my Acked-by. > --- > > mm/oom_kill.c | 6 +++++- > 1 file changed, 5 insertions(+), 1 deletion(-) > > diff -puN mm/oom_kill.c~oom-thaw-threads-if-oom-killed-thread-is-frozen-before-deferring mm/oom_kill.c > --- a/mm/oom_kill.c~oom-thaw-threads-if-oom-killed-thread-is-frozen-before-deferring > +++ a/mm/oom_kill.c > @@ -32,6 +32,7 @@ > #include > #include > #include > +#include > > int sysctl_panic_on_oom; > int sysctl_oom_kill_allocating_task; > @@ -320,8 +321,11 @@ static struct task_struct *select_bad_pr > * blocked waiting for another task which itself is waiting > * for memory. Is there a better alternative? > */ > - if (test_tsk_thread_flag(p, TIF_MEMDIE)) > + if (test_tsk_thread_flag(p, TIF_MEMDIE)) { > + if (unlikely(frozen(p))) > + thaw_process(p); > return ERR_PTR(-1UL); > + } > if (!p->mm) > continue; > > _ > Subject: Subject: oom: thaw threads if oom killed thread is frozen before deferring > > Patches currently in -mm which might be from rientjes@google.com are > > origin.patch > linux-next.patch > oom-avoid-killing-kthreads-if-they-assume-the-oom-killed-threads-mm.patch > oom-remove-oom_disable_count.patch > oom-fix-race-while-temporarily-setting-currents-oom_score_adj.patch > mm-avoid-null-pointer-access-in-vm_struct-via-proc-vmallocinfo.patch > mm-compaction-make-compact_zone_order-static.patch > oom-thaw-threads-if-oom-killed-thread-is-frozen-before-deferring.patch > cpusets-avoid-looping-when-storing-to-mems_allowed-if-one-node-remains-set.patch > -- Michal Hocko SUSE Labs SUSE LINUX s.r.o. Lihovarska 1060/12 190 00 Praha 9 Czech Republic