From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756936Ab3K1JNR (ORCPT ); Thu, 28 Nov 2013 04:13:17 -0500 Received: from mail-ea0-f175.google.com ([209.85.215.175]:54510 "EHLO mail-ea0-f175.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755428Ab3K1JNF (ORCPT ); Thu, 28 Nov 2013 04:13:05 -0500 Date: Thu, 28 Nov 2013 10:12:55 +0100 From: Michal Hocko To: Johannes Weiner 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: <20131128091255.GD2761@dhcp22.suse.cz> References: <526028bd.k5qPj2+MDOK1o6ii%akpm@linux-foundation.org> <20131127233353.GH3556@cmpxchg.org> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20131127233353.GH3556@cmpxchg.org> 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 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. -- Michal Hocko SUSE Labs