Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756107AbYLHCtN (ORCPT ); Sun, 7 Dec 2008 21:49:13 -0500 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1754311AbYLHCs6 (ORCPT ); Sun, 7 Dec 2008 21:48:58 -0500 Received: from TYO201.gate.nec.co.jp ([202.32.8.193]:62599 "EHLO tyo201.gate.nec.co.jp" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754092AbYLHCs5 (ORCPT ); Sun, 7 Dec 2008 21:48:57 -0500 Date: Mon, 8 Dec 2008 11:40:36 +0900 From: Daisuke Nishimura To: Andrew Morton Cc: LKML , linux-mm , Balbir Singh , KAMEZAWA Hiroyuki , Pavel Emelyanov , Li Zefan , Paul Menage , nishimura@mxp.nes.nec.co.jp Subject: Re: [PATCH -mmotm 3/4] memcg: avoid dead lock caused by race between oom and cpuset_attach Message-Id: <20081208114036.2e6b4876.nishimura@mxp.nes.nec.co.jp> In-Reply-To: <20081208110511.ad735d14.nishimura@mxp.nes.nec.co.jp> References: <20081208105824.f8f5d67b.nishimura@mxp.nes.nec.co.jp> <20081208110511.ad735d14.nishimura@mxp.nes.nec.co.jp> Organization: NEC Soft, Ltd. X-Mailer: Sylpheed 2.4.8 (GTK+ 2.10.14; i686-pc-mingw32) Mime-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 3181 Lines: 92 On Mon, 8 Dec 2008 11:05:11 +0900, Daisuke Nishimura wrote: > mpol_rebind_mm(), which can be called from cpuset_attach(), does down_write(mm->mmap_sem). > This means down_write(mm->mmap_sem) can be called under cgroup_mutex. > > OTOH, page fault path does down_read(mm->mmap_sem) and calls mem_cgroup_try_charge_xxx(), > which may eventually calls mem_cgroup_out_of_memory(). And mem_cgroup_out_of_memory() > calls cgroup_lock(). > This means cgroup_lock() can be called under down_read(mm->mmap_sem). > > If those two paths race, dead lock can happen. > > This patch avoid this dead lock by: > - remove cgroup_lock() from mem_cgroup_out_of_memory(). > - define new mutex (memcg_tasklist) and serialize mem_cgroup_move_task() > (->attach handler of memory cgroup) and mem_cgroup_out_of_memory. > > Signed-off-by: Daisuke Nishimura > Reviewed-by: KAMEZAWA Hiroyuki Ooops, Kamezawa-san's address was invalid... Reviewed-by: KAMEZAWA Hiroyuki Sorry. Daisuke Nishimura. > Acked-by: Balbir Singh > --- > mm/memcontrol.c | 5 +++++ > mm/oom_kill.c | 2 -- > 2 files changed, 5 insertions(+), 2 deletions(-) > > diff --git a/mm/memcontrol.c b/mm/memcontrol.c > index 9877b03..fec4fc3 100644 > --- a/mm/memcontrol.c > +++ b/mm/memcontrol.c > @@ -51,6 +51,7 @@ static int really_do_swap_account __initdata = 1; /* for remember boot option*/ > #define do_swap_account (0) > #endif > > +static DEFINE_MUTEX(memcg_tasklist); /* can be hold under cgroup_mutex */ > > /* > * Statistics for memory cgroup. > @@ -797,7 +798,9 @@ static int __mem_cgroup_try_charge(struct mm_struct *mm, > > if (!nr_retries--) { > if (oom) { > + mutex_lock(&memcg_tasklist); > mem_cgroup_out_of_memory(mem_over_limit, gfp_mask); > + mutex_unlock(&memcg_tasklist); > mem_over_limit->last_oom_jiffies = jiffies; > } > goto nomem; > @@ -2173,10 +2176,12 @@ static void mem_cgroup_move_task(struct cgroup_subsys *ss, > struct cgroup *old_cont, > struct task_struct *p) > { > + mutex_lock(&memcg_tasklist); > /* > * FIXME: It's better to move charges of this process from old > * memcg to new memcg. But it's just on TODO-List now. > */ > + mutex_unlock(&memcg_tasklist); > } > > struct cgroup_subsys mem_cgroup_subsys = { > diff --git a/mm/oom_kill.c b/mm/oom_kill.c > index fd150e3..40ba050 100644 > --- a/mm/oom_kill.c > +++ b/mm/oom_kill.c > @@ -429,7 +429,6 @@ void mem_cgroup_out_of_memory(struct mem_cgroup *mem, gfp_t gfp_mask) > unsigned long points = 0; > struct task_struct *p; > > - cgroup_lock(); > read_lock(&tasklist_lock); > retry: > p = select_bad_process(&points, mem); > @@ -444,7 +443,6 @@ retry: > goto retry; > out: > read_unlock(&tasklist_lock); > - cgroup_unlock(); > } > #endif > -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/