From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752256AbbIOMGH (ORCPT ); Tue, 15 Sep 2015 08:06:07 -0400 Received: from mx1.redhat.com ([209.132.183.28]:58099 "EHLO mx1.redhat.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751630AbbIOMGF (ORCPT ); Tue, 15 Sep 2015 08:06:05 -0400 From: "Jerome Marchand" To: Johannes Weiner , Michal Hocko Cc: cgroups@vger.kernel.org, linux-mm@kvack.org, linux-kernel@vger.kernel.org Subject: [PATCH] mm: memcontrol: fix order calculation in try_charge() Date: Tue, 15 Sep 2015 14:05:57 +0200 Message-Id: <1442318757-7141-1-git-send-email-jmarchan@redhat.com> Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 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 --- mm/memcontrol.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/mm/memcontrol.c b/mm/memcontrol.c index 1742a2d..91bf094 100644 --- a/mm/memcontrol.c +++ b/mm/memcontrol.c @@ -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)); nomem: if (!(gfp_mask & __GFP_NOFAIL)) return -ENOMEM; -- 1.9.3