From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751809AbbIRHmZ (ORCPT ); Fri, 18 Sep 2015 03:42:25 -0400 Received: from gum.cmpxchg.org ([85.214.110.215]:46318 "EHLO gum.cmpxchg.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751000AbbIRHmY (ORCPT ); Fri, 18 Sep 2015 03:42:24 -0400 Date: Fri, 18 Sep 2015 09:42:17 +0200 From: Johannes Weiner To: Jerome Marchand Cc: Michal Hocko , cgroups@vger.kernel.org, linux-mm@kvack.org, linux-kernel@vger.kernel.org Subject: Re: [PATCH] mm: memcontrol: fix order calculation in try_charge() Message-ID: <20150918074217.GD15395@cmpxchg.org> References: <1442318757-7141-1-git-send-email-jmarchan@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <1442318757-7141-1-git-send-email-jmarchan@redhat.com> User-Agent: Mutt/1.5.23+102 (2ca89bed6448) (2014-03-12) Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Tue, Sep 15, 2015 at 02:05:57PM +0200, Jerome Marchand wrote: > Since commit <6539cc05386> (mm: memcontrol: fold mem_cgroup_do_charge()), > the order to pass to mem_cgroup_oom() is calculated by passing the number > of pages to get_order() instead of the expected size in bytes. AFAICT, > it only affects the value displayed in the oom warning message. > This patch fix this. > > Signed-off-by: Jerome Marchand Acked-by: Johannes Weiner Thanks, Jerome. One minor thing: > @@ -2032,7 +2032,8 @@ retry: > > mem_cgroup_events(mem_over_limit, MEMCG_OOM, 1); > > - mem_cgroup_oom(mem_over_limit, gfp_mask, get_order(nr_pages)); > + mem_cgroup_oom(mem_over_limit, gfp_mask, > + get_order(nr_pages * PAGE_SIZE)); fls(nr_pages)? get_order() is basically fls(x / PAGE_SIZE).