From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752342AbbCZAvg (ORCPT ); Wed, 25 Mar 2015 20:51:36 -0400 Received: from mail-ig0-f170.google.com ([209.85.213.170]:35904 "EHLO mail-ig0-f170.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752042AbbCZAve (ORCPT ); Wed, 25 Mar 2015 20:51:34 -0400 Date: Wed, 25 Mar 2015 17:51:31 -0700 (PDT) From: David Rientjes X-X-Sender: rientjes@chino.kir.corp.google.com To: Johannes Weiner cc: linux-mm@kvack.org, linux-fsdevel@vger.kernel.org, linux-kernel@vger.kernel.org, Linus Torvalds , Andrew Morton , Tetsuo Handa , Huang Ying , Andrea Arcangeli , Dave Chinner , Michal Hocko , "Theodore Ts'o" Subject: Re: [patch 01/12] mm: oom_kill: remove unnecessary locking in oom_enable() In-Reply-To: <1427264236-17249-2-git-send-email-hannes@cmpxchg.org> Message-ID: References: <1427264236-17249-1-git-send-email-hannes@cmpxchg.org> <1427264236-17249-2-git-send-email-hannes@cmpxchg.org> User-Agent: Alpine 2.10 (DEB 1266 2009-07-14) MIME-Version: 1.0 Content-Type: TEXT/PLAIN; charset=US-ASCII Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Wed, 25 Mar 2015, Johannes Weiner wrote: > Setting oom_killer_disabled to false is atomic, there is no need for > further synchronization with ongoing allocations trying to OOM-kill. > > Signed-off-by: Johannes Weiner > --- > mm/oom_kill.c | 2 -- > 1 file changed, 2 deletions(-) > > diff --git a/mm/oom_kill.c b/mm/oom_kill.c > index 2b665da1b3c9..73763e489e86 100644 > --- a/mm/oom_kill.c > +++ b/mm/oom_kill.c > @@ -488,9 +488,7 @@ bool oom_killer_disable(void) > */ > void oom_killer_enable(void) > { > - down_write(&oom_sem); > oom_killer_disabled = false; > - up_write(&oom_sem); > } > > #define K(x) ((x) << (PAGE_SHIFT-10)) I haven't looked through the new disable-oom-killer-for-pm patchset that was merged, but this oom_killer_disabled thing already looks improperly handled. I think any correctness or cleanups in this area would be very helpful. I think mark_tsk_oom_victim() in mem_cgroup_out_of_memory() is just luckily not racing with a call to oom_killer_enable() and triggering the WARN_ON(oom_killer_disabled) since there's no "oom_sem" held here, and it's an improper context based on the comment of mark_tsk_oom_victim(). There might be something else that is intended but not implemented correctly that I'm unaware of, but I know of no reason why setting of oom_killer_disabled would need to take a semaphore? I'm thinking it has something to do with the remainder of that comment, specifically the "never after oom has been disabled already." Michal?