From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751691Ab3K3Dhj (ORCPT ); Fri, 29 Nov 2013 22:37:39 -0500 Received: from zene.cmpxchg.org ([85.214.230.12]:43087 "EHLO zene.cmpxchg.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751317Ab3K3Dhi (ORCPT ); Fri, 29 Nov 2013 22:37:38 -0500 Date: Fri, 29 Nov 2013 22:37:32 -0500 From: Johannes Weiner To: Michal Hocko Cc: David Rientjes , Andrew Morton , stable@kernel.org, azurit@pobox.sk, mm-commits@vger.kernel.org, linux-kernel@vger.kernel.org, linux-mm@kvack.org Subject: Re: [merged] mm-memcg-handle-non-error-oom-situations-more-gracefully.patch removed from -mm tree Message-ID: <20131130033732.GM22729@cmpxchg.org> References: <526028bd.k5qPj2+MDOK1o6ii%akpm@linux-foundation.org> <20131127233353.GH3556@cmpxchg.org> <20131128091255.GD2761@dhcp22.suse.cz> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20131128091255.GD2761@dhcp22.suse.cz> Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Thu, Nov 28, 2013 at 10:12:55AM +0100, Michal Hocko wrote: > On Wed 27-11-13 18:33:53, Johannes Weiner wrote: > [...] > > diff --git a/mm/memcontrol.c b/mm/memcontrol.c > > index 13b9d0f..5f9e467 100644 > > --- a/mm/memcontrol.c > > +++ b/mm/memcontrol.c > > @@ -2675,7 +2675,7 @@ static int __mem_cgroup_try_charge(struct mm_struct *mm, > > goto bypass; > > > > if (unlikely(task_in_memcg_oom(current))) > > - goto bypass; > > + goto nomem; > > > > /* > > * We always charge the cgroup the mm_struct belongs to. > > Yes, I think we really want this. Plan to send a patch? The first charge > failure due to OOM shouldn't be papered over by a later attempt if we > didn't get through mem_cgroup_oom_synchronize yet. Sure thing. Will send this to Andrew on Monday.